From eb161f44be21e220532c04ad07ff290251755619 Mon Sep 17 00:00:00 2001
From: x_z <zrhdyxa@163.com>
Date: Fri, 14 Oct 2022 17:54:07 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E5=BB=BA=E5=9E=9B=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=202.=E8=B0=83=E6=95=B4=E9=83=A8=E5=88=86=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E5=B7=B2=E7=9F=A5bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/basic/udiInfo.js               |  2 +-
 src/api/production/stackOrder.js       |  2 +-
 src/views/sys/stackRules.vue           |  9 +++++++--
 src/views/warehouse/stockOrderEdit.vue | 13 +++++++++++++
 4 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/src/api/basic/udiInfo.js b/src/api/basic/udiInfo.js
index 031a1d8..2b5421a 100644
--- a/src/api/basic/udiInfo.js
+++ b/src/api/basic/udiInfo.js
@@ -17,7 +17,7 @@ export function filterCompany(query) {
 
 export function filterByUuid(query) {
     return axios({
-        url: "/udiwms/udiinfo/local/filterByUuid",
+        url: "/udims/udiinfo/local/filterByUuid",
         method: "get",
         params: query
     });
diff --git a/src/api/production/stackOrder.js b/src/api/production/stackOrder.js
index 32491bb..07ff3e9 100644
--- a/src/api/production/stackOrder.js
+++ b/src/api/production/stackOrder.js
@@ -26,7 +26,7 @@ export function deleteStackOrder(data) {
 
 export function uploadStack(data) {
     return axios({
-        url: "/udims/stack/order/upload",
+        url: "/udims/stack/order/uploadStackOrder",
         method: "post",
         data: data
     });
diff --git a/src/views/sys/stackRules.vue b/src/views/sys/stackRules.vue
index 339f10d..d6b0c5f 100644
--- a/src/views/sys/stackRules.vue
+++ b/src/views/sys/stackRules.vue
@@ -295,12 +295,17 @@ export default {
                 type: "warning"
             }).then(() => {
                 this.loading = true;
-                let params = {id: row.id};
+                let params = {
+                    id: row.id,
+                    customerId: this.$store.getters.customerId
+                };
                 deleteStackRules(params).then((res) => {
+                    this.loading = false;
                     if (res.code === 20000) {
-                        this.loading = false;
                         this.getList();
                         this.$message.success(res.message);
+                    } else {
+                        this.$message.error(res.message);
                     }
                 });
             }).catch(() => {
diff --git a/src/views/warehouse/stockOrderEdit.vue b/src/views/warehouse/stockOrderEdit.vue
index 448758f..83ef1b4 100644
--- a/src/views/warehouse/stockOrderEdit.vue
+++ b/src/views/warehouse/stockOrderEdit.vue
@@ -150,6 +150,7 @@
 
 <script>
 import {stockOrderDetail, updateStockOrderDetail} from "@/api/warehouse/stockOrder";
+import {isBlank} from "@/utils/strUtil";
 
 export default {
     name: "stockOrderEdit",
@@ -201,6 +202,10 @@ export default {
         },
         batchSetParams(flag, type) {
             if (flag == '1' && type == 'salesListNo') {
+                if (isBlank(this.batchForm.secSalesListNo)) {
+                    this.$message.warning("请输入销售清单");
+                    return;
+                }
                 this.salesListNoFormVisible = false;
                 this.detailList.forEach(data => {
                     this.multipId.forEach(id => {
@@ -214,6 +219,10 @@ export default {
                 //置空批量设置表单
                 Object.keys(this.batchForm).forEach(key => this.batchForm[key] = '');
             } else if (flag == '1' && type == 'firstSalesInvNo') {
+                if (isBlank(this.batchForm.firstSalesInvNo)) {
+                    this.$message.warning("请输入第一票发票号")
+                    return;
+                }
                 this.firstSalesInvNoFormVisible = false;
                 this.detailList.forEach(data => {
                     this.multipId.forEach(id => {
@@ -226,6 +235,10 @@ export default {
                 });
                 Object.keys(this.batchForm).forEach(key => this.batchForm[key] = '');
             } else if (flag == '1' && type == 'secSalesInvNo') {
+                if (isBlank(this.batchForm.secSalesInvNo) || isBlank(this.batchForm.invoiceDate)) {
+                    this.$message.warning("请输入第二票发票号和发票日期")
+                    return;
+                }
                 this.secSalesInvNoFormVisible = false;
                 this.detailList.forEach(data => {
                     this.multipId.forEach(id => {