diff --git a/package.json b/package.json
index b7983b7..c5923b0 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "wms-pda",
- "version": "1.0.140",
+ "version": "1.0.141",
"private": true,
"description": "天豹云仓 WMS_PDA(uni-app Vue2 + @vue/cli 4.5)",
"scripts": {
diff --git a/src/manifest.json b/src/manifest.json
index e3c004b..accf726 100644
--- a/src/manifest.json
+++ b/src/manifest.json
@@ -2,8 +2,8 @@
"name" : "WMS_PDA",
"appid" : "__UNI__0B3DAD3",
"description" : "多平台快速开发的UI框架",
- "versionName" : "1.0.140",
- "versionCode" : 1000140,
+ "versionName" : "1.0.141",
+ "versionCode" : 1000141,
"transformPx" : false,
"app-plus" : {
"statusbar" : {
diff --git a/src/pages/configuration/Workbench.vue b/src/pages/configuration/Workbench.vue
index bdd963d..885e60b 100644
--- a/src/pages/configuration/Workbench.vue
+++ b/src/pages/configuration/Workbench.vue
@@ -9,9 +9,9 @@
- {{ opt.label }}
+
+
+ {{ opt.label }}
+
+
@@ -53,7 +57,9 @@
plain
:disabled="Number(item.status) !== 1"
@click="openBindPopup(item)"
- >绑定
+ >
+ 绑定
+
@@ -84,17 +90,13 @@
@@ -431,6 +438,18 @@
},
getStatusType(status) {
return Number(status) === 1 ? 'success' : 'warning';
+ },
+ // 筛选按钮激活态:启用=绿、禁用=橙,与列表状态标签 u-tag 保持一致
+ filterItemClass(opt) {
+ const classes = { 'filter-group__item--active': this.statusFilter === opt.value };
+ if (this.statusFilter === opt.value) {
+ if (opt.value === 1) {
+ classes['filter-group__item--success'] = true;
+ } else if (opt.value === 0) {
+ classes['filter-group__item--warning'] = true;
+ }
+ }
+ return classes;
}
}
}
@@ -452,7 +471,7 @@
.search-filter {
background: #ffffff;
- padding: 20rpx 24rpx 12rpx;
+ padding: 16rpx 24rpx 12rpx;
border-bottom: 1rpx solid #f0f0f0;
}
@@ -468,24 +487,55 @@
margin-top: 16rpx;
}
- /* 真机 WebView 对 flex gap 兼容性差,改用 margin 拉开按钮间隔 */
- .status-filter__chip {
- padding: 8rpx 28rpx;
- font-size: 26rpx;
- color: #606266;
- background: #f5f5f5;
- border-radius: 999rpx;
- transition: all 0.2s;
- margin-right: 32rpx;
+ .filter-group {
+ flex: 1;
+ display: flex;
}
- .status-filter__chip:last-child {
- margin-right: 0;
+ .filter-group__item {
+ flex: 1;
+ height: 56rpx;
+ padding: 0 12rpx;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ background: #f5f7fa;
+ border: 1rpx solid #ebeef5;
+ border-radius: 28rpx;
}
- .status-filter__chip--active {
- color: #ffffff;
+ .filter-group__item + .filter-group__item {
+ margin-left: 16rpx;
+ }
+
+ .filter-group__item--active {
background: #2979ff;
+ border-color: #2979ff;
+ box-shadow: 0 4rpx 12rpx rgba(41, 121, 255, 0.28);
+ }
+
+ /* 启用=绿(#5ac725)/ 禁用=橙(#f9ae3d),与列表 u-tag success/warning 一致 */
+ .filter-group__item--success {
+ background: #5ac725;
+ border-color: #5ac725;
+ box-shadow: 0 4rpx 12rpx rgba(90, 199, 37, 0.28);
+ }
+
+ .filter-group__item--warning {
+ background: #f9ae3d;
+ border-color: #f9ae3d;
+ box-shadow: 0 4rpx 12rpx rgba(249, 174, 61, 0.28);
+ }
+
+ .filter-group__item-text {
+ font-size: 34rpx;
+ color: #606266;
+ white-space: nowrap;
+ }
+
+ .filter-group__item--active .filter-group__item-text {
+ color: #ffffff;
+ font-weight: bold;
}
.list-content {
@@ -507,13 +557,13 @@
}
.empty-text {
- font-size: 34rpx;
- font-weight: 600;
+ font-size: 36rpx;
+ font-weight: bold;
color: #303133;
}
.empty-hint {
- font-size: 26rpx;
+ font-size: 32rpx;
color: #909399;
text-align: center;
}
@@ -546,7 +596,7 @@
.workbench-card__name {
font-size: 38rpx;
- font-weight: 600;
+ font-weight: bold;
color: #303133;
flex: 1;
min-width: 0;
@@ -556,6 +606,41 @@
flex-shrink: 0;
display: flex;
align-items: center;
+
+ /* 状态标签(启用/禁用)文字字号 */
+ ::v-deep .u-tag__text {
+ font-size: 34rpx;
+ line-height: 1;
+ }
+
+ /* 状态标签宽高:与 34rpx 文字协调,并与绑定按钮等高对齐 */
+ ::v-deep .u-tag {
+ height: 56rpx;
+ line-height: 56rpx;
+ padding: 0 16rpx;
+ box-sizing: border-box;
+ }
+
+ /* 绑定按钮宽高:与 36rpx 文字协调,避免 mini 尺寸过于紧凑 */
+ ::v-deep .u-button {
+ height: 56rpx;
+ min-width: auto;
+ padding: 0 24rpx;
+ line-height: 56rpx;
+ }
+
+ /* 禁用时置灰(去掉半透明效果,改为明确的灰底灰字) */
+ ::v-deep .u-button--disabled {
+ opacity: 1;
+ color: #c0c4cc;
+ background-color: #f5f7fa;
+ border-color: #dcdfe6;
+ }
+ }
+
+ .workbench-card__bind-text {
+ font-size: 36rpx;
+ line-height: 1;
}
/* 状态标签与绑定按钮间隔(用 margin 兼容真机 WebView) */
@@ -566,7 +651,7 @@
.workbench-card__row {
display: flex;
align-items: flex-start;
- font-size: 26rpx;
+ font-size: 34rpx;
padding: 6rpx 0;
}
@@ -583,78 +668,80 @@
word-break: break-all;
}
- /* 绑定面板 */
+ /* 绑定面板(样式参考完成盘点确认弹窗) */
.bind-popup {
- width: 580rpx;
- padding: 40rpx 36rpx;
+ width: 640rpx;
+ padding: 40rpx 32rpx 32rpx;
+ background: #ffffff;
+ border-radius: 20rpx;
box-sizing: border-box;
}
- .bind-popup__header {
- position: relative;
- margin-bottom: 50rpx;
- }
-
.bind-popup__title {
- font-size: 34rpx;
- font-weight: 600;
+ font-size: 42rpx;
+ font-weight: bold;
color: #303133;
text-align: center;
- }
-
- .bind-popup__close {
- position: absolute;
- top: 50%;
- right: -2rpx;
- transform: translateY(-50%);
- z-index: 2;
- padding: 6rpx;
- display: flex;
- align-items: center;
- justify-content: center;
+ margin-bottom: 32rpx;
}
.bind-popup__workbench {
display: flex;
align-items: center;
- gap: 8rpx;
- padding: 16rpx 20rpx;
+ padding: 24rpx;
margin-bottom: 24rpx;
- background: #f5f6f8;
+ background: #f5f7fa;
border-radius: 12rpx;
}
.bind-popup__label {
flex-shrink: 0;
- font-size: 26rpx;
+ font-size: 32rpx;
color: #909399;
+ margin-right: 8rpx;
}
.bind-popup__name {
font-size: 38rpx;
- font-weight: 600;
+ font-weight: bold;
color: #303133;
}
- .bind-popup__hint {
- margin-top: 12rpx;
- font-size: 24rpx;
- color: #909399;
- text-align: center;
- }
-
.bind-popup__actions {
display: flex;
align-items: center;
- margin-top: 32rpx;
+ margin-top: 64rpx;
}
- .bind-popup__actions ::v-deep .u-button {
+ .bind-popup__btn {
flex: 1;
+ height: 88rpx;
+ border-radius: 12rpx;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ font-size: 36rpx;
+ font-weight: 500;
}
- .bind-popup__actions ::v-deep .u-button + .u-button {
- margin-left: 48rpx;
+ .bind-popup__btn + .bind-popup__btn {
+ margin-left: 20rpx;
+ }
+
+ .bind-popup__btn--cancel {
+ background: #f5f7fa;
+ color: #606266;
+ border: 1rpx solid #dcdfe6;
+ }
+
+ .bind-popup__btn--confirm {
+ background: #2979ff;
+ color: #ffffff;
+ }
+
+ .bind-popup__btn--disabled {
+ opacity: 0.6;
+ pointer-events: none;
}
/* 输入框行:输入框 + 行末扫码图标按钮 */
@@ -666,6 +753,8 @@
.bind-popup__input-row ::v-deep .bind-popup__input {
flex: 1;
min-width: 0;
+ height: 88rpx;
+ box-sizing: border-box;
}
.bind-popup__input-row ::v-deep .bind-popup__scan-btn {
diff --git a/src/pages/warehouse/inventoryTransfer.vue b/src/pages/warehouse/inventoryTransfer.vue
index 343af56..920e1db 100644
--- a/src/pages/warehouse/inventoryTransfer.vue
+++ b/src/pages/warehouse/inventoryTransfer.vue
@@ -558,14 +558,14 @@ export default {
}
.filter-group__item-text {
- font-size: 30rpx;
- color: #303133;
+ font-size: 34rpx;
+ color: #606266;
white-space: nowrap;
}
.filter-group__item--active .filter-group__item-text {
color: #ffffff;
- font-weight: 600;
+ font-weight: bold;
}
/* 移出(橙色警示) */
@@ -613,7 +613,7 @@ export default {
.empty-hint {
margin-top: 12rpx;
- font-size: 30rpx;
+ font-size: 32rpx;
color: #c0c4cc;
}
diff --git a/src/pages/work/order/gBWaveStrategy.vue b/src/pages/work/order/gBWaveStrategy.vue
index 680bc6e..31658bd 100644
--- a/src/pages/work/order/gBWaveStrategy.vue
+++ b/src/pages/work/order/gBWaveStrategy.vue
@@ -24,8 +24,7 @@
策略类型:{{ currentStrategy.strategyTypeText }}
分批模式:
- {{ currentStrategy.batchModeText }}
- {{ currentStrategy.batchMode }}
+ {{ currentStrategy.batchModeText || currentStrategy.batchMode }}
@@ -81,7 +80,7 @@
color="#ffffff"
:volume-icon="false"
:more-icon="false"
- :speed="60"
+ :speed="30"
:padding="0"
:radius="0"
:autoplay="true"
@@ -103,8 +102,8 @@
- 刷新
- 抓取团购
+
+
+
+
+
+
+