From b7822c7f22433babd2dccf9bb405c73816732c96 Mon Sep 17 00:00:00 2001
From: anthonywj <yewenjie20@vip.qq.com>
Date: Wed, 22 Feb 2023 20:55:06 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=95=E6=8D=AE=E7=BC=96=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/inout/order.js                    | 21 +++++++++
 src/views/inout/IoEditOrder.vue           | 54 +++++++++++------------
 src/views/inout/IoEditOrderCodeDetail.vue | 13 +++++-
 3 files changed, 59 insertions(+), 29 deletions(-)

diff --git a/src/api/inout/order.js b/src/api/inout/order.js
index a7191e80..9f4652b8 100644
--- a/src/api/inout/order.js
+++ b/src/api/inout/order.js
@@ -41,6 +41,7 @@ export function submitOrderWeb(query) {
     data: query
   });
 }
+
 export function submitCodes(query) {
   return axios({
     url: "/warehouse/inout/submitCodes",
@@ -48,6 +49,7 @@ export function submitCodes(query) {
     data: query
   });
 }
+
 export function submitBiz(query) {
   return axios({
     url: "/warehouse/inout/submitBiz",
@@ -425,3 +427,22 @@ export function filterOrderTrace(params) {
   });
 }
 
+export function deleteInvByBillNo(query) {
+  return axios({
+    url: "/udiwms/inout/order/finish/delete",
+    method: "post",
+    data: query
+  });
+}
+
+
+export function deleteInvByCode(query) {
+  return axios({
+    url: "/udiwms/inout/code/finish/delete",
+    method: "post",
+    data: query
+  });
+}
+
+
+
diff --git a/src/views/inout/IoEditOrder.vue b/src/views/inout/IoEditOrder.vue
index 6ab5ee24..06eba9a8 100644
--- a/src/views/inout/IoEditOrder.vue
+++ b/src/views/inout/IoEditOrder.vue
@@ -43,14 +43,6 @@
             <span>{{ scope.row.createTime }}</span>
           </template>
         </el-table-column>
-        <!--        <el-table-column label="校验状态" prop="status" width="100">-->
-        <!--          <template slot-scope="scope">-->
-        <!--            <el-tag :type="(scope.row.status ===-1 ) | statusFilterType">{{-->
-        <!--                checkStatus[scope.row.status]-->
-        <!--              }}-->
-        <!--            </el-tag>-->
-        <!--          </template>-->
-        <!--        </el-table-column>-->
         <el-table-column label="操作" width="150">
           <template slot-scope="scope">
             <el-button
@@ -403,7 +395,7 @@
 <script>
 import {
   deleteByOrderId,
-  filterOrderTrace, updateOrderInfo
+  filterOrderTrace, updateOrderInfo, deleteInvByBillNo
 } from "../../api/inout/order";
 import {isBlank} from "@/utils/strUtil";
 import {getBizDetailList} from "@/api/inout/orderDetailBiz";
@@ -565,22 +557,6 @@ export default {
           this.list = [];
         });
     },
-    deleteOrders(data) {
-      this.loading = true;
-      this.deleteData.billNo = data.billNo;
-      deleteByOrderId(this.deleteData)
-        .then((response) => {
-          if (response.code == 20000) {
-            this.getList();
-            this.$message({
-              type: "success",
-              message: "删除成功！",
-            });
-          }
-        })
-        .catch(() => {
-        });
-    },
     deleteAllOrder() {
       if (this.list.length > 0) {
         this.$confirm("是否确认删除此单据和所有关联单据？", "提示", {
@@ -588,7 +564,22 @@ export default {
           cancelButtonText: "取消",
           type: "warning",
         }).then(() => {
-          //TODO 待完善删除全部单据接口
+          let billNos = [];
+          this.list.forEach(item => {
+            billNos.push(item.billNo);
+          });
+          let params = {
+            billNos: billNos
+          };
+          deleteInvByBillNo(params).then((res) => {
+            if (res.code === 20000) {
+              this.$message.success("删除成功");
+              this.list = [];
+              this.detailList = [];
+            }
+          }).catch((error) => {
+            this.$message.error("删除失败");
+          })
         }).catch(() => {
         });
       }
@@ -631,7 +622,16 @@ export default {
         type: "warning",
       })
         .then(() => {
-          //TODO 待完善删除单条单据接口
+          let query = {billNo: row.billNo};
+          deleteInvByBillNo(query).then((res) => {
+            if (res.code === 20000) {
+              this.$message.success("修改成功");
+              this.getList();
+            }
+          }).catch((error) => {
+            this.$message.error(error.message);
+          })
+
         })
         .catch(() => {
         });
diff --git a/src/views/inout/IoEditOrderCodeDetail.vue b/src/views/inout/IoEditOrderCodeDetail.vue
index 451f31c8..ef1620e6 100644
--- a/src/views/inout/IoEditOrderCodeDetail.vue
+++ b/src/views/inout/IoEditOrderCodeDetail.vue
@@ -97,7 +97,7 @@
 
 <script>
 import {
-  filterOrderTrace, updateOrderInfo
+  deleteInvByCode, updateOrderInfo
 } from "../../api/inout/order";
 import {getCodeListForEdit} from "@/api/inout/code";
 import {isBlank} from "@/utils/strUtil";
@@ -219,7 +219,16 @@ export default {
         type: "warning",
       })
         .then(() => {
-          //TODO 删除条码接口待完成
+          deleteInvByCode(row).then((res) => {
+            if (res.code === 20000) {
+              this.$message.success("操作成功");
+              this.getList();
+            } else {
+              this.$message.error(res.message);
+            }
+          }).catch((error) => {
+            this.$message.error(error.message);
+          });
         })
         .catch(() => {
         });