33

pages/pda/feeding/components/instanceBom.vue

@@ -47,7 +47,7 @@
 					</view>
 
 
-					<view class="item rx-sc" v-if='mate.isConsumable == 0'>
+					<view class="item rx-sc" v-if='mate.isConsumable == 0 && workInfo.reportStatus != 0'>
 						<view class="rx ww50">
 							<view class="lable  rx-cc">{{ currentTaskDiagram.isFirstTask == 1 ? '物料重量': '上道重量' }}</view>
 							<view class="content" v-if="currentTaskDiagram.isFirstTask == 1">
@@ -59,7 +59,7 @@
 						</view>
 
 
-						<view class="rx ww50">
+						<view class="rx ww50" v-if="workInfo.reportStatus != 0">
 							<view class="lable ww80 rx-cc">刻码</view>
 							<view class="content">{{mate.extInfo.engrave}}</view>
 						</view>
@@ -70,13 +70,13 @@
 
 
 
-					<view class="item" v-if='mate.isConsumable == 0'>
+					<view class="item"  v-if='mate.isConsumable == 0 && workInfo.reportStatus != 0'>
 						<view class="lable rx-cc">物料代号</view>
 						<view class="content">{{mate.extInfo.materielCode}}</view>
 					</view>
 
 
-					<view class="item" v-if='mate.isConsumable == 0'>
+					<view class="item" v-if='mate.isConsumable == 0 && workInfo.reportStatus != 0'>
 						<view class="lable rx-cc">客户代号</view>
 						<view class="content">{{mate.extInfo.clientCode}}</view>
 					</view>
@@ -100,6 +100,11 @@
 						</view>
 					</view>
 
+					
+						<view class="item" v-if='mate.isConsumable == 0 && workInfo.reportStatus == 0'>
+							<view class="lable rx-cc">投料类型</view>
+							<view class="content" style="color:#157A2C;">{{ workInfo.reportStatus == 0 ? '批量投料' : ''}}</view>
+						</view>
 
 
 					<view class="item rx-sc" v-if='mate.isConsumable == 0'>
@@ -212,7 +217,11 @@
 			isDetails: {
 				type: Boolean,
 				default: false
-			}
+			},
+			workInfo: {
+					type: Object,
+					default: () => {}
+				}
 		},
 
 		watch: {

pages/pda/feeding/components/semiProductBom.vue

@@ -73,7 +73,7 @@
 					</view>
 
 
-					<view class="item rx-sc" v-if='mate.isConsumable == 0'>
+					<view class="item rx-sc" v-if='mate.isConsumable == 0 && workInfo.reportStatus != 0'>
 						<view class="rx ww50">
 							<view class="lable  rx-cc">{{ currentTaskDiagram.isFirstTask == 1 ? '物料重量': '上道重量' }}</view>
 							<view class="content" v-if="currentTaskDiagram.isFirstTask == 1">
@@ -102,7 +102,7 @@
 					</view>
 
 
-					<view class="item" v-if='mate.isConsumable == 0'>
+					<view class="item" v-if='mate.isConsumable == 0 && workInfo.reportStatus != 0'>
 						<view class="lable rx-cc">客户代号</view>
 						<view class="content">{{mate.extInfo.clientCode}}</view>
 					</view>

pages/pda/feeding/details.vue

@@ -16,7 +16,8 @@
 						:list='item.equipmentList' @scanIt='scanIt'></deviceBom>
 
 
-					<productsBom v-if="item.product != null && item.product != '{}'" :itemObj="item" :productsObj="item.product">
+					<productsBom v-if="item.product != null && item.product != '{}'" :itemObj="item"
+						:productsObj="item.product">
 					</productsBom>
 
 					<modelBom v-if='item.modelList.length != 0' :workOrderId='item.workOrderId' :list='item.modelList'
@@ -25,6 +26,8 @@
 
 					<instanceBom v-if='item.instanceList.length != 0' :workOrderId='item.workOrderId'
 						:list='item.instanceList' :equipmentList="item.equipmentList"
+						:currentTaskDiagram="item.currentTaskDiagram" :workInfo="item">
+					</instanceBom>
 
 
 					<semiProductBom v-if='item.semiProductList.length != 0' :workOrderId='item.workOrderId'
@@ -34,7 +37,7 @@
 
 
 					<turnoverBom v-if='item.turnover.length != 0' :list='item.turnover' :wordItem='item' pattern='feed'
-						@handleScan='handleScan' @handleDel='handleDel' ></turnoverBom>
+						@handleScan='handleScan' @handleDel='handleDel'></turnoverBom>
 
 					<aridRegion v-if='item.aridRegionList.length != 0' :list='item.aridRegionList'
 						@handleScan='handleScan'></aridRegion>
@@ -572,21 +575,21 @@
 						this.$forceUpdate()
 
 					} else if (res.length >= 1 && res[0].rootCategoryLevelId == 7) { // 周转车 
-					    _arr = this.List
-						if(_arr.length == 1) {
+						_arr = this.List
+						if (_arr.length == 1) {
 							_arr.forEach((e, index) => {
 								e.turnover = e.turnover.concat(res)
 							})
 							this.List = _arr
-							
+
 							this.$forceUpdate()
-						} else if(_arr.length > 1) {
+						} else if (_arr.length > 1) {
 							uni.showToast({
 								title: '多个工单通过下面单个扫一扫添加',
 								icon: 'none'
 							})
 						}
-					
+
 					}
 				})
 

pages/pda/jobBooking/components/packingTgBom.vue

@@ -42,7 +42,7 @@
 
 
 
-				<view class="item rx-sc">
+				<view class="item rx-sc" v-if="item.singleReport == 1">
 					<view class="rx ww50 ">
 						<view class="lable lable150 rx-cc ">物料代号</view>
 						<view class="content content_num">
@@ -63,12 +63,12 @@
 				</view>
 
 
-				<view class="item rx-sc">
+				<view class="item rx-sc" v-if="item.singleReport == 1">
 					<view class="rx ww50 ">
 						<view class="lable lable150 rx-cc ">刻码</view>
 						<view class="content content_num ">
 							<view v-if='isDetails'>{{it.extInfo.engrave }}</view>
-							<input class="uni-input" v-else v-model="it.extInfo.engrave" ></input>
+							<input class="uni-input" v-else v-model="it.extInfo.engrave"></input>
 
 						</view>
 					</view>
@@ -77,10 +77,30 @@
 						<view class="lable lable150 rx-cc ">位置</view>
 						<view class="content content_num">
 							<view>{{it.extInfo.position }}</view>
+						</view>
+					</view>
 
+				</view>
+
+				<view class="item rx-sc" v-if="item.singleReport == 0">
+					
+					<view class="rx ww50">
+						<view class="lable lable150 rx-cc ">打包类型</view>
+						<view class="content" style="color:#157A2C;">
+							<view>批量打包</view>
+						</view>
+					</view>
+					
+					<view class="rx ww50 ">
+						<view class="lable lable150 rx-cc ">打包数量</view>
+						<view class="content content_num ">
+							<view v-if='isDetails'>{{it.feedQuantity }}</view>
+							<input class="uni-input" v-else v-model="it.feedQuantity"></input>
 						</view>
 					</view>
 
+			
+
 				</view>
 
 
@@ -89,7 +109,7 @@
 
 
 
-			<view class="content_table2">
+			<view class="content_table2" v-if="item.singleReport == 1">
 				<view class="head row rx-sc">
 					<view class="item ww25">工序重量{{it.extInfo.weightUnit}}</view>
 					<view class="item ww25">处置</view>
@@ -125,6 +145,11 @@
 
 
 
+
+
+
+
+
 		</view>
 
 
@@ -163,14 +188,14 @@
 				type: Boolean,
 				default: false
 			},
-			
+
 			isDetails: {
 				type: Boolean,
 				default: false
 			},
-			
-			
-			
+
+
+
 
 
 
@@ -183,8 +208,8 @@
 				deep: true,
 				handler(newVal) {
 					if (this.isWarehousing == false) {
-						
-					} 
+
+					}
 
 
 

pages/pda/jobBooking/index/index.vue

@@ -69,7 +69,7 @@
 
 					<packingTgBom
 						v-if='objData.pickOutInList && objData.pickOutInList.length != 0 && taskType == 4 && clientEnvironmentId == 3'
-						:list='objData.pickOutInList' :item='objData'></packingTgBom>
+						:list='objData.pickOutInList' :item='objData' ></packingTgBom>