chuangte/smart-switch-ui
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

新增计时订单（未完成）

Browse Source
This commit is contained in:
墨大叔 2024-07-24 18:05:56 +08:00
parent ec4933fd12
commit 787fe619f5
8 changed files with 1075 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/api/ss/payBill.js Normal file
View File

@ -0,0 +1,44 @@
import request from '@/utils/request'
// 查询支付订单列表
export function listPayBill(query) {
return request({
url: '/ss/payBill/list',
method: 'get',
params: query
})
}
// 查询支付订单详细
export function getPayBill(payId) {
return request({
url: '/ss/payBill/' + payId,
method: 'get'
})
}
// 新增支付订单
export function addPayBill(data) {
return request({
url: '/ss/payBill',
method: 'post',
data: data
})
}
// 修改支付订单
export function updatePayBill(data) {
return request({
url: '/ss/payBill',
method: 'put',
data: data
})
}
// 删除支付订单
export function delPayBill(payId) {
return request({
url: '/ss/payBill/' + payId,
method: 'delete'
})
}

44
src/api/ss/timeBill.js Normal file
View File

@ -0,0 +1,44 @@
import request from '@/utils/request'
// 查询时长订单列表
export function listTimeBill(query) {
return request({
url: '/ss/timeBill/list',
method: 'get',
params: query
})
}
// 查询时长订单详细
export function getTimeBill(billId) {
return request({
url: '/ss/timeBill/' + billId,
method: 'get'
})
}
// 新增时长订单
export function addTimeBill(data) {
return request({
url: '/ss/timeBill',
method: 'post',
data: data
})
}
// 修改时长订单
export function updateTimeBill(data) {
return request({
url: '/ss/timeBill',
method: 'put',
data: data
})
}
// 删除时长订单
export function delTimeBill(billId) {
return request({
url: '/ss/timeBill/' + billId,
method: 'delete'
})
}

419
src/views/ss/payBill/index.vue Normal file
View File

@ -0,0 +1,419 @@
<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="支付订单ID" prop="payId">
<el-input
v-model="queryParams.payId"
placeholder="请输入支付订单ID"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="支付订单编号" prop="payNo">
<el-input
v-model="queryParams.payNo"
placeholder="请输入支付订单编号"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="业务类型" prop="bstType">
<el-select v-model="queryParams.bstType" placeholder="请选择业务类型" clearable>
<el-option
v-for="dict in dict.type.pay_bill_bst_type"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item label="业务ID" prop="bstId">
<el-input
v-model="queryParams.bstId"
placeholder="请输入业务ID"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="支付渠道ID" prop="channelId">
<el-input
v-model="queryParams.channelId"
placeholder="请输入支付渠道ID"
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.pay_bill_status"
: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="['ss:payBill: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:payBill: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="['ss:payBill: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="['ss:payBill:export']"
>导出</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="payBillList" @selection-change="handleSelectionChange" :default-sort="defaultSort" @sort-change="onSortChange">
<el-table-column type="selection" width="55" align="center" />
<template v-for="column of showColumns">
<el-table-column
:key="column.key"
:label="column.label"
:prop="column.key"
:align="column.align"
:min-width="column.minWidth"
:sort-orders="orderSorts"
:sortable="column.sortable"
:show-overflow-tooltip="column.overflow"
>
<template slot-scope="d">
<template v-if="column.key === 'payId'">
{{d.row[column.key]}}
</template>
<template v-else-if="column.key === 'bstType'">
<dict-tag :options="dict.type.pay_bill_bst_type" :value="d.row[column.key]"/>
</template>
<template v-else-if="column.key === 'status'">
<dict-tag :options="dict.type.pay_bill_status" :value="d.row[column.key]"/>
</template>
<template v-else>
{{d.row[column.key]}}
</template>
</template>
</el-table-column>
</template>
<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="['ss:payBill:edit']"
>修改</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['ss:payBill: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="支付订单编号" prop="payNo">
<el-input v-model="form.payNo" placeholder="请输入支付订单编号" />
</el-form-item>
<el-form-item label="业务类型" prop="bstType">
<el-select v-model="form.bstType" placeholder="请选择业务类型">
<el-option
v-for="dict in dict.type.pay_bill_bst_type"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="业务ID" prop="bstId">
<el-input v-model="form.bstId" placeholder="请输入业务ID" />
</el-form-item>
<el-form-item label="订单金额" prop="amount">
<el-input v-model="form.amount" placeholder="请输入订单金额" />
</el-form-item>
<el-form-item label="支付渠道ID" prop="channelId">
<el-input v-model="form.channelId" placeholder="请输入支付渠道ID" />
</el-form-item>
<el-form-item label="支付状态" prop="status">
<el-radio-group v-model="form.status">
<el-radio
v-for="dict in dict.type.pay_bill_status"
:key="dict.value"
:label="dict.value"
>{{dict.label}}</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="支付时间" prop="payTime">
<el-date-picker clearable
v-model="form.payTime"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择支付时间">
</el-date-picker>
</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 { listPayBill, getPayBill, delPayBill, addPayBill, updatePayBill } from "@/api/ss/payBill";
import { $showColumns } from '@/utils/mixins';
// 默认排序字段
const defaultSort = {
prop: "createTime",
order: "descending"
}
export default {
name: "PayBill",
mixins: [$showColumns],
dicts: ['pay_bill_status', 'pay_bill_bst_type'],
data() {
return {
// 字段列表
columns: [
{key: 'payId', visible: true, label: '支付订单ID', minWidth: null, sortable: true, overflow: false, align: 'center'},
{key: 'payNo', visible: true, label: '支付订单编号', minWidth: null, sortable: true, overflow: false, align: 'center'},
{key: 'bstType', visible: true, label: '业务类型', minWidth: null, sortable: true, overflow: false, align: 'center'},
{key: 'bstId', visible: true, label: '业务ID', minWidth: null, sortable: true, overflow: false, align: 'center'},
{key: 'amount', visible: true, label: '订单金额（元）', minWidth: null, sortable: true, overflow: false, align: 'center'},
{key: 'channelId', visible: true, label: '支付渠道ID', minWidth: null, sortable: true, overflow: false, align: 'center'},
{key: 'status', visible: true, label: '支付状态', minWidth: null, sortable: true, overflow: false, align: 'center'},
{key: 'payTime', visible: true, label: '支付时间', minWidth: "120", sortable: false, overflow: false, align: 'center'},
],
// 排序方式
orderSorts: ['ascending', 'descending', null],
// 遮罩层
loading: true,
// 选中数组
ids: [],
// 非单个禁用
single: true,
// 非多个禁用
multiple: true,
// 显示搜索条件
showSearch: true,
// 总条数
total: 0,
// 支付订单表格数据
payBillList: [],
// 弹出层标题
title: "",
// 是否显示弹出层
open: false,
defaultSort,
// 查询参数
queryParams: {
pageNum: 1,
pageSize: 10,
orderByColumn: defaultSort.prop,
isAsc: defaultSort.order,
payId: null,
payNo: null,
bstType: null,
bstId: null,
channelId: null,
status: null,
},
// 表单参数
form: {},
// 表单校验
rules: {
payNo: [
{ required: true, message: "支付订单编号不能为空", trigger: "blur" }
],
bstType: [
{ required: true, message: "业务类型不能为空", trigger: "change" }
],
bstId: [
{ required: true, message: "业务ID不能为空", trigger: "blur" }
],
amount: [
{ required: true, message: "订单金额不能为空", trigger: "blur" }
],
channelId: [
{ required: true, message: "支付渠道ID不能为空", trigger: "blur" }
],
status: [
{ required: true, message: "支付状态不能为空", trigger: "change" }
],
createTime: [
{ required: true, message: "创建时间不能为空", trigger: "blur" }
]
}
};
},
created() {
this.getList();
},
methods: {
/** 当排序按钮被点击时触发 **/
onSortChange(column) {
if (column.order == null) {
this.queryParams.orderByColumn = defaultSort.prop;
this.queryParams.isAsc = defaultSort.order;
} else {
this.queryParams.orderByColumn = column.prop;
this.queryParams.isAsc = column.order;
}
this.getList();
},
/** 查询支付订单列表 */
getList() {
this.loading = true;
listPayBill(this.queryParams).then(response => {
this.payBillList = response.rows;
this.total = response.total;
this.loading = false;
});
},
// 取消按钮
cancel() {
this.open = false;
this.reset();
},
// 表单重置
reset() {
this.form = {
payId: null,
payNo: null,
bstType: null,
bstId: null,
amount: null,
channelId: null,
status: null,
payTime: null,
createTime: null
};
this.resetForm("form");
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1;
this.getList();
},
/** 重置按钮操作 */
resetQuery() {
this.resetForm("queryForm");
this.handleQuery();
},
// 多选框选中数据
handleSelectionChange(selection) {
this.ids = selection.map(item => item.payId)
this.single = selection.length!==1
this.multiple = !selection.length
},
/** 新增按钮操作 */
handleAdd() {
this.reset();
this.open = true;
this.title = "添加支付订单";
},
/** 修改按钮操作 */
handleUpdate(row) {
this.reset();
const payId = row.payId || this.ids
getPayBill(payId).then(response => {
this.form = response.data;
this.open = true;
this.title = "修改支付订单";
});
},
/** 提交按钮 */
submitForm() {
this.$refs["form"].validate(valid => {
if (valid) {
if (this.form.payId != null) {
updatePayBill(this.form).then(response => {
this.$modal.msgSuccess("修改成功");
this.open = false;
this.getList();
});
} else {
addPayBill(this.form).then(response => {
this.$modal.msgSuccess("新增成功");
this.open = false;
this.getList();
});
}
}
});
},
/** 删除按钮操作 */
handleDelete(row) {
const payIds = row.payId || this.ids;
this.$modal.confirm('是否确认删除支付订单编号为"' + payIds + '"的数据项？').then(function() {
return delPayBill(payIds);
}).then(() => {
this.getList();
this.$modal.msgSuccess("删除成功");
}).catch(() => {});
},
/** 导出按钮操作 */
handleExport() {
this.download('ss/payBill/export', {
...this.queryParams
}, `payBill_${new Date().getTime()}.xlsx`)
}
}
};
</script>

8
src/views/ss/suit/index.vue
View File

@ -134,7 +134,7 @@
<template #append>
<el-select v-model="form.timeUnit" style="width: 6em">
<el-option
v-for="option of dict.type.suit_time_unit"
v-for="option of dict.type.time_unit"
:key="option.value"
:label="option.label"
:value="option.value"
@ -144,7 +144,7 @@
</el-input>
</el-form-item>
<el-form-item label="价格" prop="price">
<el-input-number v-model="form.price" placeholder="请输入价格(元）" :min="0" :precision="2"/> 元
<el-input-number v-model="form.price" placeholder="请输入价格(元）" :min="0.01" :precision="2"/> 元
</el-form-item>
<el-form-item label="详细说明" prop="description">
<el-input v-model="form.description" placeholder="请输入详细说明" type="textarea" />
@ -165,12 +165,12 @@ import { findLabel } from '@/utils'
export default {
name: "Suit",
dicts: ['suit_time_unit'],
dicts: ['time_unit'],
computed: {
// 时长单位
suitTimeUnit() {
return (unit) => {
return findLabel(this.dict.type.suit_time_unit, unit);
return findLabel(this.dict.type.time_unit, unit);
}
}
},

508
src/views/ss/timeBill/index.vue Normal file
View File

@ -0,0 +1,508 @@
<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="订单ID" prop="billId">
<el-input
v-model="queryParams.billId"
placeholder="请输入订单ID"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="订单编号" prop="billNo">
<el-input
v-model="queryParams.billNo"
placeholder="请输入订单编号"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="用户ID" prop="userId">
<el-input
v-model="queryParams.userId"
placeholder="请输入用户ID"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="设备ID" prop="deviceId">
<el-input
v-model="queryParams.deviceId"
placeholder="请输入设备ID"
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.time_bill_status"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item label="到账人id" prop="mchId">
<el-input
v-model="queryParams.mchId"
placeholder="请输入到账人id"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="支付成功的渠道ID" prop="channelId">
<el-input
v-model="queryParams.channelId"
placeholder="请输入支付成功的渠道ID"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="删除标志" prop="deleted">
<el-input
v-model="queryParams.deleted"
placeholder="请输入删除标志"
clearable
@keyup.enter.native="handleQuery"
/>
</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="['ss:timeBill: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:timeBill: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="['ss:timeBill: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="['ss:timeBill:export']"
>导出</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="timeBillList" @selection-change="handleSelectionChange" :default-sort="defaultSort" @sort-change="onSortChange">
<el-table-column type="selection" width="55" align="center" />
<template v-for="column of showColumns">
<el-table-column
:key="column.key"
:label="column.label"
:prop="column.key"
:align="column.align"
:min-width="column.minWidth"
:sort-orders="orderSorts"
:sortable="column.sortable"
:show-overflow-tooltip="column.overflow"
>
<template slot-scope="d">
<template v-if="column.key === 'billId'">
{{d.row[column.key]}}
</template>
<template v-else-if="column.key === 'status'">
<dict-tag :options="dict.type.time_bill_status" :value="d.row[column.key]"/>
</template>
<template v-else>
{{d.row[column.key]}}
</template>
</template>
</el-table-column>
</template>
<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="['ss:timeBill:edit']"
>修改</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['ss:timeBill: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="订单编号" prop="billNo">
<el-input v-model="form.billNo" placeholder="请输入订单编号" />
</el-form-item>
<el-form-item label="用户ID" prop="userId">
<el-input v-model="form.userId" placeholder="请输入用户ID" />
</el-form-item>
<el-form-item label="设备ID" prop="deviceId">
<el-input v-model="form.deviceId" placeholder="请输入设备ID" />
</el-form-item>
<el-form-item label="状态" prop="status">
<el-radio-group v-model="form.status">
<el-radio
v-for="dict in dict.type.time_bill_status"
:key="dict.value"
:label="dict.value"
>{{dict.label}}</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="订单金额" prop="amount">
<el-input v-model="form.amount" placeholder="请输入订单金额" />
</el-form-item>
<el-form-item label="设备起步时长" prop="deviceStartTime">
<el-input v-model="form.deviceStartTime" placeholder="请输入设备起步时长" />
</el-form-item>
<el-form-item label="设备起步时长单位" prop="deviceStartUnit">
<el-input v-model="form.deviceStartUnit" placeholder="请输入设备起步时长单位" />
</el-form-item>
<el-form-item label="设备起步价格" prop="deviceStartPrice">
<el-input v-model="form.deviceStartPrice" placeholder="请输入设备起步价格" />
</el-form-item>
<el-form-item label="设备超出起步时长" prop="deviceOverTime">
<el-input v-model="form.deviceOverTime" placeholder="请输入设备超出起步时长" />
</el-form-item>
<el-form-item label="设备超出起步时长单位" prop="deviceOverUnit">
<el-input v-model="form.deviceOverUnit" placeholder="请输入设备超出起步时长单位" />
</el-form-item>
<el-form-item label="设备超出起步时长价格" prop="deviceOverPrice">
<el-input v-model="form.deviceOverPrice" placeholder="请输入设备超出起步时长价格" />
</el-form-item>
<el-form-item label="开始使用的时间" prop="startTime">
<el-date-picker clearable
v-model="form.startTime"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择开始使用的时间">
</el-date-picker>
</el-form-item>
<el-form-item label="结束使用的时间" prop="endTime">
<el-date-picker clearable
v-model="form.endTime"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择结束使用的时间">
</el-date-picker>
</el-form-item>
<el-form-item label="到账人id" prop="mchId">
<el-input v-model="form.mchId" placeholder="请输入到账人id" />
</el-form-item>
<el-form-item label="到账金额" prop="arrivalAmount">
<el-input v-model="form.arrivalAmount" placeholder="请输入到账金额" />
</el-form-item>
<el-form-item label="服务费" prop="serviceAmount">
<el-input v-model="form.serviceAmount" placeholder="请输入服务费" />
</el-form-item>
<el-form-item label="支付成功的渠道ID" prop="channelId">
<el-input v-model="form.channelId" placeholder="请输入支付成功的渠道ID" />
</el-form-item>
<el-form-item label="渠道成本" prop="channelCost">
<el-input v-model="form.channelCost" placeholder="请输入渠道成本" />
</el-form-item>
<el-form-item label="删除标志" prop="deleted">
<el-input v-model="form.deleted" placeholder="请输入删除标志" />
</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 { listTimeBill, getTimeBill, delTimeBill, addTimeBill, updateTimeBill } from "@/api/ss/timeBill";
import { $showColumns } from '@/utils/mixins';
// 默认排序字段
const defaultSort = {
prop: "createTime",
order: "descending"
}
export default {
name: "TimeBill",
mixins: [$showColumns],
dicts: ['time_bill_status'],
data() {
return {
// 字段列表
columns: [
{key: 'billId', visible: true, label: '订单ID', minWidth: null, sortable: true, overflow: false, align: 'center'},
{key: 'billNo', visible: true, label: '订单编号', minWidth: null, sortable: true, overflow: false, align: 'center'},
{key: 'userId', visible: true, label: '用户ID', minWidth: null, sortable: true, overflow: false, align: 'center'},
{key: 'deviceId', visible: true, label: '设备ID', minWidth: null, sortable: true, overflow: false, align: 'center'},
{key: 'status', visible: true, label: '状态', minWidth: null, sortable: true, overflow: false, align: 'center'},
{key: 'amount', visible: true, label: '订单金额（元）', minWidth: null, sortable: true, overflow: false, align: 'center'},
{key: 'deviceStartTime', visible: true, label: '设备起步时长', minWidth: null, sortable: true, overflow: false, align: 'center'},
{key: 'deviceStartUnit', visible: true, label: '设备起步时长单位', minWidth: null, sortable: true, overflow: false, align: 'center'},
{key: 'deviceStartPrice', visible: true, label: '设备起步价格（元）', minWidth: null, sortable: true, overflow: false, align: 'center'},
{key: 'deviceOverTime', visible: true, label: '设备超出起步时长', minWidth: null, sortable: true, overflow: false, align: 'center'},
{key: 'deviceOverUnit', visible: true, label: '设备超出起步时长单位', minWidth: null, sortable: true, overflow: false, align: 'center'},
{key: 'deviceOverPrice', visible: true, label: '设备超出起步时长价格（元）', minWidth: null, sortable: true, overflow: false, align: 'center'},
{key: 'startTime', visible: true, label: '开始使用的时间', minWidth: "120", sortable: false, overflow: false, align: 'center'},
{key: 'endTime', visible: true, label: '结束使用的时间', minWidth: "120", sortable: false, overflow: false, align: 'center'},
{key: 'mchId', visible: true, label: '到账人id', minWidth: null, sortable: true, overflow: false, align: 'center'},
{key: 'arrivalAmount', visible: true, label: '到账金额（元）', minWidth: null, sortable: true, overflow: false, align: 'center'},
{key: 'serviceAmount', visible: true, label: '服务费（元）', minWidth: null, sortable: true, overflow: false, align: 'center'},
{key: 'channelId', visible: true, label: '支付成功的渠道ID', minWidth: null, sortable: true, overflow: false, align: 'center'},
{key: 'channelCost', visible: true, label: '渠道成本（元）', minWidth: null, sortable: true, overflow: false, align: 'center'},
{key: 'deleted', visible: true, label: '删除标志', minWidth: null, sortable: true, overflow: false, align: 'center'},
],
// 排序方式
orderSorts: ['ascending', 'descending', null],
// 遮罩层
loading: true,
// 选中数组
ids: [],
// 非单个禁用
single: true,
// 非多个禁用
multiple: true,
// 显示搜索条件
showSearch: true,
// 总条数
total: 0,
// 时长订单表格数据
timeBillList: [],
// 弹出层标题
title: "",
// 是否显示弹出层
open: false,
defaultSort,
// 查询参数
queryParams: {
pageNum: 1,
pageSize: 10,
orderByColumn: defaultSort.prop,
isAsc: defaultSort.order,
billId: null,
billNo: null,
userId: null,
deviceId: null,
status: null,
mchId: null,
channelId: null,
deleted: null
},
// 表单参数
form: {},
// 表单校验
rules: {
billNo: [
{ required: true, message: "订单编号不能为空", trigger: "blur" }
],
userId: [
{ required: true, message: "用户ID不能为空", trigger: "blur" }
],
deviceId: [
{ required: true, message: "设备ID不能为空", trigger: "blur" }
],
status: [
{ required: true, message: "状态不能为空", trigger: "change" }
],
deviceStartTime: [
{ required: true, message: "设备起步时长不能为空", trigger: "blur" }
],
deviceStartUnit: [
{ required: true, message: "设备起步时长单位不能为空", trigger: "blur" }
],
deviceStartPrice: [
{ required: true, message: "设备起步价格不能为空", trigger: "blur" }
],
deviceOverTime: [
{ required: true, message: "设备超出起步时长不能为空", trigger: "blur" }
],
deviceOverUnit: [
{ required: true, message: "设备超出起步时长单位不能为空", trigger: "blur" }
],
deviceOverPrice: [
{ required: true, message: "设备超出起步时长价格不能为空", trigger: "blur" }
],
startTime: [
{ required: true, message: "开始使用的时间不能为空", trigger: "blur" }
],
createTime: [
{ required: true, message: "创建时间不能为空", trigger: "blur" }
],
deleted: [
{ required: true, message: "删除标志不能为空", trigger: "blur" }
]
}
};
},
created() {
this.getList();
},
methods: {
/** 当排序按钮被点击时触发 **/
onSortChange(column) {
if (column.order == null) {
this.queryParams.orderByColumn = defaultSort.prop;
this.queryParams.isAsc = defaultSort.order;
} else {
this.queryParams.orderByColumn = column.prop;
this.queryParams.isAsc = column.order;
}
this.getList();
},
/** 查询时长订单列表 */
getList() {
this.loading = true;
listTimeBill(this.queryParams).then(response => {
this.timeBillList = response.rows;
this.total = response.total;
this.loading = false;
});
},
// 取消按钮
cancel() {
this.open = false;
this.reset();
},
// 表单重置
reset() {
this.form = {
billId: null,
billNo: null,
userId: null,
deviceId: null,
status: null,
amount: null,
deviceStartTime: null,
deviceStartUnit: null,
deviceStartPrice: null,
deviceOverTime: null,
deviceOverUnit: null,
deviceOverPrice: null,
startTime: null,
endTime: null,
mchId: null,
arrivalAmount: null,
serviceAmount: null,
channelId: null,
channelCost: null,
createTime: null,
deleted: null
};
this.resetForm("form");
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1;
this.getList();
},
/** 重置按钮操作 */
resetQuery() {
this.resetForm("queryForm");
this.handleQuery();
},
// 多选框选中数据
handleSelectionChange(selection) {
this.ids = selection.map(item => item.billId)
this.single = selection.length!==1
this.multiple = !selection.length
},
/** 新增按钮操作 */
handleAdd() {
this.reset();
this.open = true;
this.title = "添加时长订单";
},
/** 修改按钮操作 */
handleUpdate(row) {
this.reset();
const billId = row.billId || this.ids
getTimeBill(billId).then(response => {
this.form = response.data;
this.open = true;
this.title = "修改时长订单";
});
},
/** 提交按钮 */
submitForm() {
this.$refs["form"].validate(valid => {
if (valid) {
if (this.form.billId != null) {
updateTimeBill(this.form).then(response => {
this.$modal.msgSuccess("修改成功");
this.open = false;
this.getList();
});
} else {
addTimeBill(this.form).then(response => {
this.$modal.msgSuccess("新增成功");
this.open = false;
this.getList();
});
}
}
});
},
/** 删除按钮操作 */
handleDelete(row) {
const billIds = row.billId || this.ids;
this.$modal.confirm('是否确认删除时长订单编号为"' + billIds + '"的数据项？').then(function() {
return delTimeBill(billIds);
}).then(() => {
this.getList();
this.$modal.msgSuccess("删除成功");
}).catch(() => {});
},
/** 导出按钮操作 */
handleExport() {
this.download('ss/timeBill/export', {
...this.queryParams
}, `timeBill_${new Date().getTime()}.xlsx`)
}
}
};
</script>

4
src/views/system/device/components/rechargeRecord.vue
View File

@ -32,7 +32,7 @@ import { findLabel } from '@/utils'
export default {
name: 'rechargeRecord',
dicts: ['suit_time_unit'],
dicts: ['time_unit'],
props: {
// 设备id
deviceId: {
@ -57,7 +57,7 @@ export default {
// 时长单位
suitTimeUnit() {
return (unit) => {
return findLabel(this.dict.type.suit_time_unit, unit);
return findLabel(this.dict.type.time_unit, unit);
}
}
},

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

@ -229,34 +229,24 @@
<sn-input :show.sync="showBindSn" @submit="onSubmitSn"></sn-input>
<!-- 添加或修改设备对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-dialog :title="title" :visible.sync="open" width="800px" append-to-body :close-on-click-modal="false">
<el-form ref="form" :model="form" :rules="rules" label-width="6em">
<el-row :gutter="gutter">
<el-col :span="span">
<el-form-item label="自定义图片" prop="customPicture">
<image-upload v-model="form.customPicture" />
</el-form-item>
</el-col>
<el-col :span="span">
<el-form-item label="型号" prop="modelId">
<form-col :span="span" label="自定义图片" prop="customPicture">
<image-upload v-model="form.customPicture" :limit="1"/>
</form-col>
<form-col :span="span" label="型号" prop="modelId">
<model-select v-model="form.modelId" :show-value.sync="form.model" @submit="onSubmitModel"/>
</el-form-item>
</el-col>
<el-col :span="span">
<el-form-item label="设备MAC" prop="mac">
</form-col>
<form-col :span="span" label="设备MAC" prop="mac">
<el-input v-model="form.mac" placeholder="请输入设备MAC" :disabled="isEdit"/>
</el-form-item>
</el-col>
<el-col :span="span">
<el-form-item label="设备SN" prop="deviceNo">
</form-col>
<form-col :span="span" label="设备SN" prop="deviceNo">
<el-input v-model="form.deviceNo" placeholder="请输入设备SN" />
</el-form-item>
</el-col>
<el-col :span="span">
<el-form-item label="设备名称" prop="deviceName">
</form-col>
<form-col :span="span" label="设备名称" prop="deviceName">
<el-input v-model="form.deviceName" placeholder="请输入设备名称" />
</el-form-item>
</el-col>
</form-col>
<form-col :span="span * 2" label="服务费" prop="serviceRate">
<el-input v-model="form.serviceRate" placeholder="请输入服务费" type="number">
<template #prepend>
@ -272,11 +262,38 @@
<template #append>{{serviceUnit(form.serviceType)}}</template>
</el-input>
</form-col>
<el-col :span="span">
<el-form-item label="备注" prop="remark">
<form-col :span="span * 2" label="备注" prop="remark">
<el-input v-model="form.remark" type="textarea" placeholder="请输入备注" />
</el-form-item>
</el-col>
</form-col>
<!--计时配置-->
<form-col :span="span" label="起步时长" prop="startTime">
<el-input v-model="form.startTime" type="number" placeholder="请输入起步时长" >
<template #append>
<el-select v-model="form.startUnit" style="width: 6em">
<el-option v-for="dict in dict.type.time_unit" :key="dict.value" :label="dict.label" :value="dict.value" />
</el-select>
</template>
</el-input>
</form-col>
<form-col :span="span" label="起步价" prop="startPrice">
<el-input v-model="form.startPrice" type="number" placeholder="请输入起步价" >
<template #append>元</template>
</el-input>
</form-col>
<form-col :span="span" label="续期时长" prop="overTime">
<el-input v-model="form.overTime" type="number" placeholder="请输入续期时长" >
<template #append>
<el-select v-model="form.overUnit" style="width: 6em">
<el-option v-for="dict in dict.type.time_unit" :key="dict.value" :label="dict.label" :value="dict.value" />
</el-select>
</template>
</el-input>
</form-col>
<form-col :span="span" label="续期价" prop="overPrice">
<el-input v-model="form.overPrice" type="number" placeholder="请输入续期价" >
<template #append>元</template>
</el-input>
</form-col>
</el-row>
</el-form>
<div slot="footer" class="dialog-footer">
@ -322,12 +339,12 @@ export default {
name: "Device",
mixins: [$serviceType],
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'],
dicts: ['sm_device_online_status', 'sm_device_status', 'sm_device_outage_way','sm_device_notice_way', 'service_type', 'time_unit'],
data() {
return {
// 是否展示选择型号弹窗
showCheckModel: false,
span: 24,
span: 12,
gutter: 8,
// 遮罩层
loading: true,
@ -468,7 +485,13 @@ export default {
deviceName: null,
serviceType: '1',
serviceRate: null,
remark: null
remark: null,
startTime: null,
startUnit: "3",
startPrice: null,
overTime: null,
overUnit: "3",
overPrice: null
};
this.resetForm("form");
},

4
src/views/system/recharge/detail.vue
View File

@ -75,12 +75,12 @@ import { findLabel } from '@/utils'
export default {
name: 'RechargeDetail',
components: { Refund },
dicts: ['sm_transaction_bill_pay_type','sm_transaction_bill_status', 'sm_transaction_bill_device_recharge_status', 'suit_time_unit'],
dicts: ['sm_transaction_bill_pay_type','sm_transaction_bill_status', 'sm_transaction_bill_device_recharge_status', 'time_unit'],
computed: {
// 时长单位
suitTimeUnit() {
return (unit) => {
return findLabel(this.dict.type.suit_time_unit, unit);
return findLabel(this.dict.type.time_unit, unit);
}
},
// 套餐状态