diff --git a/package-lock.json b/package-lock.json
index 8a77b35..dc726bf 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
{
"name": "wms-worker-station",
- "version": "1.0.20",
+ "version": "1.0.24",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
"name": "wms-worker-station",
- "version": "1.0.20",
+ "version": "1.0.24",
"devDependencies": {
"@dcloudio/types": "^3.4.8",
"@dcloudio/uni-app": "3.0.0-5000720260410001",
@@ -19,7 +19,7 @@
"@vue/runtime-core": "^3.4.21",
"electron": "^33.4.11",
"electron-builder": "^26.15.3",
- "jsbarcode": "^3.11.6",
+ "jsbarcode": "^3.12.3",
"vite": "5.2.8",
"vue": "^3.4.21",
"vue-i18n": "^9.1.9"
@@ -7580,7 +7580,7 @@
},
"node_modules/jsbarcode": {
"version": "3.12.3",
- "resolved": "https://registry.npmjs.org/jsbarcode/-/jsbarcode-3.12.3.tgz",
+ "resolved": "https://mirrors.cloud.tencent.com/npm/jsbarcode/-/jsbarcode-3.12.3.tgz",
"integrity": "sha512-CuHU9hC6dPsHF5oVFMo8NW76uQVjH4L22CsP4hW+dNnGywJHC/B0ThA1CTDVLnxKLrrpYdicBLnd2xsgTfRnvg==",
"dev": true,
"license": "MIT"
diff --git a/package.json b/package.json
index d91a4a6..c25a226 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "wms-worker-station",
- "version": "1.0.24",
+ "version": "1.0.27",
"description": "WMS仓库工作台桌面端",
"author": "tianbao",
"main": "electron/main.js",
@@ -18,7 +18,6 @@
"android:pack": "powershell -NoProfile -ExecutionPolicy Bypass -File android-offline/pack.ps1",
"start:electron": "electron electron/main.js"
},
- "dependencies": {},
"devDependencies": {
"@dcloudio/types": "^3.4.8",
"@dcloudio/uni-app": "3.0.0-5000720260410001",
@@ -31,7 +30,7 @@
"@vue/runtime-core": "^3.4.21",
"electron": "^33.4.11",
"electron-builder": "^26.15.3",
- "jsbarcode": "^3.11.6",
+ "jsbarcode": "^3.12.3",
"vite": "5.2.8",
"vue": "^3.4.21",
"vue-i18n": "^9.1.9"
diff --git a/src/pages/packaging/index.vue b/src/pages/packaging/index.vue
index 6cbdb82..50351c3 100644
--- a/src/pages/packaging/index.vue
+++ b/src/pages/packaging/index.vue
@@ -143,24 +143,24 @@
今日打包
- {{ todayWaveCount }}
团购波次
+ {{ todayWaveCount }}
- {{ todayGroupOrderCount }}
团购订单
+ {{ todayGroupOrderCount }}
- {{ todaySingleCount }}
散单
+ {{ todaySingleCount }}
- {{ todayRatio }}
团散
+ {{ todayRatio }}
- {{ todayAvgPiece ?? '—' }}
均件数
+ {{ todayAvgPiece ?? '—' }}
@@ -762,8 +762,8 @@ export default {
images,
// 打包要求(packing_requirements)
packingRequirements: it?.packing_requirements ?? it?.packingRequirements ?? '',
- // 是否免验(need_recheck=Y 免验直接标绿;默认 N 需要核实)
- needRecheck: String(it?.need_recheck ?? it?.needRecheck ?? 'N'),
+ // 是否需要验货(need_recheck=Y 需要核实;N 免验直接标绿;缺失按需要核实处理)
+ needRecheck: String(it?.need_recheck ?? it?.needRecheck ?? 'Y'),
}
})
},
@@ -916,9 +916,9 @@ export default {
// 商品明细
this.detailList = this.mapOrderItems(items)
- // 免验商品(need_recheck=Y)直接标记为已核实(标绿),无需扫码/长按
+ // 免验商品(need_recheck=N)直接标记为已核实(标绿),无需扫码/长按
this.detailList.forEach((item) => {
- if (item.needRecheck === 'Y') {
+ if (item.needRecheck === 'N') {
item.scannedQty = Number(item.qty) || 0
}
})
@@ -3453,7 +3453,7 @@ export default {
}
.pack-order-type {
- font-size: 0.614rem;
+ font-size: 0.512rem;
line-height: 1;
padding: 0.205rem 0.512rem;
border-radius: 25.574rem;
@@ -3474,13 +3474,13 @@ export default {
.pack-detail-scan-stat {
margin-left: 1.024rem;
- font-size: 0.768rem;
+ font-size: 0.64rem;
color: #2f7dff;
}
.pack-verify-hint {
margin-left: 0.614rem;
- font-size: 0.614rem;
+ font-size: 0.512rem;
color: #999;
}
@@ -3489,7 +3489,7 @@ export default {
height: 1.434rem;
line-height: 1.434rem;
padding: 0 0.614rem;
- font-size: 0.666rem;
+ font-size: 0.563rem;
border-radius: 0.205rem;
color: #ffffff;
background-color: #e64340;
@@ -3671,27 +3671,38 @@ export default {
/* 今日打包 */
.pack-today-stats {
display: flex;
+ flex-wrap: wrap;
align-items: center;
- justify-content: space-around;
padding: 0.256rem 0;
}
.pack-stat {
display: flex;
- flex-direction: column;
+ flex-direction: row;
align-items: center;
+ width: 50%;
+ min-width: 0;
+ box-sizing: border-box;
+ padding: 0.205rem 0.512rem;
}
.pack-stat-num {
font-size: 0.922rem;
font-weight: 700;
color: #2f7dff;
+ white-space: nowrap;
+ flex-shrink: 0;
}
.pack-stat-label {
font-size: 0.666rem;
color: #888;
- margin-top: 0.205rem;
+ margin-right: 0.205rem;
+ white-space: nowrap;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ flex-shrink: 1;
+ min-width: 0;
}
/* 扫描记录 */