优化

api/pda/workOrder.js

@@ -399,6 +399,19 @@ export async function listApplystorage(params) {
 
 
 
+// pda 重置打包
+
+export async function cancelPacking(params) {
+	const data = await postJ(
+		Vue.prototype.apiUrl + `/pda/mes/workreport/cancelPacking`, params, true,
+	);
+
+	if (data.code == 0) {
+		return data.data;
+	}
+	return Promise.reject(data.message);
+}
+
 
 // pda 内包装
 

pages/pda/components/bottomOperate.vue

@@ -67,9 +67,6 @@
 
 
 
-
-
-
 						<u-form-item label="工艺路线:" borderBottom prop="">
 							<zxz-uni-data-select :localdata="produceList" v-model="outsourceForm.produceRoutingId"
 								dataValue='id' dataKey="name" filterable format='{name}'></zxz-uni-data-select>
@@ -304,7 +301,10 @@
 						id: 2,
 						name: '半成品'
 					},
-				]
+				],
+				
+				clientEnvironmentId: uni.getStorageSync("userInfo") && uni.getStorageSync("userInfo")
+					.clientEnvironmentId, // *1 主环境-601环境   2 soll-索尔环境    3 tg-碳谷环境
 
 
 
@@ -488,7 +488,7 @@
 
 
 
-				if (!this.outsourceForm.produceRoutingId) {
+				if (this.clientEnvironmentId != 2 && !this.outsourceForm.produceRoutingId) {
 					uni.showToast({
 						title: '请选择工艺路线',
 						icon: 'none'

pages/pda/feeding/components/semiProductBom.vue

@@ -18,7 +18,15 @@
 						v-if='([23,2,9,28].includes(Number(mate.rootCategoryLevelId))) && mate.isConsumable == 1'>
 						<view class="rx ">
 							<view class="lable rx-cc">编码</view>
-							<view class="content">{{ mate.code }}</view>
+							<view class="content rx-bc">
+								<view>{{it.code}} </view>
+								<view class="tag_box"
+									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>
 

pages/pda/jobBooking/components/packingBom.vue

@@ -3,6 +3,10 @@
 	<view>
 		<view class="title_box rx-bc">
 			<view class="name">内包装</view>
+
+			<view class="btn_box rx-bc" @click="handCancelPacking">
+				重置打包
+			</view>
 		</view>
 
 		<view class="material ">
@@ -227,6 +231,7 @@
 		getByCode
 	} from '@/api/pda/common.js'
 	import {
+		cancelPacking,
 		packingReport,
 		getPackingReport,
 		packingReportRepeat,
@@ -337,6 +342,27 @@
 			},
 
 
+			handCancelPacking() {
+				uni.showModal({
+					title: `是否清空包装？`,
+					content: "",
+					confirmText: "确认",
+					success: () => {
+						let param = {
+							workOrderId: this.workOrderId,
+							taskId: this.taskId,
+						}
+						cancelPacking(param).then(res => {
+							this.getPackingDetails()
+							this.getPackingDetailsTwo()
+						})
+					},
+
+				})
+
+
+			},
+
 
 			handleSplit() {
 
@@ -582,6 +608,11 @@
 				margin: auto;
 			}
 		}
+
+
+		.btn_box {
+			color: $theme-color;
+		}
 	}
 
 

pages/pda/workOrder/index/index.vue

@@ -90,7 +90,9 @@
 			},
 
 
-			doSearch() {},
+			doSearch() {
+				this.getList()
+			},
 
 
 			scrolltolower() {