From 45b9b391916c94c42cea303c5c0f0fe0d0b1306c Mon Sep 17 00:00:00 2001
From: yyb <995253665@qq.com>
Date: 星期二, 23 九月 2025 15:08:01 +0800
Subject: [PATCH] 取消领料和领料页面

---
 pages/storeManagement/CancelMaterialRequisition/index.vue |   32 +++++++++------
 pages/storeManagement/MaterialRequisition/index.vue       |   30 +++++++++------
 pages/sys/home/index.vue                                  |   30 +++++++-------
 common/http.api.js                                        |    4 +-
 4 files changed, 54 insertions(+), 42 deletions(-)

diff --git a/common/http.api.js b/common/http.api.js
index 6ccf29c..cbb451f 100644
--- a/common/http.api.js
+++ b/common/http.api.js
@@ -564,12 +564,12 @@
 		// 鍙栨秷棰嗘枡
 		cancelMaterialRequisition: {
 			// 鍙栨秷棰嗘枡纭
-			cancelMaterialRequisition: (params = {}) => vm.$u.get('/mes/weighingVerification/cancelMaterialRequisition', params),
+			cancelMaterialRequisition: (params = {}) => vm.$u.get('/mes/jdat_wagonBalance/cancelMaterialRequisition', params),
 		},
 		// 棰嗘枡
 		materialRequisition: {
 			// 棰嗘枡纭
-			materialRequisition: (params = {}) => vm.$u.get('/mes/weighingVerification/materialRequisition', params),
+			materialRequisition: (params = {}) => vm.$u.get('/mes/jdat_wagonBalance/materialRequisition', params),
 		},
 
 	};
diff --git a/pages/storeManagement/CancelMaterialRequisition/index.vue b/pages/storeManagement/CancelMaterialRequisition/index.vue
index 7d852d2..5e4e975 100644
--- a/pages/storeManagement/CancelMaterialRequisition/index.vue
+++ b/pages/storeManagement/CancelMaterialRequisition/index.vue
@@ -51,7 +51,7 @@
                   <view class="_label-name">鍑�閲嶏細</view>
                 </view>
                 <view class="_content">
-                  {{ item.NW }}
+                  {{ item.KW }}
                 </view>
               </view>
             </view>
@@ -95,7 +95,7 @@
                 </view>
                 <view class="packing-registration-param-item-right">
                   <text class="item-one item-two">{{
-                    detailedList.NW
+                    detailedList.KW
                   }}</text>
                 </view>
               </view>
@@ -150,23 +150,29 @@
     });
   },
   methods: {
-	    // 鍥炴樉鎵爜鐨勪俊鎭�
+    cancel() {
+      // 澶勭悊鍙栨秷閫昏緫
+      this.showModal = false;
+    },
+    // 鍥炴樉鎵爜鐨勪俊鎭�
     saveForm(val) {
 		this.detailedList = val;
         this.showModal = true;
 	  },
 	confirm() {
-    //   // 澶勭悊纭閫昏緫
-    //   this.$u.api.cancelMaterialRequisition
-    //     .cancelMaterialRequisition({
-    //       ...this.detailedList,
-    //     })
-    //     .then((res) => {
-    //       this.hasScanSnList.push(this.detailedList);
-    //       console.log("璁板綍", this.hasScanSnList);
-    //       this.$u.toast("鍙栨秷棰嗘枡鎴愬姛");
-		//     });
+      // 澶勭悊纭閫昏緫
+      this.$u.api.cancelMaterialRequisition
+        .cancelMaterialRequisition({
+          ...this.detailedList,
+        })
+        .then((res) => {
           this.hasScanSnList.push(this.detailedList);
+          console.log("璁板綍", this.hasScanSnList);
+          this.$u.toast("鍙栨秷棰嗘枡鎴愬姛");
+        })
+        .catch((err) => {
+          this.$u.toast("鍙栨秷棰嗘枡澶辫触");
+        });
     },
   },
 };
diff --git a/pages/storeManagement/MaterialRequisition/index.vue b/pages/storeManagement/MaterialRequisition/index.vue
index 3e6da75..ca3d29b 100644
--- a/pages/storeManagement/MaterialRequisition/index.vue
+++ b/pages/storeManagement/MaterialRequisition/index.vue
@@ -51,7 +51,7 @@
                   <view class="_label-name">鍑�閲嶏細</view>
                 </view>
                 <view class="_content">
-                  {{ item.NW }}
+                  {{ item.KW }}
                 </view>
               </view>
             </view>
@@ -95,7 +95,7 @@
                 </view>
                 <view class="packing-registration-param-item-right">
                   <text class="item-one item-two">{{
-                    detailedList.NW
+                    detailedList.KW
                   }}</text>
                 </view>
               </view>
@@ -150,23 +150,29 @@
     });
   },
   methods: {
+    cancel() {
+      // 澶勭悊鍙栨秷閫昏緫
+      this.showModal = false;
+    },
 	    // 鍥炴樉鎵爜鐨勪俊鎭�
     saveForm(val) {
 		this.detailedList = val;
         this.showModal = true;
 	  },
 	confirm() {
-    //   // 澶勭悊纭閫昏緫
-    //   this.$u.api.materialRequisition
-    //     .materialRequisition({
-    //       ...this.detailedList,
-    //     })
-    //     .then((res) => {
-    //       this.hasScanSnList.push(this.detailedList);
-    //       console.log("璁板綍", this.hasScanSnList);
-    //       this.$u.toast("棰嗘枡鎴愬姛");
-		//     });
+      // 澶勭悊纭閫昏緫
+      this.$u.api.materialRequisition
+        .materialRequisition({
+          ...this.detailedList,
+        })
+        .then((res) => {
           this.hasScanSnList.push(this.detailedList);
+          console.log("璁板綍", this.hasScanSnList);
+          this.$u.toast("棰嗘枡鎴愬姛");
+        })
+        .catch((err) => {
+          this.$u.toast("棰嗘枡澶辫触");
+        });
     },
   },
 };
diff --git a/pages/sys/home/index.vue b/pages/sys/home/index.vue
index bd262ff..ec7b3af 100644
--- a/pages/sys/home/index.vue
+++ b/pages/sys/home/index.vue
@@ -84,21 +84,21 @@
 						// },
 					]
 				},
-				// {
-				// 	title: '浠撳簱绠$悊',
-				// 	list: [
-				// 		{
-				// 			name: '棰嗘枡',
-				// 			url: '/pages/storeManagement/MaterialRequisition/index',
-				// 			icon: 'eleven'
-				// 		},
-				// 		{
-				// 			name: '鍙栨秷棰嗘枡',
-				// 			url: '/pages/storeManagement/CancelMaterialRequisition/index',
-				// 			icon: 'twelve'
-				// 		},
-				// 	]
-				// }
+				{
+					title: '浠撳簱绠$悊',
+					list: [
+						{
+							name: '棰嗘枡',
+							url: '/pages/storeManagement/MaterialRequisition/index',
+							icon: 'eleven'
+						},
+						{
+							name: '鍙栨秷棰嗘枡',
+							url: '/pages/storeManagement/CancelMaterialRequisition/index',
+							icon: 'twelve'
+						},
+					]
+				}
 			]
 		};
 	},

--
Gitblit v1.9.3