From 1378fc4cd7abc24ed3a982e09437c2c8a74e9f2f Mon Sep 17 00:00:00 2001
From: 647556386 <647556386@qq.com>
Date: 星期二, 27 一月 2026 19:06:32 +0800
Subject: [PATCH] 代码优化

---
 项目代码/WIDESEA_WMSClient/src/extension/outbound/outboundOrder.js |   36 ++++++++++++++++++++++++++++++++++--
 1 files changed, 34 insertions(+), 2 deletions(-)

diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/extension/outbound/outboundOrder.js" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/extension/outbound/outboundOrder.js"
index 8cbe709..1ff6c97 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/extension/outbound/outboundOrder.js"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/extension/outbound/outboundOrder.js"
@@ -348,10 +348,10 @@
             .post(`api/MesFeedback/OutboundFeedback?orderNo=${selectedRows[0].orderNo}`, {}, "鏁版嵁澶勭悊涓�...")
             .then((x) => {
               if (x.status) {
-                _this.$Message.success('鍒嗘壒鍑哄簱鍥炶皟瀹屾垚');
+                _this.$Message.success(x.message);
                 _this.refresh();
               } else {
-                return _this.$Message.error('鍒嗘壒鍑哄簱鍥炶皟澶辫触');
+                return _this.$Message.error(x.message);
               }
             })
             .catch((error) => {
@@ -385,9 +385,12 @@
     if (rows.length == 0) return this.$error("璇烽�夋嫨鏁版嵁!");
     if (rows.length > 1) return this.$error("璇烽�夋嫨涓�鏉℃暟鎹�!");
     
+    
     // 纭繚閫変腑琛屾湁id锛堟牴鎹疄闄呰〃鏍兼暟鎹瓧娈佃皟鏁达紝姣斿rows[0].detailId绛夛級
     const selectedId = rows[0].id || rows[0].detailId;
     if (!selectedId) return this.$error("閫変腑鏁版嵁缂哄皯蹇呰ID瀛楁!");
+
+    if(rows[0].orderStatus!=0&&rows[0].orderStatus!=1)return this.$error("璇ュ崟鎹凡缁忓畬鎴�");
 
     const platformOptions = [
       { label: "绔欏彴2", value: "2-1" },
@@ -502,6 +505,7 @@
                       outboundQuantity: 1,
                       operator: this.currentOperator || "admin", 
                       orderNo: param,
+                      stockDetailIds:[]
                     };
 
                     try {
@@ -552,6 +556,34 @@
       //妗嗘灦鍒濆鍖栭厤缃悗
       //濡傛灉瑕侀厤缃槑缁嗚〃,鍦ㄦ鏂规硶鎿嶄綔
       //this.detailOptions.columns.forEach(column=>{ });
+      var CloseOrderBtn = this.buttons.find(
+              (x) => x.value == "CloseOrder"
+            );
+            if (CloseOrderBtn != null) {
+              CloseOrderBtn.onClick = () => {
+                var rows = this.$refs.table.getSelected();
+                // 鏍¢獙鏄惁鏈夐�変腑鏁版嵁
+                if (!rows || rows.length === 0) {
+                  return this.$Message.error("璇峰厛閫夋嫨闇�瑕佸叧闂殑鍗曟嵁");
+                }
+                if (rows.length > 1) {
+                  return this.$Message.error("璇烽�夋嫨涓�鏉″崟鎹�");
+                }
+                this.http.post(`api/InboundOrder/HandCloseOrder?orderIds=${rows[0].orderNo}`, {}, "鏁版嵁澶勭悊涓�...")
+                  .then((x) => {
+                    if (x.status) {
+                      this.$Message.success(x.message);
+                      this.refresh();
+                    } else {
+                      return this.$Message.error(x.message);
+                    }
+                  })
+                  .catch((error) => {
+                    // 澧炲姞寮傚父鎹曡幏锛屽鐞嗙綉缁滈敊璇瓑鎯呭喌
+                    //_this.$Message.error('璇锋眰澶辫触锛�' + (error.message || '鏈煡閿欒'));
+                  });
+              };
+            }
     },
     searchBefore(param) {
 

--
Gitblit v1.9.3