From be54a1d3875c5739774c56e08676dc712d2e2144 Mon Sep 17 00:00:00 2001
From: 44673626 <44673626@qq.com>
Date: Tue, 29 Mar 2022 20:06:29 +0800
Subject: [PATCH] =?UTF-8?q?=E6=92=A4=E9=94=80=E5=87=BA=E5=BA=93=E7=95=8C?=
 =?UTF-8?q?=E9=9D=A2=E6=9B=B4=E6=94=B9=201=EF=BC=8C=E5=A4=A7=E4=BC=97?=
 =?UTF-8?q?=E7=9C=8B=E6=9D=BF=E5=87=BA=E5=BA=93=E5=8D=95=202=EF=BC=8C?=
 =?UTF-8?q?=E5=A4=A7=E4=BC=97=E6=97=A0=E7=9C=8B=E6=9D=BF=E5=87=BA=E5=BA=93?=
 =?UTF-8?q?=E5=8D=95=203=EF=BC=8C=E4=B8=80=E6=AC=A1=E6=80=A7=E9=94=80?=
 =?UTF-8?q?=E5=94=AE=E5=87=BA=E5=BA=93=E5=8D=95=204=EF=BC=8C=E7=BA=A2?=
 =?UTF-8?q?=E6=97=97=E4=B8=80=E8=BD=BF=E5=87=BA=E5=BA=93=E5=8D=95=20?=
 =?UTF-8?q?=E8=BF=99=E4=BA=9B=E7=95=8C=E9=9D=A2=E4=B8=BA=E5=AE=9E=E4=B9=A0?=
 =?UTF-8?q?=E7=94=9F=E6=89=80=E5=86=99=EF=BC=8C=E8=87=AA=E5=B7=B1=E5=85=A8?=
 =?UTF-8?q?=E9=83=A8=E9=87=8D=E5=86=99=E4=BA=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ux/billManage/kanbanOutOrder/detail.vue   | 142 ++++++++-----
 .../billManage/kanbanWithOutOrder/detail.vue  | 195 +++++++++++++-----
 .../ux/vw/dataInput/OnetimeSale/detail.vue    | 122 +++++++----
 .../ux/vw/dataInput/hq_kb_output/detail.vue   | 129 +++++++-----
 4 files changed, 384 insertions(+), 204 deletions(-)

diff --git a/vue/src/views/ux/billManage/kanbanOutOrder/detail.vue b/vue/src/views/ux/billManage/kanbanOutOrder/detail.vue
index e49473e2..2443b269 100644
--- a/vue/src/views/ux/billManage/kanbanOutOrder/detail.vue
+++ b/vue/src/views/ux/billManage/kanbanOutOrder/detail.vue
@@ -1,4 +1,4 @@
-<!--FIS发运数据对比输出表-明细数据-->
+<!--大众看板出库单-->
 <template>
   <div class="cr-body-content">
     <flexbox class="content-header">
@@ -13,7 +13,7 @@
         type="success"
         icon="el-icon-check"
         size="mini"
-        @click="print()"
+        @click="handleCreateBills()"
         >确认出库单</el-button
       >
       <el-button
@@ -21,7 +21,7 @@
         size="mini"
         type="warning"
         icon="el-icon-download"
-        @click="handleCancelBills()"
+        @click="HandleOutPutCancel()"
         >取消出库(支持批量)
       </el-button>
       <el-button
@@ -145,7 +145,7 @@
           <el-button
             v-loading="formLoading"
             type="primary"
-            @click="handleCreateBills()"
+            @click="save()"
             >确认</el-button
           >
         </div>
@@ -367,8 +367,23 @@ export default {
       this.listQuery.Filters.push(filter);
       this.getList();
     },
-    //取消出库单
-    handleCancelBills(row) {
+    save(row) {
+      if (this.formTitle == "撤销出库") {
+        this.CancelBills(row);
+      } else if (this.formTitle == "创建出库单") {
+        this.saveBills(row);
+      }
+    },
+    //弹出出库单界面
+    handleCreateBills() {
+      this.dialogFormVisible = true;
+      if (this.$refs["accountDatelist"] !== undefined) {
+        this.$refs["accountDatelist"].resetFields();
+      }
+      this.formTitle = "创建出库单";
+    },
+    //撤销出库
+    HandleOutPutCancel() {
       if (this.multipleSelection.length == 0) {
         this.$message({
           message: "至少选择一行！",
@@ -376,46 +391,18 @@ export default {
         });
         return;
       }
-      var params = [];
-      let myalert = ""; //声明变量，其变量必须在此声明后使用
-      if (row) {
-        //单行
-        params.push(row.id);
-        myalert = row.name;
-      } else {
-        //多选
-        this.multipleSelection.forEach((element) => {
-          let id = element.id;
-          params.push(id);
-        });
-        myalert = "选中项";
-      }
-      this.listOutPutQuery.version = this.customerInfo.version;
-      this.listOutPutQuery.guids = params;
-      this.listOutPutQuery.billNum = this.customerInfo.parentId;
-      console.log("取消出库条件：" + JSON.stringify(this.listOutPutQuery));
-
+      let myalert = "选中项"; //声明变量，其变量必须在此声明后使用
       this.$confirm("是否确认取消出库" + myalert + "?", "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning",
       })
         .then(() => {
-          this.$axios
-            .posts(
-              "/api/settleaccount/wmskanbanoutput/WmsKanbanOutPut-Cancel",
-              this.listOutPutQuery
-            )
-            .then((response) => {
-              const index = this.list.indexOf(row);
-              this.$notify({
-                title: "成功",
-                message: "操作成功",
-                type: "success",
-                duration: 2000,
-              });
-              this.getList();
-            });
+          this.dialogFormVisible = true;
+          if (this.$refs["accountDatelist"] !== undefined) {
+            this.$refs["accountDatelist"].resetFields();
+          }
+          this.formTitle = "撤销出库";
         })
         .catch(() => {
           this.$message({
@@ -424,16 +411,8 @@ export default {
           });
         });
     },
-    print() {
-      this.dialogFormVisible = true;
-      if (this.$refs["accountDatelist"] !== undefined) {
-        this.$refs["accountDatelist"].resetFields();
-      }
-    },
-    //出库单
-    handleCreateBills(row) {
-      this.dialogFormVisible = true;
-      this.listLoading = true;
+    //保存出库单
+    saveBills(row) {
       this.listOutPutQuery.guids = [];
       this.listOutPutQuery.version = this.customerInfo.version;
       this.listOutPutQuery.billNum = this.customerInfo.parentId;
@@ -442,17 +421,13 @@ export default {
           message: "请选择日期！",
           type: "warning",
         });
-        this.getList();
         return;
-        //this.getList();
       } else {
         if (this.accountDatelist != "") {
           this.listOutPutQuery.accountDate = this.accountDatelist.accountDate;
         }
         //this.listOutPutQuery.accountDate = this.accountDatelist;
-        console.log(
-          "未选择时全部确认出库条件：" + JSON.stringify(this.listOutPutQuery)
-        );
+        console.log("确认出库条件：" + JSON.stringify(this.listOutPutQuery));
 
         this.$axios
           .posts(
@@ -470,13 +445,66 @@ export default {
             this.accountDatelist.accountDate = "";
             this.dialogFormVisible = false;
             this.getList();
-            this.listLoading = false;
+            this.formLoading = false;
           })
           .catch(() => {
-            this.listLoading = false;
+            this.formLoading = false;
           });
       }
     },
+    //取消出库单
+    CancelBills(row) {
+      if (this.accountDatelist.accountDate == "") {
+        this.$message({
+          message: "请选择日期！",
+          type: "warning",
+        });
+        return;
+      }
+      var params = [];
+      if (row) {
+        //单行
+        params.push(row.id);
+      } else {
+        //多选
+        this.multipleSelection.forEach((element) => {
+          let id = element.id;
+          params.push(id);
+        });
+      }
+      this.listOutPutQuery.version = this.customerInfo.version;
+      this.listOutPutQuery.guids = params;
+      this.listOutPutQuery.billNum = this.customerInfo.parentId;
+      this.listOutPutQuery.accountDate = this.accountDatelist.accountDate;
+      console.log("取消出库条件：" + JSON.stringify(this.listOutPutQuery));
+
+      this.$axios
+        .posts(
+          "/api/settleaccount/wmskanbanoutput/WmsKanbanOutPut-Cancel",
+          this.listOutPutQuery
+        )
+        .then((response) => {
+          const index = this.list.indexOf(row);
+          this.$notify({
+            title: "成功",
+            message: "操作成功",
+            type: "success",
+            duration: 2000,
+          });
+          this.accountDatelist.accountDate = "";
+          this.dialogFormVisible = false;
+          this.getList();
+          this.formLoading = false;
+        })
+        .catch(() => {
+          this.formLoading = false;
+          this.$message({
+            type: "info",
+            message: "调用服务出错！",
+          });
+        });
+    },
+
     //删除出库单
     handleDelete(row) {
       var params = [];
diff --git a/vue/src/views/ux/billManage/kanbanWithOutOrder/detail.vue b/vue/src/views/ux/billManage/kanbanWithOutOrder/detail.vue
index a1d7893f..f27c9f53 100644
--- a/vue/src/views/ux/billManage/kanbanWithOutOrder/detail.vue
+++ b/vue/src/views/ux/billManage/kanbanWithOutOrder/detail.vue
@@ -1,4 +1,4 @@
-<!--大众无条码看板-明细数据-->
+<!--大众无条码看板出库单-->
 <template>
   <div class="cr-body-content">
     <flexbox class="content-header">
@@ -34,7 +34,7 @@
         size="mini"
         type="warning"
         icon="el-icon-download"
-        @click="print()"
+        @click="HandleOutPutCancel()"
         >取消出库(支持批量)
       </el-button>
       <el-button
@@ -463,8 +463,17 @@ export default {
           });
       }
     },
-    //取消出库单
-    handleCancelBills(row) {
+
+    save(row) {
+      if (this.formTitle == "撤销出库") {
+        this.CancelBills(row);
+      } else if (this.formTitle == "创建出库单") {
+        this.saveBills(row);
+      }
+    },
+   
+     //撤销出库
+    HandleOutPutCancel() {
       if (this.multipleSelection.length == 0) {
         this.$message({
           message: "至少选择一行！",
@@ -472,46 +481,18 @@ export default {
         });
         return;
       }
-      var params = [];
-      let myalert = ""; //声明变量，其变量必须在此声明后使用
-      if (row) {
-        //单行
-        params.push(row.id);
-        myalert = row.name;
-      } else {
-        //多选
-        this.multipleSelection.forEach((element) => {
-          let id = element.id;
-          params.push(id);
-        });
-        myalert = "选中项";
-      }
-      this.listOutPutQuery.version = this.customerInfo.version;
-      this.listOutPutQuery.guids = params;
-      this.listOutPutQuery.billNum = this.customerInfo.parentId;
-      console.log("取消出库条件：" + JSON.stringify(this.listOutPutQuery));
-
+      let myalert = "选中项"; //声明变量，其变量必须在此声明后使用
       this.$confirm("是否确认取消出库" + myalert + "?", "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning",
       })
         .then(() => {
-          this.$axios
-            .posts(
-              "/api/settleaccount/wmskanbanoutputextend/WmsKanbanOutPut-Cancel",
-              this.listOutPutQuery
-            )
-            .then((response) => {
-              const index = this.list.indexOf(row);
-              this.$notify({
-                title: "成功",
-                message: "操作成功",
-                type: "success",
-                duration: 2000,
-              });
-              this.getList();
-            });
+          this.dialogFormVisible = true;
+          if (this.$refs["accountDatelist"] !== undefined) {
+            this.$refs["accountDatelist"].resetFields();
+          }
+          this.formTitle = "撤销出库";
         })
         .catch(() => {
           this.$message({
@@ -520,22 +501,18 @@ export default {
           });
         });
     },
-    print() {
+    //创建出库单
+    handleCreateBills(row) {
       this.dialogFormVisible = true;
       if (this.$refs["accountDatelist"] !== undefined) {
         this.$refs["accountDatelist"].resetFields();
       }
-    },
-    //出库单
-    handleCreateBills(row) {
-      this.dialogFormVisible = true;
       this.resultData = {};
+      this.formTitle = "创建出库单";
     },
-    //出库单
-    save(row) {
-      this.dialogFormVisible = true;
+    //保存出库单
+    saveBills(row) {
       this.resultData.errSize == 0; //重新弹窗
-      //this.formLoading = true;
       this.listOutPutQuery.guids = [];
       this.listOutPutQuery.version = this.customerInfo.version;
       this.listOutPutQuery.billNum = this.customerInfo.parentId;
@@ -544,18 +521,16 @@ export default {
           message: "请选择日期！",
           type: "warning",
         });
-        this.getList();
         return;
-        //this.getList();
       } else {
         if (this.accountDatelist != "") {
           this.listOutPutQuery.accountDate = this.accountDatelist.accountDate;
         }
-        //this.listOutPutQuery.accountDate = this.accountDatelist;
-        console.log(
+         console.log(
           "无条码看板-全部确认出库条件：" + JSON.stringify(this.listOutPutQuery)
         );
-        this.$axios
+
+            this.$axios
           .posts(
             "/api/settleaccount/wmskanbanoutputextend/WmsKanbanOutPut-Pass",
             this.listOutPutQuery
@@ -588,6 +563,122 @@ export default {
           });
       }
     },
+     //取消出库单
+    CancelBills(row) {
+      if (this.accountDatelist.accountDate == "") {
+        this.$message({
+          message: "请选择日期！",
+          type: "warning",
+        });
+        return;
+      }
+      var params = [];
+      if (row) {
+        //单行
+        params.push(row.id);
+      } else {
+        //多选
+        this.multipleSelection.forEach((element) => {
+          let id = element.id;
+          params.push(id);
+        });
+      }
+      this.listOutPutQuery.version = this.customerInfo.version;
+      this.listOutPutQuery.guids = params;
+      this.listOutPutQuery.billNum = this.customerInfo.parentId;
+      this.listOutPutQuery.accountDate = this.accountDatelist.accountDate;
+      console.log("取消出库条件：" + JSON.stringify(this.listOutPutQuery));
+
+      this.$axios
+        .posts(
+          "/api/settleaccount/wmskanbanoutputextend/WmsKanbanOutPut-Cancel",
+          this.listOutPutQuery
+        )
+        .then((response) => {
+          const index = this.list.indexOf(row);
+          this.$notify({
+            title: "成功",
+            message: "操作成功",
+            type: "success",
+            duration: 2000,
+          });
+          this.accountDatelist.accountDate = "";
+          this.dialogFormVisible = false;
+          this.getList();
+          this.formLoading = false;
+        })
+        .catch(() => {
+          this.formLoading = false;
+          this.$message({
+            type: "info",
+            message: "调用服务出错！",
+          });
+        });
+    },
+
+
+
+    // //出库单
+    // save-00(row) {
+    //   this.dialogFormVisible = true;
+    //   this.resultData.errSize == 0; //重新弹窗
+    //   //this.formLoading = true;
+    //   this.listOutPutQuery.guids = [];
+    //   this.listOutPutQuery.version = this.customerInfo.version;
+    //   this.listOutPutQuery.billNum = this.customerInfo.parentId;
+    //   if (this.accountDatelist.accountDate == "") {
+    //     this.$message({
+    //       message: "请选择日期！",
+    //       type: "warning",
+    //     });
+    //     this.getList();
+    //     return;
+    //     //this.getList();
+    //   } else {
+    //     if (this.accountDatelist != "") {
+    //       this.listOutPutQuery.accountDate = this.accountDatelist.accountDate;
+    //     }
+    //     //this.listOutPutQuery.accountDate = this.accountDatelist;
+    //     console.log(
+    //       "无条码看板-全部确认出库条件：" + JSON.stringify(this.listOutPutQuery)
+    //     );
+    //     this.$axios
+    //       .posts(
+    //         "/api/settleaccount/wmskanbanoutputextend/WmsKanbanOutPut-Pass-00",
+    //         this.listOutPutQuery
+    //       )
+    //       .then((res) => {
+    //         const index = this.list.indexOf(row);
+    //         if (res === "Success") {
+    //           this.$notify({
+    //             title: "成功",
+    //             message: "确认成功!",
+    //             type: "success",
+    //             duration: 2000,
+    //           });
+    //           this.accountDatelist.accountDate = "";
+    //           this.resultData.errSize = 0;
+    //           this.dialogFormVisible = false;
+    //           this.resultData.successMessage = "出库成功！";
+    //           this.getList();
+    //         } else {
+    //           this.dialogFormVisible = false;
+    //           this.resultData.errTemplate = res; //指定错误模板名称，作为参数，用于错误模板下载
+    //           this.resultData.errSize = 1; //保持大于0，用于控制错误数据下载按钮的可不可见
+    //           this.resultData.successMessage = "有错误检验信息！";
+    //           //alert(JSON.stringify(this.resultData));
+    //         }
+    //         this.formLoading = false;
+    //       })
+    //       .catch(() => {
+    //         this.formLoading = false;
+    //       });
+    //   }
+    // },
+
+
+
+
     //删除出库单
     handleDelete(row) {
       var params = [];
diff --git a/vue/src/views/ux/vw/dataInput/OnetimeSale/detail.vue b/vue/src/views/ux/vw/dataInput/OnetimeSale/detail.vue
index 8e602b5b..ae491cd3 100644
--- a/vue/src/views/ux/vw/dataInput/OnetimeSale/detail.vue
+++ b/vue/src/views/ux/vw/dataInput/OnetimeSale/detail.vue
@@ -22,7 +22,7 @@
         size="mini"
         type="warning"
         icon="el-icon-download"
-        @click="print()"
+        @click="HandleOutPutCancel()"
         >取消出库(支持批量)
       </el-button>
       <el-button
@@ -170,7 +170,7 @@
           <el-button
             v-loading="formLoading"
             type="primary"
-            @click="handleCreateBills()"
+            @click="save()"
             >确认</el-button
           >
         </div>
@@ -251,7 +251,7 @@ export default {
         SkipCount: 0,
         MaxResultCount: 15,
         billNum: "",
-         version: "",
+        version: "",
       },
       listOutPutQuery: {
         version: "",
@@ -447,8 +447,17 @@ export default {
           });
       }
     },
-    //取消出库单
-    handleCancelBills(row) {
+
+    save(row) {
+      if (this.formTitle == "撤销出库") {
+        this.CancelBills(row);
+      } else if (this.formTitle == "创建出库单") {
+        this.saveBills(row);
+      }
+    },
+
+    //撤销出库
+    HandleOutPutCancel() {
       if (this.multipleSelection.length == 0) {
         this.$message({
           message: "至少选择一行！",
@@ -456,46 +465,18 @@ export default {
         });
         return;
       }
-      var params = [];
-      let myalert = ""; //声明变量，其变量必须在此声明后使用
-      if (row) {
-        //单行
-        params.push(row.id);
-        myalert = row.name;
-      } else {
-        //多选
-        this.multipleSelection.forEach((element) => {
-          let id = element.id;
-          params.push(id);
-        });
-        myalert = "选中项";
-      }
-      this.listOutPutQuery.version = this.customerInfo.version;
-      this.listOutPutQuery.guids = params;
-      this.listOutPutQuery.billNum = this.customerInfo.parentId;
-      console.log("取消出库条件：" + JSON.stringify(this.listOutPutQuery));
-
+      let myalert = "选中项"; //声明变量，其变量必须在此声明后使用
       this.$confirm("是否确认取消出库" + myalert + "?", "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning",
       })
         .then(() => {
-          this.$axios
-            .posts(
-              "/api/settleaccount/WmsOneTimeSaleOutput/WmsKanbanOutPut-Cancel",
-              this.listOutPutQuery
-            )
-            .then((response) => {
-              const index = this.list.indexOf(row);
-              this.$notify({
-                title: "成功",
-                message: "操作成功",
-                type: "success",
-                duration: 2000,
-              });
-              this.getList();
-            });
+          this.dialogFormVisible = true;
+          if (this.$refs["accountDatelist"] !== undefined) {
+            this.$refs["accountDatelist"].resetFields();
+          }
+          this.formTitle = "撤销出库";
         })
         .catch(() => {
           this.$message({
@@ -504,15 +485,16 @@ export default {
           });
         });
     },
-    print() {
+    //确认出库单
+    handleCreateBills() {
       this.dialogFormVisible = true;
       if (this.$refs["accountDatelist"] !== undefined) {
         this.$refs["accountDatelist"].resetFields();
       }
+      this.formTitle = "创建出库单";
     },
     //出库单
-    handleCreateBills(row) {
-      this.dialogFormVisible = true;
+    saveBills(row) {
       this.listOutPutQuery.guids = [];
       this.listOutPutQuery.version = this.customerInfo.version;
       this.listOutPutQuery.billNum = this.customerInfo.parentId;
@@ -530,8 +512,7 @@ export default {
         }
         //this.listOutPutQuery.accountDate = this.accountDatelist;
         console.log(
-          "红旗数据调整-全部确认出库条件：" +
-            JSON.stringify(this.listOutPutQuery)
+          "一轿车-确认出库条件：" + JSON.stringify(this.listOutPutQuery)
         );
 
         this.$axios
@@ -557,6 +538,59 @@ export default {
           });
       }
     },
+    //取消出库单
+    CancelBills(row) {
+      if (this.accountDatelist.accountDate == "") {
+        this.$message({
+          message: "请选择日期！",
+          type: "warning",
+        });
+        return;
+      }
+      var params = [];
+      if (row) {
+        //单行
+        params.push(row.id);
+      } else {
+        //多选
+        this.multipleSelection.forEach((element) => {
+          let id = element.id;
+          params.push(id);
+        });
+      }
+      this.listOutPutQuery.version = this.customerInfo.version;
+      this.listOutPutQuery.guids = params;
+      this.listOutPutQuery.billNum = this.customerInfo.parentId;
+      this.listOutPutQuery.accountDate = this.accountDatelist.accountDate;
+      console.log("取消出库条件：" + JSON.stringify(this.listOutPutQuery));
+
+      this.$axios
+        .posts(
+          "/api/settleaccount/WmsOneTimeSaleOutput/WmsKanbanOutPut-Cancel",
+          this.listOutPutQuery
+        )
+        .then((response) => {
+          const index = this.list.indexOf(row);
+          this.$notify({
+            title: "成功",
+            message: "操作成功",
+            type: "success",
+            duration: 2000,
+          });
+          this.accountDatelist.accountDate = "";
+          this.dialogFormVisible = false;
+          this.getList();
+          this.formLoading = false;
+        })
+        .catch(() => {
+          this.formLoading = false;
+          this.$message({
+            type: "info",
+            message: "调用服务出错！",
+          });
+        });
+    },
+
     //删除出库单
     handleDelete(row) {
       var params = [];
diff --git a/vue/src/views/ux/vw/dataInput/hq_kb_output/detail.vue b/vue/src/views/ux/vw/dataInput/hq_kb_output/detail.vue
index 71b09b1c..9eec20dd 100644
--- a/vue/src/views/ux/vw/dataInput/hq_kb_output/detail.vue
+++ b/vue/src/views/ux/vw/dataInput/hq_kb_output/detail.vue
@@ -22,7 +22,7 @@
         size="mini"
         type="warning"
         icon="el-icon-download"
-        @click="print()"
+        @click="HandleOutPutCancel()"
         >取消出库(支持批量)
       </el-button>
       <el-button
@@ -167,10 +167,7 @@
           <el-button type="text" @click="dialogFormVisible = false"
             >取消</el-button
           >
-          <el-button
-            v-loading="formLoading"
-            type="primary"
-            @click="handleCreateBills()"
+          <el-button v-loading="formLoading" type="primary" @click="save()"
             >确认</el-button
           >
         </div>
@@ -255,7 +252,7 @@ export default {
       },
       listOutPutQuery: {
         version: "",
-        guids: "",
+        guids: [],
         billNum: "",
         accountDate: "",
       },
@@ -350,9 +347,7 @@ export default {
       this.listQuery.version = this.customerInfo.version;
       this.listQuery.billNum = this.customerInfo.parentId;
 
-      console.log(
-        "红旗一轿车库单导出：" + JSON.stringify(this.listQuery)
-      );
+      console.log("红旗一轿车库单导出：" + JSON.stringify(this.listQuery));
       this.$axios
         .posts("/api/settleaccount/WmsHQKBOutput/Export", this.listQuery)
         .then((res) => {
@@ -453,8 +448,15 @@ export default {
           });
       }
     },
-    //取消出库单
-    handleCancelBills(row) {
+    save(row) {
+      if (this.formTitle == "撤销出库") {
+        this.CancelBills(row);
+      } else if (this.formTitle == "创建出库单") {
+        this.saveBills(row);
+      }
+    },
+    //撤销出库
+    HandleOutPutCancel() {
       if (this.multipleSelection.length == 0) {
         this.$message({
           message: "至少选择一行！",
@@ -462,63 +464,88 @@ export default {
         });
         return;
       }
+      let myalert = "选中项"; //声明变量，其变量必须在此声明后使用
+      this.$confirm("是否确认取消出库" + myalert + "?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          this.dialogFormVisible = true;
+          if (this.$refs["accountDatelist"] !== undefined) {
+            this.$refs["accountDatelist"].resetFields();
+          }
+          this.formTitle = "撤销出库";
+        })
+        .catch(() => {
+          this.$message({
+            type: "info",
+            message: "已取消操作",
+          });
+        });
+    },
+    //确认出库单
+    handleCreateBills() {
+      this.dialogFormVisible = true;
+      if (this.$refs["accountDatelist"] !== undefined) {
+        this.$refs["accountDatelist"].resetFields();
+      }
+      this.formTitle = "创建出库单";
+    },
+    //取消出库单
+    CancelBills(row) {
+      if (this.accountDatelist.accountDate == "") {
+        this.$message({
+          message: "请选择日期！",
+          type: "warning",
+        });
+        return;
+      }
       var params = [];
-      let myalert = ""; //声明变量，其变量必须在此声明后使用
       if (row) {
         //单行
         params.push(row.id);
-        myalert = row.name;
       } else {
         //多选
         this.multipleSelection.forEach((element) => {
           let id = element.id;
           params.push(id);
         });
-        myalert = "选中项";
       }
       this.listOutPutQuery.version = this.customerInfo.version;
       this.listOutPutQuery.guids = params;
       this.listOutPutQuery.billNum = this.customerInfo.parentId;
+      this.listOutPutQuery.accountDate = this.accountDatelist.accountDate;
       console.log("取消出库条件：" + JSON.stringify(this.listOutPutQuery));
 
-      this.$confirm("是否确认取消出库" + myalert + "?", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-      })
-        .then(() => {
-          this.$axios
-            .posts(
-              "/api/settleaccount/WmsHQKBOutput/WmsKanbanOutPut-Cancel",
-              this.listOutPutQuery
-            )
-            .then((response) => {
-              const index = this.list.indexOf(row);
-              this.$notify({
-                title: "成功",
-                message: "操作成功",
-                type: "success",
-                duration: 2000,
-              });
-              this.getList();
-            });
+      this.$axios
+        .posts(
+          "/api/settleaccount/WmsHQKBOutput/WmsKanbanOutPut-Cancel",
+          this.listOutPutQuery
+        )
+        .then((response) => {
+          const index = this.list.indexOf(row);
+          this.$notify({
+            title: "成功",
+            message: "操作成功",
+            type: "success",
+            duration: 2000,
+          });
+          this.accountDatelist.accountDate = "";
+          this.dialogFormVisible = false;
+          this.getList();
+          this.formLoading = false;
         })
         .catch(() => {
+          this.formLoading = false;
           this.$message({
             type: "info",
-            message: "已取消操作",
+            message: "调用服务出错！",
           });
         });
     },
-    print() {
-      this.dialogFormVisible = true;
-      if (this.$refs["accountDatelist"] !== undefined) {
-        this.$refs["accountDatelist"].resetFields();
-      }
-    },
     //出库单
-    handleCreateBills(row) {
-      this.dialogFormVisible = true;
+    saveBills(row) {
       this.listOutPutQuery.guids = [];
       this.listOutPutQuery.version = this.customerInfo.version;
       this.listOutPutQuery.billNum = this.customerInfo.parentId;
@@ -527,18 +554,13 @@ export default {
           message: "请选择日期！",
           type: "warning",
         });
-        this.getList();
         return;
-        //this.getList();
       } else {
         if (this.accountDatelist != "") {
           this.listOutPutQuery.accountDate = this.accountDatelist.accountDate;
         }
         //this.listOutPutQuery.accountDate = this.accountDatelist;
-        console.log(
-          "红旗数据调整-全部确认出库条件：" +
-            JSON.stringify(this.listOutPutQuery)
-        );
+        console.log("确认出库条件：" + JSON.stringify(this.listOutPutQuery));
 
         this.$axios
           .posts(
@@ -740,10 +762,15 @@ export default {
     },
     handleSelectionChange(val) {
       this.multipleSelection = val;
+      console.log("选择中行：" + JSON.stringify(this.multipleSelection));
     },
     /** 通过回调控制style */
     cellStyle({ row, column, rowIndex, columnIndex }) {
-      if (column.property === "qty" || column.property === "realityNumber"  || column.property === "sockQty") {
+      if (
+        column.property === "qty" ||
+        column.property === "realityNumber" ||
+        column.property === "sockQty"
+      ) {
         return { textAlign: "right" };
       } else {
         return { textAlign: "left" };