From f5dddb06d4f94be9a9ae58604a88bb8ab06451d7 Mon Sep 17 00:00:00 2001 From: lancer <1905818361@qq.com> Date: Mon, 8 Nov 2021 20:25:40 +0800 Subject: [PATCH] init --- src/views/Customer/CompanyRecord.vue | 13 +++++++++---- src/views/Customer/Companymanagement.vue | 4 ++-- src/views/admin/role/index.vue | 8 +++++--- src/views/building/index.vue | 3 +++ vue.config.js | 2 +- 5 files changed, 20 insertions(+), 10 deletions(-) diff --git a/src/views/Customer/CompanyRecord.vue b/src/views/Customer/CompanyRecord.vue index 6efc181..6102a62 100644 --- a/src/views/Customer/CompanyRecord.vue +++ b/src/views/Customer/CompanyRecord.vue @@ -101,6 +101,7 @@ 删除 + 系统运营 绑定代理商 {{scope.row.lockFlag==0?'禁用':'启用'}} @@ -502,6 +503,8 @@ export default { this.cus_crd_del = this.permissions["cus_crd_del"]; this.cus_crd_bindAgent = this.permissions["cus_crd_bindAgent"]; this.cus_crd_open = this.permissions["cus_crd_open"]; + this.cus_com_sys = this.permissions["cus_com_sys"]; + this.cus_com_sys1 = this.permissions["cus_com_sys1"]; }, mounted() { this.orgType=localStorage.getItem('orgType') @@ -563,8 +566,9 @@ export default { // console.log(idx,orgId); // return this.$api.api.zkoperationrecordFindByOrg({ - orgType:idx==0?'1':'2', - orgId + orgType:2, + orgId, + operationType:this.idx==0?'1':'2' }) .then(res=>{ // console.log(res); @@ -736,11 +740,12 @@ export default { this.passFlag=false }, //获取运营人员 - getAllOperationsStaff(idx){ + //获取运营人员 + getAllOperationsStaff(idx,row){ this.optionsoperationStaff=[]; if(idx==1){ this.$api.http.getAllOperationsStaffByAgent({ - agentId:localStorage.getItem('agentId') + orgCode:row.orgCode }).then((res) => { this.optionsoperationStaff= res.data this.operaVisible=true diff --git a/src/views/Customer/Companymanagement.vue b/src/views/Customer/Companymanagement.vue index 91f0294..31bfc9b 100644 --- a/src/views/Customer/Companymanagement.vue +++ b/src/views/Customer/Companymanagement.vue @@ -93,8 +93,8 @@ - 管理系统运营 - 管理代理商运营 + + 代理商运营 diff --git a/src/views/admin/role/index.vue b/src/views/admin/role/index.vue index de48914..ef218f7 100644 --- a/src/views/admin/role/index.vue +++ b/src/views/admin/role/index.vue @@ -4,8 +4,8 @@
- 业务角色 - + 楼盘角色 + 公司角色 代理商角色 系统角色 @@ -503,6 +503,7 @@ export default { }; if (this.tabselect == 0 || this.tabselect == 1) { obj.orgCode = this.orgCode; + this.tabselect == 0?obj.orgType=1:obj.orgType=2 } if (this.tabselect == 2) { obj.agentId = this.orgCode; @@ -578,7 +579,8 @@ export default { this.dialogFormVisible = false; return; } - if(this.tabselect==0){ + if(this.tabselect==0||this.tabselect==1){ + this.tabselect == 0?this.form.orgType=1:this.form.orgType=2 this.form.orgCode = this.orgCode; this.form.agentId = null; } diff --git a/src/views/building/index.vue b/src/views/building/index.vue index 6f3a573..0748e10 100644 --- a/src/views/building/index.vue +++ b/src/views/building/index.vue @@ -284,6 +284,7 @@ 正式 试用 演示 + 测试 @@ -699,6 +700,7 @@ export default { managerPassword: "", //密码 provinceId: "", //省id cityId: "", //市id + agentId:localStorage.getItem('agentId') }, ruleForm1: {}, optionsagentId:[], @@ -1016,6 +1018,7 @@ export default { this.$api.api .getCompanyList({ orgType: this.orgType, + agentId:localStorage.getItem('agentId') }) .then((res) => { if (res.code == 0) { diff --git a/vue.config.js b/vue.config.js index 6a846f6..797e0c7 100644 --- a/vue.config.js +++ b/vue.config.js @@ -7,7 +7,7 @@ // const url = 'http://192.168.31.169:9999' //长龙 // const url = 'http://192.168.31.134:9999' //嘉豪 // const url = 'http://192.168.31.100:9999' //王笑 -const url = 'http://jw2vzp.natappfree.cc' //王笑 +const url = 'http://zwfakg.natappfree.cc' //王笑 const CompressionWebpackPlugin = require('compression-webpack-plugin') const productionGzipExtensions = ['js', 'css']