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 @@
-
-
\ 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 d99b893..0000000
Binary files a/static/images/revenue/630000.png and /dev/null differ
diff --git a/static/images/revenueBox/fourthFirst.svg b/static/images/revenueBox/fourthFirst.svg
deleted file mode 100644
index c4700fc..0000000
--- a/static/images/revenueBox/fourthFirst.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ 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