ysy %!s(int64=2) %!d(string=hai) anos
pai
achega
9b74245cb7
Modificáronse 2 ficheiros con 11 adicións e 2 borrados
  1. 1 0
      pages/pda/feeding/details.vue
  2. 10 2
      pages/pda/jobBooking/index/index.vue

+ 1 - 0
pages/pda/feeding/details.vue

@@ -223,6 +223,7 @@
 					taskId: this.taskId
 				}).then(res => {
 					this.List = res.map(m => {
+						console.log('222', m)
 						m.workOrderId = m.id
 
 						m.instanceList = [] // 物料

+ 10 - 2
pages/pda/jobBooking/index/index.vue

@@ -23,7 +23,7 @@
 					<jobBom v-if='isLoad' :item='objData' :palletList='objData.palletList'
 						:notFormed='objData.notFormedList' @penalize='penalize' @modeNum='modeNum'></jobBom>
 
-					<oneJobBom v-if='objData.instanceList &&  objData.instanceList.length != 0' :item='objData'
+					<oneJobBom v-if='objData.instanceList &&  objData.instanceList.length != 0 && taskType != 4' :item='objData'
 						:list='objData.instanceList'>
 					</oneJobBom>
 
@@ -520,11 +520,19 @@
 
 
 				// 预制体
-				if (this.objData.instanceList.length > 0) {
+				if (this.objData.instanceList.length > 0 && this.taskType != 4) {
 					let bol
 					let _i
 					bol = this.objData.instanceList.every((e, i) => {
 						_i = i + 1
+						
+						
+						
+						
+						
+						
+						
+						
 						return e.extInfo.hasOwnProperty('taskId') && e.extInfo.taskId
 					})