From 651e60fc200a282cc6366ecb1625027737ea0a9b Mon Sep 17 00:00:00 2001 From: lancer <1905818361@qq.com> Date: Sat, 6 Nov 2021 10:24:35 +0800 Subject: [PATCH 1/2] init --- vue.config.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/vue.config.js b/vue.config.js index 1fc5a6b..208f0ce 100644 --- a/vue.config.js +++ b/vue.config.js @@ -3,11 +3,11 @@ * https://cli.vuejs.org/zh/config/ */ // const url = 'http://pigx-gateway' -const url = 'http://39.97.167.65:9999' //测试 +// const url = 'http://39.97.167.65:9999' //测试 // const url = 'http://192.168.31.169:9999' //长龙 // const url = 'http://192.168.31.133:9999' //嘉豪 // const url = 'http://192.168.31.100:9999' //王笑 -// const url = 'http://mp7i3c.natappfree.cc' //王笑 +const url = 'http://chrrx3.natappfree.cc' //王笑 const CompressionWebpackPlugin = require('compression-webpack-plugin') const productionGzipExtensions = ['js', 'css'] From eef55c4e3ca533f60613d40907bd02e608944dbe Mon Sep 17 00:00:00 2001 From: lancer <1905818361@qq.com> Date: Sat, 6 Nov 2021 15:45:20 +0800 Subject: [PATCH 2/2] init --- src/api/modules/api.js | 24 ++++ src/views/Customer/AgentManagement.vue | 30 ++++- src/views/Customer/CompanyRecord.vue | 71 ++++++++++- src/views/building/Count.vue | 170 +++++++++++++++++++++---- src/views/building/index.vue | 67 +++++++++- vue.config.js | 2 +- 6 files changed, 328 insertions(+), 36 deletions(-) diff --git a/src/api/modules/api.js b/src/api/modules/api.js index 5e0b91c..4cb9076 100644 --- a/src/api/modules/api.js +++ b/src/api/modules/api.js @@ -894,3 +894,27 @@ export function receptionDataOfSystem(data) { data }) } +// 楼盘统计公司 +export function companyStatistics(query) { + return request({ + url: 'autoSR/cusStageStatistics/companyStatistics', + method:'get', + params:query + }) +} +// 楼盘统计代理商 +export function agentStatistics(query) { + return request({ + url: 'autoSR/cusStageStatistics/agentStatistics', + method:'get', + params:query + }) +} +// 楼盘统计代理商 +export function houseStatistics1(query) { + return request({ + url: 'autoSR/cusStageStatistics/houseStatistics', + method:'get', + params:query + }) +} diff --git a/src/views/Customer/AgentManagement.vue b/src/views/Customer/AgentManagement.vue index 2577ba4..481fec4 100644 --- a/src/views/Customer/AgentManagement.vue +++ b/src/views/Customer/AgentManagement.vue @@ -304,10 +304,10 @@ - + - +
@@ -347,6 +347,11 @@ export default { callback(new Error("请输入管理员账号")); } else { if (value) { + this.passFlag=false + if (!/^1[3456789]\d{9}$/.test(value)) { + // alert("手机号码不合法，请重新输入"); + callback(new Error("手机号码不合法，请重新输入")); + }else{ // 验证电话号码 this.$api.api.verPhone(value).then((res) => { // console.log(res); @@ -363,19 +368,33 @@ export default { .then(res1=>{ callback(); this.passFlag=true + if(this.dialogVisible3){ + this.replaceagentobj.managerPassword=res.data.sysUser.resultPwd + }else{ + this.addagentobj.managerPassword=res.data.sysUser.resultPwd + } + }) .catch(err=>{ console.log(err) - allback(new Error(err)); + callback(new Error(err)); }) } else { // 没有用户 // console.log("没有用户"); // callback(new Error("没有管理员账号")); + if(this.dialogVisible3){ + this.replaceagentobj.managerPassword='' + }else{ + this.addagentobj.managerPassword='' + } + this.passFlag=false callback(); } }); + } + } callback(); } @@ -513,7 +532,8 @@ export default { }, ruleser:{ managerPhone: [ - { required: true, message: '请输入管理员账号', trigger: 'blur' }, + // { required: true, message: '请输入管理员账号', trigger: 'blur' }, + { validator: validatePass, trigger: "blur" }, ], managerPassword: [ { required: true, message: '请输入管理员账号密码', trigger: 'blur' }, @@ -681,6 +701,7 @@ export default { inforeplace(row){ this.replaceagentobj.id=row.id; this.dialogVisible3=true; + this.passFlag=false }, //确认更换 replace(){ @@ -704,6 +725,7 @@ export default { //新增 infoadd(){ this.dialogVisible=true; + this.passFlag=false this.getparentIdList() this.getAllOperationsStaff() }, diff --git a/src/views/Customer/CompanyRecord.vue b/src/views/Customer/CompanyRecord.vue index 185d634..6efc181 100644 --- a/src/views/Customer/CompanyRecord.vue +++ b/src/views/Customer/CompanyRecord.vue @@ -170,10 +170,10 @@ --> - + - +
@@ -241,10 +241,10 @@ - + - +
@@ -299,6 +299,61 @@ import { mapGetters } from "vuex"; export default { data() { + var validatePass = (rule, value, callback) => { + if (value === "") { + callback(new Error("请输入管理员账号")); + } else { + if (value) { + if (!/^1[3456789]\d{9}$/.test(value)) { + // alert("手机号码不合法，请重新输入"); + callback(new Error("手机号码不合法，请重新输入")); + }else{ + // 验证电话号码 + this.$api.api.verPhone(value).then((res) => { + // console.log(res); + // 判断数据是否已经有了 + if (res.data) { + // 由用户 + this.$api.api.userVerify({ + orgType:localStorage.getItem('orgType'), + accountId:res.data.sysUser.accountId, + username:res.data.sysUser.username, + agentId:localStorage.getItem('agentId'), + orgCode:localStorage.getItem('orgCode'), + }) + .then(res1=>{ + callback(); + this.passFlag=true + if(this.dialogVisible3){ + this.replaceagentobj.managerPassword=res.data.sysUser.resultPwd + }else{ + this.addagentobj.managerPassword=res.data.sysUser.resultPwd + } + + }) + .catch(err=>{ + console.log(err) + callback(new Error(err)); + }) + } else { + // 没有用户 + // console.log("没有用户"); + // callback(new Error("没有管理员账号")); + if(this.dialogVisible3){ + this.replaceagentobj.managerPassword='' + }else{ + this.addagentobj.managerPassword='' + } + this.passFlag=false + callback(); + + } + }); + } + } + callback(); + } + }; return { addagentobj:{ agentId:'',// 代理商名称 @@ -339,7 +394,7 @@ export default { // { required: true, message: '请选择运营人员', trigger: 'blur' }, // ], managerPhone: [ - { required: true, message: '请输入管理员账号', trigger: 'blur' }, + { validator: validatePass, trigger: "blur" }, ], managerPassword: [ { required: true, message: '请输入管理员账号密码', trigger: 'blur' }, @@ -356,6 +411,7 @@ export default { dialogVisible3:false, operaVisible:false, agentVisible:false, + passFlag:false, currentPage4:1, operatorName:'',//代理商名称 operationStaffName:'',//运营人员名称 @@ -372,7 +428,8 @@ export default { }, ruleser:{ managerPhone: [ - { required: true, message: '请输入管理员账号', trigger: 'blur' }, + // { required: true, message: '请输入管理员账号', trigger: 'blur' }, + { validator: validatePass, trigger: "blur" }, ], managerPassword: [ { required: true, message: '请输入管理员账号密码', trigger: 'blur' }, @@ -623,6 +680,7 @@ export default { inforeplace(row){ this.replaceagentobj.id=row.id; this.dialogVisible3=true; + this.passFlag=false }, //确认更换 replace(){ @@ -675,6 +733,7 @@ export default { // this.findMyAgent() this.getparentIdList() this.dialogVisible=true; + this.passFlag=false }, //获取运营人员 getAllOperationsStaff(idx){ diff --git a/src/views/building/Count.vue b/src/views/building/Count.vue index e3dacc7..cca06f2 100644 --- a/src/views/building/Count.vue +++ b/src/views/building/Count.vue @@ -1,6 +1,6 @@