ysy 2 anos atrás
pai
commit
64e69098f3

+ 10 - 25
pages/pda/jobBooking/components/packingBomDetails.vue

@@ -7,10 +7,6 @@
 
 		<view class="material ">
 
-		
-
-
-
 			<view class="content_table2" v-if='packInfo.packingReportMarginList.length > 0'>
 				<view class="head row rx-sc">
 					<view class="item ww10">序号</view>
@@ -20,24 +16,18 @@
 				</view>
 
 				<view class="table">
-					<u-list @scrolltolower="scrolltolower" class="z_list">
+					<u-list @scrolltolower="scrolltolower" class="z_list" style="height: 100% !important;">
 						<view class="tr row rx-sc" v-for="(it, idx) in packInfo.packingReportMarginList" :key='idx'>
 							<view class="item ww10 rx-cc ">{{ it.computeSize }}</view>
 							<view class="item ww30 content_num rx-sc">
-								<input class="uni-input" v-model="it.quantity" type="digit"></input>
-								<view style="width: 260rpx; font-size: 22rpx;"> 
-								<!-- {{objData.unit}} -->
-								/ {{it.unit}}</view> 
+								{{it.quantity }}/ {{it.unit}}
+
 							</view>
 							<view class="item ww50">
 								{{ it.code }}
 							</view>
 							<view class="item ww10 rx-cc" v-if="!it.parentId" @click="handleCheck( idx, it)">
-								<image class="check" v-if='it.check == 1' src='@/static/check.png'>
-								</image>
-								<image class="check" v-if='it.check == 0 || it.check == null '
-									src='@/static/check_no.png'>
-								</image>
+
 							</view>
 
 						</view>
@@ -76,19 +66,15 @@
 					<view class="tr row rx-sc " v-for="(it, idx) in packInfo.packingReportList" :key='idx'>
 						<view class="item ww10 rx-cc ">{{ idx + 1 }}</view>
 						<view class="item ww30 content_num rx-sc">
-							{{ it.quantity}}  / {{it.unit}}
+							{{ it.quantity}} / {{ it.childList[0].unit}} / {{it.unit}}
 						</view>
 
-
-
 						<view class="item ww50">
 							{{ it.code }}
 						</view>
 						<view class="item ww10 rx-cc">
-
 						</view>
 
-
 					</view>
 
 
@@ -114,23 +100,22 @@
 </template>
 
 <script>
-
 	export default {
 		props: {
 			packInfo: {
 				type: Object,
 				default: () => {}
 			},
-	
+
 		},
 		data() {
 			return {
-			
 
 
 
 
-			
+
+
 
 
 
@@ -140,9 +125,9 @@
 		},
 
 		created() {
-	
 
-	
+
+
 		},
 
 		methods: {

+ 1 - 1
pages/pda/workOrder/index/details.vue

@@ -122,7 +122,7 @@
 				list: [],
 				taskType: 1,
 				
-				clientEnvironmentId: 2 ||  uni.getStorageSync("userInfo") && uni.getStorageSync("userInfo")
+				clientEnvironmentId:  uni.getStorageSync("userInfo") && uni.getStorageSync("userInfo")
 					.clientEnvironmentId, // *1 主环境-601环境   2 soll-索尔环境    3 tg-碳谷环境
 			}
 		},