Преглед изворни кода

fix: 批次托盘绑定优化

Hello小健 пре 3 месеци
родитељ
комит
84d281c9cd

+ 9 - 1
pages/instock/index.vue

@@ -69,6 +69,7 @@
 				<text class="code" :style="{ color: item.status ? 'green' : '#666' }">
 					{{ item.orderNum }}
 					<text v-if="item.batch_text">批次号: {{ item.batch_text }}</text>
+					<text v-if="item.space">仓位编码: {{ item.space }}</text>
 					{{ item.type }}
 				</text>
 
@@ -169,6 +170,11 @@ export default {
 					]
 				}
 			};
+		},
+		spaceRes: function () {
+			const res = this.spaces.find((item) => item.value === this.valiFormData.space_code);
+			console.log(res);
+			return res?.text;
 		}
 	},
 	onShow() {
@@ -251,7 +257,7 @@ export default {
 			this.valiFormData = {
 				...this.valiFormData,
 				orderNum: '',
-				space_code: '',
+				// space_code: '',
 				batch_number: '',
 				weight: '',
 				search_pkg: true,
@@ -363,6 +369,7 @@ export default {
 						const historyItem = {
 							orderNum: this.valiFormData.orderNum,
 							createTime: new Date(),
+							space: this.spaceRes,
 							type: '入库',
 							status: true
 						};
@@ -376,6 +383,7 @@ export default {
 						const historyItem = {
 							orderNum: this.valiFormData.orderNum,
 							createTime: new Date(),
+							space: this.spaceRes,
 							type: '入库',
 							status: false
 						};

+ 1 - 0
pages/instock/instockLog.vue

@@ -4,6 +4,7 @@
 			<text class="code" :style="{ color: item.status ? 'green' : '#666' }">
 				{{ item.orderNum }}
 				<text v-if="item.batch_text">批次号: {{ item.batch_text }}</text>
+				<text v-if="item.space">仓位编码: {{ item.space }}</text>
 				{{ item.type }}
 			</text>
 			<uni-icons v-if="item.status" type="checkmarkempty" class="status" size="16" color="green"></uni-icons>

+ 2 - 3
pages/scanLotno/index.vue

@@ -306,7 +306,6 @@
 					getHistory();
 				}
 				st = setTimeout(() => {
-					setFocus();
 					reset();
 					setFocus();
 					st && clearTimeout(st);
@@ -440,11 +439,11 @@
 	}
 
 	.select-item {
-		.uni-forms-item__content {
+		:deep(.uni-forms-item__content) {
 			display: flex !important;
 		}
 
-		.uni-forms-item__label {
+		:deep(.uni-forms-item__label) {
 			width: auto !important;
 		}
 

+ 3 - 3
unpackage/dist/cache/.vite/deps/_metadata.json

@@ -1,8 +1,8 @@
 {
-  "hash": "f40f3ae4",
-  "configHash": "d35ae346",
+  "hash": "adf7464e",
+  "configHash": "fd42d985",
   "lockfileHash": "e3b0c442",
-  "browserHash": "63a7975d",
+  "browserHash": "d1f8efbb",
   "optimized": {},
   "chunks": {}
 }

+ 0 - 0
unpackage/dist/dev/.vue-devtools/frontServer.js


+ 1 - 0
unpackage/dist/dev/.vue-devtools/port.js

@@ -0,0 +1 @@
+9098