change

pages/entry/mater-group.vue

@@ -44,7 +44,8 @@
 							<tr v-for="(e, i) in dataList" :key="i">
 								<td>{{e.material_name}}</td>
 								<td>{{e.material_code}}</td>
-								<td>{{e.qty}}</td>
+								<!-- <td>{{e.qty}}</td> -->
+								<td><input type="number" class="sin_input" v-model="e.qty" @blur="handleBlur(e)"></td>
 								<td>{{e.pcsn}}</td>
 							</tr>
 						</tbody>
@@ -78,6 +79,7 @@
 				val3: '',
 				wlxxtext: '',
 				dataList: [],
+				curList: [],
 				disabled: false
 			};
 		},
@@ -86,10 +88,56 @@
 		},
 		onShow() {
 			if (this.$store.getters.publicArr.length) {
-				this.dataList = this.$store.getters.publicArr
+				// this.dataList =  [...this.dataList, ...this.$store.getters.publicArr]
+				this.dataList = this.mergeArrays(this.dataList, this.$store.getters.publicArr)
 			}
 		},
 		methods: {
+			mergeArrays (arr1, arr2) {
+				// 创建Map存储结果，以material_id为键
+				const resultMap = new Map();
+				
+				// 先添加arr1的所有记录
+				arr1.forEach(item => {
+					resultMap.set(item.material_id, { ...item });
+				});
+				
+				// 合并arr2的记录
+				arr2.forEach(item => {
+					const materialId = item.material_id;
+					if (resultMap.has(materialId)) {
+					// 存在相同material_id：更新qty为arr2的值
+					const existing = resultMap.get(materialId);
+					resultMap.set(materialId, {
+						...existing,  // 保留原有字段
+						qty: item.qty,  // 使用arr2的qty值
+						// 如果arr2有pcsn则更新，否则保留原来的pcsn
+						...(item.pcsn !== undefined && { pcsn: item.pcsn })
+					});
+					} else {
+					// 不存在相同material_id：直接添加新记录
+					resultMap.set(materialId, { ...item });
+					}
+				});
+				
+				// 将Map的值转为数组
+				return Array.from(resultMap.values());
+			},
+			handleBlur (e) {
+				if (e.qty) {
+					if (e.qty < 0) {
+						e.qty = 0
+					} else {
+						e.qty = e.qty.replace(/[^0-9]/g, '')
+						e.qty = e.qty.replace(/^0+/, '') || '0'
+					}
+				} else {
+					// uni.showToast({
+					// 	title: '数量必填',
+					// 	icon: 'none'
+					// })
+				}
+			},
 			toJump () {
 				uni.navigateTo({
 					url: '/pages/common/mater-list?title=查询物料'
@@ -107,6 +155,17 @@
 					this.disabled = false
 					return
 				}
+				let allValid = this.dataList.every(item => item.qty !== '');
+				console.log(allValid, 666)
+				console.log(this.dataList, 666)
+				if (!allValid) {
+					uni.showToast({
+						title: '数量必填',
+						icon: 'none'
+					})
+					this.disabled = false
+					return
+				}
 				try {
 					let res = await groupPlate(this.dataList, this.val2, this.val1)
 					if (res.code === '200') {