From d01658c63cd541fe4ea5cec5c4bd7f23b9408cdb Mon Sep 17 00:00:00 2001
From: 647556386 <647556386@qq.com>
Date: 星期六, 18 十月 2025 15:04:56 +0800
Subject: [PATCH] 前端,pda,后端接口更改,新增,优化

---
 WMS/WIDESEA_WMSClient/src/extension/inbound/inboundOrder.js |   85 ++++++++++++++++++++++++++++++++++--------
 1 files changed, 68 insertions(+), 17 deletions(-)

diff --git a/WMS/WIDESEA_WMSClient/src/extension/inbound/inboundOrder.js b/WMS/WIDESEA_WMSClient/src/extension/inbound/inboundOrder.js
index 0c319b9..9c84a6a 100644
--- a/WMS/WIDESEA_WMSClient/src/extension/inbound/inboundOrder.js
+++ b/WMS/WIDESEA_WMSClient/src/extension/inbound/inboundOrder.js
@@ -1,22 +1,73 @@
 
-//姝s鏂囦欢鏄敤鏉ヨ嚜瀹氫箟鎵╁睍涓氬姟浠g爜锛屽彲浠ユ墿灞曚竴浜涜嚜瀹氫箟椤甸潰鎴栬�呴噸鏂伴厤缃敓鎴愮殑浠g爜
-
+import gridHeader from './extend/AddInboundOrder.vue'
+import gridBody from './extend/inOrderDetail.vue'
 let extension = {
-    components: {
-      //鏌ヨ鐣岄潰鎵╁睍缁勪欢
-      gridHeader: '',
-      gridBody: '',
-      gridFooter: '',
-      //鏂板缓銆佺紪杈戝脊鍑烘鎵╁睍缁勪欢
-      modelHeader: '',
-      modelBody: '',
-      modelFooter: ''
-    },
-    tableAction: '', //鎸囧畾鏌愬紶琛ㄧ殑鏉冮檺(杩欓噷濉啓琛ㄥ悕,榛樿涓嶇敤濉啓)
-    buttons: { view: [], box: [], detail: [] }, //鎵╁睍鐨勬寜閽�
-    methods: {
-       //涓嬮潰杩欎簺鏂规硶鍙互淇濈暀涔熷彲浠ュ垹闄�
-      onInit() {  
+  components: {
+    //鏌ヨ鐣岄潰鎵╁睍缁勪欢
+    gridHeader: gridHeader,
+    gridBody: gridBody,
+    gridFooter: '',
+    //鏂板缓銆佺紪杈戝脊鍑烘鎵╁睍缁勪欢
+    modelHeader: '',
+    modelBody: '',
+    modelFooter: ''
+  },
+  tableAction: '', //鎸囧畾鏌愬紶琛ㄧ殑鏉冮檺(杩欓噷濉啓琛ㄥ悕,榛樿涓嶇敤濉啓)
+  buttons: { view: [], box: [], detail: [] }, //鎵╁睍鐨勬寜閽�
+  methods: {
+    //涓嬮潰杩欎簺鏂规硶鍙互淇濈暀涔熷彲浠ュ垹闄�
+    onInit() {
+
+      this.columns.push({
+          field: '鎿嶄綔',
+          title: '鎿嶄綔',
+          width: 90,
+          fixed: 'right',
+          align: 'center',
+          formatter: (row) => {
+              return (
+                  '<i style="cursor: pointer;color: #2d8cf0;"class="el-icon-view">鏌ョ湅鏄庣粏</i>'
+              );
+          },
+          click: (row) => {
+              this.$refs.gridBody.open(row);
+          }
+      });
+      
+      let addBtn = this.buttons.find(x => x.value == 'Add');
+      if (addBtn) {
+        addBtn.onClick = function () {
+          this.$refs.gridHeader.open();
+        }
+      };
+      let FeedbackInboundCanceERP = this.buttons.find(x => x.value == 'FeedbackInboundCanceERP');
+      if (FeedbackInboundCanceERP) {
+        FeedbackInboundCanceERP.onClick = function () {
+          this.$confirm("鏄惁纭鍙栨秷鍗曟嵁","鍗曟嵁鍙栨秷璀﹀憡",{
+              confirmButtonText: "纭畾",
+              cancelButtonText: "鍙栨秷",
+              type: "warning",
+              center: true,
+              }).then(() => {
+                let rows = this.$refs.table.getSelected();
+                if (rows.length == 0) return this.$error("璇烽�夋嫨鏁版嵁!");
+                if (rows.length > 1) return this.$error("璇烽�夋嫨涓�鏉℃暟鎹�!");
+                var param = rows[0].orderNo;
+                this.http
+                  .post("api/InboundOrder/FeedbackInboundCanceERP?orderNo="+param, "鏁版嵁澶勭悊涓�...")
+                  .then((x) => {
+                    if (x.status) {
+                      this.$Message.success('鍏ュ簱鍗曟嵁鍙栨秷鎴愬姛');
+                      this.refresh();
+                    } else {
+                      return this.$error(x.message);
+                    }
+                  });
+              });
+        }
+      }
+
+      
       },
       onInited() {
         //妗嗘灦鍒濆鍖栭厤缃悗

--
Gitblit v1.9.3