33

pages/pda/common.js

@@ -101,7 +101,7 @@ export const tableHeader = selectEquiType => {
 		case 7:
 			return [
 				{
-						label: '编号',
+						label: '编号', 
 						prop: 'batchNo'
 				},
 				{

pages/pda/feeding/details.vue

@@ -310,8 +310,7 @@
 									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)
 								}
 
@@ -350,11 +349,9 @@
 
 
 			handleScan(id, type) {
-				console.log(id)
-				console.log(type)
 
-				// this.scanData('SCJHGD20240117002', type, id)
-				// return false
+
+
 
 				uni.scanCode({
 					success: (res) => {
@@ -394,7 +391,7 @@
 
 			},
 			scanIt(id) {
-
+			
 				uni.scanCode({
 					success: (res) => {
 						this.scanItData(res.result, id)
@@ -406,8 +403,8 @@
 			scanItData(result, id) {
 
 				scanLedger(result).then(res => {
-
-
+                   
+ 
 					let _arr = []
 					if (res.length == 1 && res[0].rootCategoryLevelId == 4) { // 设备
 						_arr = this.List
@@ -430,8 +427,7 @@
 						this.List = _arr
 						this.$forceUpdate()
 
-					} else if (res.length >= 1 && ['1'].includes(res[0].rootCategoryLevelId)) { // 物料
-
+					} else if (res.length >= 1 &&  [1].includes(Number(res[0].rootCategoryLevelId))) { // 物料
 						_arr = this.List
 						_arr.forEach((e, index) => {
 							if (e.workOrderId == id) {
@@ -442,7 +438,20 @@
 
 						this.$forceUpdate()
 
-					} else if (res.length >= 1 && res[0].rootCategoryLevelId == 11) { // 干燥区
+					}  else if (res.length >= 1 &&  [23, 2, 9, 28].includes(Number(res[0].rootCategoryLevelId))) { 
+						_arr = this.List
+						_arr.forEach((e, index) => {
+							if (e.workOrderId == id) {
+								_arr[index].semiProductList = _arr[index].semiProductList.concat(res)
+							}
+						})
+						this.List = _arr
+
+						this.$forceUpdate()
+
+					}
+					
+					else if (res.length >= 1 && res[0].rootCategoryLevelId == 11) { // 干燥区
 						_arr = this.List
 						_arr.forEach((e, index) => {
 							if (e.workOrderId == id) {
@@ -512,6 +521,7 @@
 				uni.scanCode({
 					success: (res) => {
 						this.scanItAllData(res.result)
+						
 
 					}
 				})
@@ -540,8 +550,7 @@
 						this.List = _arr
 						this.$forceUpdate()
 
-					} else if (res.length >= 1 && ['1'].includes(res[0].rootCategoryLevelId)) {
-
+					} else if (res.length >= 1 &&  [1].includes(Number(res[0].rootCategoryLevelId))) {
 						_arr = this.List
 						_arr.forEach((e, index) => {
 							e.instanceList = e.instanceList.concat(res)
@@ -550,6 +559,15 @@
 
 						this.$forceUpdate()
 
+					}  else if (res.length >= 1 &&  [23, 2, 9, 28].includes(Number(res[0].rootCategoryLevelId))) {
+						_arr = this.List
+						_arr.forEach((e, index) => {
+							e.semiProductList = e.semiProductList.concat(res)
+						})
+						this.List = _arr
+
+						this.$forceUpdate()
+
 					}
 				})
 

pages/pda/jobBooking/components/semiProductJobBom.vue

@@ -135,7 +135,7 @@
 						</view>
 						<view class="item ww25 content_num">
 							<view v-if='isDetails'>{{it.extInfo.reportWeight }}</view>
-							<input class="uni-input" v-else v-model="it.extInfo.reportWeight"></input>
+							<input class="uni-input" v-else v-model="it.extInfo.reportWeight" type='digit'></input>
 						</view>
 						<view class="item ww25" @click="openNumerate(it, idx)" v-if="isFirstTask == 1">
 							<view class="numerate">点击计算</view>
@@ -500,7 +500,7 @@
 					this.resultObj = {}
 
 
-					if (Number(this.reportWeight) < this.paramList[0].CVIWeight) {
+					if (Number(this.reportWeight) < Number(this.paramList[0].CVIWeight)) {
 						this.resultObj = this.paramList[0]
 						this.setDataSave()
 						return false
@@ -512,10 +512,13 @@
 						this.setDataSave()
 						return false
 					}
+					console.log(88,this.reportWeight)
 
 				
 					for (let i = 1; i < this.paramList.length; i++) {
-						if ( Number(this.paramList[i-1].CVIWeight) < Number(this.reportWeight) &&  Number(this.reportWeight)  < Number(this.paramList[i].CVIWeight)) {
+						console.log(i)
+						console.log(11,Number(this.paramList[i-1].CVIWeight), Number(this.reportWeight))
+						if (Number(this.paramList[i-1].CVIWeight) < Number(this.reportWeight) &&  Number(this.reportWeight)  < Number(this.paramList[i].CVIWeight)) {
 							this.resultObj = this.paramList[i]
 							break;
 						}

pages/pda/jobBooking/index/index.vue

@@ -396,6 +396,8 @@
 				getByIdReport(this.id, this.taskId).then(res => {
 
 					this.objData = res
+			
+
 					if (!this.objData.hasOwnProperty('turnover')) {
 						this.objData['turnover'] = []
 					}
@@ -837,7 +839,9 @@
 					this.objData['notFormedList'] = res.extInfo.notFormedList
 					this.objData['turnover'] = res.extInfo.turnover
 					this.objData['productRecycleList'] = res.extInfo.productRecycleList
-
+                 	this.objData['semiProductList'] = res.extInfo.semiProductList
+					this.objData['modelList'] = res.extInfo.modelList
+					
 
 				})
 			},