From 49da1b3a7e7a2efb4adae422631fecf076b6e91d Mon Sep 17 00:00:00 2001 From: lancer <1905818361@qq.com> Date: Thu, 11 Nov 2021 11:00:29 +0800 Subject: [PATCH 1/4] init --- src/views/Customer/AgentManagement.vue | 1 + src/views/Customer/CompanyRecord.vue | 2 ++ src/views/Customer/Companymanagement.vue | 6 ++++-- src/views/admin/role/index.vue | 3 ++- src/views/building/index.vue | 1 + vue.config.js | 4 ++-- 6 files changed, 12 insertions(+), 5 deletions(-) diff --git a/src/views/Customer/AgentManagement.vue b/src/views/Customer/AgentManagement.vue index df37abf..ab49c03 100644 --- a/src/views/Customer/AgentManagement.vue +++ b/src/views/Customer/AgentManagement.vue @@ -570,6 +570,7 @@ export default { .then(res=>{ console.log(res); this.$message.success('操作成功') + this.getAgentList() this.operaVisible=false }) } diff --git a/src/views/Customer/CompanyRecord.vue b/src/views/Customer/CompanyRecord.vue index eef7db3..18b09b2 100644 --- a/src/views/Customer/CompanyRecord.vue +++ b/src/views/Customer/CompanyRecord.vue @@ -529,6 +529,7 @@ export default { .then(res=>{ this.$message.success('操作成功') this.agentVisible=false + this.Screeningofempty() }) } }) @@ -547,6 +548,7 @@ export default { console.log(res); this.$message.success('操作成功') this.operaVisible=false + this.Screeningofempty() }) } }) diff --git a/src/views/Customer/Companymanagement.vue b/src/views/Customer/Companymanagement.vue index dddaa48..fece57b 100644 --- a/src/views/Customer/Companymanagement.vue +++ b/src/views/Customer/Companymanagement.vue @@ -4,10 +4,10 @@
-
代理商名称：
+
公司名称：
@@ -458,6 +458,7 @@ export default { .then(res=>{ this.$message.success('操作成功') this.agentVisible=false + this.Screeningofempty() }) } }) @@ -477,6 +478,7 @@ export default { console.log(res); this.$message.success('操作成功') this.operaVisible=false + this.Screeningofempty() }) } }) diff --git a/src/views/admin/role/index.vue b/src/views/admin/role/index.vue index 8a2c7a4..9157599 100644 --- a/src/views/admin/role/index.vue +++ b/src/views/admin/role/index.vue @@ -500,6 +500,7 @@ export default { let obj = { current: this.page.currentPage, size: this.page.pageSize, + ...this.searchMsg }; if (this.tabselect == 0 || this.tabselect == 1) { obj.orgCode = this.orgCode; @@ -549,7 +550,7 @@ export default { }, search() { console.log(this.searchMsg, "搜索内容"); - this.getList(this.searchMsg); + this.getList(); }, refreshChange() { this.getList(); diff --git a/src/views/building/index.vue b/src/views/building/index.vue index b1c15af..d0220a2 100644 --- a/src/views/building/index.vue +++ b/src/views/building/index.vue @@ -808,6 +808,7 @@ export default { console.log(res); this.$message.success("操作成功"); this.operaVisible = false; + this.zkhousePage(); }); } }); diff --git a/vue.config.js b/vue.config.js index 1b7d06c..0670918 100644 --- a/vue.config.js +++ b/vue.config.js @@ -5,9 +5,9 @@ // const url = 'http://pigx-gateway' // const url = 'http://39.97.167.65:9999' //测试 // const url = 'http://192.168.31.169:9999' //长龙 -const url = 'http://192.168.31.134:9999' //嘉豪 +// const url = 'http://192.168.31.134:9999' //嘉豪 // const url = 'http://192.168.31.100:9999' //王笑 -// const url = 'http://yuuapd.natappfree.cc' //王笑 +const url = 'http://rymset.natappfree.cc' //王笑 const CompressionWebpackPlugin = require('compression-webpack-plugin') const productionGzipExtensions = ['js', 'css'] From 719ebc9db1900ddee1d56ce9e14ee2a3382add3d Mon Sep 17 00:00:00 2001 From: lancer <1905818361@qq.com> Date: Thu, 11 Nov 2021 11:56:49 +0800 Subject: [PATCH 2/4] init --- src/views/admin/role/index.vue | 4 ++-- src/views/admin/user/index.vue | 20 +++++++++++++++----- 2 files changed, 17 insertions(+), 7 deletions(-) diff --git a/src/views/admin/role/index.vue b/src/views/admin/role/index.vue index 9157599..1fa021d 100644 --- a/src/views/admin/role/index.vue +++ b/src/views/admin/role/index.vue @@ -102,8 +102,8 @@ - - + + diff --git a/src/views/admin/user/index.vue b/src/views/admin/user/index.vue index 8851c43..1b5b6ca 100644 --- a/src/views/admin/user/index.vue +++ b/src/views/admin/user/index.vue @@ -119,14 +119,15 @@ - + - - + + @@ -1253,9 +1254,9 @@ export default { // this.userDeptTree()// 获取部门树 this.deptGetOrgList(); //获取公司列表 this.getAgentList(); //获取代理商列表 - this.userDict( + this.userDict( { - dictKey: localStorage.getItem("orgType"), + dictKey: localStorage.getItem('orgType'), dictType: 3, }, "userRoleList" @@ -1983,6 +1984,15 @@ export default { this.passwordForm.userId = row.userId; this.passwordVisible = true; }, + queryOrgTypeChange(e){ + this.userDict( + { + dictKey: e, + dictType: 3, + }, + "userRoleList" + ); + }, editpwd() { // console.log(this.passwordForm); // return From 1b65b0fcf064aa9fb53ce81791483cd8a7d21262 Mon Sep 17 00:00:00 2001 From: lancer <1905818361@qq.com> Date: Thu, 11 Nov 2021 13:50:25 +0800 Subject: [PATCH 3/4] init --- src/views/admin/dept/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/admin/dept/index.vue b/src/views/admin/dept/index.vue index 812ef0e..fb5f505 100644 --- a/src/views/admin/dept/index.vue +++ b/src/views/admin/dept/index.vue @@ -25,7 +25,7 @@