chuangte/bick_back
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

111

Browse Source
This commit is contained in:
tx 2024-11-08 09:38:40 +08:00
parent 121f975387
commit 03aca53ea4
5 changed files with 161 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

208
src/views/system/dept/deptDetail.vue
View File

@ -50,25 +50,25 @@
<!-- {{detail.limitRefundReason | defaultValue}}--> <!-- {{detail.limitRefundReason | defaultValue}}-->
<!-- </el-descriptions-item>--> <!-- </el-descriptions-item>-->
<el-descriptions-item label="服务费"> <el-descriptions-item label="服务费">
{{ detail.platformServiceFee }}% {{ detail.platformServiceFee }}%
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="充值手续费"> <el-descriptions-item label="充值手续费">
{{ detail.handlingCharge }}% {{ detail.handlingCharge }}‰
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="提现手续费"> <el-descriptions-item label="提现手续费">
{{ detail.withdrawHandlingCharge }}% {{ detail.withdrawHandlingCharge }}‰
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="已提现"> <el-descriptions-item label="已提现">
{{ deptInfo.withdraw }}元 {{ deptInfo.withdraw }}元
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="待结算"> <el-descriptions-item label="待结算">
{{ deptInfo.settlementAmount }} {{ deptInfo.settlementAmount }}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="营收"> <el-descriptions-item label="营收">
{{ deptInfo.todayIncome }}元 | {{ deptInfo.totalIncome }}元 {{ deptInfo.todayIncome }}元 | {{ deptInfo.totalIncome }}元
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="订单数"> <el-descriptions-item label="订单数">
{{ deptInfo.todayOrderCount}}元 | {{ deptInfo.totalOrderCount }}元 {{ deptInfo.todayOrderCount }}笔 | {{ deptInfo.totalOrderCount }}笔
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="订单金额"> <el-descriptions-item label="订单金额">
{{ deptInfo.todayOrderFee }}元 | {{ deptInfo.totalOrderFee }}元 {{ deptInfo.todayOrderFee }}元 | {{ deptInfo.totalOrderFee }}元
@ -83,47 +83,112 @@
</div> </div>
<el-tabs> <el-tabs>
<el-tab-pane label="车辆信息"> <el-tab-pane label="车辆信息(单位:辆)">
<el-descriptions :column="3"> <el-descriptions :column="3">
<el-descriptions-item label="车辆"> <el-descriptions-item label="总数">
{{ deptInfo.vehicleVo.offlineDevices.length}}辆 | {{ deptInfo.vehicleVo.allNum}}辆 <span
:style="{ color: deptInfo.vehicleVo.offlineDevices.length > 0 ? 'red' : 'gray' }">
{{ deptInfo.vehicleVo.offlineDevices.length }}
</span> |
<span >
{{ deptInfo.vehicleVo.allNum }}
</span>
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="仓库"> <el-descriptions-item label="仓库">
{{deptInfo.offlineStatusCount.inStashNum }}辆 | {{ deptInfo.vehicleVo.inStashNum }}辆 <span
</el-descriptions-item> :style="{ color: deptInfo.offlineStatusCount.inStashNum > 0 ? 'red' : 'gray' }">
<el-descriptions-item label=" 投放" > {{ deptInfo.offlineStatusCount.inStashNum }}
<template> </span> |
<!-- <pre></pre> --> <span
<div @click="noline">{{ deptInfo.vehicleVo.offlineDevices.length-deptInfo.offlineStatusCount.inStashNum}}辆 | {{ deptInfo.vehicleVo.inOperation}}辆</div> >
</template> {{ deptInfo.vehicleVo.inStashNum }}
</span>
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="投放">
<div @click="noline">
<span
:style="{ color: (deptInfo.vehicleVo.offlineDevices.length - deptInfo.offlineStatusCount.inStashNum) > 0 ? 'red' : 'gray' }">
{{ deptInfo.vehicleVo.offlineDevices.length -
deptInfo.offlineStatusCount.inStashNum }}
</span> |
<span
>
{{ deptInfo.vehicleVo.inOperation }}
</span>
</div>
</el-descriptions-item>
<el-descriptions-item label="订单"> <el-descriptions-item label="订单">
{{ deptInfo.offlineStatusCount.ridingNum +deptInfo.offlineStatusCount.temporarilyLockNum}}辆 | {{deptInfo.vehicleVo.ridingNum+ deptInfo.vehicleVo.temporarilyLockNum}}辆 <span
:style="{ color: (deptInfo.offlineStatusCount.ridingNum + deptInfo.offlineStatusCount.temporarilyLockNum) > 0 ? 'red' : 'gray' }">
{{ deptInfo.offlineStatusCount.ridingNum +
deptInfo.offlineStatusCount.temporarilyLockNum }}
</span> |
<span
>
{{ deptInfo.vehicleVo.ridingNum + deptInfo.vehicleVo.temporarilyLockNum
}}
</span>
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="骑行"> <el-descriptions-item label="骑行">
{{ deptInfo.offlineStatusCount.ridingNum }}辆 | {{ deptInfo.vehicleVo.ridingNum }}辆 <span
:style="{ color: deptInfo.offlineStatusCount.ridingNum > 0 ? 'red' : 'gray' }">
{{ deptInfo.offlineStatusCount.ridingNum }}
</span> |
<span >
{{ deptInfo.vehicleVo.ridingNum }}
</span>
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="锁车 ">
{{ deptInfo.offlineStatusCount.temporarilyLockNum }}辆 | {{ deptInfo.vehicleVo.temporarilyLockNum}}辆 <el-descriptions-item label="锁车">
<span
:style="{ color: deptInfo.offlineStatusCount.temporarilyLockNum > 0 ? 'red' : 'gray' }">
{{ deptInfo.offlineStatusCount.temporarilyLockNum }}
</span> |
<span
>
{{ deptInfo.vehicleVo.temporarilyLockNum }}
</span>
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="待租"> <el-descriptions-item label="待租">
{{ deptInfo.offlineStatusCount.normalNum }}辆 | {{ deptInfo.vehicleVo.normalNum}}辆 <span
:style="{ color: deptInfo.offlineStatusCount.normalNum > 0 ? 'red' : 'gray' }">
{{ deptInfo.offlineStatusCount.normalNum }}
</span> |
<span >
{{ deptInfo.vehicleVo.normalNum }}
</span>
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label=" 预约">
{{ deptInfo.offlineStatusCount.inAppointmentNum }}辆 | {{ deptInfo.vehicleVo.inAppointmentNum }}辆 <el-descriptions-item label="预约">
<span
:style="{ color: deptInfo.offlineStatusCount.inAppointmentNum > 0 ? 'red' : 'gray' }">
{{ deptInfo.offlineStatusCount.inAppointmentNum }}
</span> |
<span
>
{{ deptInfo.vehicleVo.inAppointmentNum }}
</span>
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="禁用 ">
{{ deptInfo.offlineStatusCount.offlineNum }}辆 | {{ deptInfo.vehicleVo.disabledNum}}辆 <el-descriptions-item label="禁用">
<span
:style="{ color: deptInfo.offlineStatusCount.offlineNum > 0 ? 'red' : 'gray' }">
{{ deptInfo.offlineStatusCount.offlineNum }}
</span> |
<span
>
{{ deptInfo.vehicleVo.disabledNum }}
</span>
</el-descriptions-item> </el-descriptions-item>
</el-descriptions> </el-descriptions>
</el-tab-pane> </el-tab-pane>
</el-tabs> </el-tabs>
</div> </div>
</el-card> </el-card>
@ -153,7 +218,7 @@
<!-- <recharge :query="{deptId: detail.deptId}" :view="views.user"/> --> <!-- <recharge :query="{deptId: detail.deptId}" :view="views.user"/> -->
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="车辆列表" lazy name="车辆列表"> <el-tab-pane label="车辆列表" lazy name="车辆列表">
<device ref="deviceComponent" :deptId="detail.deptId" v-if="detail.deptId" /> <device ref="deviceComponent" :deptId="detail.deptId" v-if="detail.deptId" />
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="订单" lazy> <el-tab-pane label="订单" lazy>
@ -186,7 +251,7 @@
<el-empty v-else description="用户不存在" /> <el-empty v-else description="用户不存在" />
<!--用户设置--> <!--用户设置-->
<user-config-dialog :show.sync="showConfigDialog" :deptId="detail.deptId" v-if="detail.deptId" /> <user-config-dialog :show.sync="showConfigDialog" :deptId="detail.deptId" v-if="detail.deptId" />
</div> </div>
</template> </template>
@ -246,7 +311,7 @@ export default {
return (type) => { return (type) => {
return type === '2' ? '元' : '%'; return type === '2' ? '元' : '%';
} }
} }
}, },
data() { data() {
return { return {
@ -254,7 +319,7 @@ export default {
loading: false, loading: false,
showConfigDialog: false, showConfigDialog: false,
deptInfo: {}, deptInfo: {},
defaultValue:0, defaultValue: 0,
activeTab: '运营区', // 默认激活的标签页 activeTab: '运营区', // 默认激活的标签页
} }
}, },
@ -283,46 +348,47 @@ export default {
getDeptInfo(this.$route.params.deptId).then(response => { getDeptInfo(this.$route.params.deptId).then(response => {
this.deptInfo = response.data; this.deptInfo = response.data;
// 初始化离线状态统计对象 // 初始化离线状态统计对象
this.deptInfo.offlineStatusCount = { this.deptInfo.offlineStatusCount = {
inStashNum: 0, // 仓库中 inStashNum: 0, // 仓库中
normalNum: 0, // 待租 normalNum: 0, // 待租
inAppointmentNum: 0, // 预约中 inAppointmentNum: 0, // 预约中
ridingNum: 0, // 骑行中 ridingNum: 0, // 骑行中
temporarilyLockNum: 0, // 临时锁车中 temporarilyLockNum: 0, // 临时锁车中
dispatchingNum: 0, // 调度中 dispatchingNum: 0, // 调度中
offlineNum: 0 // 下线 offlineNum: 0 // 下线
}; };
// 根据 status 进行分类统计 // 根据 status 进行分类统计
this.deptInfo.vehicleVo.offlineDevices.forEach(device => { this.deptInfo.vehicleVo.offlineDevices.forEach(device => {
switch (device.status) { switch (device.status) {
case 0: case '0':
this.deptInfo.offlineStatusCount.inStashNum += 1; this.deptInfo.offlineStatusCount.inStashNum += 1;
break; break;
case 1: case '1':
this.deptInfo.offlineStatusCount.normalNum += 1; this.deptInfo.offlineStatusCount.normalNum += 1;
break; break;
case 2: case '2':
this.deptInfo.offlineStatusCount.inAppointmentNum += 1; this.deptInfo.offlineStatusCount.inAppointmentNum += 1;
break; break;
case 3: case '3':
this.deptInfo.offlineStatusCount.ridingNum += 1; this.deptInfo.offlineStatusCount.ridingNum += 1;
break; break;
case 4: case '4':
this.deptInfo.offlineStatusCount.temporarilyLockNum += 1; this.deptInfo.offlineStatusCount.temporarilyLockNum += 1;
break; break;
case 6: case '6':
this.deptInfo.offlineStatusCount.dispatchingNum += 1; this.deptInfo.offlineStatusCount.dispatchingNum += 1;
break; break;
case 8: case '8':
this.deptInfo.offlineStatusCount.offlineNum += 1; this.deptInfo.offlineStatusCount.offlineNum += 1;
break; break;
} }
}); });
}).finally(() => { // console.log(this.deptInfo.vehicleVo,'this.deptInfo.offlineStatusCountthis.deptInfo.offlineStatusCount');
// 加载完成后可以进行其他操作 }).finally(() => {
}); // 加载完成后可以进行其他操作
});
}, },
} }
} }

19
src/views/system/device/index.vue
View File

@ -1449,9 +1449,9 @@ export default {
} }
); );
} }
listModel(this.queryParams).then((response) => { // listModel(this.queryParams).then((response) => {
this.modelOptions = response.rows; // this.modelOptions = response.rows;
}); // });
listArea(this.queryParams).then((response) => { listArea(this.queryParams).then((response) => {
this.areaOptions = response.rows; this.areaOptions = response.rows;
}); });
@ -1468,9 +1468,9 @@ export default {
} }
); );
} }
listModel(this.queryParams).then((response) => { // listModel(this.queryParams).then((response) => {
this.modelOptions = response.rows; // this.modelOptions = response.rows;
}); // });
listArea(this.queryParams).then((response) => { listArea(this.queryParams).then((response) => {
this.areaOptions = response.rows; this.areaOptions = response.rows;
}); });
@ -1496,6 +1496,13 @@ export default {
this.reset(); this.reset();
this.open = true; this.open = true;
this.title = "添加设备"; this.title = "添加设备";
this.$nextTick(() => {
if(this.deptId){
this.form.deptId=this.deptId
}
})
}, },
/** 详情按钮 */ /** 详情按钮 */
handleView(row) { handleView(row) {

3
src/views/system/fee/index.vue
View File

@ -583,6 +583,9 @@ export default {
this.reset(); this.reset();
this.open = true; this.open = true;
this.title = "添加收费方式"; this.title = "添加收费方式";
if(this.deptId){
this.form.deptId=this.deptId
}
}, },
handleUpdate(row) { handleUpdate(row) {
this.reset(); this.reset();

3
src/views/system/model/index.vue
View File

@ -439,6 +439,9 @@ export default {
this.reset(); this.reset();
this.open = true; this.open = true;
this.title = "添加车辆型号"; this.title = "添加车辆型号";
if(this.deptId){
this.form.operator=this.deptId
}
}, },
/** 修改按钮操作 */ /** 修改按钮操作 */
handleUpdate(row) { handleUpdate(row) {

6
src/views/system/partner/index.vue
View File

@ -514,7 +514,11 @@ export default {
getUser().then(response => { getUser().then(response => {
this.postOptions = response.posts; this.postOptions = response.posts;
this.roleOptions = response.roles; 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.open = true;
this.title = "添加合伙人"; this.title = "添加合伙人";
this.form.password = this.initPassword; this.form.password = this.initPassword;