ysy 2 jaren geleden
bovenliggende
commit
1703de12ec
2 gewijzigde bestanden met toevoegingen van 17 en 3 verwijderingen
  1. 6 1
      pages/pda/feeding/components/palletBom.vue
  2. 11 2
      pages/pda/workOrder/index/details.vue

+ 6 - 1
pages/pda/feeding/components/palletBom.vue

@@ -45,7 +45,7 @@
 				<view class="item">
 					<view class="lable rx-cc">数量</view>
 					<view class="content content_num">
-						<input class="uni-input" v-model="item.feedQuantity || 1" type='digit' ></input>
+						<input class="uni-input" v-model="item.feedQuantity || 1" type='digit' :disabled="isDetails"></input>
 					</view>
 				</view>
 
@@ -67,6 +67,11 @@
 			palletList: {
 				type: Array,
 				default: () => []
+			},
+			
+			isDetails: {
+				type: Boolean,
+				default: false
 			}
 		},
 

+ 11 - 2
pages/pda/workOrder/index/details.vue

@@ -28,6 +28,12 @@
 					<jobBom :item='objData' v-if="objData.notFormedList" :palletList='objData.palletList'
 						:notFormed='objData.notFormedList' :isDetails='true'></jobBom>
 
+					<palletBom v-if="objData.palletList.length != 0" :palletList='objData.palletList' :isDetails='true'>
+					</palletBom>
+
+<!-- 					<revolvingDiskBom v-if="objData.revolvingDiskList.length > 0"
+						:revolvingDiskList="objData.revolvingDiskList"></revolvingDiskBom> -->
+
 					<oneJobBom v-if='objData.instanceList &&  objData.instanceList.length != 0'
 						:list='objData.instanceList' :item='objData' :isDetails='true'> </oneJobBom>
 
@@ -79,6 +85,8 @@
 
 	import qualityStat from '../../sample/components/qualityStat.vue'
 	import sampleBom from '../../sample/components/sampleBom.vue'
+	import palletBom from '../../feeding/components/palletBom.vue'
+	import revolvingDiskBom from '../../feeding/components/revolvingDiskBom.vue'
 	export default {
 		components: {
 			workOrderBom,
@@ -92,7 +100,9 @@
 			paramBom,
 
 			qualityStat,
-			sampleBom
+			sampleBom,
+			palletBom,
+			revolvingDiskBom
 		},
 		data() {
 			return {
@@ -117,7 +127,6 @@
 					taskId: this.taskId
 				}
 				listWorkReport(param).then(res => {
-					console.log(2, res)
 					this.list = res
 				})
 			},