Merge remote-tracking branch 'origin/master'

pages/pda/components/bottomOperate.vue

@@ -22,9 +22,16 @@
 			</view>
 
 
+			<view class="list rx-bc" v-if="btnState == 1">
+				<view class="list_item_btn" @click="operate('jobBooking', {})">报工</view>
+				<view class="list_item_btn" @click="operate('',item)">批量报工</view>
+			</view>
+
+
+
 
 			<view class="list rx-bc" v-if="newTaskObj.existOutsource == 1">
-				<view class="list_item_btn" @click="operate('outPicking', {})">委外领料</view>
+				<view class="list_item_btn" @click="operate('jobBooking', {})">委外领料</view>
 				<view class="list_item_btn" @click="operate('jobBooking', {})">委外报工</view>
 			</view>
 
@@ -56,10 +63,11 @@
 							<zxz-uni-data-select :localdata="typeList" v-model="outsourceForm.type" dataValue='id'
 								dataKey="name" filterable format='{name}'></zxz-uni-data-select>
 						</u-form-item>
-						
-						
+
+
 						<u-form-item label="委外数量:" borderBottom prop="num">
-							<input class="uni-input content_num" :disabled="outsourceForm.type == 2 ? false : true" v-model="outsourceForm.formedNumLast" type='number'></input>
+							<input class="uni-input content_num" :disabled="outsourceForm.type == 2 ? false : true"
+								v-model="outsourceForm.formedNumLast" type='number'></input>
 						</u-form-item>
 
 						<u-form-item label="委外物料:" borderBottom prop="" v-if="outsourceForm.type == 2">
@@ -243,10 +251,7 @@
 							name: '投料',
 							type: 'feeding'
 						},
-						{
-							name: '报工',
-							type: 'jobBooking'
-						},
+
 						{
 							name: '更换周转车',
 							type: 'turnover'
@@ -469,7 +474,8 @@
 
 				this.newStepsList = []
 				this.stepsList.forEach((f, i) => {
-					if (f.taskId != '-1' && f.taskId != '-2'  && i > this.activeIndex && (f.type == 1 ||  f.type == 4 )) {
+					if (f.taskId != '-1' && f.taskId != '-2' && i > this.activeIndex && (f.type == 1 || f.type ==
+							4)) {
 						this.newStepsList.push(f)
 					}
 				})
@@ -722,19 +728,19 @@
 		font-style: normal;
 		font-weight: 600;
 	}
-	
-	
+
+
 	.content_num {
 		display: flex;
 		align-items: center;
 		padding: 0 4rpx;
-	
+
 		/deep/ .uni-input-input {
 			border: 2rpx solid #F0F8F2;
 			background: #F0F8F2;
 			color: $theme-color;
 		}
-	
-	
+
+
 	}
 </style>

pages/pda/jobBooking/components/jobBom.vue

@@ -11,7 +11,8 @@
 			<view class="content_table">
 
 
-				<view class="item rx-sc" v-if="Object.prototype.hasOwnProperty.call(item, 'product') && clientEnvironmentId != 3">
+				<view class="item rx-sc"
+					v-if="Object.prototype.hasOwnProperty.call(item, 'product') && clientEnvironmentId != 3">
 					<view class="rx ">
 						<view class="lable lable220 rx-cc ">投料数量</view>
 						<view class="content">
@@ -243,7 +244,8 @@
 				this.$set(this.notFormedList[0], 'notFormedWeight', weight)
 
 
-				if (this.item.product[0].feedQuantity > 0 && Number(this.notFormedList[0].notFormedNum)) {
+				if (this.item.product[0] && this.item.product[0].feedQuantity > 0 && Number(this.notFormedList[0]
+						.notFormedNum)) {
 					this.$set(this.item.workReportInfo, 'formedNum', this.item.product[0].feedQuantity - Number(this
 						.notFormedList[0]
 						.notFormedNum))
@@ -268,6 +270,10 @@
 			},
 
 			changeNum() {
+				
+				let total = Number(this.item.workReportInfo.formedNum) + Number(this.notFormedList[0].notFormedNum)
+				this.$emit('modeNum', total)
+				
 				this.notForme()
 				// this.blurNum()
 			},

pages/pda/picking/components/boatBom.vue

@@ -46,8 +46,8 @@
 					<view class="lable rx-cc">数量 </view>
 					<view class="content content_num">
 						<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>
+							type='digit'></input> {{ item.unit}} <text style="font-size: 20rpx;margin-left: 18rpx;"> 数量:	{{ Number(item.count || 0) * Number(resObj.formingNum) }} 	 </text>
+					
 
 					</view>
 				</view>