From d1ba4adab4dc9539ad55e2105eb4e4e63c685fe9 Mon Sep 17 00:00:00 2001 From: wangxiaohua <1214073490@qq.com> Date: Thu, 25 Nov 2021 11:48:39 +0800 Subject: [PATCH] init --- src/page/wel.vue | 23 ++++++++- src/views/Customer/AgentManagement.vue | 11 +++-- src/views/Customer/SalesStage.vue | 5 -- src/views/Customer/index.vue | 51 ++++++++++++++----- src/views/Equipment/equipmentDetailList.vue | 2 +- src/views/Statistics/TrendAnalysis.vue | 1 + src/views/Statistics/dataScreeAge.vue | 2 +- src/views/Statistics/dataScreeOrg.vue | 2 +- src/views/Statistics/dataScreeSys.vue | 2 +- src/views/Statistics/trend.vue | 54 +++++++++------------ src/views/building/index.vue | 7 ++- vue.config.js | 4 +- 12 files changed, 104 insertions(+), 60 deletions(-) diff --git a/src/page/wel.vue b/src/page/wel.vue index 3583a52..1965dcc 100644 --- a/src/page/wel.vue +++ b/src/page/wel.vue @@ -954,15 +954,19 @@ export default { }, methods: { jumpto(ind){ + let num = 24 * 3600 * 1000 * 29; + let dang=this.getCurrentTime() + let timevt=this.timestampToTime(new Date(dang).getTime() + num); + let newtime=[dang,timevt] if(ind==1){ this.$router.push({ path: "/Customer/AgentManagement", - query: { residueTime: 30 }, + query: { residueTime: newtime,serviceStatus:0 }, }); }else if(ind==2){ this.$router.push({ path: "/building/index", - query: { residueTime: 30 }, + query: { residueTime: newtime,serviceStatus:0 }, }); }else if(ind==3){ this.$router.push({ @@ -975,6 +979,21 @@ export default { query: { flag: 2 }, }); } + }, + timestampToTime(timestamp) { + var date = new Date(timestamp); //时间戳为10位需*1000，时间戳为13位的话不需乘1000 + var yyyy = date.getFullYear() + "-"; + var MM =(date.getMonth() + 1 < 10 ? "0" + (date.getMonth() + 1): date.getMonth() + 1) + "-"; + var dd =(date.getDate() < 10 ? "0" + date.getDate() : date.getDate()); + return yyyy + MM + dd; + }, + getCurrentTime() { + //获取当前时间并打印 + 　　let yy = new Date().getFullYear(); + 　　let mm = new Date().getMonth()+1; + 　　let dd = new Date().getDate(); + 　 let gettime = yy+'-'+mm+'-'+dd + 　 return gettime }, //切换楼盘 houseChange() { diff --git a/src/views/Customer/AgentManagement.vue b/src/views/Customer/AgentManagement.vue index a571e4d..bd9695f 100644 --- a/src/views/Customer/AgentManagement.vue +++ b/src/views/Customer/AgentManagement.vue @@ -625,7 +625,7 @@ export default { { required: true, message: "请填写密码", trigger: "change" }, { min: 6, max: 18, message: '请输入6~18位，数字或字母组合的密码', trigger: 'blur' } ], - } + }, }; }, @@ -641,7 +641,13 @@ export default { this.cus_ag_open = this.permissions["cus_ag_open"]; }, mounted() { - console.log(this.$route.query.residueTime,'跳转代餐') + if(this.$route.query.serviceStatus){ + this.timelist=this.$route.query.residueTime; + this.contractStartDate=this.timelist[0]; + this.contractEndDate=this.timelist[1]; + this.serviceStatus=this.$route.query.serviceStatus; + } + this.getAgentList() }, methods: { @@ -963,7 +969,6 @@ export default { operationalName:this.operationalName, }).then((res) => { - console.log(res.data); this.tableData=res.data.records; this.total=res.data.total }); diff --git a/src/views/Customer/SalesStage.vue b/src/views/Customer/SalesStage.vue index 8f8cd08..1914dc6 100644 --- a/src/views/Customer/SalesStage.vue +++ b/src/views/Customer/SalesStage.vue @@ -151,21 +151,16 @@ computed: { } else { this.houseId = res.data[0].id; } - // this.houseId = res.data[0].id; // 获取列表 this.findbypage(); }); }, findbypage() { let obj = { - // current: this.currentPage, - // size: this.size, houseId: this.houseId, }; this.$api.api.lifeTrackDefineList(obj).then((res) => { - // console.log(res) this.tableData = res.data; - // this.total = res.data.total; }); }, //删除 diff --git a/src/views/Customer/index.vue b/src/views/Customer/index.vue index 122e052..e06b567 100644 --- a/src/views/Customer/index.vue +++ b/src/views/Customer/index.vue @@ -178,6 +178,27 @@ +
+
客户阶段：
+ + + + +
+ + +
@@ -220,15 +241,9 @@ }} - + @@ -400,7 +415,10 @@ export default { dateType: "0", projectId: "", timeType: "0", + clientStage:'' }, + clientStagelist:[], + }; }, computed: { @@ -466,7 +484,7 @@ export default { staDate: "", endDate: "", dateType: "0", - // projectId: "", + searchForm: "", timeType: "0", projectId:this.orgType==3? localStorage.getItem('houseId'):this.houseList[0].id, }; @@ -477,7 +495,18 @@ export default { this.findKeywords(); // 获取置业顾问列表 this.findUserListByHouseId(); + this.getclientStage() + }, + getclientStage() { + let obj = { + houseId: this.searchForm.projectId, + }; + this.$api.api.lifeTrackDefineList(obj).then((res) => { + this.clientStagelist = res.data; + }); }, + + timeChange(e) { this.searchForm.dateType=null this.searchForm.staDate = e[0]; @@ -498,7 +527,6 @@ export default { type: this.type, }) .then((res) => { - console.log(res); this.keywordsList = res.data; }); }, @@ -508,7 +536,6 @@ export default { orgType: localStorage.getItem("orgType"), }) .then((res) => { - // console.log(res) this.houseList = res.data; if(localStorage.getItem('orgType')==3){ this.searchForm.projectId=localStorage.getItem('houseId') @@ -516,7 +543,6 @@ export default { this.searchForm.projectId = res.data[0].id; } this.houseChange(); - // this.tabtimetap(0); }); }, // 置业顾问列表 @@ -525,7 +551,6 @@ export default { orgType: localStorage.getItem("orgType"), projectId: this.searchForm.projectId, }); - console.log(result); this.accountList = result.data; }, handleSizeChange(val) { diff --git a/src/views/Equipment/equipmentDetailList.vue b/src/views/Equipment/equipmentDetailList.vue index e551d2b..e2abbad 100644 --- a/src/views/Equipment/equipmentDetailList.vue +++ b/src/views/Equipment/equipmentDetailList.vue @@ -1300,7 +1300,7 @@ export default { item.index = index + 1; }); this.tableData = res.data.records; - this.page.total = res.data.current; + this.page.total = res.data.total; } }); }, diff --git a/src/views/Statistics/TrendAnalysis.vue b/src/views/Statistics/TrendAnalysis.vue index 3adc6d4..94d5f67 100644 --- a/src/views/Statistics/TrendAnalysis.vue +++ b/src/views/Statistics/TrendAnalysis.vue @@ -734,6 +734,7 @@ export default { this.selectTime = ""; this.selectTime1 = ""; this.timeSelect(e); + console.log(e,'asdasdajdasjdgasdghasdgsajdggh'); }, timeSelect(e) { if (this.timeType == -1) { diff --git a/src/views/Statistics/dataScreeAge.vue b/src/views/Statistics/dataScreeAge.vue index f11ca64..ebad42c 100644 --- a/src/views/Statistics/dataScreeAge.vue +++ b/src/views/Statistics/dataScreeAge.vue @@ -75,7 +75,7 @@
接待量
- {{ secondTab.receptionQuantity || 0 }} + {{ secondTab.receptionQuantityInToday || 0 }}
diff --git a/src/views/Statistics/dataScreeOrg.vue b/src/views/Statistics/dataScreeOrg.vue index bdff34f..6c71f20 100644 --- a/src/views/Statistics/dataScreeOrg.vue +++ b/src/views/Statistics/dataScreeOrg.vue @@ -149,7 +149,7 @@
接待量
- {{ secondTab.receptionQuantity || 0 }} + {{ secondTab.receptionQuantityInToday || 0 }}