优化

pages/pda/components/bottomOperate.vue

@@ -293,7 +293,6 @@
 					taskId: this.newTaskObj.currentTaskId,
 					workOrderId: this.newTaskObj.workOrderId,
 
-
 				}
 				checkOutsource(param).then(res => {
 
@@ -352,6 +351,15 @@
 					})
 					return false
 				}
+				
+				if (!this.outsourceForm.produceRoutingId) {
+					uni.showToast({
+						title: '请选择工艺路线',
+						icon: 'none'
+					})
+					return false
+				}
+				
 				if (!this.outsourceForm.requireDeliveryTime) {
 					uni.showToast({
 						title: '请选择委外完成时间',
@@ -359,6 +367,8 @@
 					})
 					return false
 				}
+				
+				
 
 				let param = {
 					...this.outsourceForm,
@@ -366,6 +376,7 @@
 					workOrderId: this.newTaskObj.workOrderId,
 					isRelease: isRelease
 				}
+		
 				applyoutsourceSave(param).then(res => {
 					console.log(res)
 					this.outCancel()

pages/pda/feeding/components/packingBom.vue

@@ -1,7 +1,7 @@
 <template>
 	<view>
 		<view class="title_box rx-bc">
-			<view class="name">包装</view>
+			<view class="name">包装材料</view>
 		</view>
 
 		<view class="material rx-ss" v-for="(mate, idx) in list">

pages/pda/jobBooking/components/oneJobQualityBom.vue

@@ -129,7 +129,7 @@
 				<view class="table">
 
 					<view class="tr row rx-sc">
-						<view class="item ww25">{{it.extInfo.weight    }}
+						<view class="item ww25">{{it.extInfo.weight  }}
 						</view>
 						<view class="item ww25 content_num">
 							<view v-if='isDetails'>{{it.extInfo.newWeight }}</view>

pages/pda/jobBooking/components/semiProductJobBom.vue

@@ -16,8 +16,9 @@
 
 							<view class="round">{{idx + 1}}</view>物料编码
 						</view>
-						<view class="content rx-sc">
-							<view>{{it.code}}</view>
+						<view class="content rx-bc">
+							<view>{{it.code}} </view>
+							<view v-if="Object.prototype.hasOwnProperty.call(it, 'extInfo')  && Object.prototype.hasOwnProperty.call(it.extInfo, 'productionTimes') &&  Object.prototype.hasOwnProperty.call(it.extInfo.productionTimes,item.currentTaskDiagram.taskId) ">{{ it.extInfo.productionTimes[item.currentTaskDiagram.taskId]}}</view>
 						</view>
 					</view>
 				</view>
@@ -26,7 +27,8 @@
 					<view class="rx">
 						<view class="lable lable150 rx-cc ">名称</view>
 						<view class="content rx-sc">
-							<view>{{it.name}} <text v-if="[2, 23].includes(Number(it.rootCategoryLevelId))">  ({{it.rootCategoryLevelId == 2 ? '在制品' :  it.rootCategoryLevelId == 23 ? '半成品' : '' }}) </text> </view>
+
+							<view>{{it.name}}  <text v-if="[2, 23].includes(Number(it.rootCategoryLevelId))">  ({{it.rootCategoryLevelId == 2 ? '在制品' :  it.rootCategoryLevelId == 23 ? '半成品' : '' }}) </text>  </view>
 						</view>
 					</view>
 				</view>

pages/pda/jobBooking/index/index.vue

@@ -30,7 +30,7 @@
 					<revolvingDiskBom v-if="isLoad && objData.revolvingDiskList.length > 0"
 						:revolvingDiskList="objData.revolvingDiskList"></revolvingDiskBom>
 
-			<!-- 		<oneJobBom
+					<!-- 		<oneJobBom
 						v-if='objData.instanceList &&  objData.instanceList.length != 0 && taskType != 4 && taskType != 6'
 						:item='objData' :list='objData.instanceList'>
 					</oneJobBom> -->
@@ -69,17 +69,17 @@
 					<view class="operate_box rx-sc">
 						<u-button size="small" class="u-reset-button" type="success" @click="handAdd">手动添加</u-button>
 					</view>
-					
-					
-						<view style="height: 100rpx;"></view>
+
+
+					<view style="height: 100rpx;"></view>
 
 				</view>
 
 			</u-list>
 		</view>
-		
-		
-	
+
+
+
 
 
 		<view class="bottom-wrapper">
@@ -659,7 +659,7 @@
 					}
 				}
 
-      
+
 
 				jobSave(this.objData).then(res => {
 
@@ -674,9 +674,9 @@
 							success: rr => {
 								if (rr.confirm) {
 									uni.navigateTo({
-										url: `/pages/pda/warehousing/index?workOrderId=${this.id}&taskId=${this.taskId}&workReportId=${res}`
+										url: `/pages/pda/warehousing/index?workOrderId=${this.id}&taskId=-1&workReportId=${res}`
 									})
-								} else {
+								} else { 
 									uni.navigateBack()
 								}