diff --git a/src/router/ebiz/performance.js b/src/router/ebiz/performance.js index d78d55867..597878d3f 100644 --- a/src/router/ebiz/performance.js +++ b/src/router/ebiz/performance.js @@ -1,6 +1,7 @@ const performance = () => import('@/views/ebiz/performance/Performance') const attendanceInfo = () => import('@/views/ebiz/performance/AttendanceInfo') const PerformanceList = () => import('@/views/ebiz/performance/PerformanceList') +const PerformanceInfo = () => import('@/views/ebiz/performance/PerformanceInfo') export default [ { @@ -29,5 +30,14 @@ export default [ title: '业绩查询', index: 3 } + }, + { + path: '/performance/PerformanceInfo', + name: 'PerformanceInfo', + component: PerformanceInfo, + meta: { + title: '业绩查询', + index: 4 + } } ] \ No newline at end of file diff --git a/src/views/ebiz/attendance/Monthly.vue b/src/views/ebiz/attendance/Monthly.vue index bcd3b0e46..7697b2056 100644 --- a/src/views/ebiz/attendance/Monthly.vue +++ b/src/views/ebiz/attendance/Monthly.vue @@ -8,7 +8,7 @@
- +
- +
班次：正常 09:00-18:00
@@ -71,6 +73,7 @@ export default { show: false, isShowCalendar: true, showTodayButton: false, + inline:'inline', mask: [], workTime:'', workTimeOff:'', @@ -189,7 +192,7 @@ export default { let arr1=[] let obj1={} let date1=[] - obj1.color='orange' + obj1.color='#FFD700' for(let i=0;i \ No newline at end of file diff --git a/src/views/ebiz/performance/AttendanceInfo.vue b/src/views/ebiz/performance/AttendanceInfo.vue index 4147daa6d..da652a242 100644 --- a/src/views/ebiz/performance/AttendanceInfo.vue +++ b/src/views/ebiz/performance/AttendanceInfo.vue @@ -147,17 +147,6 @@ export default { console.log(e) // this.titleTime = dateFormat(this.currentDate, 'yyyy-MM') }, - month() { - this.$jump({ - flag: 'h5', - extra: { - url: location.origin + `/#/attendance/Monthly/`, - }, - routerInfo: { - path: `/attendance/Monthly`, - }, - }) - }, //跳转查看 details(e) { console.log(e) @@ -173,10 +162,10 @@ export default { this.$jump({ flag: 'h5', extra: { - url: location.origin + `/#/performance/Performance`, + url: location.origin + `/#/performance/PerformanceInfo`, }, routerInfo: { - path: `/performance/Performance`, + path: `/performance/PerformanceInfo`, }, }) }, diff --git a/src/views/ebiz/performance/Performance.vue b/src/views/ebiz/performance/Performance.vue index dac81af60..4040572a7 100644 --- a/src/views/ebiz/performance/Performance.vue +++ b/src/views/ebiz/performance/Performance.vue @@ -27,25 +27,24 @@ />
-
+ +
{{item.agentName}}
- + -->
@@ -91,7 +90,6 @@
-->
查看团队业绩
@@ -141,36 +139,36 @@ export default { created() { // console.log('=======' + this.$route.params.parmas) console.log("+++++++++++"+JSON.parse(window.localStorage.getItem('parmas'))) - if (window.localStorage.getItem('parmas') !== null) { - this.mask = JSON.parse(window.localStorage.getItem('parmas')).mask - ;(this.titleTime = JSON.parse(window.localStorage.getItem('parmas')).date.slice(0, 7)), - (this.dateTime = JSON.parse(window.localStorage.getItem('parmas')).date), - (this.unitName = JSON.parse(window.localStorage.getItem('parmas')).unitName), - (this.Name = JSON.parse(window.localStorage.getItem('parmas')).Name), - (this.code = JSON.parse(window.localStorage.getItem('parmas')).code), - this.buName=JSON.parse(window.localStorage.getItem('parmas')).buName - }else if (window.localStorage.getItem('parmas2') !== null) { - this.mask = JSON.parse(window.localStorage.getItem('parmas2')).mask - ;(this.titleTime = JSON.parse(window.localStorage.getItem('parmas2')).date.slice(0, 7)), - (this.dateTime = JSON.parse(window.localStorage.getItem('parmas2')).date), - (this.unitName = JSON.parse(window.localStorage.getItem('parmas2')).unitName), - (this.Name = JSON.parse(window.localStorage.getItem('parmas2')).Name), - (this.code = JSON.parse(window.localStorage.getItem('parmas2')).code), - this.buName=JSON.parse(window.localStorage.getItem('parmas2')).buName, - this.agentCode=JSON.parse(window.localStorage.getItem('parmas2')).agentCode - }else if (window.localStorage.getItem('parmas1') !== null) { - this.mask = JSON.parse(window.localStorage.getItem('parmas1')).mask - ;(this.titleTime = JSON.parse(window.localStorage.getItem('parmas1')).date.slice(0, 7)), - (this.dateTime = JSON.parse(window.localStorage.getItem('parmas1')).date), - (this.unitName = JSON.parse(window.localStorage.getItem('parmas1')).unitName), - (this.Name = JSON.parse(window.localStorage.getItem('parmas1')).Name), - (this.code = JSON.parse(window.localStorage.getItem('parmas1')).code), - this.buName=JSON.parse(window.localStorage.getItem('parmas1')).buName - localStorage.removeItem('parmas1'); - } + // if (window.localStorage.getItem('parmas') !== null) { + // this.mask = JSON.parse(window.localStorage.getItem('parmas')).mask + // ;(this.titleTime = JSON.parse(window.localStorage.getItem('parmas')).date.slice(0, 7)), + // (this.dateTime = JSON.parse(window.localStorage.getItem('parmas')).date), + // (this.unitName = JSON.parse(window.localStorage.getItem('parmas')).unitName), + // (this.Name = JSON.parse(window.localStorage.getItem('parmas')).Name), + // (this.code = JSON.parse(window.localStorage.getItem('parmas')).code), + // this.buName=JSON.parse(window.localStorage.getItem('parmas')).buName + // }else if (window.localStorage.getItem('parmas2') !== null) { + // this.mask = JSON.parse(window.localStorage.getItem('parmas2')).mask + // ;(this.titleTime = JSON.parse(window.localStorage.getItem('parmas2')).date.slice(0, 7)), + // (this.dateTime = JSON.parse(window.localStorage.getItem('parmas2')).date), + // (this.unitName = JSON.parse(window.localStorage.getItem('parmas2')).unitName), + // (this.Name = JSON.parse(window.localStorage.getItem('parmas2')).Name), + // (this.code = JSON.parse(window.localStorage.getItem('parmas2')).code), + // this.buName=JSON.parse(window.localStorage.getItem('parmas2')).buName, + // this.agentCode=JSON.parse(window.localStorage.getItem('parmas2')).agentCode + // }else if (window.localStorage.getItem('parmas1') !== null) { + // this.mask = JSON.parse(window.localStorage.getItem('parmas1')).mask + // ;(this.titleTime = JSON.parse(window.localStorage.getItem('parmas1')).date.slice(0, 7)), + // (this.dateTime = JSON.parse(window.localStorage.getItem('parmas1')).date), + // (this.unitName = JSON.parse(window.localStorage.getItem('parmas1')).unitName), + // (this.Name = JSON.parse(window.localStorage.getItem('parmas1')).Name), + // (this.code = JSON.parse(window.localStorage.getItem('parmas1')).code), + // this.buName=JSON.parse(window.localStorage.getItem('parmas1')).buName + // window.localStorage.removeItem('parmas1'); + // } - if (this.mask !== '1') { + setTimeout(() => { // eslint-disable-next-line no-undef EWebBridge.webCallAppInJs('webview_right_button', { @@ -183,7 +181,7 @@ export default { ], }) }, 1000) - } + // this.performanceData() if (this.code == '') { @@ -343,7 +341,7 @@ export default { } }) }, - //点击头像 + // 点击头像 InfoDetails(item) { console.log(item) for (let i = 0; i < this.headerList.length; i++) { @@ -368,7 +366,7 @@ export default { }, }, destroyed: function () { - // console.log("我已经离开了！"); + console.log("我已经离开了！"); let parmas1={} parmas1.date=this.dateTime parmas1.unitName=this.unitName @@ -377,10 +375,10 @@ export default { if(this.mask=="1"){ // localStorage.parmas1 = JSON.stringify(parmas1) }else{ - localStorage.removeItem('parmas1'); + window.localStorage.removeItem('parmas1'); } - localStorage.removeItem('parmas2'); + window.localStorage.removeItem('parmas2'); }, } diff --git a/src/views/ebiz/performance/PerformanceInfo.vue b/src/views/ebiz/performance/PerformanceInfo.vue new file mode 100644 index 000000000..6c6a7cc53 --- /dev/null +++ b/src/views/ebiz/performance/PerformanceInfo.vue @@ -0,0 +1,380 @@ + + + \ No newline at end of file diff --git a/src/views/ebiz/performance/PerformanceList.vue b/src/views/ebiz/performance/PerformanceList.vue index ca714e60f..d3ab68081 100644 --- a/src/views/ebiz/performance/PerformanceList.vue +++ b/src/views/ebiz/performance/PerformanceList.vue @@ -183,10 +183,10 @@ export default { this.$jump({ flag: 'h5', extra: { - url: location.origin + `/#/performance/Performance`, + url: location.origin + `/#/performance/PerformanceInfo`, }, routerInfo: { - path: `/performance/Performance`, + path: `/performance/PerformanceInfo`, }, }) } else if (this.agentGrade.slice(0, 2) == 'A3') {