From 82d938e60bb4a3936798c629f48a13030df6cfaa Mon Sep 17 00:00:00 2001 From: zzyuan <781948537@qq.com> Date: Thu, 27 Mar 2025 16:31:51 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E9=97=AE=E9=A2=98=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/base/canteen.js | 14 ++++- src/api/base/stall.js | 12 +++- .../butie/butieSummary/index.vue | 2 +- .../consume/consumeSummary/index.vue | 9 +-- .../consume/consumerWalletSummary/index.vue | 17 +++++ .../accountCenter/consume/trade/index.vue | 10 ++- src/views/base/area/index.vue | 2 +- src/views/base/canteen/index.vue | 41 +++++++++--- src/views/base/stall/index.vue | 60 +++++++++++++----- src/views/dish/dish/index.vue | 62 ++++++++++--------- src/views/dish/material/index.vue | 2 +- src/views/dish/nutritionInfo/index.vue | 8 +-- src/views/order/reserveManagement/index.vue | 2 +- src/views/superstore/shopMaterial/index.vue | 2 +- src/views/system/dept/index.vue | 2 +- src/views/system/dict/data.vue | 2 +- src/views/system/dict/index.vue | 2 +- src/views/system/menu/index.vue | 2 +- src/views/system/notice/index.vue | 2 +- src/views/system/operlog/index.vue | 2 +- src/views/system/post/index.vue | 2 +- src/views/system/role/authUser.vue | 2 +- src/views/system/role/index.vue | 2 +- 23 files changed, 181 insertions(+), 80 deletions(-) diff --git a/src/api/base/canteen.js b/src/api/base/canteen.js index 76a8ae05..22f09eeb 100644 --- a/src/api/base/canteen.js +++ b/src/api/base/canteen.js @@ -79,7 +79,19 @@ export function getCanteenLabelApi(data) { }, data: data }) -} +} + + // 通过角色查人员 +export function userListByRoleApi(data) { + return request({ + url: '/system/user/listByPost', + method: 'post', + headers: { + "merchant-id":"378915229716713472", + }, + data: data + }) +} // 人员职位职称查询 export function queryAllCustJobApi(data) { return request({ diff --git a/src/api/base/stall.js b/src/api/base/stall.js index c746d0a8..4ce5398d 100644 --- a/src/api/base/stall.js +++ b/src/api/base/stall.js @@ -123,7 +123,17 @@ export function getKindListApi(data) { } - + // 通过角色查人员 +export function userListByRoleApi(data) { + return request({ + url: '/system/user/listByPost', + method: 'post', + headers: { + "merchant-id":"378915229716713472", + }, + data: data + }) +} // 人员职位职称查询 export function queryAllCustJobApi(data) { return request({ diff --git a/src/views/accountCenter/butie/butieSummary/index.vue b/src/views/accountCenter/butie/butieSummary/index.vue index eaabad48..9a3f6b18 100644 --- a/src/views/accountCenter/butie/butieSummary/index.vue +++ b/src/views/accountCenter/butie/butieSummary/index.vue @@ -68,7 +68,7 @@ - + diff --git a/src/views/accountCenter/consume/consumeSummary/index.vue b/src/views/accountCenter/consume/consumeSummary/index.vue index 004c3901..2be1b79b 100644 --- a/src/views/accountCenter/consume/consumeSummary/index.vue +++ b/src/views/accountCenter/consume/consumeSummary/index.vue @@ -180,7 +180,7 @@ keyword:null, psnTypeList:[], orgIdList:[], - orgLevel:2 + orgLevel:1 }, }; }, @@ -234,10 +234,10 @@ keyword:null, psnTypeList:[], orgIdList:[], - orgLevel:2 + orgLevel:1 } if(this.activeName=='organization'){ - let arr = this.lookForAllId(this.deptOptions) + let arr = this.lookForAllId(this.deptOptions) this.$set(this.queryParams,'orgIdList',arr) } this.resetForm("queryForm"); @@ -257,10 +257,11 @@ keyword:null, psnTypeList:[], orgIdList:[], - orgLevel:2 + orgLevel:1 } if(this.activeName=='organization'){ let arr = this.lookForAllId(this.deptOptions) + console.log(arr) this.$set(this.queryParams,'orgIdList',arr) } this.resetForm("queryForm"); diff --git a/src/views/accountCenter/consume/consumerWalletSummary/index.vue b/src/views/accountCenter/consume/consumerWalletSummary/index.vue index ff60b7b2..715cfa98 100644 --- a/src/views/accountCenter/consume/consumerWalletSummary/index.vue +++ b/src/views/accountCenter/consume/consumerWalletSummary/index.vue @@ -196,6 +196,15 @@ }) .filter((node) => node.status !== '1') }, + lookForAllId(data = [], arr = []) { + for (let item of data) { + if(!item.children){ + arr.push(item.id) + } + if (item.children && item.children.length) this.lookForAllId(item.children, arr) + } + return arr + }, handleTabClick(tab, event) { console.log(tab.name,tab.label) // if(this.activeName=='cust'){ @@ -217,6 +226,10 @@ orgIdList:[], orgLevel:1 } + if(this.activeName=='organization'){ + let arr = this.lookForAllId(this.deptOptions) + this.$set(this.queryParams,'orgIdList',arr) + } this.resetForm("queryForm"); this.handleQuery() }, @@ -236,6 +249,10 @@ orgIdList:[], orgLevel:1 } + if(this.activeName=='organization'){ + let arr = this.lookForAllId(this.deptOptions) + this.$set(this.queryParams,'orgIdList',arr) + } this.resetForm("queryForm"); this.handleQuery(); }, diff --git a/src/views/accountCenter/consume/trade/index.vue b/src/views/accountCenter/consume/trade/index.vue index 8b48484f..8c3f6c26 100644 --- a/src/views/accountCenter/consume/trade/index.vue +++ b/src/views/accountCenter/consume/trade/index.vue @@ -64,12 +64,12 @@ + @input="(v)=>(queryParams.minAmount=v.replace(/[^\d.]/g,''))"> 至 + @input="(v)=>(queryParams.maxAmount=v.replace(/[^\d.]/g,''))"> @@ -290,6 +290,12 @@ "beginTime":this.formatDate(this.dateRange[0]), "endTime":this.formatDate(this.dateRange[1]) } + if(param.minAmount&¶m.minAmount!=""){ + param.minAmount = Number(param.minAmount*100) + } + if(param.maxAmount&¶m.maxAmount!=""){ + param.maxAmount = Number(param.maxAmount*100) + } accountFlowPageApi(param).then(response => { this.tableListData = response.resultPage.records; this.total = Number(response.resultPage.total); diff --git a/src/views/base/area/index.vue b/src/views/base/area/index.vue index 614eceec..1ae2a25e 100644 --- a/src/views/base/area/index.vue +++ b/src/views/base/area/index.vue @@ -43,7 +43,7 @@ diff --git a/src/views/base/canteen/index.vue b/src/views/base/canteen/index.vue index 6855ba51..2c551cca 100644 --- a/src/views/base/canteen/index.vue +++ b/src/views/base/canteen/index.vue @@ -226,8 +226,15 @@ - - + + + + + @@ -422,7 +429,7 @@