11

.hbuilderx/launch.json

@@ -4,16 +4,23 @@
     "version" : "0.0",
     "configurations" : [
         {
-            "app-plus" : {
-                "launchtype" : "local"
-            },
-            "default" : {
-                "launchtype" : "local"
-            },
-            "h5" : {
-                "launchtype" : "local"
-            },
-            "type" : "uniCloud"
+        	"app-plus" : 
+        	{
+        		"launchtype" : "local"
+        	},
+        	"default" : 
+        	{
+        		"launchtype" : "local"
+        	},
+        	"h5" : 
+        	{
+        		"launchtype" : "local"
+        	},
+        	"mp-weixin" : 
+        	{
+        		"launchtype" : "local"
+        	},
+        	"type" : "uniCloud"
         },
         {
             "playground" : "standard",

pages/pda/jobBooking/components/oneJobQualityBom.vue

@@ -137,7 +137,7 @@
 
 			<view class="content_table2">
 				<view class="head row rx-sc">
-					<view class="item ww25">物料重量 {{it.extInfo.weightUnit}}</view>
+					<view class="item ww25">{{it.extInfo.newWeight ? '工序重量' : '物料重量'  }} {{it.extInfo.weightUnit}}</view>
 					<view class="item ww25">报工重量{{it.extInfo.weightUnit}}</view>
 					<view class="item ww25" v-if="isFirstTask == 1">质检结果
 					</view>
@@ -149,11 +149,11 @@
 				<view class="table">
 
 					<view class="tr row rx-sc">
-						<view class="item ww25">{{it.extInfo.weight }}
+						<view class="item ww25">{{it.extInfo.newWeight ? it.extInfo.newWeight :  it.extInfo.weight  }}
 						</view>
 						<view class="item ww25 content_num">
-							<view v-if='isDetails'>{{it.extInfo.newWeight }}</view>
-							<input class="uni-input" v-else v-model="it.extInfo.newWeight"></input>
+							<view v-if='isDetails'>{{it.extInfo.reportWeight }}</view>
+							<input class="uni-input" v-else v-model="it.extInfo.reportWeight"></input>
 						</view>
 						<view class="item ww25" @click="openNumerate(it, idx)" v-if="isFirstTask == 1">
 							<view class="numerate">点击计算</view>

pages/pda/jobBooking/index/index.vue

@@ -298,6 +298,9 @@
 
 					if (res.length >= 1 && res[0].rootCategoryLevelId == 5) { // 磨具
 						if (this.objData.modelList.length == 0) {
+							
+							
+							
 							this.objData.modelList = res
 							this.$forceUpdate()
 						} else {

pages/pda/picking/components/boatBom.vue

@@ -43,12 +43,22 @@
 				</view>
 
 				<view class="item">
-					<view class="lable rx-cc">数量</view>
+					<view class="lable rx-cc">数量 </view>
 					<view class="content content_num">
-						<input class="uni-input" v-model="item.demandQuantity" type='digit'></input> {{ item.unit}}
+						<input class="uni-input" style="width: 300rpx;" v-model="item.demandQuantity" type='digit'></input>  {{ item.unit}}  <text style="font-size: 20rpx;margin-left: 18rpx;"> 数量: {{ Number(item.count || 0) * Number(resObj.formingNum) }} </text>
 
 					</view>
 				</view>
+				
+				<view class="item">
+					<view class="lable rx-cc">领料仓库</view>
+					<view class="content pd4">
+						<zxz-uni-data-select :localdata="item.warehouseList" v-model="item.warehouseId"
+							dataValue='id' format='{name}' dataKey="name" filterable
+							:clear='false'></zxz-uni-data-select>
+					</view>
+				</view>
+				
 
 			</view>
 
@@ -80,6 +90,10 @@
 			palletList2: {
 				type: Array,
 				default: () => []
+			},
+			resObj: {
+				type: Object,
+				default: () => {}
 			}
 
 		},

pages/pda/picking/details.vue

@@ -79,7 +79,7 @@
 							:modelList2='item.modelList2' :code='item.code' @hendDel='hendDel'>
 						</modelBom>
 
-						<boatBom :palletList='item.palletList' :palletList2='item.palletList2' :code='item.code'
+						<boatBom :palletList='item.palletList' :palletList2='item.palletList2' :code='item.code' :resObj='item'
 							@hendDel='hendDel'>
 						</boatBom>
 
@@ -89,7 +89,8 @@
 						
 						<semiProductBom :list="item.semiProductList2"></semiProductBom>
 					    
-
+						
+						<view style="height: 80rpx;"></view>
 
 						<view class='flex_btn' v-if='isPick' @click="openDetails">已有领料单</view>
 
@@ -252,6 +253,7 @@
 					ids: this.idsList,
 					taskId: this.taskId
 				}).then(res => {
+					console.log(2,res)
 
 					this.List = res.map(m => {
 						m.workOrderId = m.id