From 18e5dfb618a6dc73479c931ce0bc5c4b40daa3ed Mon Sep 17 00:00:00 2001 From: x_z Date: Sat, 20 Aug 2022 17:39:33 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E9=A1=B5=E9=9D=A2=E6=A0=A1?= =?UTF-8?q?=E9=AA=8C=E4=BF=A1=E6=81=AF=E6=9C=AA=E6=B8=85=E9=99=A4=E9=97=AE?= =?UTF-8?q?=E9=A2=98=202.=E4=BF=AE=E5=A4=8D=E6=9C=AA=E9=80=89=E6=8B=A9?= =?UTF-8?q?=E6=9D=A1=E7=A0=81=E4=B9=9F=E5=8F=AF=E4=BB=A5=E8=BF=9B=E8=A1=8C?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E9=97=AE=E9=A2=98=203.=E8=B0=83=E6=95=B4?= =?UTF-8?q?=E4=BB=93=E5=BA=93=E5=AD=97=E5=85=B8=E9=A1=B5=E9=9D=A2=EF=BC=8C?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=88=86=E9=A1=B5=E6=8F=92=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/basic/invWarehouse.vue | 101 ++++++++++++++--------- src/views/userManage/admin/authAdmin.vue | 13 +-- src/views/warehouse/errorCode.vue | 18 ++-- 3 files changed, 80 insertions(+), 52 deletions(-) diff --git a/src/views/basic/invWarehouse.vue b/src/views/basic/invWarehouse.vue index 2d94c39..69ac590 100644 --- a/src/views/basic/invWarehouse.vue +++ b/src/views/basic/invWarehouse.vue @@ -192,6 +192,15 @@ + + + @@ -217,7 +226,7 @@ + + +
取消 @@ -868,24 +886,15 @@ export default { this.$forceUpdate(); }, loadLinkData(row) { - let query = { - code: row.code - }; this.currentCode = row.code; this.currentRow = row; - //加载用户数据 - warehouseUserList(query).then((res) => { - this.userData = res.data; - }).catch((error) => { - this.$message.error("用户数据加载失败"); - }); - //加载单据类型数据 - warehouseBussinessTypeList(query).then((res) => { - this.bussinessTypeData = res.data; - }).catch((error) => { - this.$message.error("单据类型数据加载失败"); - }); + this.userQuery.code = this.currentCode; + this.userQuery.page = 1; + this.busQuery.code = this.currentCode; + this.busQuery.page = 1; + this.loadUserList(); + this.loadBussinessTypeList(); }, getAddUserList(val) { this.addUserQuery.page = val; @@ -908,10 +917,14 @@ export default { }); }); }, - addUser() { + addUser(val) { 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(1); } @@ -920,15 +933,27 @@ export default { loadUserList(val) { if (val != null) { this.userQuery.page = val; - } + }; //加载用户数据 warehouseUserList(this.userQuery).then((res) => { - this.userData = res.data.list; - this.userTotal = res.data.total; + this.userData = res.data.list || []; + this.userTotal = res.data.total || 0; }).catch((error) => { this.$message.error("用户数据加载失败") }); }, + loadBussinessTypeList(val) { + if (val != null) { + this.busQuery.page = val; + } + //加载单据类型数据 + warehouseBussinessTypeList(this.busQuery).then((res) => { + this.bussinessTypeData = res.data.list || []; + this.busTotal = res.data.total || 0; + }).catch((error) => { + this.$message.error("单据类型数据加载失败"); + }); + }, handleUserSelectionChange(row) { let _this = this; _this.selectUserList = []; @@ -958,27 +983,25 @@ export default { let loadParam = { code: this.currentCode }; - //重新加载数据 - warehouseUserList(loadParam).then((res) => { - this.userData = res.data; - }).catch((error) => { - }); + this.loadUserList(); }).catch((error) => { this.$message.error("添加失败"); }); }, - addBussinessType() { + addBussinessType(val) { if (this.currentCode == null || this.currentCode == "") { this.$message.error("请先选择仓库"); } else { this.bussinessTypeFormVisible = true; - let query = { - enabled: true, - customerId: this.$store.getters.customerId - }; - getJoinBussinessType(query).then((res) => { + if (val === null || val === undefined) { + this.bussinessTypeQuery.page = 1; + } else { + this.bussinessTypeQuery.page = val; + } + getJoinBussinessType(this.bussinessTypeQuery).then((res) => { this.selectBussinessTypeList = []; - this.bussinessTypeList = res.data.list; + this.bussinessTypeList = res.data.list || []; + this.bussinessTypeTotal = res.data.total || 0; var that = this; that.$nextTick(() => { @@ -1007,15 +1030,11 @@ export default { bussinessTypes: JSON.stringify(this.selectBussinessTypeList) }; saveWarehouseBussinessType(query).then((res) => { - this.$message.success("添加成功"); - //重新加载数据表格 - let loadParam = { - code: this.currentCode - }; - warehouseBussinessTypeList(loadParam).then((res) => { - this.bussinessTypeData = res.data; - }).catch((error) => { - }); + if (res.code === 20000) { + this.$message.success("添加成功"); + //重新加载数据表格 + this.loadBussinessTypeList(); + } }).catch((error) => { }); } diff --git a/src/views/userManage/admin/authAdmin.vue b/src/views/userManage/admin/authAdmin.vue index 699cb1d..890eb7c 100644 --- a/src/views/userManage/admin/authAdmin.vue +++ b/src/views/userManage/admin/authAdmin.vue @@ -340,7 +340,9 @@ export default { // 刷新表单 resetForm() { this.$nextTick(() => { - this.$refs["dataForm"].resetFields(); + if (this.formName === "add") { + this.$refs["dataForm"].resetFields(); + } this.$refs["dataForm"].clearValidate(); }); }, @@ -349,23 +351,22 @@ export default { // 更改值 this.formVisible = !this.formVisible; // 清空表单 - this.$refs["dataForm"].resetFields(); return true; }, // 显示表单 handleForm(index, row) { this.formVisible = true; this.resetForm(); - this.formData = JSON.parse(JSON.stringify(formJson)); - if (row !== null) { - this.formData = Object.assign({}, row); - } this.formName = "add"; this.formRules = this.addRules; if (index !== null) { this.index = index; this.formName = "edit"; this.formRules = this.editRules; + this.formData = JSON.parse(JSON.stringify(formJson)); + if (row !== null) { + this.formData = Object.assign({}, row); + } } if (this.$store.getters.customerId == 110) { this.showRole = true; diff --git a/src/views/warehouse/errorCode.vue b/src/views/warehouse/errorCode.vue index 2221250..724a6eb 100644 --- a/src/views/warehouse/errorCode.vue +++ b/src/views/warehouse/errorCode.vue @@ -181,6 +181,10 @@ export default { }, deleteDialog() { + if (this.multipleSelection.length === 0) { + this.$message.warning("请选择需要删除的条码") + return; + } this.$confirm("是否删除所选条码?", "提示", { confirmButtonText: "确定", cancelButtonText: "取消", @@ -227,11 +231,15 @@ export default { codes: codeList, }; deleteCodes(tquery).then((response) => { - this.getCodeList(); - this.$message({ - type: "success", - message: "删除成功！", - }); + if (response.code === 20000) { + this.getCodeList(); + this.$message({ + type: "success", + message: "删除成功！", + }); + } else { + this.$message.error("删除失败！"); + } }); },