From c13d3e48a9c75ffbf94e3a033b237d6a2012d9d6 Mon Sep 17 00:00:00 2001
From: x_z <zrhdyxa@163.com>
Date: Tue, 18 Oct 2022 11:55:52 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E4=BB=93=E5=BA=93=E5=AD=97?=
 =?UTF-8?q?=E5=85=B8=EF=BC=8C=E6=A8=A1=E6=9D=BF=EF=BC=8C=E8=80=97=E6=9D=90?=
 =?UTF-8?q?=E5=AD=97=E5=85=B8=E9=A1=B5=E9=9D=A2=E7=9A=84=E9=83=A8=E5=88=86?=
 =?UTF-8?q?bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/basic/UdiInfoManage.vue             |  4 +-
 src/views/basic/invWarehouse.vue              | 37 ++++++++++---------
 .../userManage/param/systemPDFTemplate.vue    |  2 +
 3 files changed, 23 insertions(+), 20 deletions(-)

diff --git a/src/views/basic/UdiInfoManage.vue b/src/views/basic/UdiInfoManage.vue
index 981926d..bdb6b1b 100644
--- a/src/views/basic/UdiInfoManage.vue
+++ b/src/views/basic/UdiInfoManage.vue
@@ -897,7 +897,7 @@ export default {
         diableChange() {
             let query = {
                 relId: this.editQuery.id,
-                isDisable: this.editQuery.disable
+                isDisable: this.editQuery.isDisable
             }
             disableUdi(query)
                 .then((response) => {
@@ -905,7 +905,7 @@ export default {
                         this.editQuery.disable = false;
                         this.$message.error(response.message);
                     } else {
-                        if (this.editQuery.disable) {
+                        if (this.editQuery.isDisable) {
                             this.$message.success("已禁用");
                         } else {
                             this.$message.success("已取消禁用");
diff --git a/src/views/basic/invWarehouse.vue b/src/views/basic/invWarehouse.vue
index 9d0ff63..caaf0f6 100644
--- a/src/views/basic/invWarehouse.vue
+++ b/src/views/basic/invWarehouse.vue
@@ -599,9 +599,7 @@ export default {
             },
             busTotal: 0,
             addUserQuery: {
-                customerId: this.$store.getters.customerId,
-                page: 1,
-                limit: 10
+                customerId: this.$store.getters.customerId
             },
             addUserTotal: 0,
             bussinessTypeQuery: {
@@ -908,10 +906,6 @@ export default {
             if (this.currentCode == null || this.currentCode == "") {
                 this.$message.error("请先选择仓库");
             } else {
-                if (val === null || val === undefined) {
-                    this.addUserQuery.page = 1;
-                    this.addUserTotal = 0;
-                }
                 this.userFormVisible = true;
                 this.getAddUserList();
             }
@@ -986,19 +980,26 @@ export default {
                     this.bussinessTypeList = res.data.list || [];
                     this.bussinessTypeTotal = res.data.total || 0;
 
-                    var that = this;
-                    that.$nextTick(() => {
-                        if (that.$refs.typeList) {
-                            that.$refs.typeList.clearSelection();
-                        }
-                        that.bussinessTypeList.forEach(row => {
-                            for (let j in that.bussinessTypeData) {
-                                if (row.action == that.bussinessTypeData[j].action) {
-                                    that.$refs.typeList.toggleRowSelection(row, true);
-                                }
+                    let busDataList = []; //仓库关联的单据类型列表
+                    warehouseBussinessTypeList({code: this.currentCode}).then((res) => {
+                        busDataList = res.data.list;
+
+                        var that = this;
+                        that.$nextTick(() => {
+                            if (that.$refs.typeList) {
+                                that.$refs.typeList.clearSelection();
                             }
+
+                            that.bussinessTypeList.forEach(row => {
+                                for (let j in busDataList) {
+                                    if (row.action === busDataList[j].action) {
+                                        that.$refs.typeList.toggleRowSelection(row, true);
+                                    }
+                                }
+                            });
                         });
-                    });
+                    })
+
                 }).catch((error) => {
                 });
             }
diff --git a/src/views/userManage/param/systemPDFTemplate.vue b/src/views/userManage/param/systemPDFTemplate.vue
index 5931512..5368507 100644
--- a/src/views/userManage/param/systemPDFTemplate.vue
+++ b/src/views/userManage/param/systemPDFTemplate.vue
@@ -627,6 +627,8 @@ export default {
 
             if (!isBlank(row.customerId)) {
                 this.enableAction = false;
+                this.formData.action = null;
+                this.formData.bussinessTypeName = null;
                 this.getActions(row.customerId);
             } else {
                 this.enableAction = true;