优化用户体验
This commit is contained in:
墨大叔
parent
89afc5697b
commit
f471dca782
|
|
@ -184,3 +184,10 @@ aside {
|
|||
margin-bottom: 10px;
|
||||
}
|
||||
}
|
||||
|
||||
.plus {
|
||||
color: red;
|
||||
}
|
||||
.subtract {
|
||||
color: green;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,80 @@
|
|||
<template>
|
||||
<treeselect
|
||||
v-model="computedValue"
|
||||
:options="deptOptions"
|
||||
:normalizer="normalizer"
|
||||
:placeholder="placeholder"
|
||||
:disabled="disabled"
|
||||
@select="onSelect"
|
||||
/>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import {listDept} from "@/api/system/dept";
|
||||
import Treeselect from "@riophae/vue-treeselect";
|
||||
import "@riophae/vue-treeselect/dist/vue-treeselect.css";
|
||||
import { isDeepEqual } from '@/utils'
|
||||
import { listArticle } from '@/api/system/article'
|
||||
|
||||
export default {
|
||||
name: "ArticleClassifyTreeSelect",
|
||||
components: { Treeselect },
|
||||
props: {
|
||||
value: {
|
||||
type: String,
|
||||
default: null,
|
||||
},
|
||||
placeholder: {
|
||||
type: String,
|
||||
default: '选择分类'
|
||||
},
|
||||
disabled: {
|
||||
type: Boolean,
|
||||
default: false
|
||||
}
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
deptOptions: [],
|
||||
}
|
||||
},
|
||||
computed: {
|
||||
computedValue: {
|
||||
get() {
|
||||
return this.value;
|
||||
},
|
||||
set(val) {
|
||||
this.$emit('input', val);
|
||||
if (!isDeepEqual(val, this.value)) {
|
||||
this.$emit('change', val);
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
created() {
|
||||
this.getData();
|
||||
},
|
||||
methods: {
|
||||
getData() {
|
||||
listArticle().then(response => {
|
||||
this.deptOptions = this.handleTree(response.data, "classifyId");
|
||||
});
|
||||
},
|
||||
/** 转换运营商数据结构 */
|
||||
normalizer(node) {
|
||||
if (node.children && !node.children.length) {
|
||||
delete node.children;
|
||||
}
|
||||
return {
|
||||
id: node.deptId,
|
||||
label: node.deptName,
|
||||
children: node.children
|
||||
};
|
||||
},
|
||||
onSelect(data) {
|
||||
this.$emit('select', data)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
</script>
|
||||
79
src/components/Business/Dept/DeptTreeSelect.vue
Normal file
79
src/components/Business/Dept/DeptTreeSelect.vue
Normal file
|
|
@ -0,0 +1,79 @@
|
|||
<template>
|
||||
<treeselect
|
||||
v-model="computedValue"
|
||||
:options="deptOptions"
|
||||
:normalizer="normalizer"
|
||||
:placeholder="placeholder"
|
||||
:disabled="disabled"
|
||||
@select="onSelect"
|
||||
/>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import {listDept} from "@/api/system/dept";
|
||||
import Treeselect from "@riophae/vue-treeselect";
|
||||
import "@riophae/vue-treeselect/dist/vue-treeselect.css";
|
||||
import { isDeepEqual } from '@/utils'
|
||||
|
||||
export default {
|
||||
name: "DeptTreeSelect",
|
||||
components: { Treeselect },
|
||||
props: {
|
||||
value: {
|
||||
type: String,
|
||||
default: null,
|
||||
},
|
||||
placeholder: {
|
||||
type: String,
|
||||
default: '选择运营商'
|
||||
},
|
||||
disabled: {
|
||||
type: Boolean,
|
||||
default: false
|
||||
}
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
deptOptions: [],
|
||||
}
|
||||
},
|
||||
computed: {
|
||||
computedValue: {
|
||||
get() {
|
||||
return this.value;
|
||||
},
|
||||
set(val) {
|
||||
this.$emit('input', val);
|
||||
if (!isDeepEqual(val, this.value)) {
|
||||
this.$emit('change', val);
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
created() {
|
||||
this.getDeptTree();
|
||||
},
|
||||
methods: {
|
||||
getDeptTree() {
|
||||
listDept().then(response => {
|
||||
this.deptOptions = this.handleTree(response.data, "deptId");
|
||||
});
|
||||
},
|
||||
/** 转换运营商数据结构 */
|
||||
normalizer(node) {
|
||||
if (node.children && !node.children.length) {
|
||||
delete node.children;
|
||||
}
|
||||
return {
|
||||
id: node.deptId,
|
||||
label: node.deptName,
|
||||
children: node.children
|
||||
};
|
||||
},
|
||||
onSelect(data) {
|
||||
this.$emit('select', data)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
</script>
|
||||
|
|
@ -3,6 +3,7 @@ import { exp } from 'qrcode/lib/core/galois-field'
|
|||
|
||||
export const views = {
|
||||
user: 'user', // 用户
|
||||
mch: 'mch', // 商户
|
||||
device: 'device', // 设备
|
||||
store: 'store', // 店铺
|
||||
transfer: 'transfer', // 转账
|
||||
|
|
@ -123,3 +124,15 @@ export const RechargeStatus = {
|
|||
DEPOSIT_WAIT_PAY: "8", // 押金待支付
|
||||
DEPOSIT_SUCCESS: "9", // 押金已支付
|
||||
}
|
||||
|
||||
// 时长/电量变化类型
|
||||
export const RecordTimeType = {
|
||||
TIME: '1', // 时间
|
||||
ELE: '2' // 电量
|
||||
}
|
||||
|
||||
// 时长/电量变化操作人类型
|
||||
export const RecordTimeOperatorType = {
|
||||
ADMIN: '1', // 管理员
|
||||
USER: '2', // 用户
|
||||
}
|
||||
|
|
|
|||
|
|
@ -33,3 +33,14 @@ export function toDescriptionFromSecond(data) {
|
|||
desc.text += desc.second + ' 秒';
|
||||
return desc;
|
||||
}
|
||||
|
||||
// 增加日期
|
||||
export function plusDays(date, day) {
|
||||
let result = new Date();
|
||||
if (date instanceof Date) {
|
||||
result = new Date(date.getTime());
|
||||
} else if (date instanceof String) {
|
||||
result = new Date(date);
|
||||
}
|
||||
return result.setDate(result.getDate() + day);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -401,11 +401,6 @@ export function getTimeArray(start, end, step) {
|
|||
return list;
|
||||
}
|
||||
|
||||
// 增加日期
|
||||
export function plusDays(date, day) {
|
||||
return date.setDate(date.getDate() + day);
|
||||
}
|
||||
|
||||
// 深度比较两个对象是否相等
|
||||
export function isDeepEqual(obj1, obj2) {
|
||||
if (obj1 === obj2) return true;
|
||||
|
|
|
|||
|
|
@ -63,6 +63,26 @@ export const $showColumns = {
|
|||
}
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
hideColumn(columns) {
|
||||
if (this.columns != null) {
|
||||
this.columns.filter(item => columns.includes(item.key))
|
||||
.forEach(item => {
|
||||
item.visible = false;
|
||||
})
|
||||
}
|
||||
},
|
||||
removeColumn(columns) {
|
||||
if (columns != null) {
|
||||
columns.forEach(column => {
|
||||
let index = this.columns.findIndex(item => column === item.key);
|
||||
if (index != null && index > -1) {
|
||||
this.columns.splice(index, 1);
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// 充值服务费
|
||||
|
|
|
|||
|
|
@ -142,10 +142,10 @@ export default {
|
|||
},
|
||||
],
|
||||
legend: {
|
||||
data: ['expected', 'actual']
|
||||
show: true,
|
||||
},
|
||||
series: [{
|
||||
name: '平台总余额',
|
||||
name: '平台总余额（元）',
|
||||
smooth: true,
|
||||
type: 'line',
|
||||
itemStyle: {
|
||||
|
|
@ -165,7 +165,7 @@ export default {
|
|||
animationDuration: 2800,
|
||||
animationEasing: 'quadraticOut'
|
||||
},{
|
||||
name: '用户总余额',
|
||||
name: '用户总余额（元）',
|
||||
smooth: true,
|
||||
type: 'line',
|
||||
itemStyle: {
|
||||
|
|
@ -185,7 +185,7 @@ export default {
|
|||
animationDuration: 2800,
|
||||
animationEasing: 'quadraticOut'
|
||||
},{
|
||||
name: '充值',
|
||||
name: '充值金额（元）',
|
||||
itemStyle: {
|
||||
normal: {
|
||||
color: '#21CCFF',
|
||||
|
|
|
|||
|
|
@ -8,8 +8,6 @@ require('echarts/theme/macarons') // echarts theme
|
|||
import resize from './mixins/resize'
|
||||
import { getTimeArray } from '@/utils'
|
||||
|
||||
const animationDuration = 6000
|
||||
|
||||
export default {
|
||||
name: 'dailyBillReport',
|
||||
mixins: [resize],
|
||||
|
|
@ -98,8 +96,11 @@ export default {
|
|||
type: 'shadow' // 默认为直线，可选为：'line' | 'shadow'
|
||||
}
|
||||
},
|
||||
legend: {
|
||||
show: true
|
||||
},
|
||||
grid: {
|
||||
top: 10,
|
||||
top: 30,
|
||||
left: '2%',
|
||||
right: '2%',
|
||||
bottom: '3%',
|
||||
|
|
@ -122,7 +123,6 @@ export default {
|
|||
name: '充值（元）',
|
||||
type: 'line',
|
||||
data: this.getHourData(this.billData, 'recharge'),
|
||||
animationDuration,
|
||||
itemStyle: {
|
||||
normal: {
|
||||
color: '#246EFF',
|
||||
|
|
@ -132,10 +132,9 @@ export default {
|
|||
name: '提现（元）',
|
||||
type: 'line',
|
||||
data: this.getHourData(this.billData, 'withdraw'),
|
||||
animationDuration,
|
||||
itemStyle: {
|
||||
normal: {
|
||||
color: '#81E2FF',
|
||||
color: '#31d697',
|
||||
}
|
||||
},
|
||||
}]
|
||||
|
|
|
|||
|
|
@ -10,8 +10,6 @@ import {getTimeArray} from "@/utils";
|
|||
import {hourBillCount} from "@/api/system/dashboard";
|
||||
import {parseTime} from "@/utils/ruoyi";
|
||||
|
||||
const animationDuration = 1000
|
||||
|
||||
export default {
|
||||
name: 'dailyProfitReport',
|
||||
mixins: [resize],
|
||||
|
|
@ -92,7 +90,7 @@ export default {
|
|||
}
|
||||
},
|
||||
grid: {
|
||||
top: 10,
|
||||
top: 30,
|
||||
left: '2%',
|
||||
right: '2%',
|
||||
bottom: '3%',
|
||||
|
|
@ -111,17 +109,11 @@ export default {
|
|||
show: false
|
||||
}
|
||||
},
|
||||
legend: {
|
||||
show: true,
|
||||
},
|
||||
series: [{
|
||||
name: '月费收入（元）',
|
||||
type: 'line',
|
||||
data: this.getChartData(this.billData, 'monthAmount'),
|
||||
itemStyle: {
|
||||
normal: {
|
||||
color: '#246EFF',
|
||||
}
|
||||
},
|
||||
}, {
|
||||
name: '服务费收入（元）',
|
||||
name: '订单服务费收入（元）',
|
||||
type: 'line',
|
||||
data: this.getChartData(this.billData, 'serviceAmount'),
|
||||
itemStyle: {
|
||||
|
|
@ -130,12 +122,30 @@ export default {
|
|||
}
|
||||
},
|
||||
},{
|
||||
name: '提现服务费收入（元）',
|
||||
type: 'line',
|
||||
data: this.getChartData(this.billData, 'withdrawServiceAmount'),
|
||||
itemStyle: {
|
||||
normal: {
|
||||
color: '#246EFF',
|
||||
}
|
||||
},
|
||||
}, {
|
||||
name: '月费收入（元）',
|
||||
type: 'line',
|
||||
data: this.getChartData(this.billData, 'monthAmount'),
|
||||
itemStyle: {
|
||||
normal: {
|
||||
color: '#31d697',
|
||||
}
|
||||
},
|
||||
}, {
|
||||
name: '渠道成本（元）',
|
||||
type: 'line',
|
||||
data: this.getChartData(this.billData, 'channelCost'),
|
||||
itemStyle: {
|
||||
normal: {
|
||||
color: '#68bfe4',
|
||||
color: '#ffb731',
|
||||
}
|
||||
},
|
||||
},
|
||||
|
|
|
|||
|
|
@ -1,7 +1,8 @@
|
|||
|
||||
<template>
|
||||
<div>
|
||||
<el-row style="margin-bottom: 16px">
|
||||
<el-row style="margin-bottom: 16px;">
|
||||
<!-- <el-button @click="handleMove(-1)">前移一天</el-button>-->
|
||||
<el-date-picker
|
||||
v-model="dateRange"
|
||||
type="daterange"
|
||||
|
|
@ -13,6 +14,7 @@
|
|||
:picker-options="pickerOptions"
|
||||
:clearable="false"
|
||||
/>
|
||||
<!-- <el-button @click="handleMove(1)">后移一天</el-button>-->
|
||||
</el-row>
|
||||
<daily-profit-report :bill-data="billData" width="100%" height="250px"/>
|
||||
</div>
|
||||
|
|
@ -21,6 +23,8 @@
|
|||
import DailyProfitReport from '@/views/dashboard/DailyProfitReport.vue'
|
||||
import { getServiceIncome } from '@/api/system/dashboard'
|
||||
import { getLastDate, getLastDateStr, getLastMonth } from '@/utils'
|
||||
import { plusDays } from '@/utils/date'
|
||||
import { parseTime } from '@/utils/ruoyi'
|
||||
|
||||
export default {
|
||||
name: 'ServiceIncomeChart',
|
||||
|
|
@ -73,6 +77,12 @@ export default {
|
|||
this.getData();
|
||||
},
|
||||
methods: {
|
||||
// 前后移动
|
||||
handleMove(n) {
|
||||
this.queryParams.startDate = parseTime(plusDays(this.queryParams.startDate, n), '{y}-{m}-{d}');
|
||||
this.queryParams.endDate = parseTime(plusDays(this.queryParams.endDate, n), '{y}-{m}-{d}');
|
||||
this.getData();
|
||||
},
|
||||
getData() {
|
||||
this.loading = true;
|
||||
getServiceIncome(this.queryParams).then(res => {
|
||||
|
|
|
|||
|
|
@ -128,7 +128,7 @@ export default {
|
|||
// 查询参数
|
||||
queryParams: {
|
||||
pageNum: 1,
|
||||
pageSize: 10,
|
||||
pageSize: 20,
|
||||
accessId: null,
|
||||
userName: null,
|
||||
accessKey: null,
|
||||
|
|
|
|||
|
|
@ -283,7 +283,7 @@ export default {
|
|||
// 查询参数
|
||||
queryParams: {
|
||||
pageNum: 1,
|
||||
pageSize: 10,
|
||||
pageSize: 20,
|
||||
storeName: null,
|
||||
deviceName: null,
|
||||
model: null,
|
||||
|
|
|
|||
|
|
@ -227,7 +227,7 @@ export default {
|
|||
// 查询参数
|
||||
queryParams: {
|
||||
pageNum: 1,
|
||||
pageSize: 10,
|
||||
pageSize: 20,
|
||||
orderByColumn: defaultSort.prop,
|
||||
isAsc: defaultSort.order,
|
||||
billId: null,
|
||||
|
|
|
|||
|
|
@ -234,7 +234,7 @@ export default {
|
|||
// 查询参数
|
||||
queryParams: {
|
||||
pageNum: 1,
|
||||
pageSize: 10,
|
||||
pageSize: 20,
|
||||
userName: null,
|
||||
deviceName: null,
|
||||
landlordName: null,
|
||||
|
|
|
|||
|
|
@ -185,7 +185,7 @@ export default {
|
|||
// 查询参数
|
||||
queryParams: {
|
||||
pageNum: 1,
|
||||
pageSize: 10,
|
||||
pageSize: 20,
|
||||
orderByColumn: defaultSort.prop,
|
||||
isAsc: defaultSort.order,
|
||||
userName: null,
|
||||
|
|
|
|||
|
|
@ -195,7 +195,7 @@ export default {
|
|||
// 查询参数
|
||||
queryParams: {
|
||||
pageNum: 1,
|
||||
pageSize: 10,
|
||||
pageSize: 20,
|
||||
refundId: null,
|
||||
refundNo: null,
|
||||
billId: null,
|
||||
|
|
|
|||
|
|
@ -251,7 +251,7 @@ export default {
|
|||
// 查询参数
|
||||
queryParams: {
|
||||
pageNum: 1,
|
||||
pageSize: 10,
|
||||
pageSize: 20,
|
||||
storeId: null,
|
||||
userId: null,
|
||||
name: null,
|
||||
|
|
|
|||
|
|
@ -196,7 +196,7 @@ export default {
|
|||
// 查询参数
|
||||
queryParams: {
|
||||
pageNum: 1,
|
||||
pageSize: 10,
|
||||
pageSize: 20,
|
||||
orderByColumn: defaultSort.prop,
|
||||
isAsc: defaultSort.order,
|
||||
id: null,
|
||||
|
|
|
|||
|
|
@ -165,7 +165,7 @@ export default {
|
|||
// 查询参数
|
||||
queryParams: {
|
||||
pageNum: 1,
|
||||
pageSize: 10,
|
||||
pageSize: 20,
|
||||
deviceId: null,
|
||||
name: null,
|
||||
feeType: null,
|
||||
|
|
|
|||
|
|
@ -177,7 +177,7 @@ export default {
|
|||
// 查询参数
|
||||
queryParams: {
|
||||
pageNum: 1,
|
||||
pageSize: 10,
|
||||
pageSize: 20,
|
||||
userName: null,
|
||||
deviceName: null,
|
||||
mchName: null,
|
||||
|
|
|
|||
|
|
@ -327,7 +327,7 @@ export default {
|
|||
// 查询参数
|
||||
queryParams: {
|
||||
pageNum: 1,
|
||||
pageSize: 10,
|
||||
pageSize: 20,
|
||||
jobName: undefined,
|
||||
jobGroup: undefined,
|
||||
status: undefined
|
||||
|
|
|
|||
|
|
@ -209,7 +209,7 @@ export default {
|
|||
// 查询参数
|
||||
queryParams: {
|
||||
pageNum: 1,
|
||||
pageSize: 10,
|
||||
pageSize: 20,
|
||||
jobName: undefined,
|
||||
jobGroup: undefined,
|
||||
status: undefined
|
||||
|
|
|
|||
|
|
@ -160,7 +160,7 @@ export default {
|
|||
// 查询参数
|
||||
queryParams: {
|
||||
pageNum: 1,
|
||||
pageSize: 10,
|
||||
pageSize: 20,
|
||||
ipaddr: undefined,
|
||||
userName: undefined,
|
||||
status: undefined
|
||||
|
|
|
|||
|
|
@ -76,7 +76,7 @@ export default {
|
|||
// 表格数据
|
||||
list: [],
|
||||
pageNum: 1,
|
||||
pageSize: 10,
|
||||
pageSize: 20,
|
||||
// 查询参数
|
||||
queryParams: {
|
||||
ipaddr: undefined,
|
||||
|
|
|
|||
|
|
@ -237,7 +237,7 @@ export default {
|
|||
// 查询参数
|
||||
queryParams: {
|
||||
pageNum: 1,
|
||||
pageSize: 10,
|
||||
pageSize: 20,
|
||||
operIp: undefined,
|
||||
title: undefined,
|
||||
operName: undefined,
|
||||
|
|
|
|||
|
|
@ -152,7 +152,7 @@ export default {
|
|||
// 查询参数
|
||||
queryParams: {
|
||||
pageNum: 1,
|
||||
pageSize: 10,
|
||||
pageSize: 20,
|
||||
abnormalId: null,
|
||||
deviceNo: null,
|
||||
content: null,
|
||||
|
|
|
|||
|
|
@ -172,7 +172,7 @@ export default {
|
|||
// 查询参数
|
||||
queryParams: {
|
||||
pageNum: 1,
|
||||
pageSize: 10,
|
||||
pageSize: 20,
|
||||
accessId: null,
|
||||
userName: null,
|
||||
accessKey: null,
|
||||
|
|
|
|||
|
|
@ -34,17 +34,6 @@
|
|||
v-hasPermi="['ss:account:add']"
|
||||
>新增</el-button>
|
||||
</el-col>
|
||||
<el-col :span="1.5">
|
||||
<el-button
|
||||
type="success"
|
||||
plain
|
||||
icon="el-icon-edit"
|
||||
size="mini"
|
||||
:disabled="single"
|
||||
@click="handleUpdate"
|
||||
v-hasPermi="['ss:account:edit']"
|
||||
>修改</el-button>
|
||||
</el-col>
|
||||
<el-col :span="1.5">
|
||||
<el-button
|
||||
type="danger"
|
||||
|
|
@ -231,7 +220,7 @@ export default {
|
|||
// 查询参数
|
||||
queryParams: {
|
||||
pageNum: 1,
|
||||
pageSize: 10,
|
||||
pageSize: 20,
|
||||
orderByColumn: defaultSort.prop,
|
||||
isAsc: defaultSort.order,
|
||||
accountId: null,
|
||||
|
|
|
|||
|
|
@ -189,7 +189,7 @@ export default {
|
|||
// 查询参数
|
||||
queryParams: {
|
||||
pageNum: 1,
|
||||
pageSize: 10,
|
||||
pageSize: 20,
|
||||
adId: null,
|
||||
type: null,
|
||||
picture: null,
|
||||
|
|
|
|||
|
|
@ -312,7 +312,7 @@ export default {
|
|||
// 查询参数
|
||||
queryParams: {
|
||||
pageNum: 1,
|
||||
pageSize: 10,
|
||||
pageSize: 20,
|
||||
orderByColumn: defaultSort.prop,
|
||||
isAsc: defaultSort.order,
|
||||
billId: null,
|
||||
|
|
|
|||
|
|
@ -235,7 +235,7 @@ export default {
|
|||
// 查询参数
|
||||
queryParams: {
|
||||
pageNum: 1,
|
||||
pageSize: 10,
|
||||
pageSize: 20,
|
||||
orderByColumn: defaultSort.prop,
|
||||
isAsc: defaultSort.order,
|
||||
id: null,
|
||||
|
|
|
|||
|
|
@ -291,7 +291,7 @@ export default {
|
|||
// 查询参数
|
||||
queryParams: {
|
||||
pageNum: 1,
|
||||
pageSize: 10,
|
||||
pageSize: 20,
|
||||
orderByColumn: defaultSort.prop,
|
||||
isAsc: defaultSort.order,
|
||||
channelId: null,
|
||||
|
|
|
|||
|
|
@ -181,7 +181,7 @@ export default {
|
|||
// 查询参数
|
||||
queryParams: {
|
||||
pageNum: 1,
|
||||
pageSize: 10,
|
||||
pageSize: 20,
|
||||
userId: null,
|
||||
status: null,
|
||||
name: null,
|
||||
|
|
|
|||
|
|
@ -231,7 +231,7 @@ export default {
|
|||
// 查询参数
|
||||
queryParams: {
|
||||
pageNum: 1,
|
||||
pageSize: 10,
|
||||
pageSize: 20,
|
||||
orderByColumn: defaultSort.prop,
|
||||
isAsc: defaultSort.order,
|
||||
payId: null,
|
||||
|
|
@ -285,6 +285,11 @@ export default {
|
|||
...this.queryParams,
|
||||
...this.query
|
||||
}
|
||||
|
||||
if (this.view != null) {
|
||||
this.showSearch = false;
|
||||
}
|
||||
|
||||
this.getList();
|
||||
},
|
||||
methods: {
|
||||
|
|
|
|||
|
|
@ -237,7 +237,7 @@ export default {
|
|||
// 查询参数
|
||||
queryParams: {
|
||||
pageNum: 1,
|
||||
pageSize: 10,
|
||||
pageSize: 20,
|
||||
orderByColumn: defaultSort.prop,
|
||||
isAsc: defaultSort.order,
|
||||
billId: null,
|
||||
|
|
|
|||
|
|
@ -77,15 +77,18 @@
|
|||
<el-table v-loading="loading" :data="recordBalanceList" @selection-change="handleSelectionChange" :default-sort="defaultSort" @sort-change="onSortChange">
|
||||
<el-table-column type="selection" width="55" align="center" />
|
||||
<el-table-column label="记录ID" align="center" prop="id" sortable="custom" :sort-orders="orderSorts" v-if="isShow('id')" width="100"/>
|
||||
<el-table-column label="用户名称" align="center" prop="userName" sortable="custom" :sort-orders="orderSorts" v-if="isShow('userName')"/>
|
||||
<el-table-column label="变动时间" align="center" prop="createTime" sortable="custom" :sort-orders="orderSorts" v-if="isShow('createTime')"/>
|
||||
<el-table-column label="用户名称" align="center" prop="userName" sortable="custom" :sort-orders="orderSorts" v-if="isShow('userName') && notHasView(views.user)"/>
|
||||
<el-table-column label="业务类型" align="center" prop="bstType" sortable="custom" :sort-orders="orderSorts" v-if="isShow('bstType')">
|
||||
<template slot-scope="d">
|
||||
<dict-tag :value="d.row.bstType" :options="dict.type.record_balance_bst_type"/>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="变动时间" align="center" prop="createTime" sortable="custom" :sort-orders="orderSorts" v-if="isShow('createTime')"/>
|
||||
<el-table-column label="变动金额" align="center" prop="beforeBalance" sortable="custom" :sort-orders="orderSorts" v-if="isShow('amount')">
|
||||
<template slot-scope="d">{{d.row.amount | money}} 元</template>
|
||||
<el-table-column label="变动金额" align="center" prop="amount" sortable="custom" :sort-orders="orderSorts" v-if="isShow('amount')">
|
||||
<template slot-scope="d">
|
||||
<span v-if="d.row.amount >= 0" style="color: red;font-weight: bold;">+{{d.row.amount | money}} 元</span>
|
||||
<span v-else style="color: green;font-weight: bold;">{{d.row.amount | money}} 元</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="变动前余额" align="center" prop="beforeBalance" sortable="custom" :sort-orders="orderSorts" v-if="isShow('beforeBalance')">
|
||||
<template slot-scope="d">{{d.row.beforeBalance | money}} 元</template>
|
||||
|
|
@ -172,7 +175,7 @@ export default {
|
|||
return {
|
||||
// 字段列表
|
||||
columns: [
|
||||
{key: 'id', visible: true, label: 'ID'},
|
||||
{key: 'id', visible: false, label: 'ID'},
|
||||
{key: 'userName', visible: true, label: '用户名称'},
|
||||
{key: 'bstType', visible: true, label: '业务类型'},
|
||||
{key: 'createTime', visible: true, label: '变动时间'},
|
||||
|
|
@ -205,7 +208,7 @@ export default {
|
|||
// 查询参数
|
||||
queryParams: {
|
||||
pageNum: 1,
|
||||
pageSize: 10,
|
||||
pageSize: 20,
|
||||
orderByColumn: defaultSort.prop,
|
||||
isAsc: defaultSort.order,
|
||||
userName: null,
|
||||
|
|
|
|||
|
|
@ -191,7 +191,7 @@ export default {
|
|||
// 查询参数
|
||||
queryParams: {
|
||||
pageNum: 1,
|
||||
pageSize: 10,
|
||||
pageSize: 20,
|
||||
refundId: null,
|
||||
refundNo: null,
|
||||
billId: null,
|
||||
|
|
|
|||
|
|
@ -67,7 +67,7 @@ export default {
|
|||
total: 0,
|
||||
queryParams: {
|
||||
pageNum: 1,
|
||||
pageSize: 10,
|
||||
pageSize: 20,
|
||||
storeId: null,
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -65,7 +65,7 @@ export default {
|
|||
total: 0,
|
||||
queryParams: {
|
||||
pageNum: 1,
|
||||
pageSize: 10,
|
||||
pageSize: 20,
|
||||
status: '2',
|
||||
storeId: null,
|
||||
}
|
||||
|
|
|
|||
|
|
@ -99,10 +99,12 @@
|
|||
<el-card class="box-card">
|
||||
<el-tabs>
|
||||
<el-tab-pane label="设备列表" :lazy="true">
|
||||
<device-list :store-id="store.storeId"/>
|
||||
<!-- <device-list :store-id="store.storeId"/>-->
|
||||
<device v-if="store.storeId != null" :query="{storeId: store.storeId}" :view="views.store"/>
|
||||
</el-tab-pane>
|
||||
<el-tab-pane label="收入记录" :lazy="true">
|
||||
<recharge-list :store-id="store.storeId"/>
|
||||
<el-tab-pane label="订单列表" :lazy="true">
|
||||
<!-- <recharge-list :store-id="store.storeId"/>-->
|
||||
<recharge v-if="store.storeId != null" :query="{storeId: store.storeId}" :view="views.store"/>
|
||||
</el-tab-pane>
|
||||
<el-tab-pane label="变更记录" :lazy="true">
|
||||
<store-apply :query="{storeId: store.storeId}" :view="views.store"/>
|
||||
|
|
@ -123,6 +125,8 @@ import StoreRechargeReport from '@/views/ss/store/components/storeRechargeReport
|
|||
import UserLink from '@/components/Business/SmUser/UserLink.vue'
|
||||
import StoreApply from '@/views/ss/storeApply/index.vue'
|
||||
import { views } from '@/utils/constants'
|
||||
import Device from '@/views/system/device/index.vue'
|
||||
import Recharge from '@/views/system/recharge/index.vue'
|
||||
|
||||
export default {
|
||||
name: 'storeDetail',
|
||||
|
|
@ -131,7 +135,7 @@ export default {
|
|||
return views
|
||||
}
|
||||
},
|
||||
components: { StoreApply, UserLink, StoreRechargeReport, RechargeList, DeviceList, PlaceSearchMap },
|
||||
components: { Recharge, Device, StoreApply, UserLink, StoreRechargeReport, RechargeList, DeviceList, PlaceSearchMap },
|
||||
dicts: ['ss_store_type', 'store_status'],
|
||||
data() {
|
||||
return {
|
||||
|
|
|
|||
|
|
@ -292,7 +292,7 @@ export default {
|
|||
// 查询参数
|
||||
queryParams: {
|
||||
pageNum: 1,
|
||||
pageSize: 10,
|
||||
pageSize: 20,
|
||||
storeId: null,
|
||||
userId: null,
|
||||
name: null,
|
||||
|
|
|
|||
|
|
@ -256,7 +256,7 @@ export default {
|
|||
// 查询参数
|
||||
queryParams: {
|
||||
pageNum: 1,
|
||||
pageSize: 10,
|
||||
pageSize: 20,
|
||||
orderByColumn: defaultSort.prop,
|
||||
isAsc: defaultSort.order,
|
||||
id: null,
|
||||
|
|
|
|||
|
|
@ -308,7 +308,7 @@ export default {
|
|||
// 查询参数
|
||||
queryParams: {
|
||||
pageNum: 1,
|
||||
pageSize: 10,
|
||||
pageSize: 20,
|
||||
deviceId: null,
|
||||
name: null,
|
||||
feeType: null,
|
||||
|
|
|
|||
|
|
@ -9,10 +9,10 @@
|
|||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="用户名称" prop="operatorName">
|
||||
<el-form-item label="操作用户" prop="operatorName">
|
||||
<el-input
|
||||
v-model="queryParams.operatorName"
|
||||
placeholder="请输入用户名称"
|
||||
placeholder="请输入操作用户名称"
|
||||
clearable
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
|
|
@ -49,18 +49,33 @@
|
|||
|
||||
<el-table v-loading="loading" :data="timeList" @selection-change="handleSelectionChange">
|
||||
<el-table-column type="selection" width="55" align="center" />
|
||||
<el-table-column label="记录id" align="center" prop="id" width="100"/>
|
||||
<el-table-column label="时长" align="center" prop="amount" >
|
||||
<template slot-scope="d">{{descTime(d.row.amount).text}}</template>
|
||||
<!-- <el-table-column label="记录id" align="center" prop="id" width="100"/>-->
|
||||
<el-table-column label="操作时间" align="center" prop="operatorTime" width="180"/>
|
||||
<el-table-column label="变化类型" align="center" prop="type">
|
||||
<template slot-scope="scope">
|
||||
<dict-tag :options="dict.type.record_time_type" :value="scope.row.type"/>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="变化值" align="center" prop="amount" >
|
||||
<template slot-scope="d">
|
||||
<span v-if="d.row.amount >= 0" class="plus">+{{descTime(d.row).text}}</span>
|
||||
<span v-else class="subtract">{{descTime(d.row).text}}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="变化原因" align="center" prop="reason" />
|
||||
<el-table-column label="用户名称" align="center" prop="operatorName" />
|
||||
<el-table-column label="用户类型" align="center" prop="operatorType">
|
||||
<el-table-column label="操作人" align="center" prop="operatorName">
|
||||
<template slot-scope="d">
|
||||
<span v-if="d.row.operatorType === RecordTimeOperatorType.USER">
|
||||
<user-link :id="d.row.operatorId" :name="d.row.operatorName"/>
|
||||
</span>
|
||||
<span v-else>{{d.row.operatorName}}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="操作人类型" align="center" prop="operatorType">
|
||||
<template slot-scope="scope">
|
||||
<dict-tag :options="dict.type.ss_record_time_operator_type" :value="scope.row.operatorType"/>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="操作时间" align="center" prop="operatorTime" width="180"/>
|
||||
</el-table>
|
||||
|
||||
<pagination
|
||||
|
|
@ -86,7 +101,7 @@
|
|||
<el-form-item label="用户名称" prop="operatorName">
|
||||
<el-input v-model="form.operatorName" placeholder="请输入操作人名称" />
|
||||
</el-form-item>
|
||||
<el-form-item label="用户类型" prop="operatorType">
|
||||
<el-form-item label="操作人类型" prop="operatorType" label-width="6em">
|
||||
<el-select v-model="form.operatorType" placeholder="请选择操作人类型">
|
||||
<el-option
|
||||
v-for="dict in dict.type.ss_record_time_operator_type"
|
||||
|
|
@ -117,11 +132,14 @@
|
|||
import { listTime, getTime, delTime, addTime, updateTime } from "@/api/ss/time";
|
||||
import { $view } from '@/utils/mixins'
|
||||
import { toDescriptionFromSecond } from '@/utils/date'
|
||||
import { RecordTimeOperatorType, RecordTimeType } from '@/utils/constants'
|
||||
import UserLink from '@/components/Business/SmUser/UserLink.vue'
|
||||
|
||||
export default {
|
||||
name: "RecordTime",
|
||||
components: { UserLink },
|
||||
mixins: [$view],
|
||||
dicts: ['ss_record_time_operator_type'],
|
||||
dicts: ['ss_record_time_operator_type', 'record_time_type'],
|
||||
props: {
|
||||
query: {
|
||||
type: Object,
|
||||
|
|
@ -129,9 +147,18 @@ export default {
|
|||
}
|
||||
},
|
||||
computed: {
|
||||
RecordTimeOperatorType() {
|
||||
return RecordTimeOperatorType
|
||||
},
|
||||
descTime() {
|
||||
return (second) => {
|
||||
return toDescriptionFromSecond(second);
|
||||
return (row) => {
|
||||
if (RecordTimeType.TIME === row.type) {
|
||||
return toDescriptionFromSecond(row.amount);
|
||||
} else {
|
||||
return {
|
||||
text: row.amount + '度'
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
|
|
@ -158,7 +185,7 @@ export default {
|
|||
// 查询参数
|
||||
queryParams: {
|
||||
pageNum: 1,
|
||||
pageSize: 10,
|
||||
pageSize: 20,
|
||||
reason: null,
|
||||
operatorName: null,
|
||||
operatorType: null,
|
||||
|
|
|
|||
|
|
@ -321,7 +321,7 @@ export default {
|
|||
// 查询参数
|
||||
queryParams: {
|
||||
pageNum: 1,
|
||||
pageSize: 10,
|
||||
pageSize: 20,
|
||||
orderByColumn: defaultSort.prop,
|
||||
isAsc: defaultSort.order,
|
||||
billId: null,
|
||||
|
|
|
|||
|
|
@ -218,7 +218,7 @@ export default {
|
|||
// 查询参数
|
||||
queryParams: {
|
||||
pageNum: 1,
|
||||
pageSize: 10,
|
||||
pageSize: 20,
|
||||
orderByColumn: defaultSort.prop,
|
||||
isAsc: defaultSort.order,
|
||||
batchId: null,
|
||||
|
|
|
|||
|
|
@ -186,7 +186,7 @@ export default {
|
|||
// 查询参数
|
||||
queryParams: {
|
||||
pageNum: 1,
|
||||
pageSize: 10,
|
||||
pageSize: 20,
|
||||
orderByColumn: defaultSort.prop,
|
||||
isAsc: defaultSort.order,
|
||||
detailId: null,
|
||||
|
|
|
|||
|
|
@ -10,6 +10,9 @@
|
|||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
</el-form-item>
|
||||
<!-- <el-form-item label="分类" prop="classifyId">-->
|
||||
<!-- <article-classify-tree-select v-model="queryParams.classifyId"/>-->
|
||||
<!-- </el-form-item>-->
|
||||
<el-form-item>
|
||||
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
|
||||
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
|
||||
|
|
@ -174,10 +177,11 @@
|
|||
import { listArticle, getArticle, delArticle, addArticle, updateArticle,classifyTreeSelect } from "@/api/system/article";
|
||||
import Treeselect from "@riophae/vue-treeselect";
|
||||
import "@riophae/vue-treeselect/dist/vue-treeselect.css";
|
||||
import ArticleClassifyTreeSelect from '@/components/Business/ArticleClassify/ArticleClassifyTreeSelect.vue'
|
||||
|
||||
export default {
|
||||
name: "Article",
|
||||
components: { Treeselect },
|
||||
components: { ArticleClassifyTreeSelect, Treeselect },
|
||||
data() {
|
||||
return {
|
||||
// 遮罩层
|
||||
|
|
@ -203,7 +207,7 @@ export default {
|
|||
// 查询参数
|
||||
queryParams: {
|
||||
pageNum: 1,
|
||||
pageSize: 10,
|
||||
pageSize: 20,
|
||||
classify: null,
|
||||
title: null,
|
||||
},
|
||||
|
|
|
|||
|
|
@ -1,390 +0,0 @@
|
|||
<template>
|
||||
<div class="app-container">
|
||||
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
|
||||
<el-form-item label="分类名称" prop="dictLabel">
|
||||
<el-input
|
||||
v-model="queryParams.dictLabel"
|
||||
placeholder="请输入分类名称"
|
||||
clearable
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="状态" prop="status">
|
||||
<el-select v-model="queryParams.status" placeholder="状态" clearable>
|
||||
<el-option
|
||||
v-for="dict in dict.type.sys_normal_disable"
|
||||
:key="dict.value"
|
||||
:label="dict.label"
|
||||
:value="dict.value"
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item>
|
||||
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
|
||||
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
|
||||
<el-row :gutter="10" class="mb8">
|
||||
<el-col :span="1.5">
|
||||
<el-button
|
||||
type="primary"
|
||||
plain
|
||||
icon="el-icon-plus"
|
||||
size="mini"
|
||||
@click="handleAdd"
|
||||
v-hasPermi="['system:dict:add']"
|
||||
>新增</el-button>
|
||||
</el-col>
|
||||
<el-col :span="1.5">
|
||||
<el-button
|
||||
type="success"
|
||||
plain
|
||||
icon="el-icon-edit"
|
||||
size="mini"
|
||||
:disabled="single"
|
||||
@click="handleUpdate"
|
||||
v-hasPermi="['system:dict:edit']"
|
||||
>修改</el-button>
|
||||
</el-col>
|
||||
<el-col :span="1.5">
|
||||
<el-button
|
||||
type="danger"
|
||||
plain
|
||||
icon="el-icon-delete"
|
||||
size="mini"
|
||||
:disabled="multiple"
|
||||
@click="handleDelete"
|
||||
v-hasPermi="['system:dict:remove']"
|
||||
>删除</el-button>
|
||||
</el-col>
|
||||
<el-col :span="1.5">
|
||||
<el-button
|
||||
type="warning"
|
||||
plain
|
||||
icon="el-icon-download"
|
||||
size="mini"
|
||||
@click="handleExport"
|
||||
v-hasPermi="['system:dict:export']"
|
||||
>导出</el-button>
|
||||
</el-col>
|
||||
<!-- <el-col :span="1.5">-->
|
||||
<!-- <el-button-->
|
||||
<!-- type="warning"-->
|
||||
<!-- plain-->
|
||||
<!-- icon="el-icon-close"-->
|
||||
<!-- size="mini"-->
|
||||
<!-- @click="handleClose"-->
|
||||
<!-- >关闭</el-button>-->
|
||||
<!-- </el-col>-->
|
||||
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
|
||||
</el-row>
|
||||
|
||||
<el-table v-loading="loading" :data="dataList" @selection-change="handleSelectionChange">
|
||||
<el-table-column type="selection" width="55" align="center" />
|
||||
<!-- <el-table-column label="编码" align="center" prop="dictCode" />-->
|
||||
<el-table-column label="分类名称" align="center" prop="dictLabel">
|
||||
<template slot-scope="scope">
|
||||
<span v-if="(scope.row.listClass == '' || scope.row.listClass == 'default') && (scope.row.cssClass == '' || scope.row.cssClass == null)">{{ scope.row.dictLabel }}</span>
|
||||
<el-tag v-else :type="scope.row.listClass == 'primary' ? '' : scope.row.listClass" :class="scope.row.cssClass">{{ scope.row.dictLabel }}</el-tag>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="自定义值" align="center" prop="dictValue" />
|
||||
<el-table-column label="排序" align="center" prop="dictSort" />
|
||||
<el-table-column label="状态" align="center" prop="status">
|
||||
<template slot-scope="scope">
|
||||
<dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.status"/>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="备注" align="center" prop="remark" :show-overflow-tooltip="true" />
|
||||
<el-table-column label="创建时间" align="center" prop="createTime" width="180">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ parseTime(scope.row.createTime) }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
|
||||
<template slot-scope="scope">
|
||||
<el-button
|
||||
size="mini"
|
||||
type="text"
|
||||
icon="el-icon-edit"
|
||||
@click="handleUpdate(scope.row)"
|
||||
v-hasPermi="['system:dict:edit']"
|
||||
>修改</el-button>
|
||||
<el-button
|
||||
size="mini"
|
||||
type="text"
|
||||
icon="el-icon-delete"
|
||||
@click="handleDelete(scope.row)"
|
||||
v-hasPermi="['system:dict:remove']"
|
||||
>删除</el-button>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
|
||||
<pagination
|
||||
v-show="total>0"
|
||||
:total="total"
|
||||
:page.sync="queryParams.pageNum"
|
||||
:limit.sync="queryParams.pageSize"
|
||||
@pagination="getList"
|
||||
/>
|
||||
|
||||
<!-- 添加或修改参数配置对话框 -->
|
||||
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
|
||||
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
|
||||
<!-- <el-form-item label="分类类型">-->
|
||||
<!-- <el-input v-model="form.dictType" :disabled="true" />-->
|
||||
<!-- </el-form-item>-->
|
||||
<el-form-item label="分类名称" prop="dictLabel">
|
||||
<el-input v-model="form.dictLabel" placeholder="请输入分类名称" />
|
||||
</el-form-item>
|
||||
<el-form-item label="自定义值" prop="dictValue">
|
||||
<el-input v-model="form.dictValue" placeholder="请输入自定义值" />
|
||||
</el-form-item>
|
||||
<!-- <el-form-item label="样式属性" prop="cssClass">-->
|
||||
<!-- <el-input v-model="form.cssClass" placeholder="请输入样式属性" />-->
|
||||
<!-- </el-form-item>-->
|
||||
<el-form-item label="显示排序" prop="dictSort">
|
||||
<el-input-number v-model="form.dictSort" controls-position="right" :min="0" />
|
||||
</el-form-item>
|
||||
<el-form-item label="回显样式" prop="listClass">
|
||||
<el-select v-model="form.listClass">
|
||||
<el-option
|
||||
v-for="item in listClassOptions"
|
||||
:key="item.value"
|
||||
:label="item.label + '(' + item.value + ')'"
|
||||
:value="item.value"
|
||||
></el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="状态" prop="status">
|
||||
<el-radio-group v-model="form.status">
|
||||
<el-radio
|
||||
v-for="dict in dict.type.sys_normal_disable"
|
||||
:key="dict.value"
|
||||
:label="dict.value"
|
||||
>{{dict.label}}</el-radio>
|
||||
</el-radio-group>
|
||||
</el-form-item>
|
||||
<el-form-item label="备注" prop="remark">
|
||||
<el-input v-model="form.remark" type="textarea" placeholder="请输入内容"></el-input>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
<div slot="footer" class="dialog-footer">
|
||||
<el-button type="primary" @click="submitForm">确 定</el-button>
|
||||
<el-button @click="cancel">取 消</el-button>
|
||||
</div>
|
||||
</el-dialog>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import { listData, getData, delData, addData, updateData } from "@/api/system/dict/data";
|
||||
import { optionselect as getDictOptionselect, getType } from "@/api/system/dict/type";
|
||||
|
||||
export default {
|
||||
name: "Data",
|
||||
dicts: ['sys_normal_disable'],
|
||||
data() {
|
||||
return {
|
||||
// 遮罩层
|
||||
loading: true,
|
||||
// 选中数组
|
||||
ids: [],
|
||||
// 非单个禁用
|
||||
single: true,
|
||||
// 非多个禁用
|
||||
multiple: true,
|
||||
// 显示搜索条件
|
||||
showSearch: true,
|
||||
// 总条数
|
||||
total: 0,
|
||||
// 分类表格数据
|
||||
dataList: [],
|
||||
// 默认分类类型
|
||||
defaultDictType: "",
|
||||
// 弹出层标题
|
||||
title: "",
|
||||
// 是否显示弹出层
|
||||
open: false,
|
||||
// 分类名称回显样式
|
||||
listClassOptions: [
|
||||
{
|
||||
value: "default",
|
||||
label: "默认"
|
||||
},
|
||||
{
|
||||
value: "primary",
|
||||
label: "主要"
|
||||
},
|
||||
{
|
||||
value: "success",
|
||||
label: "成功"
|
||||
},
|
||||
{
|
||||
value: "info",
|
||||
label: "信息"
|
||||
},
|
||||
{
|
||||
value: "warning",
|
||||
label: "警告"
|
||||
},
|
||||
{
|
||||
value: "danger",
|
||||
label: "危险"
|
||||
}
|
||||
],
|
||||
// 类型数据分类
|
||||
typeOptions: [],
|
||||
// 查询参数
|
||||
queryParams: {
|
||||
pageNum: 1,
|
||||
pageSize: 10,
|
||||
dictType: 'article_classify',
|
||||
dictLabel: undefined,
|
||||
status: undefined
|
||||
},
|
||||
// 表单参数
|
||||
form: {},
|
||||
// 表单校验
|
||||
rules: {
|
||||
dictLabel: [
|
||||
{ required: true, message: "分类名称不能为空", trigger: "blur" }
|
||||
],
|
||||
dictValue: [
|
||||
{ required: true, message: "自定义值不能为空", trigger: "blur" }
|
||||
],
|
||||
dictSort: [
|
||||
{ required: true, message: "数据顺序不能为空", trigger: "blur" }
|
||||
]
|
||||
}
|
||||
};
|
||||
},
|
||||
created() {
|
||||
this.getList();
|
||||
},
|
||||
methods: {
|
||||
/** 查询分类类型详细 */
|
||||
getType(dictId) {
|
||||
getType(dictId).then(response => {
|
||||
this.queryParams.dictType = response.data.dictType;
|
||||
this.defaultDictType = response.data.dictType;
|
||||
this.getList();
|
||||
});
|
||||
},
|
||||
/** 查询分类类型列表 */
|
||||
getTypeList() {
|
||||
getDictOptionselect().then(response => {
|
||||
this.typeOptions = response.data;
|
||||
});
|
||||
},
|
||||
/** 查询文章分类列表 */
|
||||
getList() {
|
||||
this.loading = true;
|
||||
listData(this.queryParams).then(response => {
|
||||
this.dataList = response.rows;
|
||||
this.total = response.total;
|
||||
this.loading = false;
|
||||
});
|
||||
},
|
||||
// 取消按钮
|
||||
cancel() {
|
||||
this.open = false;
|
||||
this.reset();
|
||||
},
|
||||
// 表单重置
|
||||
reset() {
|
||||
this.form = {
|
||||
dictCode: undefined,
|
||||
dictLabel: undefined,
|
||||
dictValue: undefined,
|
||||
cssClass: undefined,
|
||||
listClass: 'default',
|
||||
dictSort: 0,
|
||||
status: "0",
|
||||
remark: undefined
|
||||
};
|
||||
this.resetForm("form");
|
||||
},
|
||||
/** 搜索按钮操作 */
|
||||
handleQuery() {
|
||||
this.queryParams.pageNum = 1;
|
||||
this.getList();
|
||||
},
|
||||
/** 返回按钮操作 */
|
||||
handleClose() {
|
||||
const obj = { path: "/system/dict" };
|
||||
this.$tab.closeOpenPage(obj);
|
||||
},
|
||||
/** 重置按钮操作 */
|
||||
resetQuery() {
|
||||
this.resetForm("queryForm");
|
||||
this.queryParams.dictType = this.defaultDictType;
|
||||
this.handleQuery();
|
||||
},
|
||||
/** 新增按钮操作 */
|
||||
handleAdd() {
|
||||
this.reset();
|
||||
this.open = true;
|
||||
this.title = "添加文章分类";
|
||||
this.form.dictType = this.queryParams.dictType;
|
||||
},
|
||||
// 多选框选中数据
|
||||
handleSelectionChange(selection) {
|
||||
this.ids = selection.map(item => item.dictCode)
|
||||
this.single = selection.length!=1
|
||||
this.multiple = !selection.length
|
||||
},
|
||||
/** 修改按钮操作 */
|
||||
handleUpdate(row) {
|
||||
this.reset();
|
||||
const dictCode = row.dictCode || this.ids
|
||||
getData(dictCode).then(response => {
|
||||
this.form = response.data;
|
||||
this.open = true;
|
||||
this.title = "修改文章分类";
|
||||
});
|
||||
},
|
||||
/** 提交按钮 */
|
||||
submitForm: function() {
|
||||
this.$refs["form"].validate(valid => {
|
||||
if (valid) {
|
||||
if (this.form.dictCode != undefined) {
|
||||
updateData(this.form).then(response => {
|
||||
this.$store.dispatch('dict/removeDict', this.queryParams.dictType);
|
||||
this.$modal.msgSuccess("修改成功");
|
||||
this.open = false;
|
||||
this.getList();
|
||||
});
|
||||
} else {
|
||||
addData(this.form).then(response => {
|
||||
this.$store.dispatch('dict/removeDict', this.queryParams.dictType);
|
||||
this.$modal.msgSuccess("新增成功");
|
||||
this.open = false;
|
||||
this.getList();
|
||||
});
|
||||
}
|
||||
}
|
||||
});
|
||||
},
|
||||
/** 删除按钮操作 */
|
||||
handleDelete(row) {
|
||||
const dictCodes = row.dictCode || this.ids;
|
||||
this.$modal.confirm('是否确认删除分类编码为"' + dictCodes + '"的数据项？').then(function() {
|
||||
return delData(dictCodes);
|
||||
}).then(() => {
|
||||
this.getList();
|
||||
this.$modal.msgSuccess("删除成功");
|
||||
this.$store.dispatch('dict/removeDict', this.queryParams.dictType);
|
||||
}).catch(() => {});
|
||||
},
|
||||
/** 导出按钮操作 */
|
||||
handleExport() {
|
||||
this.download('system/dict/data/export', {
|
||||
...this.queryParams
|
||||
}, `data_${new Date().getTime()}.xlsx`)
|
||||
}
|
||||
}
|
||||
};
|
||||
</script>
|
||||
|
|
@ -164,7 +164,7 @@ export default {
|
|||
// 查询参数
|
||||
queryParams: {
|
||||
pageNum: 1,
|
||||
pageSize: 10,
|
||||
pageSize: 20,
|
||||
name: null,
|
||||
enabled: null,
|
||||
serviceRate: null,
|
||||
|
|
|
|||
|
|
@ -145,7 +145,7 @@ export default {
|
|||
// 查询参数
|
||||
queryParams: {
|
||||
pageNum: 1,
|
||||
pageSize: 10,
|
||||
pageSize: 20,
|
||||
userId: null,
|
||||
content: null
|
||||
},
|
||||
|
|
|
|||
|
|
@ -215,7 +215,7 @@ export default {
|
|||
// 查询参数
|
||||
queryParams: {
|
||||
pageNum: 1,
|
||||
pageSize: 10,
|
||||
pageSize: 20,
|
||||
configName: undefined,
|
||||
configKey: undefined,
|
||||
configType: undefined
|
||||
|
|
|
|||
|
|
@ -36,7 +36,7 @@ export default {
|
|||
total: 0,
|
||||
queryParams: {
|
||||
pageNum: 1,
|
||||
pageSize: 10,
|
||||
pageSize: 20,
|
||||
deviceId: null,
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -39,7 +39,7 @@ export default {
|
|||
total: 0,
|
||||
queryParams: {
|
||||
pageNum: 1,
|
||||
pageSize: 10,
|
||||
pageSize: 20,
|
||||
type: 1,
|
||||
deviceId: null,
|
||||
}
|
||||
|
|
|
|||
|
|
@ -47,7 +47,7 @@ export default {
|
|||
total: 0,
|
||||
queryParams: {
|
||||
pageNum: 1,
|
||||
pageSize: 10,
|
||||
pageSize: 20,
|
||||
type: 1,
|
||||
deviceId: null,
|
||||
}
|
||||
|
|
|
|||
|
|
@ -39,7 +39,7 @@ export default {
|
|||
total: 0,
|
||||
queryParams: {
|
||||
pageNum: 1,
|
||||
pageSize: 10,
|
||||
pageSize: 20,
|
||||
deviceId: null,
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -36,7 +36,7 @@ export default {
|
|||
total: 0,
|
||||
queryParams: {
|
||||
pageNum: 1,
|
||||
pageSize: 10,
|
||||
pageSize: 20,
|
||||
deviceId: null,
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -40,7 +40,7 @@ export default {
|
|||
total: 0,
|
||||
queryParams: {
|
||||
pageNum: 1,
|
||||
pageSize: 10,
|
||||
pageSize: 20,
|
||||
tenantDeviceId: null,
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -94,14 +94,15 @@
|
|||
<el-tab-pane label="套餐列表" :lazy="true">
|
||||
<suit v-if="deviceData.deviceId != null" :view="views.device" :query="{deviceId: deviceData.deviceId}"/>
|
||||
</el-tab-pane>
|
||||
<el-tab-pane label="用户充值记录" :lazy="true">
|
||||
<recharge-record :device-id="deviceData.deviceId"/>
|
||||
<el-tab-pane label="订单列表" :lazy="true">
|
||||
<recharge :query="{deviceId: deviceData.deviceId}" :view="views.device"/>
|
||||
</el-tab-pane>
|
||||
<el-tab-pane label="时长变化记录" :lazy="true">
|
||||
<el-tab-pane label="时长/电量变化" :lazy="true">
|
||||
<record-time :query="{deviceId: deviceData.deviceId}" view="device"/>
|
||||
</el-tab-pane>
|
||||
<el-tab-pane label="抄表记录" :lazy="true">
|
||||
<reading-record :device-id="deviceData.deviceId"/>
|
||||
|
||||
</el-tab-pane>
|
||||
<el-tab-pane label="绑定记录" :lazy="true">
|
||||
<bind-record :device-id="deviceData.deviceId"/>
|
||||
|
|
@ -145,11 +146,13 @@ import { toDescriptionFromSecond } from '@/utils/date'
|
|||
import StoreLink from '@/components/Business/Store/StoreLink.vue'
|
||||
import UserLink from '@/components/Business/SmUser/UserLink.vue'
|
||||
import { $serviceType, $view } from '@/utils/mixins'
|
||||
import Recharge from '@/views/system/recharge/index.vue'
|
||||
|
||||
export default {
|
||||
name: 'Device/:deviceId',
|
||||
mixins: [$serviceType, $view],
|
||||
components: {
|
||||
Recharge,
|
||||
UserLink,
|
||||
StoreLink,
|
||||
RecordTime,
|
||||
|
|
|
|||
|
|
@ -173,7 +173,7 @@
|
|||
<dict-tag :options="dict.type.sm_device_status" :value="scope.row.status"/>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="所属用户" align="center" prop="userName" >
|
||||
<el-table-column label="所属用户" align="center" prop="userName" v-if="notHasView(views.user)">
|
||||
<user-link slot-scope="d" :id="d.row.userId" :name="d.row.userName"/>
|
||||
</el-table-column>
|
||||
<el-table-column label="所属店铺" align="center" prop="storeName" >
|
||||
|
|
@ -346,13 +346,21 @@ import ModelDialog from '@/components/Business/Model/modelDialog.vue'
|
|||
import UserLink from '@/components/Business/SmUser/UserLink.vue'
|
||||
import StoreLink from '@/components/Business/Store/StoreLink.vue'
|
||||
import DeviceLink from '@/components/Business/Device/DeviceLink.vue'
|
||||
import { $serviceType } from '@/utils/mixins'
|
||||
import { $serviceType, $view } from '@/utils/mixins'
|
||||
|
||||
export default {
|
||||
name: "Device",
|
||||
mixins: [$serviceType],
|
||||
mixins: [$serviceType, $view],
|
||||
components: { DeviceLink, StoreLink, UserLink, ModelDialog, UserInput, StoreInput, SnInput, QrCode, SmUserSelect, ModelSelect},
|
||||
dicts: ['sm_device_online_status', 'sm_device_status', 'sm_device_outage_way','sm_device_notice_way', 'service_type', 'time_unit'],
|
||||
props: {
|
||||
query: {
|
||||
type: Object,
|
||||
default: () => {
|
||||
return {}
|
||||
}
|
||||
}
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
// 是否展示选择型号弹窗
|
||||
|
|
@ -380,7 +388,7 @@ export default {
|
|||
// 查询参数
|
||||
queryParams: {
|
||||
pageNum: 1,
|
||||
pageSize: 10,
|
||||
pageSize: 20,
|
||||
storeName: null,
|
||||
deviceName: null,
|
||||
model: null,
|
||||
|
|
@ -427,6 +435,7 @@ export default {
|
|||
created() {
|
||||
this.queryParams = {
|
||||
...this.queryParams,
|
||||
...this.query,
|
||||
...this.$route.query
|
||||
}
|
||||
this.getList();
|
||||
|
|
|
|||
|
|
@ -250,7 +250,7 @@ export default {
|
|||
// 查询参数
|
||||
queryParams: {
|
||||
pageNum: 1,
|
||||
pageSize: 10,
|
||||
pageSize: 20,
|
||||
dictType: undefined,
|
||||
dictLabel: undefined,
|
||||
status: undefined
|
||||
|
|
@ -399,4 +399,4 @@ export default {
|
|||
}
|
||||
}
|
||||
};
|
||||
</script>
|
||||
</script>
|
||||
|
|
|
|||
|
|
@ -218,7 +218,7 @@ export default {
|
|||
// 查询参数
|
||||
queryParams: {
|
||||
pageNum: 1,
|
||||
pageSize: 10,
|
||||
pageSize: 20,
|
||||
dictName: undefined,
|
||||
dictType: undefined,
|
||||
status: undefined
|
||||
|
|
@ -344,4 +344,4 @@ export default {
|
|||
}
|
||||
}
|
||||
};
|
||||
</script>
|
||||
</script>
|
||||
|
|
|
|||
|
|
@ -196,7 +196,7 @@ export default {
|
|||
// 查询参数
|
||||
queryParams: {
|
||||
pageNum: 1,
|
||||
pageSize: 10,
|
||||
pageSize: 20,
|
||||
modelName: null,
|
||||
model: null,
|
||||
idCode: null,
|
||||
|
|
|
|||
|
|
@ -198,7 +198,7 @@ export default {
|
|||
// 查询参数
|
||||
queryParams: {
|
||||
pageNum: 1,
|
||||
pageSize: 10,
|
||||
pageSize: 20,
|
||||
noticeTitle: undefined,
|
||||
createBy: undefined,
|
||||
status: undefined
|
||||
|
|
|
|||
|
|
@ -185,7 +185,7 @@ export default {
|
|||
// 查询参数
|
||||
queryParams: {
|
||||
pageNum: 1,
|
||||
pageSize: 10,
|
||||
pageSize: 20,
|
||||
postCode: undefined,
|
||||
postName: undefined,
|
||||
status: undefined
|
||||
|
|
|
|||
|
|
@ -1,77 +1,80 @@
|
|||
<template>
|
||||
<div class="app-container" v-loading="loading">
|
||||
<el-card class="box-card">
|
||||
<el-descriptions title="基本信息">
|
||||
<el-descriptions-item label="订单编号">{{detail.billNo | defaultValue}}</el-descriptions-item>
|
||||
<el-descriptions-item label="交易状态" :span="2">
|
||||
<dict-tag :value="detail.status" :options="dict.type.sm_transaction_bill_status" size="small"/>
|
||||
</el-descriptions-item>
|
||||
<el-descriptions-item label="交易金额">{{detail.money | money | defaultValue}} 元</el-descriptions-item>
|
||||
<el-descriptions-item label="收款人到账金额">{{detail.arrivalAmount | money | defaultValue}} 元</el-descriptions-item>
|
||||
<el-descriptions-item label="手续费">{{detail.serviceCharge | money | defaultValue}} 元</el-descriptions-item>
|
||||
<el-descriptions-item label="平台渠道成本">{{detail.channelCost | money | defaultValue}} 元</el-descriptions-item>
|
||||
<el-descriptions-item label="平台利润">{{detail.serviceCharge - detail.channelCost | money | defaultValue}} 元</el-descriptions-item>
|
||||
</el-descriptions>
|
||||
</el-card>
|
||||
<el-card class="box-card">
|
||||
<el-descriptions title="设备套餐信息">
|
||||
<el-descriptions-item label="设备编号">
|
||||
<device-link :id="detail.deviceId" :text="detail.deviceNo"/>
|
||||
</el-descriptions-item>
|
||||
<el-descriptions-item label="设备名称">
|
||||
<device-link :id="detail.deviceId" :text="detail.deviceName"/>
|
||||
</el-descriptions-item>
|
||||
<el-row :gutter="12">
|
||||
<el-col :span="18">
|
||||
|
||||
<el-descriptions-item label="套餐名称">{{detail.suitName | defaultValue}}</el-descriptions-item>
|
||||
<el-descriptions-item label="套餐计费模式">
|
||||
<dict-tag :value="detail.suitFeeMode" :options="dict.type.suit_fee_mode" size="small"/>
|
||||
</el-descriptions-item>
|
||||
<el-descriptions-item label="套餐计费类型">
|
||||
<dict-tag :value="detail.suitFeeType" :options="dict.type.suit_fee_type" size="small"/>
|
||||
</el-descriptions-item>
|
||||
<el-descriptions-item label="套餐时长" v-if="detail.suitFeeType === SuitFeeType.TIMING">{{detail.suitTime | defaultValue}} {{suitTimeUnit(detail.suitTimeUnit)}}</el-descriptions-item>
|
||||
<el-descriptions-item label="套餐电量" v-if="detail.suitFeeType === SuitFeeType.COUNT">{{detail.suitTime | defaultValue}} 度</el-descriptions-item>
|
||||
<el-descriptions-item label="设备充值状态" v-if="[SuitFeeType.TIMING, SuitFeeType.COUNT].includes(detail.suitFeeType)">
|
||||
<dict-tag :value="detail.deviceRechargeStatus"
|
||||
:options="dict.type.sm_transaction_bill_device_recharge_status"
|
||||
size="small"/>
|
||||
</el-descriptions-item>
|
||||
<el-descriptions-item label="套餐开始时间">{{detail.suitStartTime | defaultValue}}</el-descriptions-item>
|
||||
<el-descriptions-item label="套餐结束时间">{{detail.suitEndTime | defaultValue}}</el-descriptions-item>
|
||||
<el-descriptions-item label="套餐失效时间">{{detail.suitExpireTime | defaultValue}}</el-descriptions-item>
|
||||
<el-descriptions-item label="套餐开始使用时设备总用电量">{{detail.suitStartEle | defaultValue}} 度</el-descriptions-item>
|
||||
<el-descriptions-item label="套餐结束使用时设备总用电量">{{detail.suitEndEle | defaultValue}} 度</el-descriptions-item>
|
||||
<el-descriptions-item label="当前设备总用电量" v-if="[SuitFeeType.TIME_COUNT].includes(detail.suitFeeType)">
|
||||
{{detail.deviceTotalEle | money | defaultValue}} 度
|
||||
</el-descriptions-item>
|
||||
</el-descriptions>
|
||||
</el-card>
|
||||
<el-card class="box-card">
|
||||
<el-descriptions title="基本信息" :column="4">
|
||||
<el-descriptions-item label="订单编号">{{detail.billNo | defaultValue}}</el-descriptions-item>
|
||||
<el-descriptions-item label="交易状态">
|
||||
<dict-tag :value="detail.status" :options="dict.type.sm_transaction_bill_status" size="small"/>
|
||||
</el-descriptions-item>
|
||||
<el-descriptions-item label="交易金额">{{detail.money | money | defaultValue}} 元</el-descriptions-item>
|
||||
<el-descriptions-item label="到账金额">{{detail.arrivalAmount | money | defaultValue}} 元</el-descriptions-item>
|
||||
<el-descriptions-item label="手续费">{{detail.serviceCharge | money | defaultValue}} 元</el-descriptions-item>
|
||||
<el-descriptions-item label="退款金额">{{detail.refundAmount | money | defaultValue}} 元</el-descriptions-item>
|
||||
<el-descriptions-item label="商户退款金额">{{detail.refundMchAmount | money | defaultValue}} 元</el-descriptions-item>
|
||||
<el-descriptions-item label="服务费退款金额">{{detail.refundServiceAmount | money | defaultValue}} 元</el-descriptions-item>
|
||||
<el-descriptions-item label="平台渠道成本">{{detail.channelCost | money | defaultValue}} 元</el-descriptions-item>
|
||||
<el-descriptions-item label="平台利润">{{detail.serviceCharge - detail.channelCost | money | defaultValue}} 元</el-descriptions-item>
|
||||
</el-descriptions>
|
||||
</el-card>
|
||||
<el-card class="box-card">
|
||||
<el-descriptions title="设备套餐信息" :column="4">
|
||||
<el-descriptions-item label="设备">
|
||||
<device-link :id="detail.deviceId" :text="detail.deviceName"/>
|
||||
(<device-link :id="detail.deviceId" :text="detail.deviceNo"/>)
|
||||
</el-descriptions-item>
|
||||
<el-descriptions-item label="套餐名称">{{detail.suitName | defaultValue}}</el-descriptions-item>
|
||||
<el-descriptions-item label="套餐计费模式">
|
||||
<dict-tag :value="detail.suitFeeMode" :options="dict.type.suit_fee_mode" size="small"/>
|
||||
</el-descriptions-item>
|
||||
<el-descriptions-item label="套餐计费类型">
|
||||
<dict-tag :value="detail.suitFeeType" :options="dict.type.suit_fee_type" size="small"/>
|
||||
</el-descriptions-item>
|
||||
<el-descriptions-item label="使用状态">
|
||||
<el-tag type="warning" v-if="detail.isUsing" size="small">使用中</el-tag>
|
||||
<el-tag type="success" v-else-if="detail.isFinished" size="small">已结束</el-tag>
|
||||
<el-tag type="info" v-else size="small">未开始</el-tag>
|
||||
</el-descriptions-item>
|
||||
<el-descriptions-item label="设备充值状态" v-if="[SuitFeeType.TIMING, SuitFeeType.COUNT].includes(detail.suitFeeType)">
|
||||
<dict-tag :value="detail.deviceRechargeStatus"
|
||||
:options="dict.type.sm_transaction_bill_device_recharge_status"
|
||||
size="small"/>
|
||||
</el-descriptions-item>
|
||||
<el-descriptions-item label="套餐时长" v-if="detail.suitFeeType === SuitFeeType.TIMING">{{detail.suitTime | defaultValue}} {{suitTimeUnit(detail.suitTimeUnit)}}</el-descriptions-item>
|
||||
<el-descriptions-item label="套餐电量" v-if="detail.suitFeeType === SuitFeeType.COUNT">{{detail.suitTime | defaultValue}} 度</el-descriptions-item>
|
||||
<el-descriptions-item label="开始时间">{{detail.suitStartTime | defaultValue}}</el-descriptions-item>
|
||||
<el-descriptions-item label="结束时间">{{detail.suitEndTime | defaultValue}}</el-descriptions-item>
|
||||
<el-descriptions-item label="失效时间">{{detail.suitExpireTime | defaultValue}}</el-descriptions-item>
|
||||
<el-descriptions-item label="开始总用电量">{{detail.suitStartEle | defaultValue}} 度</el-descriptions-item>
|
||||
<el-descriptions-item label="结束总用电量">{{detail.suitEndEle | defaultValue}} 度</el-descriptions-item>
|
||||
</el-descriptions>
|
||||
</el-card>
|
||||
</el-col>
|
||||
<el-col :span="6">
|
||||
<el-card class="box-card">
|
||||
<el-descriptions title="支付方信息" :column="1">
|
||||
<el-descriptions-item label="用户名称">
|
||||
<user-link :id="detail.userId" :name="detail.userName"/>
|
||||
</el-descriptions-item>
|
||||
<el-descriptions-item label="支付方式">
|
||||
<dict-tag :value="detail.channelId" :options="dict.type.channel_type" size="small"/>
|
||||
</el-descriptions-item>
|
||||
<el-descriptions-item label="支付时间">{{detail.payTime | defaultValue}}</el-descriptions-item>
|
||||
</el-descriptions>
|
||||
</el-card>
|
||||
|
||||
<el-card class="box-card">
|
||||
<el-descriptions title="支付方信息">
|
||||
<el-descriptions-item label="用户名称">
|
||||
<user-link :id="detail.userId" :name="detail.userName"/>
|
||||
</el-descriptions-item>
|
||||
<el-descriptions-item label="支付方式">
|
||||
<dict-tag :value="detail.channelId" :options="dict.type.channel_type" size="small"/>
|
||||
</el-descriptions-item>
|
||||
<el-descriptions-item label="支付时间">{{detail.payTime | defaultValue}}</el-descriptions-item>
|
||||
</el-descriptions>
|
||||
</el-card>
|
||||
|
||||
<el-card class="box-card">
|
||||
<el-descriptions title="收款方信息">
|
||||
<el-descriptions-item label="收款人">{{detail.mchName | defaultValue}}</el-descriptions-item>
|
||||
<el-descriptions-item label="收款人手机号">{{detail.mchMobile | defaultValue}}</el-descriptions-item>
|
||||
<el-descriptions-item label="店铺名称">{{detail.storeName | defaultValue}}</el-descriptions-item>
|
||||
<el-descriptions-item label="店铺地址">{{detail.storeAddress | defaultValue}}</el-descriptions-item>
|
||||
</el-descriptions>
|
||||
<el-descriptions>
|
||||
<el-descriptions-item label="总计退款金额">{{detail.refundAmount | money | defaultValue}} 元</el-descriptions-item>
|
||||
<el-descriptions-item label="商户总计退款金额">{{detail.refundMchAmount | money | defaultValue}} 元</el-descriptions-item>
|
||||
<el-descriptions-item label="服务费总计退款金额">{{detail.refundServiceAmount | money | defaultValue}} 元</el-descriptions-item>
|
||||
</el-descriptions>
|
||||
</el-card>
|
||||
<el-card class="box-card">
|
||||
<el-descriptions title="收款方信息" :column="1">
|
||||
<el-descriptions-item label="收款人">{{detail.mchName | defaultValue}}</el-descriptions-item>
|
||||
<el-descriptions-item label="收款人手机号">{{detail.mchMobile | defaultValue}}</el-descriptions-item>
|
||||
<el-descriptions-item label="店铺名称">{{detail.storeName | defaultValue}}</el-descriptions-item>
|
||||
<el-descriptions-item label="店铺地址">{{detail.storeAddress | defaultValue}}</el-descriptions-item>
|
||||
</el-descriptions>
|
||||
</el-card>
|
||||
</el-col>
|
||||
</el-row>
|
||||
|
||||
<el-card class="box-card">
|
||||
<el-tabs>
|
||||
|
|
|
|||
|
|
@ -1,6 +1,18 @@
|
|||
<template>
|
||||
<div class="app-container">
|
||||
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
|
||||
<el-form-item label="订单时间" prop="createDateRange" >
|
||||
<el-date-picker
|
||||
v-model="queryParams.createDateRange"
|
||||
value-format="yyyy-MM-dd"
|
||||
type="daterange"
|
||||
range-separator="至"
|
||||
start-placeholder="开始日期"
|
||||
end-placeholder="结束日期"
|
||||
:clearable="false"
|
||||
@change="handleQuery"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="订单编号" prop="billNo">
|
||||
<el-input
|
||||
v-model="queryParams.billNo"
|
||||
|
|
@ -9,15 +21,15 @@
|
|||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="用户名称" prop="userName">
|
||||
<el-form-item label="充值用户" prop="userName" v-if="notHasView(views.user)">
|
||||
<el-input
|
||||
v-model="queryParams.userName"
|
||||
placeholder="请输入用户名称"
|
||||
placeholder="请输入充值用户名称"
|
||||
clearable
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="设备名称" prop="deviceName">
|
||||
<el-form-item label="设备名称" prop="deviceName" v-if="notHasView(views.device)">
|
||||
<el-input
|
||||
v-model="queryParams.deviceName"
|
||||
placeholder="请输入设备名称"
|
||||
|
|
@ -25,7 +37,7 @@
|
|||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="设备SN" prop="deviceNo">
|
||||
<el-form-item label="设备SN" prop="deviceNo" v-if="notHasView(views.device)">
|
||||
<el-input
|
||||
v-model="queryParams.deviceNo"
|
||||
placeholder="请输入设备SN"
|
||||
|
|
@ -33,7 +45,7 @@
|
|||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="收款用户" label-width="120" prop="mchName">
|
||||
<el-form-item label="收款用户" label-width="120" prop="mchName" v-if="notHasView(views.mch)">
|
||||
<el-input
|
||||
v-model="queryParams.mchName"
|
||||
placeholder="请输入收款用户名称"
|
||||
|
|
@ -41,45 +53,49 @@
|
|||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="设备充值状态" prop="deviceRechargeStatus" label-width="7em">
|
||||
<el-select v-model="queryParams.deviceRechargeStatus" clearable placeholder="请选择设备充值状态" @change="handleQuery">
|
||||
<el-option
|
||||
v-for="dict in dict.type.sm_transaction_bill_device_recharge_status"
|
||||
:key="dict.value"
|
||||
:label="dict.label"
|
||||
:value="dict.value"
|
||||
/>
|
||||
</el-select>
|
||||
<el-form-item label="店铺名称" label-width="120" prop="storeName" v-if="notHasView(views.store)">
|
||||
<el-input
|
||||
v-model="queryParams.storeName"
|
||||
placeholder="请输入店铺名称"
|
||||
clearable
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="支付方式" prop="channelId">
|
||||
<el-select v-model="queryParams.channelId" clearable placeholder="请选择支付方式" @change="handleQuery">
|
||||
<el-option
|
||||
v-for="dict in dict.type.channel_type"
|
||||
:key="dict.value"
|
||||
:label="dict.label"
|
||||
:value="dict.value"
|
||||
/>
|
||||
</el-select>
|
||||
<el-form-item label="订单金额" label-width="120" prop="money">
|
||||
<el-input
|
||||
v-model="queryParams.money"
|
||||
placeholder="请输入订单金额（元）"
|
||||
clearable
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="收费模式" prop="suitFeeMode">
|
||||
<el-select v-model="queryParams.suitFeeMode" clearable placeholder="请选择收费模式" @change="handleQuery">
|
||||
<el-option
|
||||
v-for="dict in dict.type.suit_fee_mode"
|
||||
:key="dict.value"
|
||||
:label="dict.label"
|
||||
:value="dict.value"
|
||||
/>
|
||||
</el-select>
|
||||
<el-form-item label="支付方式" prop="channelIds">
|
||||
<el-checkbox-group v-model="queryParams.channelIds" @change="handleQuery" size="mini">
|
||||
<el-checkbox-button v-for="dict in dict.type.channel_type" :label="dict.value" :key="dict.value">
|
||||
{{dict.label}}
|
||||
</el-checkbox-button>
|
||||
</el-checkbox-group>
|
||||
</el-form-item>
|
||||
<el-form-item label="收费方式" prop="suitFeeType">
|
||||
<el-select v-model="queryParams.suitFeeType" clearable placeholder="请选择收费方式" @change="handleQuery">
|
||||
<el-option
|
||||
v-for="dict in dict.type.suit_fee_type"
|
||||
:key="dict.value"
|
||||
:label="dict.label"
|
||||
:value="dict.value"
|
||||
/>
|
||||
</el-select>
|
||||
<el-form-item label="收费模式" prop="suitFeeModes">
|
||||
<el-checkbox-group v-model="queryParams.suitFeeModes" @change="handleQuery" size="mini">
|
||||
<el-checkbox-button v-for="dict in dict.type.suit_fee_mode" :label="dict.value" :key="dict.value">
|
||||
{{dict.label}}
|
||||
</el-checkbox-button>
|
||||
</el-checkbox-group>
|
||||
</el-form-item>
|
||||
<el-form-item label="收费方式" prop="suitFeeTypes">
|
||||
<el-checkbox-group v-model="queryParams.suitFeeTypes" @change="handleQuery" size="mini">
|
||||
<el-checkbox-button v-for="dict in dict.type.suit_fee_type" :label="dict.value" :key="dict.value">
|
||||
{{dict.label}}
|
||||
</el-checkbox-button>
|
||||
</el-checkbox-group>
|
||||
</el-form-item>
|
||||
<el-form-item label="设备充值状态" prop="deviceRechargeStatusList" label-width="7em">
|
||||
<el-checkbox-group v-model="queryParams.deviceRechargeStatusList" @change="handleQuery" size="mini">
|
||||
<el-checkbox-button v-for="dict in dict.type.sm_transaction_bill_device_recharge_status" :label="dict.value" :key="dict.value">
|
||||
{{dict.label}}
|
||||
</el-checkbox-button>
|
||||
</el-checkbox-group>
|
||||
</el-form-item>
|
||||
<el-form-item label="交易状态" prop="statusList">
|
||||
<el-checkbox-group v-model="queryParams.statusList" @change="handleQuery" size="mini">
|
||||
|
|
@ -121,6 +137,7 @@
|
|||
:sortable="column.sortable"
|
||||
:show-overflow-tooltip="column.overflow"
|
||||
:width="column.width"
|
||||
:fixed="column.fixed"
|
||||
>
|
||||
<template slot-scope="d">
|
||||
<template v-if="column.key === 'billId'">
|
||||
|
|
@ -138,6 +155,12 @@
|
|||
<template v-else-if="column.key === 'mchName'">
|
||||
<user-link :id="d.row.mchId" :name="d.row.mchName"/>
|
||||
</template>
|
||||
<template v-else-if="column.key === 'storeId'">
|
||||
<store-link :id="d.row.storeId" :name="d.row.storeName"/>
|
||||
</template>
|
||||
<template v-else-if="column.key === 'channelId'">
|
||||
<dict-tag :value="d.row.channelId" :options="dict.type.channel_type"/>
|
||||
</template>
|
||||
<template v-else-if="column.key === 'suitFeeMode'">
|
||||
<dict-tag :value="d.row.suitFeeMode" :options="dict.type.suit_fee_mode"/>
|
||||
</template>
|
||||
|
|
@ -152,9 +175,31 @@
|
|||
<el-tag type="success" v-else-if="d.row.isFinished">已结束</el-tag>
|
||||
<el-tag type="info" v-else>未开始</el-tag>
|
||||
</template>
|
||||
<template v-else-if="['money', 'serviceCharge', 'channelCost', 'arrivalAmount'].includes(column.key)">
|
||||
<template v-else-if="column.key === 'deviceRechargeStatus'">
|
||||
<dict-tag :value="d.row.deviceRechargeStatus" :options="dict.type.sm_transaction_bill_device_recharge_status"/>
|
||||
</template>
|
||||
<template v-else-if="column.key === 'suitDeviceInfo'">
|
||||
<div>开始时间:{{d.row.suitStartTime | defaultValue}}</div>
|
||||
<div>结束时间:{{d.row.suitEndTime | defaultValue}}</div>
|
||||
<div>失效时间:{{d.row.suitExpireTime | defaultValue}}</div>
|
||||
<div>起始总用电量:{{d.row.suitStartEle | defaultValue}} 度</div>
|
||||
<div>结束总用电量:{{d.row.suitEndEle | defaultValue}} 度</div>
|
||||
</template>
|
||||
<template v-else-if="['channelCost'].includes(column.key)">
|
||||
{{d.row[column.key] | money | defaultValue}} 元
|
||||
</template>
|
||||
<template v-else-if="column.key === 'money'">
|
||||
{{d.row.money | money | defaultValue}} 元
|
||||
<div v-if="d.row.refundAmount">退款 {{d.row.refundAmount | money | defaultValue}} 元</div>
|
||||
</template>
|
||||
<template v-else-if="column.key === 'arrivalAmount'">
|
||||
{{d.row.arrivalAmount | money | defaultValue}} 元
|
||||
<div v-if="d.row.refundMchAmount">退款 {{d.row.refundMchAmount | money | defaultValue}} 元</div>
|
||||
</template>
|
||||
<template v-else-if="column.key === 'serviceCharge'">
|
||||
{{d.row.serviceCharge | money | defaultValue}} 元
|
||||
<div v-if="d.row.refundServiceAmount">退款 {{d.row.refundServiceAmount | money | defaultValue}} 元</div>
|
||||
</template>
|
||||
<template v-else>
|
||||
{{d.row[column.key] | defaultValue}}
|
||||
</template>
|
||||
|
|
@ -254,7 +299,8 @@ import UserLink from '@/components/Business/SmUser/UserLink.vue'
|
|||
import DeviceLink from '@/components/Business/Device/DeviceLink.vue'
|
||||
import RechargeLink from '@/components/Business/Transaction/RechargeLink.vue'
|
||||
import { RechargeStatus, SuitFeeType } from '@/utils/constants'
|
||||
import { $showColumns } from '@/utils/mixins'
|
||||
import { $showColumns, $view } from '@/utils/mixins'
|
||||
import StoreLink from '@/components/Business/Store/StoreLink.vue'
|
||||
|
||||
// 默认排序字段
|
||||
const defaultSort = {
|
||||
|
|
@ -264,9 +310,15 @@ const defaultSort = {
|
|||
|
||||
export default {
|
||||
name: "Recharge",
|
||||
mixins: [$showColumns],
|
||||
components: { RechargeLink, DeviceLink, UserLink },
|
||||
mixins: [$showColumns, $view],
|
||||
components: { StoreLink, RechargeLink, DeviceLink, UserLink },
|
||||
dicts: ['channel_type','sm_transaction_bill_status', 'sm_transaction_bill_device_recharge_status', 'suit_fee_mode', 'suit_fee_type'],
|
||||
props: {
|
||||
query: {
|
||||
type: Object,
|
||||
default: () => {}
|
||||
}
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
defaultSort,
|
||||
|
|
@ -274,20 +326,24 @@ export default {
|
|||
orderSorts: ['ascending', 'descending', null],
|
||||
// 字段列表
|
||||
columns: [
|
||||
{key: 'billId', visible: false, label: '订单ID', minWidth: null, sortable: true, overflow: false, align: 'center', width: "80"},
|
||||
{key: 'createTime', visible: true, label: '时间', minWidth: null, sortable: true, overflow: false, align: 'center', width: "100"},
|
||||
{key: 'billNo', visible: true, label: '订单编号', minWidth: null, sortable: true, overflow: false, align: 'center', width: "100"},
|
||||
{key: 'userName', visible: true, label: '充值用户', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
|
||||
{key: 'deviceName', visible: true, label: '设备名称/SN', minWidth: null, sortable: true, overflow: false, align: 'center', width: "120"},
|
||||
{key: 'mchName', visible: true, label: '商户', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
|
||||
{key: 'money', visible: true, label: '交易金额', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
|
||||
{key: 'arrivalAmount', visible: true, label: '到账金额', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
|
||||
{key: 'serviceCharge', visible: true, label: '手续费', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
|
||||
{key: 'channelCost', visible: true, label: '成本', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
|
||||
{key: 'suitFeeMode', visible: true, label: '收费模式', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
|
||||
{key: 'suitFeeType', visible: true, label: '收费方式', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
|
||||
{key: 'status', visible: true, label: '交易状态', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
|
||||
{key: 'isUsing', visible: true, label: '使用状态', minWidth: null, sortable: false, overflow: false, align: 'center', width: null},
|
||||
{key: 'billId', visible: false, label: '订单ID', minWidth: null, sortable: true, overflow: false, align: 'center', width: "80", fixed: 'left'},
|
||||
{key: 'createTime', visible: true, label: '时间', minWidth: null, sortable: true, overflow: false, align: 'center', width: "100", fixed: 'left'},
|
||||
{key: 'billNo', visible: true, label: '订单编号', minWidth: null, sortable: true, overflow: false, align: 'center', width: "100", fixed: 'left'},
|
||||
{key: 'userName', visible: true, label: '充值用户', minWidth: null, sortable: false, overflow: false, align: 'center', width: null, fixed: null},
|
||||
{key: 'deviceName', visible: true, label: '设备名称/SN', minWidth: null, sortable: false, overflow: false, align: 'center', width: "120", fixed: null},
|
||||
{key: 'mchName', visible: true, label: '收款用户', minWidth: null, sortable: false, overflow: false, align: 'center', width: null, fixed: null},
|
||||
{key: 'storeId', visible: false, label: '店铺', minWidth: null, sortable: false, overflow: false, align: 'center', width: null, fixed: null},
|
||||
{key: 'money', visible: true, label: '订单金额', minWidth: null, sortable: true, overflow: false, align: 'center', width: "100", fixed: null},
|
||||
{key: 'arrivalAmount', visible: true, label: '到账金额', minWidth: null, sortable: true, overflow: false, align: 'center', width: "100", fixed: null},
|
||||
{key: 'serviceCharge', visible: true, label: '手续费', minWidth: null, sortable: true, overflow: false, align: 'center', width: "100", fixed: null},
|
||||
{key: 'channelCost', visible: true, label: '成本', minWidth: null, sortable: true, overflow: false, align: 'center', width: null, fixed: null},
|
||||
{key: 'channelId', visible: true, label: '支付方式', minWidth: null, sortable: false, overflow: false, align: 'center', width: "120", fixed: null},
|
||||
{key: 'suitFeeMode', visible: true, label: '收费模式', minWidth: null, sortable: false, overflow: false, align: 'center', width: null, fixed: null},
|
||||
{key: 'suitFeeType', visible: true, label: '收费方式', minWidth: null, sortable: false, overflow: false, align: 'center', width: "120", fixed: null},
|
||||
{key: 'status', visible: true, label: '交易状态', minWidth: null, sortable: false, overflow: false, align: 'center', width: null, fixed: null},
|
||||
{key: 'isUsing', visible: true, label: '使用状态', minWidth: null, sortable: false, overflow: false, align: 'center', width: null, fixed: null},
|
||||
{key: 'deviceRechargeStatus', visible: true, label: '设备状态', minWidth: null, sortable: false, overflow: false, align: 'center', width: null, fixed: null},
|
||||
{key: 'suitDeviceInfo', visible: false, label: '设备套餐详情', minWidth: null, sortable: false, overflow: false, align: 'center', width: "250", fixed: null},
|
||||
],
|
||||
// 遮罩层
|
||||
loading: true,
|
||||
|
|
@ -310,7 +366,7 @@ export default {
|
|||
// 查询参数
|
||||
queryParams: {
|
||||
pageNum: 1,
|
||||
pageSize: 10,
|
||||
pageSize: 20,
|
||||
orderByColumn: defaultSort.prop,
|
||||
isAsc: defaultSort.order,
|
||||
userName: null,
|
||||
|
|
@ -318,6 +374,10 @@ export default {
|
|||
landlordName: null,
|
||||
type: "1", // 充值
|
||||
statusList: ['1','2','3','6','7','8','9'],
|
||||
channelIds: [],
|
||||
suitFeeTypes: [],
|
||||
suitFeeModes: [],
|
||||
deviceRechargeStatusList: []
|
||||
},
|
||||
// 表单参数
|
||||
form: {},
|
||||
|
|
@ -352,11 +412,33 @@ export default {
|
|||
},
|
||||
canClose() {
|
||||
return (row) => {
|
||||
// （支付成功或者押金支付成功） 且 订单未完成
|
||||
return [RechargeStatus.PAY_SUCCESS, RechargeStatus.DEPOSIT_SUCCESS].includes(row.status) && !row.isFinished;
|
||||
}
|
||||
}
|
||||
},
|
||||
},
|
||||
created() {
|
||||
this.queryParams = {
|
||||
...this.queryParams,
|
||||
...this.query
|
||||
}
|
||||
|
||||
// 隐藏搜索
|
||||
if (this.view != null) {
|
||||
this.showSearch = false;
|
||||
}
|
||||
|
||||
// 根据当前视图隐藏部分列
|
||||
if (this.hasView(this.views.user)) {
|
||||
this.hideColumn(['userName'])
|
||||
} else if (this.hasView(this.views.mch)) {
|
||||
this.hideColumn(['mchName'])
|
||||
} else if (this.hasView(this.views.store)) {
|
||||
this.hideColumn(['storeId'])
|
||||
} else if (this.hasView(this.views.device)) {
|
||||
this.hideColumn(['deviceName'])
|
||||
}
|
||||
|
||||
this.getList();
|
||||
},
|
||||
methods: {
|
||||
|
|
|
|||
|
|
@ -124,7 +124,7 @@ export default {
|
|||
// 查询参数
|
||||
queryParams: {
|
||||
pageNum: 1,
|
||||
pageSize: 10,
|
||||
pageSize: 20,
|
||||
roleId: undefined,
|
||||
userName: undefined,
|
||||
phonenumber: undefined
|
||||
|
|
@ -196,4 +196,4 @@ export default {
|
|||
}
|
||||
}
|
||||
};
|
||||
</script>
|
||||
</script>
|
||||
|
|
|
|||
|
|
@ -316,7 +316,7 @@ export default {
|
|||
// 查询参数
|
||||
queryParams: {
|
||||
pageNum: 1,
|
||||
pageSize: 10,
|
||||
pageSize: 20,
|
||||
roleName: undefined,
|
||||
roleKey: undefined,
|
||||
status: undefined
|
||||
|
|
@ -602,4 +602,4 @@ export default {
|
|||
}
|
||||
}
|
||||
};
|
||||
</script>
|
||||
</script>
|
||||
|
|
|
|||
|
|
@ -79,7 +79,7 @@ export default {
|
|||
// 查询参数
|
||||
queryParams: {
|
||||
pageNum: 1,
|
||||
pageSize: 10,
|
||||
pageSize: 20,
|
||||
roleId: undefined,
|
||||
userName: undefined,
|
||||
phonenumber: undefined
|
||||
|
|
|
|||
|
|
@ -44,7 +44,7 @@ export default {
|
|||
loading: false,
|
||||
queryParams: {
|
||||
pageNum: 1,
|
||||
pageSize: 10,
|
||||
pageSize: 20,
|
||||
userId: null,
|
||||
},
|
||||
total: 0,
|
||||
|
|
|
|||
|
|
@ -56,7 +56,7 @@ export default {
|
|||
loading: false,
|
||||
queryParams: {
|
||||
pageNum: 1,
|
||||
pageSize: 10,
|
||||
pageSize: 20,
|
||||
userId: null,
|
||||
},
|
||||
total: 0,
|
||||
|
|
|
|||
|
|
@ -52,7 +52,7 @@
|
|||
<el-card class="box-card">
|
||||
<el-tabs>
|
||||
<el-tab-pane label="设备列表" lazy>
|
||||
<user-device :user-id="userData.userId"/>
|
||||
<device v-if="userData.userId != null" :query="{userId: userData.userId}" :view="views.user"/>
|
||||
</el-tab-pane>
|
||||
<el-tab-pane label="店铺列表" lazy>
|
||||
<store :query="{userId: userData.userId}" :view="views.user"/>
|
||||
|
|
@ -60,15 +60,18 @@
|
|||
<el-tab-pane label="套餐列表" lazy>
|
||||
<suit :query="{userId: userData.userId}" :view="views.user"/>
|
||||
</el-tab-pane>
|
||||
<el-tab-pane label="账户列表" lazy>
|
||||
<account :query="{userId: userData.userId}" :view="views.user"/>
|
||||
<el-tab-pane label="充值订单" lazy>
|
||||
<recharge :query="{userId: userData.userId}" :view="views.user"/>
|
||||
</el-tab-pane>
|
||||
<el-tab-pane label="充值提现记录" lazy>
|
||||
<user-account :landlord-id="userData.userId"/>
|
||||
<el-tab-pane label="收入订单" lazy>
|
||||
<recharge :query="{mchId: userData.userId}" :view="views.mch"/>
|
||||
</el-tab-pane>
|
||||
<el-tab-pane label="余额变化记录" lazy>
|
||||
<el-tab-pane label="账变记录" lazy>
|
||||
<record-balance :query="{userId: userData.userId}" :view="views.user"/>
|
||||
</el-tab-pane>
|
||||
<el-tab-pane label="收款账户" lazy>
|
||||
<account :query="{userId: userData.userId}" :view="views.user"/>
|
||||
</el-tab-pane>
|
||||
<el-tab-pane label="用户秘钥" lazy>
|
||||
<access :query="{userId: userData.userId}" :view="views.user"/>
|
||||
</el-tab-pane>
|
||||
|
|
@ -91,11 +94,13 @@ import Store from '@/views/ss/store/index.vue'
|
|||
import RecordBalance from '@/views/ss/recordBalance/index.vue'
|
||||
import Account from '@/views/ss/account/index.vue'
|
||||
import Suit from '@/views/ss/suit/index.vue'
|
||||
import Device from '@/views/system/device/index.vue'
|
||||
import Recharge from '@/views/system/recharge/index.vue'
|
||||
|
||||
export default {
|
||||
name: 'User/:userId',
|
||||
mixins: [$view, $serviceType],
|
||||
components: { Suit, Account, RecordBalance, Store, Access, UserRechargeReport, UserAccount, UserDevice, LineChart},
|
||||
components: { Recharge, Device, Suit, Account, RecordBalance, Store, Access, UserRechargeReport, UserAccount, UserDevice, LineChart},
|
||||
dicts: ['sm_user_type', 'service_type', 'withdraw_service_type'],
|
||||
computed: {
|
||||
serviceUnit() {
|
||||
|
|
|
|||
|
|
@ -348,7 +348,7 @@ export default {
|
|||
// 查询参数
|
||||
queryParams: {
|
||||
pageNum: 1,
|
||||
pageSize: 10,
|
||||
pageSize: 20,
|
||||
orderByColumn: defaultSort.prop,
|
||||
isAsc: defaultSort.order,
|
||||
isMch: null,
|
||||
|
|
|
|||
|
|
@ -57,7 +57,7 @@ export default {
|
|||
// 分页信息
|
||||
total: 0,
|
||||
pageNum: 1,
|
||||
pageSize: 10,
|
||||
pageSize: 20,
|
||||
// 选中角色编号
|
||||
roleIds:[],
|
||||
// 角色信息
|
||||
|
|
@ -114,4 +114,4 @@ export default {
|
|||
},
|
||||
},
|
||||
};
|
||||
</script>
|
||||
</script>
|
||||
|
|
|
|||
|
|
@ -406,7 +406,7 @@ export default {
|
|||
// 查询参数
|
||||
queryParams: {
|
||||
pageNum: 1,
|
||||
pageSize: 10,
|
||||
pageSize: 20,
|
||||
userName: undefined,
|
||||
phonenumber: undefined,
|
||||
status: undefined,
|
||||
|
|
@ -667,4 +667,4 @@ export default {
|
|||
}
|
||||
}
|
||||
};
|
||||
</script>
|
||||
</script>
|
||||
|
|
|
|||
|
|
@ -206,7 +206,7 @@ export default {
|
|||
// 查询参数
|
||||
queryParams: {
|
||||
pageNum: 1,
|
||||
pageSize: 10,
|
||||
pageSize: 20,
|
||||
userName: null,
|
||||
deviceName: null,
|
||||
mchName: null,
|
||||
|
|
|
|||
|
|
@ -62,7 +62,7 @@ export default {
|
|||
// 查询参数
|
||||
queryParams: {
|
||||
pageNum: 1,
|
||||
pageSize: 10,
|
||||
pageSize: 20,
|
||||
tableName: undefined,
|
||||
tableComment: undefined
|
||||
}
|
||||
|
|
|
|||
|
|
@ -215,7 +215,7 @@ export default {
|
|||
// 查询参数
|
||||
queryParams: {
|
||||
pageNum: 1,
|
||||
pageSize: 10,
|
||||
pageSize: 20,
|
||||
tableName: undefined,
|
||||
tableComment: undefined
|
||||
},
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user