From 4232b053448fe3abb2127d0486fcc31fe0cfac8f Mon Sep 17 00:00:00 2001 From: x_z Date: Tue, 21 Jun 2022 18:04:06 +0800 Subject: [PATCH 1/4] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E4=BE=9B=E5=BA=94?= =?UTF-8?q?=E5=95=86=E7=AE=A1=E7=90=86=EF=BC=8C=E6=96=B0=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E6=9F=A5=E8=AF=A2=E6=A1=86=E4=BC=A0=E5=8F=82?= =?UTF-8?q?=E9=94=99=E8=AF=AF=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/userManage/registerManage.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/userManage/registerManage.vue b/src/views/userManage/registerManage.vue index 870a4a5..b652a78 100644 --- a/src/views/userManage/registerManage.vue +++ b/src/views/userManage/registerManage.vue @@ -4,7 +4,7 @@ From 653ec92bbab6bd9d35d4c934d0566db002677b28 Mon Sep 17 00:00:00 2001 From: x_z Date: Wed, 22 Jun 2022 14:16:00 +0800 Subject: [PATCH 2/4] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E9=94=99=E5=88=AB?= =?UTF-8?q?=E5=AD=97=EF=BC=8C=E5=A2=9E=E5=8A=A0=E5=8F=82=E6=95=B0=E6=A0=A1?= =?UTF-8?q?=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/basic/BussinessTypeModify.vue | 2 +- src/views/userManage/admin/authAdmin.vue | 11 ++++------- src/views/userManage/param/systemParamConfig.vue | 16 ++++++++-------- 3 files changed, 13 insertions(+), 16 deletions(-) diff --git a/src/views/basic/BussinessTypeModify.vue b/src/views/basic/BussinessTypeModify.vue index 7a9c37a..8aa7532 100644 --- a/src/views/basic/BussinessTypeModify.vue +++ b/src/views/basic/BussinessTypeModify.vue @@ -236,7 +236,7 @@
单据默认勾选缺量补单 - 出入库是必须校验预验收库 + 出入库时必须校验预验收库 出入库时是否查询库存 diff --git a/src/views/userManage/admin/authAdmin.vue b/src/views/userManage/admin/authAdmin.vue index a44c1ee..211af95 100644 --- a/src/views/userManage/admin/authAdmin.vue +++ b/src/views/userManage/admin/authAdmin.vue @@ -273,7 +273,10 @@ export default { ], userFlag: [ {required: true, message: "请选择状态", trigger: "change"} - ] + ], + passWord: [ + {required: true, message: "请输入密码", trigger: "blur"} + ] }, deleteLoading: false }; @@ -361,12 +364,6 @@ export default { } }, formSubmit() { - console.log( - this.formData.userName + - "-----" + - this.formData.employeeName + - this.formData.userFlag - ); this.$refs["dataForm"].validate(valid => { if (valid) { this.formLoading = true; diff --git a/src/views/userManage/param/systemParamConfig.vue b/src/views/userManage/param/systemParamConfig.vue index ec848d0..55746da 100644 --- a/src/views/userManage/param/systemParamConfig.vue +++ b/src/views/userManage/param/systemParamConfig.vue @@ -13,10 +13,10 @@ - - - - + + + + @@ -175,8 +175,6 @@ export default { this.loading = false; this.list = response.data.list || []; this.total = response.data.total || 0; - console.log('------------') - console.log(response) }) .catch(() => { this.loading = false; @@ -214,15 +212,17 @@ export default { } }, formSubmit() { + if (!Number.isInteger(parseInt(this.formData.paramValue))) { + this.$message.warning("参数值必须为数字"); + return; + } this.$refs["dataForm"].validate(valid => { if (valid) { this.formLoading = true; let data = Object.assign({}, this.formData); - console.log('------2------') data.paramValue = data.paramValue.trim(); systemParamConfigSave(data, this.formName) .then(response => { - console.log(response) this.formLoading = false; if (response.code !== 20000) { this.$message.error(response.message); From 51e962b2d4860c2ac54fb75491f759173b9121a7 Mon Sep 17 00:00:00 2001 From: x_z Date: Wed, 22 Jun 2022 21:55:11 +0800 Subject: [PATCH 3/4] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E6=89=AB=E7=A0=81?= =?UTF-8?q?=E5=8D=95=E6=8D=AE=E6=A0=A1=E9=AA=8C=E5=BC=82=E5=B8=B8=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E4=BB=93=E5=BA=93=E6=97=A0=E6=B3=95=E9=80=89=E6=8B=A9?= =?UTF-8?q?=E9=97=AE=E9=A2=98=202.=E4=BF=AE=E5=A4=8D=E6=96=B0=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E5=AE=A1=E6=A0=B8=EF=BC=8C=E6=89=80=E5=B1=9E=E4=BE=9B?= =?UTF-8?q?=E5=BA=94=E5=95=86=E6=97=A0=E6=B3=95=E9=80=89=E6=8B=A9=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/userManage/registerManage.vue | 20 ++++++-------------- src/views/warehouse/IOCheckErrOrder.vue | 3 ++- 2 files changed, 8 insertions(+), 15 deletions(-) diff --git a/src/views/userManage/registerManage.vue b/src/views/userManage/registerManage.vue index b652a78..c161add 100644 --- a/src/views/userManage/registerManage.vue +++ b/src/views/userManage/registerManage.vue @@ -262,9 +262,10 @@ > + :value="item.id"> + {{item.name}} @@ -410,9 +411,9 @@ }, selectOne(event) { this.rowData.companyName = event.name; - this.rowData.companyId = event.value; + this.rowData.companyId = event.id; this.checkQuery.companyName = event.name; - this.checkQuery.companyId = event.value; + this.checkQuery.companyId = event.id; this.sSelectStatus = true; }, remoteMethod(query) { @@ -425,9 +426,8 @@ }; getBasicUnitMaintains2(tQuery) .then((response) => { - console.log(response) this.sLoading = false; - this.sOptions = response.data.list; + this.sOptions = response.data.list }) .catch(() => { this.sLoading = false; @@ -442,7 +442,6 @@ }, handleCheckedChange(val) { - console.log(val); }, handleSizeChange(val) { @@ -454,7 +453,6 @@ this.getList(); }, findMethod(query) { - console.log(query); this.fromOptions = []; let cQuery = { key: query, @@ -487,21 +485,16 @@ }); }, checkDialog(row) { - console.log(this.checkQuery.roles); this.check = row.roles; this.checkQuery = { id: row.id + "", checkType: 1, roles: row.roles, }; - console.log( - this.check + "---" + row.roles + "---" + this.checkQuery.roles - ); this.rowData = row; if (this.registerConfigMap.companyCheckStatus) { this.sValue = this.rowData.companyName; } - console.log(this.rowData); this.centerDialogVisible = true; }, @@ -547,7 +540,6 @@ authCustomerRoles() .then((response) => { this.roles = response.data.list || []; - console.log("888---" + this.checkQuery.roles); }) .catch(() => { this.checkQuery.roles = []; diff --git a/src/views/warehouse/IOCheckErrOrder.vue b/src/views/warehouse/IOCheckErrOrder.vue index 1332538..1c9d642 100644 --- a/src/views/warehouse/IOCheckErrOrder.vue +++ b/src/views/warehouse/IOCheckErrOrder.vue @@ -570,6 +570,7 @@ export default { status: null, startTime: "", endTime: "", + locStorageCode: null }, detailQuery: { orderId: "", @@ -774,7 +775,6 @@ export default { this.filterQuery.customerId = store.getters.customerId; filterOrder(this.filterQuery) .then((response) => { - console.log(response) this.loading = false; this.list = response.data.list || []; this.total = response.data.total || 0; @@ -1062,6 +1062,7 @@ export default { filterAllByUser() .then((response) => { this.storageList = response.data || []; + console.log(this.storageList); if (this.storageList.length > 0) { this.filterQuery.locStorageCode = this.storageList[0].code; this.getList(); From 02cf0c10d0851eefc621d813fcae1214b51b4258 Mon Sep 17 00:00:00 2001 From: x_z Date: Thu, 23 Jun 2022 09:10:15 +0800 Subject: [PATCH 4/4] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E5=88=86=E9=A1=B5?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=AF=BC=E8=87=B4=E7=9A=84=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=97=A0=E7=BB=93=E6=9E=9C=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/userManage/customerManage.vue | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/views/userManage/customerManage.vue b/src/views/userManage/customerManage.vue index 686a2f7..9451a1c 100644 --- a/src/views/userManage/customerManage.vue +++ b/src/views/userManage/customerManage.vue @@ -448,6 +448,9 @@ export default { }, getList() { this.loading = true; + if (this.filterQuery.companyName != null && this.filterQuery.companyName != '') { + this.filterQuery.page = 1; + } getCustomers(this.filterQuery) .then((response) => { this.loading = false;