From ce29486ad48b4c8a59885d6392202416afd5e22d Mon Sep 17 00:00:00 2001
From: x_z <zrhdyxa@163.com>
Date: Mon, 17 Oct 2022 11:26:49 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E4=BC=A0=E5=8F=82=E9=94=99?=
 =?UTF-8?q?=E8=AF=AF=E5=AF=BC=E8=87=B4=E7=9A=84=E6=97=A0=E6=B3=95=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4=E5=8D=95=E6=8D=AE=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/warehouse/ioNewScanOrder.vue | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/views/warehouse/ioNewScanOrder.vue b/src/views/warehouse/ioNewScanOrder.vue
index 1f4b6c7..ff0085b 100644
--- a/src/views/warehouse/ioNewScanOrder.vue
+++ b/src/views/warehouse/ioNewScanOrder.vue
@@ -85,7 +85,7 @@
                     <el-button
                         type="text"
                         size="small"
-                        @click.native.stop="deleteDialog(scope.row.id)"
+                        @click.native.stop="deleteDialog(scope.row)"
                     >删除
                     </el-button
                     >
@@ -189,15 +189,20 @@ export default {
             this.getList();
         },
         getList() {
+            this.loading = true;
             filterOrder(this.filterQuery).then((res) => {
                 if (res.code === 20000) {
+                    this.loading = false;
                     this.list = res.data.list || [];
                     this.total = res.data.total || 0;
+                } else {
+                    this.$message.error(res.message);
+                    this.loading = false;
+                    this.list = [];
+                    this.total = 0;
                 }
             })
         },
-        cancelDialog() {
-        },
         handleModifyClick(row) {
             this.formName = 'edit';
             this.addOrderVisible = true;
@@ -226,12 +231,14 @@ export default {
                 type: "warning"
             }).then(() => {
                 this.loading = true;
-                let params = {id: row.orderId};
+                let params = {orderId: row.orderId};
                 deleteByOrderId(params).then((res) => {
                     if (res.code === 20000) {
                         this.$message.success("删除成功");
                         this.getList();
                     }
+                }).catch((error) => {
+                    this.$message.error(error.message);
                 })
             }).catch(() => {
             });