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;