From 959609349c0495a006fbe486a79dbfd4b75cd119 Mon Sep 17 00:00:00 2001 From: cclu <1106109051@qq.com> Date: Thu, 23 Nov 2023 10:18:11 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=88=E4=BC=A0=E4=B8=80=E7=89=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages.json | 36 +++++---- pages/operatingStatements/detail.vue | 4 +- pages/operatingStatements/index.vue | 39 +++++++++- static/images/index/car.svg | 86 ---------------------- static/images/revenue/630000.png | Bin 7523 -> 0 bytes static/images/revenueBox/fourthFirst.svg | 1 - static/images/revenueBox/fourthSecond.svg | 1 - static/images/revenueBox/fourthther.svg | 1 - static/images/revenueBox/thirdFirst.svg | 1 - static/images/revenueBox/thirdOther.svg | 1 - static/images/revenueBox/thirdSecond.svg | 1 - 11 files changed, 58 insertions(+), 113 deletions(-) delete mode 100644 static/images/index/car.svg delete mode 100644 static/images/revenue/630000.png delete mode 100644 static/images/revenueBox/fourthFirst.svg delete mode 100644 static/images/revenueBox/fourthSecond.svg delete mode 100644 static/images/revenueBox/fourthther.svg delete mode 100644 static/images/revenueBox/thirdFirst.svg delete mode 100644 static/images/revenueBox/thirdOther.svg delete mode 100644 static/images/revenueBox/thirdSecond.svg diff --git a/pages.json b/pages.json index ee8c12b..db09e74 100644 --- a/pages.json +++ b/pages.json @@ -30,25 +30,29 @@ { "navigationBarTitleText": "驿达数智化看板" } - }, - { - "path": "pages/authorityApproval/index", - "style": - { - "navigationBarTitleText": "权限审批", - "enablePullDownRefresh": true - } - }, - { - "path": "pages/authorityApproval/detail", - "style": - { - "navigationBarTitleText": "权限审批", - "enablePullDownRefresh": true - } } ], "subPackages": [ //分包加载配置 + { + "root": "pages/authorityApproval", + "pages": [ + { + "path": "index", + "style": { + "navigationBarTitleText": "权限审批", + "enablePullDownRefresh": true + } + }, + { + "path": "detail", + "style": + { + "navigationBarTitleText": "权限审批", + "enablePullDownRefresh": true + } + } + ] + }, { "root": "pages/auditingPop", "pages": [ diff --git a/pages/operatingStatements/detail.vue b/pages/operatingStatements/detail.vue index 42d0ab8..cf5ffd3 100644 --- a/pages/operatingStatements/detail.vue +++ b/pages/operatingStatements/detail.vue @@ -128,8 +128,8 @@ import request from '@/util/index.js' provinceCode: obj.pcode, SearchKeyName:_this.pageOption.searchKey, SearchKeyValue:_this.pageOption.searchValue, - BusinessType:_this.pageOption.BusinessTypeValue?_this.pageOption.BusinessTypeValue:'', - SettlementMode:_this.pageOption.SettlementModeValue?_this.pageOption.SettlementModeValue:'', + BusinessType:_this.pageOption.BusinessTypeValue>0?_this.pageOption.BusinessTypeValue:'', + SettlementMode:_this.pageOption.SettlementModeValue>0?_this.pageOption.SettlementModeValue:'', }).then(res=>{ console.log('res',res) if(res.Result_Code==100) { diff --git a/pages/operatingStatements/index.vue b/pages/operatingStatements/index.vue index 4c0907b..e4fbf90 100644 --- a/pages/operatingStatements/index.vue +++ b/pages/operatingStatements/index.vue @@ -247,6 +247,7 @@ import {mapState} from 'vuex' import request from '@/util/index.js' import {wrapTreeNode} from "../../util/dateTime"; + import moment from "moment"; export default { data() { @@ -302,12 +303,19 @@ this.pageData.searchTime = this.searchTimePopup this.$refs.timePopup.close() }, - // 选择了经营模式 + // 经营模式和结算模式只能二选一 选了一个另一个就取消 + // 选择了结算模式 handleChangeSettlement(value){ + if (this.BusinessTypeValue!==0){ + this.BusinessTypeValue = 0 + } this.SettlementModeValue = value }, // 选择了经营模式 handleChangeBusiness(value){ + if (this.SettlementModeValue!==0){ + this.SettlementModeValue = 0 + } this.BusinessTypeValue = value }, // 选择了自定义时间 @@ -349,7 +357,7 @@ this.BusinessTypeValue = 0 this.SettlementModeValue = 0 this.selectTime = 0 - this.getList() + // this.getList() }, handleDelete(){ this.searchText = '' @@ -396,7 +404,32 @@ mask:true }) let _this = this - let searchTime = this.pageData.searchTime + let searchTime + + if(this.selectTime){ + console.log('selectTime',this.selectTime) + let startTime; + let endTime; + if (this.selectTime===1){ + endTime = moment().subtract(1, 'day').format('YYYY-MM-DD') + startTime = moment().subtract(7, 'day').format('YYYY-MM-DD') + searchTime = [startTime,endTime] + }else if(this.selectTime===2){ + endTime = moment().subtract(1, 'day').format('YYYY-MM-DD') + startTime = moment().subtract(30, 'day').format('YYYY-MM-DD') + searchTime = [startTime,endTime] + }else if(this.selectTime===3){ + endTime = moment().subtract(1, 'day').format('YYYY-MM-DD') + startTime = moment().subtract(90, 'day').format('YYYY-MM-DD') + searchTime = [startTime,endTime] + }else if(this.selectTime===3){ + endTime = moment().subtract(1, 'day').format('YYYY-MM-DD') + startTime = moment().subtract(180, 'day').format('YYYY-MM-DD') + searchTime = [startTime,endTime] + } + }else{ + searchTime = this.pageData.searchTime + } let searchName = '' this.checkBoxValue.forEach(item=>{ if (searchName){ diff --git a/static/images/index/car.svg b/static/images/index/car.svg deleted file mode 100644 index 66cb528..0000000 --- a/static/images/index/car.svg +++ /dev/null @@ -1,86 +0,0 @@ - - - 商业bi/车流画像@2x - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/static/images/revenue/630000.png b/static/images/revenue/630000.png deleted file mode 100644 index d99b893e657f4faefff8474cdd392d0114afda14..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 7523 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 \ No newline at end of file diff --git a/static/images/revenueBox/fourthSecond.svg b/static/images/revenueBox/fourthSecond.svg deleted file mode 100644 index 605e433..0000000 --- a/static/images/revenueBox/fourthSecond.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/static/images/revenueBox/fourthther.svg b/static/images/revenueBox/fourthther.svg deleted file mode 100644 index 91a83a6..0000000 --- a/static/images/revenueBox/fourthther.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/static/images/revenueBox/thirdFirst.svg b/static/images/revenueBox/thirdFirst.svg deleted file mode 100644 index d29f028..0000000 --- a/static/images/revenueBox/thirdFirst.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/static/images/revenueBox/thirdOther.svg b/static/images/revenueBox/thirdOther.svg deleted file mode 100644 index 56e79b4..0000000 --- a/static/images/revenueBox/thirdOther.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/static/images/revenueBox/thirdSecond.svg b/static/images/revenueBox/thirdSecond.svg deleted file mode 100644 index 37d1c94..0000000 --- a/static/images/revenueBox/thirdSecond.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file