11

pages/pda/feeding/components/feedBom.js

@@ -166,6 +166,43 @@ export const tableHeader = selectEquiType => {
 					prop: 'brandNum'
 				}
 			]
+			
+			case 9:
+				return [
+				
+			
+					{
+						label: '型号',
+						prop: 'modelType'
+					},
+					{
+						label: '规格',
+						prop: 'specification'
+					},
+					{
+						label: '牌号',
+						prop: 'brandNum'
+					}
+				]
+				
+				case 28:
+					return [
+					
+				
+						{
+							label: '型号',
+							prop: 'modelType'
+						},
+						{
+							label: '规格',
+							prop: 'specification'
+						},
+						{
+							label: '牌号',
+							prop: 'brandNum'
+						}
+					]
+				
 
 	}
 

pages/pda/feeding/details.vue

@@ -97,7 +97,6 @@
 		workorderList,
 		getByCode,
 		scanLedger
-
 	} from '@/api/pda/workOrder.js'
 
 	import {
@@ -187,7 +186,7 @@
 								palletList = palletList.concat(f)
 							} else if (f.rootCategoryLevelId == 26) {
 								revolvingDiskList = revolvingDiskList.concat(f)
-							}  else if ([23, 2, 9,28].includes(Number(f.rootCategoryLevelId))) {
+							} else if ([23, 2, 9, 28].includes(Number(f.rootCategoryLevelId))) {
 								semiProductList = semiProductList.concat(f)
 							}
 
@@ -223,7 +222,7 @@
 			scrolltolower() {},
 
 			save() {
-			
+
 				this.List.forEach(f => {
 					f.instanceList.forEach(e => {
 						if (Object.prototype.hasOwnProperty.call(e, 'type')) {
@@ -265,7 +264,7 @@
 
 						if (m.pickOutInList.length > 0) {
 							m.pickOutInList.forEach(f => {
-											
+
 								if (f.rootCategoryLevelId == 1) {
 									m.instanceList.push(f)
 								} else if (f.rootCategoryLevelId == 4) {
@@ -280,7 +279,8 @@
 									m.palletList.push(f)
 								} else if (f.rootCategoryLevelId == 26) {
 									m.revolvingDiskList.push(f)
-								} else if ([23, 2, 9,28].includes(Number(f.rootCategoryLevelId))) {
+								} else if ([23, 2, 9, 28].includes(Number(f
+									.rootCategoryLevelId))) {
 									m.semiProductList.push(f)
 								}
 
@@ -365,20 +365,20 @@
 
 			},
 			scanIt(id) {
-				console.log(id)
-
 
 				uni.scanCode({
 					success: (res) => {
 						this.scanItData(res.result, id)
-						console.log(res.result, id)
+
 					}
 				})
 			},
 
 			scanItData(result, id) {
+
 				scanLedger(result).then(res => {
 
+
 					let _arr = []
 					if (res.length == 1 && res[0].rootCategoryLevelId == 4) { // 设备
 						_arr = this.List
@@ -445,24 +445,31 @@
 
 						this.$forceUpdate()
 					} else if (res.length >= 1 && res[0].rootCategoryLevelId == 7) { // 周转车
-						let isFals = _arr[index].turnover.some(m => m.code == res[0].code)
-						if (isFals) {
-							uni.showToast({
-								title: '周转车已存在',
-								icon: 'none'
-							})
-							return false
-						} else {
-							_arr = this.List
-							_arr.forEach((e, index) => {
-								if (e.workOrderId == id) {
-									_arr[index].turnover = _arr[index].turnover.concat(res)
+						_arr = this.List
+						_arr.forEach((e, index) => {
+							if (e.workOrderId == id) {
+								let isFals = _arr[index].turnover.some(m => m.code == res[0].code)
+								if (isFals) {
+									uni.showToast({
+										title: '周转车已存在',
+										icon: 'none'
+									})
+									return false
 								}
-							})
-							this.List = _arr
-							
-							this.$forceUpdate()
-						}
+								
+								_arr.forEach((e, index) => {
+									if (e.workOrderId == id) {
+										_arr[index].turnover = _arr[index].turnover.concat(res)
+									}
+								})
+								this.List = _arr
+								this.$forceUpdate()
+								
+							}
+						})
+
+
+			
 					}
 
 

pages/pda/jobBooking/components/packingBom.vue

@@ -123,7 +123,7 @@
 							总共{{temporaryCount}} {{objData.unit}} / {{this.temporaryNum}} {{unit}}
 							--打包成 1
 							<zxz-uni-data-select :localdata="unitList" v-model="packUnit" dataValue='Key'
-								format='{Value}' dataKey="Key" filterable :clear='false'></zxz-uni-data-select>
+								format='{Value}' dataKey="Key"  :clear='false'></zxz-uni-data-select>
 
 							<view class="penalize" @click="handlePack">打包</view>