dianliang/oil-station
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug

Browse Source
This commit is contained in:
cun-nan 2024-07-27 16:08:07 +08:00
parent 21b339c49b
commit d25f5b521c
3 changed files with 30 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fuintAdmin_zt/src/layout/components/Sidebar/index.vue
View File

@ -20,7 +20,7 @@
>
<sidebar-item
v-for="(route, index) in sidebarRouters"
:key="route.path + index"
:key="route.path + index"
:item="route"
:base-path="route.path"
:activeMenu="activeMenu"

49
fuintAdmin_zt/src/views/components/Service/allOrder.vue
View File

@ -84,8 +84,8 @@
</el-form>
<el-table ref="tables" border v-loading="loading" :data="list" @selection-change="handleSelectionChange" :default-sort="defaultSort" @sort-change="handleSortChange">
<el-table-column label="序号" align="center" type="index" />
<el-table-column label="订单号" align="center" prop="orderNo" />
<el-table-column label="订单类型" align="center" prop="type" width="100">
<el-table-column label="订单号" align="center" prop="orderNo" width="220"/>
<el-table-column label="所属机构" align="center" prop="type" width="200">
<template slot-scope="scope">
{{ getType(scope.row.type) }}
</template>
@ -93,16 +93,23 @@
<el-table-column :label="sumPayMoney" align="center" prop="payMoney">
</el-table-column>
<el-table-column label="订单类型" align="center" prop="createTime">
<template slot-scope="scope">
<span v-if="scope.row.payChannel==='applet'">小程序</span>
<span v-else-if="scope.row.payChannel==='POS'">收银台</span>
<span v-else>收银台</span>
</template>
</el-table-column>
<el-table-column label="支付方式" align="center" prop="payType">
<template slot-scope="scope">
<dict-tag :options="dict.type.payment_type" :value="scope.row.payType"/>
</template>
</el-table-column>
<el-table-column label="订单类型" align="center" prop="createTime" width="150">
<el-table-column label="订单状态" align="center" prop="status">
<template slot-scope="scope">
<span>{{ scope.row.payChannel==='applet'?'小程序': '收银台'}}</span>
<dict-tag :options="dict.type.pay_status" :value="scope.row.status"/>
</template>
</el-table-column>
@ -112,25 +119,25 @@
</template>
</el-table-column>
<el-table-column label="支付通道" align="center" prop="userMobile" width="150">
<template slot-scope="scope">
<span>{{ scope.row.userMobile?scope.row.userMobile: '散户'}}</span>
</template>
</el-table-column>
<!-- <el-table-column label="支付通道" align="center" prop="userMobile" width="150">-->
<!-- <template slot-scope="scope">-->
<!-- <span>{{ scope.row.userMobile?scope.row.userMobile: '散户'}}</span>-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column label="商户号编号" align="center" prop="userMobile" width="150">
<template slot-scope="scope">
<span>{{ scope.row.userMobile?scope.row.userMobile: '散户'}}</span>
</template>
</el-table-column>
<!-- <el-table-column label="商户号编号" align="center" prop="userMobile" width="150">-->
<!-- <template slot-scope="scope">-->
<!-- <span>{{ scope.row.userMobile?scope.row.userMobile: '散户'}}</span>-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column label="订单创建时间" align="center" prop="createTime" width="150">
<el-table-column label="订单创建时间" align="center" prop="createTime">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.createTime) || '--'}}</span>
</template>
</el-table-column>
<el-table-column label="订单完成时间" align="center" prop="payTime" width="150">
<el-table-column label="订单完成时间" align="center" prop="payTime">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.payTime) || '--'}}</span>
</template>
@ -157,7 +164,7 @@
import { getOrderListApi,getSumPayMoneyApi } from "../../../api/allOrder";
export default {
name: "asdf",
dicts: ['transaction','handover','handover_quit','payment_type',
dicts: ['transaction','handover','handover_quit','payment_type','pay_status',
'jbjl','official','notice','role'],
props: ["id"],
@ -229,7 +236,7 @@
{ value: 'applet',label: '小程序'},
{ value: 'cashier',label: '收银台'},
],
sumPayMoney:'支付金额'
sumPayMoney:'订单金额'
};
},
created() {
@ -256,9 +263,9 @@
getSumPayMoneyApi(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
if(response.data > 0) {
const sum = response.data
this.sumPayMoney = '支付金额(总计：￥'+sum+')'
this.sumPayMoney = '订单金额(总计：￥'+sum+')'
}else {
this.sumPayMoney = '支付金额'
this.sumPayMoney = '订单金额'
}
// this.loading = false;

1
fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/AllOrderInfoMapper.xml
View File

@ -178,6 +178,7 @@
aoi.update_time AS updateTime,
aoi.update_by AS updateBy,
aoi.content AS content,
aoi.status AS status,
mu.name userName,
mu.mobile userMobile
from all_order_info aoi