diff --git a/package.json b/package.json index 76951d6..cd460d1 100644 --- a/package.json +++ b/package.json @@ -35,6 +35,7 @@ "vue": "^2.6.10", "vue-audio-player": "0.0.2", "vue-axios": "^2.1.2", + "vue-bus": "^1.2.1", "vue-clipboard2": "^0.3.0", "vue-cron": "^1.0.9", "vue-echarts": "^4.0.1", diff --git a/src/api/modules/api.js b/src/api/modules/api.js index d4776a8..0d0ead5 100644 --- a/src/api/modules/api.js +++ b/src/api/modules/api.js @@ -306,7 +306,11 @@ export function findHouseByUser(query) { return request({ url: '/autoSR/zkhouse/findHouseByUser', method:'get', - params:query + params:{ + agentId:localStorage.getItem('agentId'), + orgCode:localStorage.getItem('orgCode'), + ...query + } }) } // 楼盘绑定 @@ -941,3 +945,18 @@ export function accountRankTOP10(query) { params:query }) } +// 置业顾问列表 +export function receptionStatisticsAllAccount(query) { + return request({ + url: '/autoSR/cusStageStatistics/receptionStatisticsAllAccount', + method:'get', + params:query + }) +} +export function receptionStatistics(query) { + return request({ + url: '/autoSR/cusStageStatistics/receptionStatistics', + method:'get', + params:query + }) +} diff --git a/src/main.js b/src/main.js index 6c9e086..47833fd 100644 --- a/src/main.js +++ b/src/main.js @@ -44,7 +44,6 @@ Vue.use(AVUE, { size: 'small', menuType: 'text' }) - // 注册全局容器 Vue.component('basicContainer', basicContainer) diff --git a/src/page/check/chose.vue b/src/page/check/chose.vue index 501f628..8a41f11 100644 --- a/src/page/check/chose.vue +++ b/src/page/check/chose.vue @@ -355,9 +355,11 @@ export default { localStorage.setItem("houseId", item.id); } this.$router.push({ path: "/wel" }); + localStorage.setItem('allClose',true) }, goback() { this.$router.back(); + localStorage.setItem('allClose',false) }, handleSizeChange(val) { console.log(`每页 ${val} 条`); diff --git a/src/page/check/index.vue b/src/page/check/index.vue index b64025c..5e90277 100644 --- a/src/page/check/index.vue +++ b/src/page/check/index.vue @@ -87,6 +87,7 @@ export default { // 对此进行判断，获取this.$route的参数，如果没有则退出登陆，有的话就返回之前的页面 if (this.backFlag) { this.$router.back(); + localStorage.setItem('allClose',false) } else { this.$confirm("是否退出系统, 是否继续?", "提示", { confirmButtonText: "确定", @@ -240,7 +241,7 @@ export default { // 楼盘后台 // this.$router.push({ path: "/chose", query: { flag: 3 } }); } - + localStorage.setItem('allClose',true) // this.$router.push({ path: "/chose" }); }, }, diff --git a/src/page/index/tags.vue b/src/page/index/tags.vue index 99ce409..d7ffe70 100644 --- a/src/page/index/tags.vue +++ b/src/page/index/tags.vue @@ -69,12 +69,16 @@ }, contextmenuFlag() { window.addEventListener('mousedown', this.watchContextmenu) - } + }, }, created() { }, mounted() { this.setActive() + console.log(localStorage.getItem('allClose')); + if(localStorage.getItem('allClose')=='true'){ + this.closeAllTags() + } }, computed: { ...mapGetters(['tagWel', 'tagList', 'tag', 'website']), diff --git a/src/page/login/userlogin.vue b/src/page/login/userlogin.vue index d31d809..03bed4b 100644 --- a/src/page/login/userlogin.vue +++ b/src/page/login/userlogin.vue @@ -119,6 +119,7 @@ export default { this.$store.dispatch("LoginByUsername", this.loginForm).then(() => { // this.$router.push({ path: this.tagWel.value }); this.info = getStore({ name: "userInfo" }); + localStorage.setItem('allClose',false) that.$api.api.getTab().then((res) => { // console.log(res) // 循环数组，给定各种标志 diff --git a/src/views/Customer/AgentManagement.vue b/src/views/Customer/AgentManagement.vue index 481fec4..6d62f19 100644 --- a/src/views/Customer/AgentManagement.vue +++ b/src/views/Customer/AgentManagement.vue @@ -138,7 +138,7 @@ 编辑 更换账号 删除 - 管理系统运营 + 系统运营 {{scope.row.lockFlag==0?'禁用':'启用'}} @@ -350,7 +350,7 @@ export default { this.passFlag=false if (!/^1[3456789]\d{9}$/.test(value)) { // alert("手机号码不合法，请重新输入"); - callback(new Error("手机号码不合法，请重新输入")); + callback(new Error("手机号格式错误，请重新输入")); }else{ // 验证电话号码 this.$api.api.verPhone(value).then((res) => { @@ -403,7 +403,7 @@ export default { options: [ { value: "0", - label: "服务器内", + label: "服务中", }, { value: "1", diff --git a/src/views/Customer/CompanyRecord.vue b/src/views/Customer/CompanyRecord.vue index 6102a62..fad475a 100644 --- a/src/views/Customer/CompanyRecord.vue +++ b/src/views/Customer/CompanyRecord.vue @@ -307,7 +307,7 @@ export default { if (value) { if (!/^1[3456789]\d{9}$/.test(value)) { // alert("手机号码不合法，请重新输入"); - callback(new Error("手机号码不合法，请重新输入")); + callback(new Error("手机号格式错误，请重新输入")); }else{ // 验证电话号码 this.$api.api.verPhone(value).then((res) => { @@ -538,9 +538,10 @@ export default { if(valid){ // console.log(valid,this.operaForm); this.$api.api.zkoperationrecordSaveCompany({ - orgType:this.idx==0?'1':'2', + orgType:2, accountIds:this.operaForm.operationalPeople.join(','), - orgId: this.operaForm.orgId + orgId: this.operaForm.orgId, + operationType:this.idx==0?'1':'2' }) .then(res=>{ console.log(res); diff --git a/src/views/Customer/Companymanagement.vue b/src/views/Customer/Companymanagement.vue index 31bfc9b..dddaa48 100644 --- a/src/views/Customer/Companymanagement.vue +++ b/src/views/Customer/Companymanagement.vue @@ -94,7 +94,7 @@ 更换账号 删除 --> - 代理商运营 + 售后运营 diff --git a/src/views/Statistics/ReceptionStatistical.vue b/src/views/Statistics/ReceptionStatistical.vue index 8e8b8ef..0ceaf22 100644 --- a/src/views/Statistics/ReceptionStatistical.vue +++ b/src/views/Statistics/ReceptionStatistical.vue @@ -1,16 +1,658 @@ + diff --git a/src/views/admin/role/index.vue b/src/views/admin/role/index.vue index ef218f7..8a2c7a4 100644 --- a/src/views/admin/role/index.vue +++ b/src/views/admin/role/index.vue @@ -503,7 +503,7 @@ export default { }; if (this.tabselect == 0 || this.tabselect == 1) { obj.orgCode = this.orgCode; - this.tabselect == 0?obj.orgType=1:obj.orgType=2 + this.tabselect == 0?obj.orgType=3:obj.orgType=2 } if (this.tabselect == 2) { obj.agentId = this.orgCode; @@ -580,7 +580,7 @@ export default { return; } if(this.tabselect==0||this.tabselect==1){ - this.tabselect == 0?this.form.orgType=1:this.form.orgType=2 + this.tabselect == 0?this.form.orgType=3:this.form.orgType=2 this.form.orgCode = this.orgCode; this.form.agentId = null; } diff --git a/src/views/admin/user/index.vue b/src/views/admin/user/index.vue index 193086a..98907ff 100644 --- a/src/views/admin/user/index.vue +++ b/src/views/admin/user/index.vue @@ -59,13 +59,13 @@ - + 查询 重置 @@ -137,11 +137,18 @@ clearable placeholder="请选择" > - + + + @@ -367,7 +374,7 @@ 女 - + 是 否 @@ -547,6 +554,25 @@ + + + + + + + { console.log(res); this.houseVisible = false; + this.roleList(); }); } else { // 省市json串 @@ -1551,10 +1589,9 @@ export default { .then((res) => { console.log(res); this.houseVisible = false; + this.roleList(); }); } - - this.roleList(); }, // 楼盘绑定解绑 // bindhouse(e){ @@ -2111,9 +2148,18 @@ export default { this.formTwo.houseId=row.houseId this.formTwo.newRoleId=row.roleId this.formTwo.deptId=row.deptId + this.formTwo.userRoleType=row.userRoleType+'' console.log(this.formTwo); // 获取角色列表 this.typeChange1(row) + this.userDict( + { + dictKey:row.orgType, + dictType: 3, + }, + "userRoleTypeList" + ); + // 获取部门列表 this.dialogFormVisibleTwo=true }, diff --git a/src/views/building/index.vue b/src/views/building/index.vue index 0748e10..25dd572 100644 --- a/src/views/building/index.vue +++ b/src/views/building/index.vue @@ -133,7 +133,7 @@
筛选相关：
筛选 @@ -232,8 +232,8 @@ >更换账号 - 管理系统运营人员 - 管理代理商运营 + 系统运营 + 售后运营 绑定代理商 删除 @@ -529,7 +529,7 @@ export default { if (value) { if (!/^1[3456789]\d{9}$/.test(value)) { // alert("手机号码不合法，请重新输入"); - callback(new Error("手机号码不合法，请重新输入")); + callback(new Error("手机号格式错误，请重新输入")); } } callback(); @@ -543,7 +543,7 @@ export default { this.passFlag=false if (!/^1[3456789]\d{9}$/.test(value)) { // alert("手机号码不合法，请重新输入"); - callback(new Error("手机号码不合法，请重新输入")); + callback(new Error("手机号格式错误，请重新输入")); }else{ // 验证电话号码 this.$api.api.verPhone(value).then((res) => { @@ -640,11 +640,11 @@ export default { options1: [ { value: "0", - label: "服务器内", + label: "服务中", }, { value: "1", - label: "已失效", + label: "已过期", }, ], options: [ @@ -660,6 +660,10 @@ export default { value: "2", label: "演示", }, + { + value: "3", + label: "测试", + }, ], currentPage: 1, size: 10, @@ -859,6 +863,10 @@ export default { // this.optionsoperationalPeople = res.data; // }); }, + screen(){ + this.currentPage=1 + this.zkhousePage() + }, addSurequxiao() { this.dialogVisible = false; }, diff --git a/vue.config.js b/vue.config.js index 76a42cb..bb0b3a6 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://zwfakg.natappfree.cc' //王笑 +// const url = 'http://jrcd6b.natappfree.cc' //王笑 const CompressionWebpackPlugin = require('compression-webpack-plugin') const productionGzipExtensions = ['js', 'css']