From 76486524892abdfd3039eedc28d83cbbfb56d042 Mon Sep 17 00:00:00 2001
From: yyb <995253665@qq.com>
Date: 星期三, 18 六月 2025 16:17:05 +0800
Subject: [PATCH] 取消报工/车间订单下发/车间订单取消下发/功能点逻辑编写

---
 pages/wareHouse/moveWareHouse/index.vue |  119 ++++++++++++++++++++++++++++++-----------------------------
 1 files changed, 60 insertions(+), 59 deletions(-)

diff --git a/pages/wareHouse/moveWareHouse/index.vue b/pages/wareHouse/moveWareHouse/index.vue
index 18a11f5..5b35f7e 100644
--- a/pages/wareHouse/moveWareHouse/index.vue
+++ b/pages/wareHouse/moveWareHouse/index.vue
@@ -10,8 +10,11 @@
 						<text class="item-one">搴撲綅</text>
 					</view>
 					<view class="packing-registration-param-item-right">
-						<text
-							class="item-one item-two">{{ registerInfo.storageLocation == '' ? "璇锋壂鎻忓簱浣�" : registerInfo.storageLocation }}</text>
+						<text class="item-one item-two">{{
+              registerInfo.proposedLocation == ""
+                ? "璇锋壂鎻忓簱浣�"
+                : registerInfo.proposedLocation
+            }}</text>
 					</view>
 				</view>
 				<view class="packing-registration-param-item param-extra">
@@ -26,7 +29,6 @@
 		<view class="wrap">
 			<scroll-view class="packing-registration-scroll-list" scroll-y="true">
 				<u-cell-group class="packing-registration-scroll-list-group" :border="false">
-					<!-- <div class="tip" style="text-align: center;" v-if="hasScanSnList.length==0">-璇锋壂鐮�-</div> -->
 					<view class="content" v-for="(item, index) in hasScanSnList" :key="index" :index="index">
 						<view class="content-header">
 							<view class="content-header-title">{{ index + 1 }}</view>
@@ -37,7 +39,7 @@
 									<view class="_label-name">闆朵欢鍙凤細</view>
 								</view>
 								<view class="_content">
-									{{ item.value0 }}
+									{{ item.partNo }}
 								</view>
 							</view>
 							<view class="row-list">
@@ -45,7 +47,7 @@
 									<view class="_label-name">鎵规鍙凤細</view>
 								</view>
 								<view class="_content">
-									{{ item.value1 }}
+									{{ item.moNo }}
 								</view>
 							</view>
 							<view class="row-list">
@@ -53,7 +55,7 @@
 									<view class="_label-name">搴撲綅鍙凤細</view>
 								</view>
 								<view class="_content">
-									{{ item.value0 }}
+									{{ item.proposedLocation }}
 								</view>
 							</view>
 							<view class="row-list">
@@ -79,7 +81,7 @@
 								<text class="item-one">鎵瑰彿</text>
 							</view>
 							<view class="packing-registration-param-item-right">
-								<text class="item-one item-two">{{ 111 }}</text>
+								<text class="item-one item-two">{{ detailedList.moNo }}</text>
 							</view>
 						</view>
 						<view class="packing-registration-param-item param-extra">
@@ -87,7 +89,9 @@
 								<text class="item-one">闆朵欢鎻忚堪</text>
 							</view>
 							<view class="packing-registration-param-item-right">
-								<text class="item-one item-two">{{ 111 }}</text>
+								<text class="item-one item-two">{{
+                  detailedList.partName
+                }}</text>
 							</view>
 						</view>
 						<view class="packing-registration-param-item param-extra">
@@ -95,7 +99,7 @@
 								<text class="item-one">WDR</text>
 							</view>
 							<view class="packing-registration-param-item-right">
-								<text class="item-one item-two">{{ 111 }}</text>
+								<text class="item-one item-two">{{ detailedList.WDR }}</text>
 							</view>
 						</view>
 						<view class="packing-registration-param-item param-extra">
@@ -111,7 +115,9 @@
 								<text class="item-one">褰撳墠搴撲綅</text>
 							</view>
 							<view class="packing-registration-param-item-right">
-								<text class="item-one item-two">{{ 111 }}</text>
+								<text class="item-one item-two">{{
+                  detailedList.proposedLocation
+                }}</text>
 							</view>
 						</view>
 					</view>
@@ -141,38 +147,15 @@
 					storageLocation: "",
 					num: 0,
 				},
-				showModal: true, // 鎺у埗寮圭獥鏄剧ず闅愯棌鐨勫彉閲�
-				hasScanSnList: [{
-						value0: "11111111111111111111111",
-						value1: "111",
-						value2: "111",
-						value3: "111",
-					},
-					{
-						value0: "111",
-						value1: "111",
-						value2: "111",
-						value3: "111",
-					},
-					{
-						value0: "111",
-						value1: "111",
-						value2: "111",
-						value3: "111",
-					},
-					{
-						value0: "111",
-						value1: "111",
-						value2: "111",
-						value3: "111",
-					},
-					{
-						value0: "111",
-						value1: "111",
-						value2: "111",
-						value3: "111",
-					},
-				],
+				showModal: false, // 鎺у埗寮圭獥鏄剧ず闅愯棌鐨勫彉閲�
+				hasScanSnList: [],
+				detailedList: {
+					moNo: "",
+					partNo: "",
+					proposedLocation: "",
+					WDR: "",
+				},
+				codeInfoId: '',
 			};
 		},
 		onLoad() {},
@@ -186,19 +169,33 @@
 				if (data.code) {
 					let codeInfo = JSON.parse(data.code);
 					// 鎵弿鎶ュ伐鍗曚簩缁寸爜
-					that.saveForm(codeInfo);
+					// 鍒ゆ柇鎵弿鐨勬槸搴撲綅鐮佽繕鏄祦杞爜
+					if (codeInfo.LN) {
+						that.saveForm(codeInfo)
+					} else {
+						that.codeInfoId = codeInfo.id
+						that.saveModalForm(codeInfo)
+						that.getHandelList();
+					}
 				}
 			});
 		},
 		methods: {
+			getHandelList() {
+				this.$u.api.workReporting
+					.getProductMainV1({
+						current: 1,
+						size: -1,
+						id: this.codeInfoId,
+					})
+					.then((res) => {
+						this.hasScanSnList = res.data.productOutputList;
+					});
+			},
 			confirm() {
 				// 澶勭悊纭閫昏緫
-				this.show = false;
-			},
-			cancel() {
-				this.show = false; // 鍏抽棴寮圭獥
 				// 鐐瑰嚮纭绉诲簱
-				if (_) {
+				if (true) {
 					uni.showToast({
 						icon: "none",
 						title: "浣犳棤娉曞皢闆朵欢绉诲埌鐩稿悓浣嶇疆",
@@ -206,20 +203,24 @@
 					});
 					return
 				}
-				this.$u.api.workReporting._({}).then((res) => {
-					console.log("res", res);
-					this.hasScanSnList = res.data.records;
-				});
+				this.getHandelList()
+				this.show = false;
 			},
-			// 鍥炴樉鎵爜鐨勪俊鎭�-鎶ュ伐鍗�
+			cancel() {
+				this.show = false; // 鍏抽棴寮圭獥
+			},
+			// 鍥炴樉鎵爜鐨勪俊鎭�
 			saveForm(val) {
-				// 鍒ゆ柇鎵弿鐨勬槸搴撲綅鐮佽繕鏄祦杞爜
-				if (_) {
-					this.registerInfo.storageLocation = val.storageLocation
-				}
-				if (_) {
+				this.registerInfo.proposedLocation = val.LN
+			}
+			saveModalForm(val) {
+				this.detailedList: {
+						moNo: val.moNo,
+						partNo: val.partNo,
+						proposedLocation: val.proposedLocation,
+						WDR: val.WDR,
+					},
 					this.show = true;
-				}
 			}
 		},
 	};

--
Gitblit v1.9.3