diff --git a/.hbuilderx/launch.json b/.hbuilderx/launch.json index 9c80382..0c2e437 100644 --- a/.hbuilderx/launch.json +++ b/.hbuilderx/launch.json @@ -2,7 +2,7 @@ "version" : "1.0", "configurations" : [ { - "playground" : "custom", + "playground" : "standard", "type" : "uni-app:app-android" }, { diff --git a/package.json b/package.json index d8eff57..ccfa0da 100644 --- a/package.json +++ b/package.json @@ -58,6 +58,7 @@ "@dcloudio/uni-mp-xhs": "3.0.0-4020920240930001", "@dcloudio/uni-quickapp-webview": "3.0.0-4020920240930001", "@rollup/rollup-darwin-arm64": "^4.27.2", + "lodash-es": "^4.17.21", "pinia": "^2.2.2", "pinia-plugin-persistedstate": "^3.2.3", "sass": "^1.32.13", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index f875e58..297e976 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -56,6 +56,9 @@ importers: '@rollup/rollup-darwin-arm64': specifier: ^4.27.2 version: 4.27.2 + lodash-es: + specifier: ^4.17.21 + version: 4.17.21 pinia: specifier: ^2.2.2 version: 2.2.6(vue@3.5.13) @@ -2748,6 +2751,9 @@ packages: resolution: {integrity: sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==} engines: {node: '>=10'} + lodash-es@4.17.21: + resolution: {integrity: sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw==} + lodash.camelcase@4.3.0: resolution: {integrity: sha512-TwuEnCnxbc3rAvhf/LbG7tJUDzhqXyFnv3dtzLOPgCG/hODL7WFnsbwktkD7yUV0RrreP/l1PALq/YSg6VvjlA==} @@ -7555,6 +7561,8 @@ snapshots: dependencies: p-locate: 5.0.0 + lodash-es@4.17.21: {} + lodash.camelcase@4.3.0: {} lodash.debounce@4.0.8: {} diff --git a/src/pages/login/index.vue b/src/pages/login/index.vue index fc535a0..cf3dd4c 100644 --- a/src/pages/login/index.vue +++ b/src/pages/login/index.vue @@ -20,9 +20,10 @@ diff --git a/src/pages/picking/outbound/details.vue b/src/pages/picking/outbound/details.vue index 4cea7fe..610020d 100644 --- a/src/pages/picking/outbound/details.vue +++ b/src/pages/picking/outbound/details.vue @@ -8,7 +8,7 @@ - + 查询 @@ -19,47 +19,47 @@ class="table-list-item" @tap="onCodingItem(item)" > -
+ {{ index + 1 }} 物资名称: -
{{ item.maTypeName }}
+ + {{ item.maTypeName }} +
{{ index + 1 }} 规格型号: -
{{ item.typeName }}
+ + {{ item.typeName }} +
{{ index + 1 }} 预领数量: -
{{ item.preNum }}
+ + {{ item.preNum }} +
{{ index + 1 }} 已领数量: -
{{ item.alNum }}
+ + {{ item.alNum }} +
{{ index + 1 }} 待领数量: -
{{ item.preNum - item.alNum }}
+ {{ item.preNum - item.alNum }}
{{ index + 1 }} 单位: -
{{ item.unitName }}
+ {{ item.unitName }}
@@ -168,7 +168,7 @@ const onCodingItem = (item) => { if (manageType === 0) { codingUrl = '/pages/picking/outbound/code-outbound' // 编码出库 } - if (manageType === 1) { + if (manageType == 1) { codingUrl = '/pages/picking/outbound/num-outbound' // 数量出库 } diff --git a/src/pages/picking/outbound/index.vue b/src/pages/picking/outbound/index.vue index bebebeb..10c8fb8 100644 --- a/src/pages/picking/outbound/index.vue +++ b/src/pages/picking/outbound/index.vue @@ -115,8 +115,8 @@