1.修复仓库字典,模板,耗材字典页面的部分bug

master
x_z 3 years ago
parent ce29486ad4
commit c13d3e48a9

@ -897,7 +897,7 @@ export default {
diableChange() { diableChange() {
let query = { let query = {
relId: this.editQuery.id, relId: this.editQuery.id,
isDisable: this.editQuery.disable isDisable: this.editQuery.isDisable
} }
disableUdi(query) disableUdi(query)
.then((response) => { .then((response) => {
@ -905,7 +905,7 @@ export default {
this.editQuery.disable = false; this.editQuery.disable = false;
this.$message.error(response.message); this.$message.error(response.message);
} else { } else {
if (this.editQuery.disable) { if (this.editQuery.isDisable) {
this.$message.success("已禁用"); this.$message.success("已禁用");
} else { } else {
this.$message.success("已取消禁用"); this.$message.success("已取消禁用");

@ -599,9 +599,7 @@ export default {
}, },
busTotal: 0, busTotal: 0,
addUserQuery: { addUserQuery: {
customerId: this.$store.getters.customerId, customerId: this.$store.getters.customerId
page: 1,
limit: 10
}, },
addUserTotal: 0, addUserTotal: 0,
bussinessTypeQuery: { bussinessTypeQuery: {
@ -908,10 +906,6 @@ export default {
if (this.currentCode == null || this.currentCode == "") { if (this.currentCode == null || this.currentCode == "") {
this.$message.error("请先选择仓库"); this.$message.error("请先选择仓库");
} else { } else {
if (val === null || val === undefined) {
this.addUserQuery.page = 1;
this.addUserTotal = 0;
}
this.userFormVisible = true; this.userFormVisible = true;
this.getAddUserList(); this.getAddUserList();
} }
@ -986,19 +980,26 @@ export default {
this.bussinessTypeList = res.data.list || []; this.bussinessTypeList = res.data.list || [];
this.bussinessTypeTotal = res.data.total || 0; this.bussinessTypeTotal = res.data.total || 0;
var that = this; let busDataList = []; //
that.$nextTick(() => { warehouseBussinessTypeList({code: this.currentCode}).then((res) => {
if (that.$refs.typeList) { busDataList = res.data.list;
that.$refs.typeList.clearSelection();
} var that = this;
that.bussinessTypeList.forEach(row => { that.$nextTick(() => {
for (let j in that.bussinessTypeData) { if (that.$refs.typeList) {
if (row.action == that.bussinessTypeData[j].action) { that.$refs.typeList.clearSelection();
that.$refs.typeList.toggleRowSelection(row, true);
}
} }
that.bussinessTypeList.forEach(row => {
for (let j in busDataList) {
if (row.action === busDataList[j].action) {
that.$refs.typeList.toggleRowSelection(row, true);
}
}
});
}); });
}); })
}).catch((error) => { }).catch((error) => {
}); });
} }

@ -627,6 +627,8 @@ export default {
if (!isBlank(row.customerId)) { if (!isBlank(row.customerId)) {
this.enableAction = false; this.enableAction = false;
this.formData.action = null;
this.formData.bussinessTypeName = null;
this.getActions(row.customerId); this.getActions(row.customerId);
} else { } else {
this.enableAction = true; this.enableAction = true;

Loading…
Cancel
Save