From 03aca53ea44423c8a9608426d716fb5e1e260eee Mon Sep 17 00:00:00 2001 From: tx <2622874537@qq.com> Date: Fri, 8 Nov 2024 09:38:40 +0800 Subject: [PATCH 1/2] 111 --- src/views/system/dept/deptDetail.vue | 208 ++++++++++++++++++--------- src/views/system/device/index.vue | 19 ++- src/views/system/fee/index.vue | 3 + src/views/system/model/index.vue | 3 + src/views/system/partner/index.vue | 6 +- 5 files changed, 161 insertions(+), 78 deletions(-) diff --git a/src/views/system/dept/deptDetail.vue b/src/views/system/dept/deptDetail.vue index 2dfdc04..b4764a2 100644 --- a/src/views/system/dept/deptDetail.vue +++ b/src/views/system/dept/deptDetail.vue @@ -50,25 +50,25 @@ - {{ detail.platformServiceFee }}% + {{ detail.platformServiceFee }}% - {{ detail.handlingCharge }}% + {{ detail.handlingCharge }}‰ - {{ detail.withdrawHandlingCharge }}% + {{ detail.withdrawHandlingCharge }}‰ - {{ deptInfo.withdraw }}元 + {{ deptInfo.withdraw }}元 {{ deptInfo.settlementAmount }} - {{ deptInfo.todayIncome }}元 | {{ deptInfo.totalIncome }}元 + {{ deptInfo.todayIncome }}元 | {{ deptInfo.totalIncome }}元 - {{ deptInfo.todayOrderCount}}元 | {{ deptInfo.totalOrderCount }}元 + {{ deptInfo.todayOrderCount }}笔 | {{ deptInfo.totalOrderCount }}笔 {{ deptInfo.todayOrderFee }}元 | {{ deptInfo.totalOrderFee }}元 @@ -83,47 +83,112 @@ - + - - {{ deptInfo.vehicleVo.offlineDevices.length}}辆 | {{ deptInfo.vehicleVo.allNum}}辆 + + + {{ deptInfo.vehicleVo.offlineDevices.length }} + | + + {{ deptInfo.vehicleVo.allNum }} + + - {{deptInfo.offlineStatusCount.inStashNum }}辆 | {{ deptInfo.vehicleVo.inStashNum }}辆 - - - - + + {{ deptInfo.offlineStatusCount.inStashNum }} + | + + {{ deptInfo.vehicleVo.inStashNum }} + - + +
+ + {{ deptInfo.vehicleVo.offlineDevices.length - + deptInfo.offlineStatusCount.inStashNum }} + | + + {{ deptInfo.vehicleVo.inOperation }} + +
+ - {{ deptInfo.offlineStatusCount.ridingNum +deptInfo.offlineStatusCount.temporarilyLockNum}}辆 | {{deptInfo.vehicleVo.ridingNum+ deptInfo.vehicleVo.temporarilyLockNum}}辆 + + {{ deptInfo.offlineStatusCount.ridingNum + + deptInfo.offlineStatusCount.temporarilyLockNum }} + | + + {{ deptInfo.vehicleVo.ridingNum + deptInfo.vehicleVo.temporarilyLockNum + }} + + - {{ deptInfo.offlineStatusCount.ridingNum }}辆 | {{ deptInfo.vehicleVo.ridingNum }}辆 + + {{ deptInfo.offlineStatusCount.ridingNum }} + | + + {{ deptInfo.vehicleVo.ridingNum }} + - - {{ deptInfo.offlineStatusCount.temporarilyLockNum }}辆 | {{ deptInfo.vehicleVo.temporarilyLockNum}}辆 + + + + {{ deptInfo.offlineStatusCount.temporarilyLockNum }} + | + + {{ deptInfo.vehicleVo.temporarilyLockNum }} + - {{ deptInfo.offlineStatusCount.normalNum }}辆 | {{ deptInfo.vehicleVo.normalNum}}辆 + + {{ deptInfo.offlineStatusCount.normalNum }} + | + + {{ deptInfo.vehicleVo.normalNum }} + - - {{ deptInfo.offlineStatusCount.inAppointmentNum }}辆 | {{ deptInfo.vehicleVo.inAppointmentNum }}辆 + + + + {{ deptInfo.offlineStatusCount.inAppointmentNum }} + | + + {{ deptInfo.vehicleVo.inAppointmentNum }} + - - {{ deptInfo.offlineStatusCount.offlineNum }}辆 | {{ deptInfo.vehicleVo.disabledNum}}辆 + + + + {{ deptInfo.offlineStatusCount.offlineNum }} + | + + {{ deptInfo.vehicleVo.disabledNum }} + - + @@ -153,7 +218,7 @@ - + @@ -186,7 +251,7 @@ - + @@ -246,7 +311,7 @@ export default { return (type) => { return type === '2' ? '元' : '%'; } - } + } }, data() { return { @@ -254,7 +319,7 @@ export default { loading: false, showConfigDialog: false, deptInfo: {}, - defaultValue:0, + defaultValue: 0, activeTab: '运营区', // 默认激活的标签页 } }, @@ -283,46 +348,47 @@ export default { getDeptInfo(this.$route.params.deptId).then(response => { this.deptInfo = response.data; - // 初始化离线状态统计对象 - this.deptInfo.offlineStatusCount = { - inStashNum: 0, // 仓库中 - normalNum: 0, // 待租 - inAppointmentNum: 0, // 预约中 - ridingNum: 0, // 骑行中 - temporarilyLockNum: 0, // 临时锁车中 - dispatchingNum: 0, // 调度中 - offlineNum: 0 // 下线 - }; + // 初始化离线状态统计对象 + this.deptInfo.offlineStatusCount = { + inStashNum: 0, // 仓库中 + normalNum: 0, // 待租 + inAppointmentNum: 0, // 预约中 + ridingNum: 0, // 骑行中 + temporarilyLockNum: 0, // 临时锁车中 + dispatchingNum: 0, // 调度中 + offlineNum: 0 // 下线 + }; - // 根据 status 进行分类统计 - this.deptInfo.vehicleVo.offlineDevices.forEach(device => { - switch (device.status) { - case 0: - this.deptInfo.offlineStatusCount.inStashNum += 1; - break; - case 1: - this.deptInfo.offlineStatusCount.normalNum += 1; - break; - case 2: - this.deptInfo.offlineStatusCount.inAppointmentNum += 1; - break; - case 3: - this.deptInfo.offlineStatusCount.ridingNum += 1; - break; - case 4: - this.deptInfo.offlineStatusCount.temporarilyLockNum += 1; - break; - case 6: - this.deptInfo.offlineStatusCount.dispatchingNum += 1; - break; - case 8: - this.deptInfo.offlineStatusCount.offlineNum += 1; - break; - } - }); - }).finally(() => { - // 加载完成后可以进行其他操作 - }); + // 根据 status 进行分类统计 + this.deptInfo.vehicleVo.offlineDevices.forEach(device => { + switch (device.status) { + case '0': + this.deptInfo.offlineStatusCount.inStashNum += 1; + break; + case '1': + this.deptInfo.offlineStatusCount.normalNum += 1; + break; + case '2': + this.deptInfo.offlineStatusCount.inAppointmentNum += 1; + break; + case '3': + this.deptInfo.offlineStatusCount.ridingNum += 1; + break; + case '4': + this.deptInfo.offlineStatusCount.temporarilyLockNum += 1; + break; + case '6': + this.deptInfo.offlineStatusCount.dispatchingNum += 1; + break; + case '8': + this.deptInfo.offlineStatusCount.offlineNum += 1; + break; + } + }); + // console.log(this.deptInfo.vehicleVo,'this.deptInfo.offlineStatusCountthis.deptInfo.offlineStatusCount'); + }).finally(() => { + // 加载完成后可以进行其他操作 + }); }, } } diff --git a/src/views/system/device/index.vue b/src/views/system/device/index.vue index c0e3056..94c4060 100644 --- a/src/views/system/device/index.vue +++ b/src/views/system/device/index.vue @@ -1449,9 +1449,9 @@ export default { } ); } - listModel(this.queryParams).then((response) => { - this.modelOptions = response.rows; - }); + // listModel(this.queryParams).then((response) => { + // this.modelOptions = response.rows; + // }); listArea(this.queryParams).then((response) => { this.areaOptions = response.rows; }); @@ -1468,9 +1468,9 @@ export default { } ); } - listModel(this.queryParams).then((response) => { - this.modelOptions = response.rows; - }); + // listModel(this.queryParams).then((response) => { + // this.modelOptions = response.rows; + // }); listArea(this.queryParams).then((response) => { this.areaOptions = response.rows; }); @@ -1496,6 +1496,13 @@ export default { this.reset(); this.open = true; this.title = "添加设备"; + + this.$nextTick(() => { + if(this.deptId){ + this.form.deptId=this.deptId + + } + }) }, /** 详情按钮 */ handleView(row) { diff --git a/src/views/system/fee/index.vue b/src/views/system/fee/index.vue index e63a139..5b8bcf4 100644 --- a/src/views/system/fee/index.vue +++ b/src/views/system/fee/index.vue @@ -583,6 +583,9 @@ export default { this.reset(); this.open = true; this.title = "添加收费方式"; + if(this.deptId){ + this.form.deptId=this.deptId + } }, handleUpdate(row) { this.reset(); diff --git a/src/views/system/model/index.vue b/src/views/system/model/index.vue index 399e2b6..d70b5aa 100644 --- a/src/views/system/model/index.vue +++ b/src/views/system/model/index.vue @@ -439,6 +439,9 @@ export default { this.reset(); this.open = true; this.title = "添加车辆型号"; + if(this.deptId){ + this.form.operator=this.deptId + } }, /** 修改按钮操作 */ handleUpdate(row) { diff --git a/src/views/system/partner/index.vue b/src/views/system/partner/index.vue index f46b690..a74f8de 100644 --- a/src/views/system/partner/index.vue +++ b/src/views/system/partner/index.vue @@ -514,7 +514,11 @@ export default { getUser().then(response => { this.postOptions = response.posts; this.roleOptions = response.roles; - this.areaOptions = response.areas; + if (this.deptId) { + this.areaOptions = response.areas.filter(area => area.deptId === this.deptId); + } else { + this.areaOptions = response.areas; + } this.open = true; this.title = "添加合伙人"; this.form.password = this.initPassword; From f7c300ab8f47a03d19c1f863002ca43b78db27e7 Mon Sep 17 00:00:00 2001 From: tx <2622874537@qq.com> Date: Fri, 8 Nov 2024 09:54:02 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=96=B0=E9=9C=80=E6=B1=82=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/system/dept/deptDetail.vue | 7 +++++-- src/views/system/user/index.vue | 14 +++++++++++++- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/src/views/system/dept/deptDetail.vue b/src/views/system/dept/deptDetail.vue index b4764a2..1a7a074 100644 --- a/src/views/system/dept/deptDetail.vue +++ b/src/views/system/dept/deptDetail.vue @@ -244,6 +244,9 @@ + + + @@ -289,7 +292,7 @@ import refund from "@/views/system/refund/index"; import audit from "@/views/system/audit/index"; import flow from "@/views/system/flow/index"; import withdraw from "@/views/system/withdrawAudit/index"; - +import user from "@/views/system/user/index"; // import Withdraw from '@/views/system/withdraw/index.vue' // import RealName from '@/views/ss/realName/index.vue' @@ -301,7 +304,7 @@ import withdraw from "@/views/system/withdrawAudit/index"; export default { name: 'User/:deptId', mixins: [$view, $serviceType], - components: { Area, Fees, Model, device, order, partner, refund, audit, flow, withdraw, BooleanTag, Recharge, UserRechargeReport, UserConfigDialog, UserAccount, UserDevice, LineChart }, + components: { Area, Fees,user, Model, device, order, partner, refund, audit, flow, withdraw, BooleanTag, Recharge, UserRechargeReport, UserConfigDialog, UserAccount, UserDevice, LineChart }, dicts: ['sys_normal_disable', 'sys_yes_no'], computed: { SmUserType() { diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue index 1b38c20..a4ee5d4 100644 --- a/src/views/system/user/index.vue +++ b/src/views/system/user/index.vue @@ -265,6 +265,13 @@ export default { return this.userName === 'admin' ? 21 : 24; } }, + props: { + // 用户id + deptId: { + type: Number, + default: null, + } + }, data() { return { options: [], @@ -333,7 +340,7 @@ export default { userName: undefined, phonenumber: undefined, status: undefined, - deptId: undefined, + deptId: this.deptId, typeList: "00,03" }, // 列信息 @@ -518,6 +525,7 @@ export default { getDeptTree() { deptTreeSelect().then(response => { this.deptOptions = response.data; + }); }, // 筛选节点 @@ -611,6 +619,10 @@ export default { this.open = true; this.title = "添加用户"; this.form.password = this.initPassword; + if(this.deptId){ + this.form.deptId=this.deptId + } + }); }, /** 修改按钮操作 */