优化

pages/pda/common.js

@@ -178,6 +178,28 @@ export const tableHeader = selectEquiType => {
 
 		case 14:
 			return []
+			
+			case 23:
+				return [
+			
+					{
+						label: '名称',
+						prop: 'name'
+					},
+			
+					{
+						label: '型号',
+						prop: 'modelType'
+					},
+					{
+						label: '规格',
+						prop: 'specification'
+					},
+					{
+						label: '牌号',
+						prop: 'brandNum'
+					}
+				]
 
 	}
 

pages/pda/feeding/details.vue

@@ -161,6 +161,7 @@
 						let equipmentList = [] // 生产设备
 						let palletList = [] // 舟皿
 						let revolvingDiskList = [] // 周转盘
+						let semiProductList = [] // 半成品
 
 
 						selectList.forEach(f => {
@@ -180,7 +181,10 @@
 								palletList = palletList.concat(f)
 							} else if (f.rootCategoryLevelId == 26) {
 								revolvingDiskList = revolvingDiskList.concat(f)
+							}else if (f.rootCategoryLevelId == 23) {
+								semiProductList = semiProductList.concat(f)
 							}
+							
 
 
 
@@ -193,6 +197,7 @@
 						this.$set(m, 'equipmentList', equipmentList)
 						this.$set(m, 'palletList', palletList)
 						this.$set(m, 'revolvingDiskList', revolvingDiskList)
+						this.$set(m, 'semiProductList', semiProductList)
 
 
 

pages/pda/turnover/components/qualityTurnoverBom.vue

@@ -188,14 +188,21 @@
 
 			},
 
-			saveTurn(index, newTurnover) {
+			saveTurn(index, newTurnover, unmatched) {
 				let arr = this.newList[index].extInfo.positionList.filter(e => {
 					return e.check
 				})
 
 				arr.forEach(f => {
-					f.isend = true
-					f.quantity = 0
+					if(!unmatched.includes(f.code)) {
+						f.isend = true
+						f.quantity = 0
+						f.categoryCode = null
+						f.workOrderCode = null
+					} else {
+						f.check = false
+					}
+			
 				})
 
 				let turnoverArr = []

pages/pda/turnover/components/qualityTurnoverPopup.vue

@@ -218,14 +218,14 @@
 			},
 
 			save() {
-				if (this.sum - this.count != 0) {
-					uni.showToast({
-						title: '转移数量对应不上',
-						icon: 'none'
-					})
-					return
-				}
-				this.$emit('saveTurn', this.idx, this.newTurnover)
+				// if (this.sum - this.count != 0) {
+				// 	uni.showToast({
+				// 		title: '转移数量对应不上',
+				// 		icon: 'none'
+				// 	})
+				// 	return
+				// }
+				this.$emit('saveTurn', this.idx, this.newTurnover, this.unmatched)
 				this.show = false
 
 			}