diff --git a/fuintAdmin_zt/src/api/allOrder.js b/fuintAdmin_zt/src/api/allOrder.js index 88be902ca..cf8a36f28 100644 --- a/fuintAdmin_zt/src/api/allOrder.js +++ b/fuintAdmin_zt/src/api/allOrder.js @@ -163,6 +163,14 @@ export function getFenxiByDailiTypeApi(query) { }) } +export function getFenxiByDailiTypeByDataApi(query) { + return request({ + url: 'business/allOrderInfo/getFenxiByDailiTypeBydata', + method: 'get', + params: query + + }) +} export function getFenxiByDailgetFenxiByDailiTypeiByDataApi(query) { return request({ url: 'business/allOrderInfo/getFenxiByDailiBydata', diff --git a/fuintAdmin_zt/src/api/duty/duty.js b/fuintAdmin_zt/src/api/duty/duty.js index 259cd5aa4..4fa13eab7 100644 --- a/fuintAdmin_zt/src/api/duty/duty.js +++ b/fuintAdmin_zt/src/api/duty/duty.js @@ -23,6 +23,13 @@ export function selectyDutyIdsApi(query) { params: query }) } +export function getByRoleIdApi(query) { + return request({ + url: '/backendApi/account/getByRoleId', + method: 'get', + params: query + }) +} // 根据id删除角色信息 export function dutyDelete(id) { diff --git a/fuintAdmin_zt/src/views/Site/index.vue b/fuintAdmin_zt/src/views/Site/index.vue index f4323ab2c..81fc1752c 100644 --- a/fuintAdmin_zt/src/views/Site/index.vue +++ b/fuintAdmin_zt/src/views/Site/index.vue @@ -1,8 +1,13 @@ + - + + + - - - + @@ -1096,8 +1085,21 @@ export default { trigger: "blur" } ], - oldValue:'' - } + oldValue:'', + + }, + activeindex:0, + tablist:[ + { + name:'机构信息', + }, + { + name:'用户信息', + }, + { + name:'角色信息', + }, + ] }; }, watch: { @@ -1127,9 +1129,25 @@ export default { this.getList(); this.selectChildByDeptIdApi(); + console.log("activeName",this.$route.query.activeName) if (this.$route.query.activeName){ this.activeName = this.$route.query.activeName + if (this.activeName == 'list'){ + this.activeindex = 0 + } + if (this.activeName == 'info'){ + this.activeindex = 1 + } + if (this.activeName == 'duty'){ + this.activeindex = 2 + } this.handleClick() + this.handleClick1() + + }else { + this.activeindex = 0 + this.handleClick1() + } if (this.$route.fullPath) { @@ -1384,6 +1402,7 @@ export default { // 页面初始化 initPage() { this.activeName= 'list', + this.activeindex= 0, this.userList= 'list', // this.cleanUp() this.getList() @@ -1563,6 +1582,15 @@ export default { this.getDutyList() } }, + handleClick1() { + console.log("1",this.activeName) + if (this.activeindex== 0){ + this.onlyGetUser() + } + if (this.activeindex== 3){ + this.getDutyList() + } + }, //树形页操作 //新增树 append(data) { @@ -1570,6 +1598,7 @@ export default { // 清除表单 this.cleanRuleForm() this.activeName = 'info' + this.activeindex = 1 this.pdinfo = 1 this.timeFrame = [] this.beginTime = "" @@ -2174,5 +2203,29 @@ export default { margin-right: 10px; } + .tab-box{ + width: 100%; + background: #fff; + display: flex; + box-sizing: border-box; + padding: 0px 50px; + } + + .f-box{ + height: 40px; + color: #999999; + margin-right: 50px; + display: flex; + align-items: center; + + } + .active{ + color: #FF9655 !important; + border-bottom: 2px solid #FF9655 !important; + } + + .tabder-box{ + width: 85%; + } diff --git a/fuintAdmin_zt/src/views/financialStatement/dai_yunyingfenxi/tab/paytype.vue b/fuintAdmin_zt/src/views/financialStatement/dai_yunyingfenxi/tab/paytype.vue index 63fdcd48b..81a6a36ec 100644 --- a/fuintAdmin_zt/src/views/financialStatement/dai_yunyingfenxi/tab/paytype.vue +++ b/fuintAdmin_zt/src/views/financialStatement/dai_yunyingfenxi/tab/paytype.vue @@ -42,19 +42,19 @@
活跃油站汇总总数/合作油站汇总总数
-
{{ orderStatistics.sumnum }}/0
+
{{ orderStatistics.storeId?orderStatistics.storeId:0 }}/{{orderStatistics.sumOil}}
交易金额汇总数（万元）/交易笔数
-
{{ orderStatistics.tongjMoney }}
+
{{ orderStatistics.payMoney?orderStatistics.payMoney:0 }}/{{orderStatistics.count}}
退款金额（元）/退款笔数
-
{{ orderStatistics.tongjXfMoney }}
+
{{ orderStatistics.refMoney?orderStatistics.refMoney:0 }}/{{orderStatistics.refCount}}
-
新增油站数（万元）
-
0
+
新增油站数
+
{{ orderStatistics.storeId?orderStatistics.storeId:0 }}
@@ -93,8 +93,8 @@