44

pages/pda/jobBooking/components/packingTgBom.vue

@@ -3,12 +3,13 @@
 		<view class="title_box rx-bc">
 			<view class="name">打包信息： ({{ isWarehousing ? list.length : item.pickOutInList.length || 0}})个</view>
 		</view>
+  
 
 
 		<view class="material " v-for="(it, idx) in isWarehousing ? list :  item.pickOutInList" :key="idx">
+   	
 
-
-			<view class="content_table">
+			<view class="content_table" >
 
 				<view class="item rx-sc">
 					<view class="rx">
@@ -42,7 +43,7 @@
 
 
 
-				<view class="item rx-sc" v-if="item.singleReport == 1">
+				<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">
@@ -61,7 +62,9 @@
 					</view>
 
 				</view>
-
+				
+	
+       
 
 				<view class="item rx-sc" v-if="item.singleReport == 1">
 					<view class="rx ww50 ">
@@ -81,16 +84,27 @@
 					</view>
 
 				</view>
+				
+				<view class="item rx-sc"  v-if="item.singleReport == 0">
+					<view class="rx">
+						<view class="lable lable150 rx-cc ">总重量 </view>
+						<view class="content rx-sc">
+							<view>{{it.extInfo.newWeight}} {{it.extInfo.weightUnit}}</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 ">
@@ -99,7 +113,7 @@
 						</view>
 					</view>
 
-			
+
 
 				</view>
 
@@ -109,7 +123,7 @@
 
 
 
-			<view class="content_table2" v-if="item.singleReport == 1">
+			<view class="content_table2" v-if="it.singleReport == 1">
 				<view class="head row rx-sc">
 					<view class="item ww25">工序重量{{it.extInfo.weightUnit}}</view>
 					<view class="item ww25">处置</view>
@@ -301,7 +315,7 @@
 
 
 		.content_table {
-			width: 100%;
+			width: 99%;
 			border: 2rpx solid $border-color;
 
 			.item {

pages/pda/warehousing/index.vue

@@ -23,7 +23,7 @@
 
 					<view class="list_box" v-for="(it, index) in tgList" :key="index" v-if="clientEnvironmentId == 3">
 						<view class="time">打包时间： {{ it.createTime }}</view>
-						<packingTgBom :list='it.extInfo.pickOutInList' :isWarehousing='true'></packingTgBom>
+						<packingTgBom :list='it.extInfo.pickOutInList' :isWarehousing='true' :item='it' ></packingTgBom>
 					</view>
 
 

pages/pda/workOrder/index/details.vue

@@ -64,7 +64,7 @@
 
 					<packingTgBom
 						v-if='objData.packInfo && objData.packInfo.pickOutInList &&   objData.packInfo.pickOutInList != 0 && taskType == 4 && clientEnvironmentId == 3 '
-						:list='objData.packInfo.pickOutInList' :isWarehousing='true' :isDetails="true"></packingTgBom>
+						:list='objData.packInfo.pickOutInList' :isWarehousing='true' :isDetails="true" :item='objData' ></packingTgBom>
 
 					<packingBom v-if="objData.packInfo && clientEnvironmentId == 2" :packInfo="objData.packInfo">
 					</packingBom>