From 9051d96029c8e860c6e6657b7df2106bfbfdc010 Mon Sep 17 00:00:00 2001
From: chenyong <chenyong@hnkhzn.com>
Date: 星期五, 06 三月 2026 15:20:54 +0800
Subject: [PATCH] 111

---
 项目代码/WMS/WIDESEA_WMSClient/src/extension/taskinfo/task.js |  272 +++++++++++++++++++++++++++++++-----------------------
 1 files changed, 157 insertions(+), 115 deletions(-)

diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSClient/src/extension/taskinfo/task.js" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSClient/src/extension/taskinfo/task.js"
index c60206e..a2e1f79 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSClient/src/extension/taskinfo/task.js"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSClient/src/extension/taskinfo/task.js"
@@ -1,127 +1,169 @@
-
 //姝s鏂囦欢鏄敤鏉ヨ嚜瀹氫箟鎵╁睍涓氬姟浠g爜锛屽彲浠ユ墿灞曚竴浜涜嚜瀹氫箟椤甸潰鎴栬�呴噸鏂伴厤缃敓鎴愮殑浠g爜
 
 let extension = {
-  components: {
-    //鏌ヨ鐣岄潰鎵╁睍缁勪欢
-    gridHeader: '',
-    gridBody: '',
-    gridFooter: '',
-    //鏂板缓銆佺紪杈戝脊鍑烘鎵╁睍缁勪欢
-    modelHeader: '',
-    modelBody: '',
-    modelFooter: ''
-  },
-  tableAction: '', //鎸囧畾鏌愬紶琛ㄧ殑鏉冮檺(杩欓噷濉啓琛ㄥ悕,榛樿涓嶇敤濉啓)
-  buttons: { view: [], box: [], detail: [] }, //鎵╁睍鐨勬寜閽�
-  methods: {
-    //涓嬮潰杩欎簺鏂规硶鍙互淇濈暀涔熷彲浠ュ垹闄�
-    onInit() {
-      let TaskHandCancelBtn = this.buttons.find(x => x.value == 'TaskHandCancel');
-      if (TaskHandCancelBtn) {
-        TaskHandCancelBtn.onClick = function () {
-          this.$message.success('鑷畾涔夋寜閽偣鍑讳簨浠�');
-        }
-      }
-      let TaskHandCompletedBtn = this.buttons.find(x => x.value == 'TaskHandCompleted');
-      if (TaskHandCompletedBtn) {
-        TaskHandCompletedBtn.onClick = function () {
-          let rows = this.$refs.table.getSelected();
-          if (rows.length == 0) return this.$error("璇烽�夋嫨鏁版嵁!");
-          this.$confirm("鏄惁纭畾瑕佹墜鍔ㄥ畬鎴愶紝鎵嬪姩瀹屾垚鍚庤鍒犻櫎WCS绯荤粺涓殑浠诲姟锛�", "鎻愮ず", {
-            // iconClass:"el-icon-success",//el-icon-remove鑷畾涔夊浘鏍囨牱寮�
-            confirmButtonText: "纭",//纭鎸夐挳鏂囧瓧鏇存崲
-            cancelButtonText: "鍙栨秷",//鍙栨秷鎸夐挳鏂囧瓧鏇存崲
-            // cancelBtn:"鍙栨秷",//鍙栨秷鎸夐挳鏂囧瓧鏇存崲
-            showClose: true,//鏄惁鏄剧ず鍙充笂瑙掑叧闂寜閽�
-            type: "warning",//鎻愮ず绫诲瀷 success:鎴愬姛/info:淇℃伅/warning:璀﹀憡/error:鎶ラ敊
-          }).then(() => {
-            var param = rows[0].taskNum;
-            this.http
-              .get("api/Task/TaskCompleted?taskNum=" + param, "鏁版嵁澶勭悊涓�...")
-              .then((x) => {
-                if (x.status) {
-                  this.$Message.success('浠诲姟鎵嬪姩瀹屾垚鎴愬姛.');
-                  this.refresh();
-                } else {
-                  return this.$error(x.message);
+    components: {
+        //鏌ヨ鐣岄潰鎵╁睍缁勪欢
+        gridHeader: '',
+        gridBody: '',
+        gridFooter: '',
+        //鏂板缓銆佺紪杈戝脊鍑烘鎵╁睍缁勪欢
+        modelHeader: '',
+        modelBody: '',
+        modelFooter: ''
+    },
+    tableAction: '', //鎸囧畾鏌愬紶琛ㄧ殑鏉冮檺(杩欓噷濉啓琛ㄥ悕,榛樿涓嶇敤濉啓)
+    buttons: { view: [], box: [], detail: [] }, //鎵╁睍鐨勬寜閽�
+    methods: {
+        //涓嬮潰杩欎簺鏂规硶鍙互淇濈暀涔熷彲浠ュ垹闄�
+        onInit() {
+            let TaskHandCancelBtn = this.buttons.find(x => x.value == 'TaskHandCancel');
+            if (TaskHandCancelBtn) {
+                TaskHandCancelBtn.onClick = function() {
+                    this.$message.success('鑷畾涔夋寜閽偣鍑讳簨浠�');
                 }
-              });
-          })
+            }
+            let TaskHandCompletedBtn = this.buttons.find(x => x.value == 'TaskHandCompleted');
+            if (TaskHandCompletedBtn) {
+                TaskHandCompletedBtn.onClick = function() {
+                    let rows = this.$refs.table.getSelected();
+                    if (rows.length == 0) return this.$error("璇烽�夋嫨鏁版嵁!");
+                    this.$confirm(`鏄惁纭畾瑕佹墜鍔ㄥ畬鎴愶紝${rows[0].taskNum}浠诲姟!`, "鎻愮ず", {
+                        // iconClass:"el-icon-success",//el-icon-remove鑷畾涔夊浘鏍囨牱寮�
+                        confirmButtonText: "纭", //纭鎸夐挳鏂囧瓧鏇存崲
+                        cancelButtonText: "鍙栨秷", //鍙栨秷鎸夐挳鏂囧瓧鏇存崲
+                        // cancelBtn:"鍙栨秷",//鍙栨秷鎸夐挳鏂囧瓧鏇存崲
+                        showClose: true, //鏄惁鏄剧ず鍙充笂瑙掑叧闂寜閽�
+                        type: "warning", //鎻愮ず绫诲瀷 success:鎴愬姛/info:淇℃伅/warning:璀﹀憡/error:鎶ラ敊
+                    }).then(() => {
+                        var param = rows[0].palletCode;
+                        let data = {
+                            BusinessId: "1",
+                            TaskId: 1,
+                            PalletCode: param
+                        }
+                        this.http
+                            .post("v1/pallet/rmsPalletTask/mockComplete", data)
+                            .then((x) => {
+                                if (x.status) {
+                                    this.$Message.success('浠诲姟鎵嬪姩瀹屾垚鎴愬姛.');
+                                    this.refresh();
+                                } else {
+                                    return this.$error(x.message);
+                                }
+                            });
+                    })
 
-        }
-      }
+                }
+            }
+            //鑷畾涔夋墜鍔ㄥ彂閫佷换鍔′俊鎭寜閽�
+            let Manualtasksendingbutton = this.buttons.find(x => x.value == 'Manualtasksendingbut');
+            if (Manualtasksendingbutton) {
+                Manualtasksendingbutton.onClick = function() {
+                    let rows = this.$refs.table.getSelected();
+                    if (rows.length == 0) return this.$error("璇烽�夋嫨鏁版嵁!");
+                    this.$confirm(`鏄惁纭畾鎵嬪姩鍙戦�佷换鍔′俊鎭嚦wcs锛�${rows[0].taskNum}浠诲姟!`, "鎻愮ず", {
+                        // iconClass:"el-icon-success",//el-icon-remove鑷畾涔夊浘鏍囨牱寮�
+                        confirmButtonText: "纭", //纭鎸夐挳鏂囧瓧鏇存崲
+                        cancelButtonText: "鍙栨秷", //鍙栨秷鎸夐挳鏂囧瓧鏇存崲
+                        // cancelBtn:"鍙栨秷",//鍙栨秷鎸夐挳鏂囧瓧鏇存崲
+                        showClose: true, //鏄惁鏄剧ず鍙充笂瑙掑叧闂寜閽�
+                        type: "warning", //鎻愮ず绫诲瀷 success:鎴愬姛/info:淇℃伅/warning:璀﹀憡/error:鎶ラ敊
+                    }).then(() => {
+                        var task = rows[0].taskNum;
+                        // let data = {
+                        //     BusinessId: "1",
+                        //     TaskId: 1,
+                        //     PalletCode: param
+                        // }
+                        this.http
+                            .get(`api/Task/WCSTask?task=${task}`)
+                            .then((x) => {
+                                if (x.status) {
+                                    this.$Message.success('浠诲姟鎵嬪姩涓嬪彂鎴愬姛.');
+                                    this.refresh();
+                                } else {
+                                    return this.$error(x.message);
+                                }
+                            });
+                    })
+
+                }
+            }
 
 
-      var btnHandOutbound = this.buttons.find(x => x.value == "TaskCancellation");
-      if (btnHandOutbound != null) {
-        btnHandOutbound.onClick = () => {
-          let rows = this.$refs.table.getSelected();
-          if (rows.length == 0) {
+            var btnHandOutbound = this.buttons.find(x => x.value == "TaskCancellation");
+if (btnHandOutbound != null) {
+    btnHandOutbound.onClick = () => {
+        let rows = this.$refs.table.getSelected();
+        if (rows.length == 0) {
             return this.$error("璇烽�夋嫨鏁版嵁!");
-          } else {
-            
-
-              this.$confirm("鏄惁纭畾瑕佸彇娑堜换鍔★紝鍙栨秷鍚庤鍒犻櫎WCS绯荤粺涓殑浠诲姟锛�", "鎻愮ず", {
-                // iconClass:"el-icon-success",//el-icon-remove鑷畾涔夊浘鏍囨牱寮�
-                confirmButtonText: "纭",//纭鎸夐挳鏂囧瓧鏇存崲
-                cancelButtonText: "鍙栨秷",//鍙栨秷鎸夐挳鏂囧瓧鏇存崲
-                // cancelBtn:"鍙栨秷",//鍙栨秷鎸夐挳鏂囧瓧鏇存崲
-                showClose: true,//鏄惁鏄剧ず鍙充笂瑙掑叧闂寜閽�
-                type: "warning",//鎻愮ず绫诲瀷 success:鎴愬姛/info:淇℃伅/warning:璀﹀憡/error:鎶ラ敊
-              }).then(() => {
-                var ids = rows.map(x => {
-                  return x.taskNum
+        } else {
+            this.$confirm(`鏄惁纭畾瑕佸彇娑堜换鍔★紝${rows[0].taskNum}浠诲姟`, "鎻愮ず", {
+                confirmButtonText: "纭",
+                cancelButtonText: "鍙栨秷",
+                showClose: true,
+                type: "warning",
+            }).then(() => {
+                // 淇敼杩欓噷锛氫娇鐢ㄦ墭鐩樺彿(palletCode)鑰屼笉鏄换鍔″彿(taskNum)
+                var palletCodes = rows.map(x => {
+                    return x.palletCode  // 鍋囪琛ㄦ牸鏁版嵁涓湁palletCode瀛楁
                 })
-                this.http
-                  .get("api/Task/Cancelinventory?TaskNum=" + ids, "鏁版嵁澶勭悊涓�...")
-                  .then((x) => {
-                    if (x.status) {
-                      this.$Message.success('鎴愬姛.');
-                      this.refresh();
-                    } else {
-                      return this.$error(x.message);
-                    }
-                  });
-              })
-          }
+                var palletCode = rows[0].palletCode;  // 鐩存帴鍙栫涓�涓�
+var requestData = { palletCode: palletCode };  // 鍒涘缓JSON瀵硅薄
+                // 娉ㄦ剰锛氳繖閲屼竴娆″彧鑳藉鐞嗕竴涓墭鐩橈紝鎵�浠ュ彇绗竴涓�変腑鐨勬墭鐩樺彿
+                if (palletCodes.length > 0) {
+                    this.http
+                    .post("v1/pallet/rmsPalletTask/cancelTask", requestData, "鏁版嵁澶勭悊涓�...")
+                        .then((x) => {
+                            if (x.status) {
+                                this.$Message.success('鎴愬姛.');
+                                this.refresh();
+                            } else {
+                                return this.$error(x.message);
+                            }
+                        });
+                } else {
+                    this.$error("鏈壘鍒版墭鐩樺彿淇℃伅!");
+                }
+            })
         }
-      }
-    },
-    onInited() {
-      //妗嗘灦鍒濆鍖栭厤缃悗
-      //濡傛灉瑕侀厤缃槑缁嗚〃,鍦ㄦ鏂规硶鎿嶄綔
-      //this.detailOptions.columns.forEach(column=>{ });
-    },
-    searchBefore(param) {
-      //鐣岄潰鏌ヨ鍓�,鍙互缁檖aram.wheres娣诲姞鏌ヨ鍙傛暟
-      //杩斿洖false锛屽垯涓嶄細鎵ц鏌ヨ
-      return true;
-    },
-    searchAfter(result) {
-      //鏌ヨ鍚庯紝result杩斿洖鐨勬煡璇㈡暟鎹�,鍙互鍦ㄦ樉绀哄埌琛ㄦ牸鍓嶅鐞嗚〃鏍肩殑鍊�
-      return true;
-    },
-    addBefore(formData) {
-      //鏂板缓淇濆瓨鍓峟ormData涓哄璞★紝鍖呮嫭鏄庣粏琛紝鍙互缁欑粰琛ㄥ崟璁剧疆鍊硷紝鑷繁杈撳嚭鐪媐ormData鐨勫��
-      return true;
-    },
-    updateBefore(formData) {
-      //缂栬緫淇濆瓨鍓峟ormData涓哄璞★紝鍖呮嫭鏄庣粏琛ㄣ�佸垹闄よ鐨処d
-      return true;
-    },
-    rowClick({ row, column, event }) {
-      //鏌ヨ鐣岄潰鐐瑰嚮琛屼簨浠�
-      this.$refs.table.$refs.table.toggleRowSelection(row); //鍗曞嚮琛屾椂閫変腑褰撳墠琛�;
-    },
-    modelOpenAfter(row) {
-      //鐐瑰嚮缂栬緫銆佹柊寤烘寜閽脊鍑烘鍚庯紝鍙互鍦ㄦ澶勫啓閫昏緫锛屽锛屼粠鍚庡彴鑾峰彇鏁版嵁
-      //(1)鍒ゆ柇鏄紪杈戣繕鏄柊寤烘搷浣滐細 this.currentAction=='Add';
-      //(2)缁欏脊鍑烘璁剧疆榛樿鍊�
-      //(3)this.editFormFields.瀛楁='xxx';
-      //濡傛灉闇�瑕佺粰涓嬫媺妗嗚缃粯璁ゅ�硷紝璇烽亶鍘唗his.editFormOptions鎵惧埌瀛楁閰嶇疆瀵瑰簲data灞炴�х殑key鍊�
-      //鐪嬩笉鎳傚氨鎶婅緭鍑虹湅锛歝onsole.log(this.editFormOptions)
     }
-  }
+}
+        },
+        onInited() {
+            //妗嗘灦鍒濆鍖栭厤缃悗
+            //濡傛灉瑕侀厤缃槑缁嗚〃,鍦ㄦ鏂规硶鎿嶄綔
+            //this.detailOptions.columns.forEach(column=>{ });
+        },
+        searchBefore(param) {
+            //鐣岄潰鏌ヨ鍓�,鍙互缁檖aram.wheres娣诲姞鏌ヨ鍙傛暟
+            //杩斿洖false锛屽垯涓嶄細鎵ц鏌ヨ
+            return true;
+        },
+        searchAfter(result) {
+            //鏌ヨ鍚庯紝result杩斿洖鐨勬煡璇㈡暟鎹�,鍙互鍦ㄦ樉绀哄埌琛ㄦ牸鍓嶅鐞嗚〃鏍肩殑鍊�
+            return true;
+        },
+        addBefore(formData) {
+            //鏂板缓淇濆瓨鍓峟ormData涓哄璞★紝鍖呮嫭鏄庣粏琛紝鍙互缁欑粰琛ㄥ崟璁剧疆鍊硷紝鑷繁杈撳嚭鐪媐ormData鐨勫��
+            return true;
+        },
+        updateBefore(formData) {
+            //缂栬緫淇濆瓨鍓峟ormData涓哄璞★紝鍖呮嫭鏄庣粏琛ㄣ�佸垹闄よ鐨処d
+            return true;
+        },
+        rowClick({ row, column, event }) {
+            //鏌ヨ鐣岄潰鐐瑰嚮琛屼簨浠�
+            this.$refs.table.$refs.table.toggleRowSelection(row); //鍗曞嚮琛屾椂閫変腑褰撳墠琛�;
+        },
+        modelOpenAfter(row) {
+            //鐐瑰嚮缂栬緫銆佹柊寤烘寜閽脊鍑烘鍚庯紝鍙互鍦ㄦ澶勫啓閫昏緫锛屽锛屼粠鍚庡彴鑾峰彇鏁版嵁
+            //(1)鍒ゆ柇鏄紪杈戣繕鏄柊寤烘搷浣滐細 this.currentAction=='Add';
+            //(2)缁欏脊鍑烘璁剧疆榛樿鍊�
+            //(3)this.editFormFields.瀛楁='xxx';
+            //濡傛灉闇�瑕佺粰涓嬫媺妗嗚缃粯璁ゅ�硷紝璇烽亶鍘唗his.editFormOptions鎵惧埌瀛楁閰嶇疆瀵瑰簲data灞炴�х殑key鍊�
+            //鐪嬩笉鎳傚氨鎶婅緭鍑虹湅锛歝onsole.log(this.editFormOptions)
+        }
+    }
 };
-export default extension;
+export default extension;
\ No newline at end of file

--
Gitblit v1.9.3