diff --git a/src/api/ss/payBill.js b/src/api/ss/payBill.js
new file mode 100644
index 0000000..76918e6
--- /dev/null
+++ b/src/api/ss/payBill.js
@@ -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'
+ })
+}
diff --git a/src/api/ss/timeBill.js b/src/api/ss/timeBill.js
new file mode 100644
index 0000000..10a23e4
--- /dev/null
+++ b/src/api/ss/timeBill.js
@@ -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'
+ })
+}
diff --git a/src/views/ss/payBill/index.vue b/src/views/ss/payBill/index.vue
new file mode 100644
index 0000000..90cc908
--- /dev/null
+++ b/src/views/ss/payBill/index.vue
@@ -0,0 +1,419 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 搜索
+ 重置
+
+
+
+
+
+ 新增
+
+
+ 修改
+
+
+ 删除
+
+
+ 导出
+
+
+
+
+
+
+
+
+
+
+ {{d.row[column.key]}}
+
+
+
+
+
+
+
+
+ {{d.row[column.key]}}
+
+
+
+
+
+
+ 修改
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{dict.label}}
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/ss/suit/index.vue b/src/views/ss/suit/index.vue
index 6f307b5..681a34d 100644
--- a/src/views/ss/suit/index.vue
+++ b/src/views/ss/suit/index.vue
@@ -134,7 +134,7 @@
- 元
+ 元
@@ -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);
}
}
},
diff --git a/src/views/ss/timeBill/index.vue b/src/views/ss/timeBill/index.vue
new file mode 100644
index 0000000..215a9b7
--- /dev/null
+++ b/src/views/ss/timeBill/index.vue
@@ -0,0 +1,508 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 搜索
+ 重置
+
+
+
+
+
+ 新增
+
+
+ 修改
+
+
+ 删除
+
+
+ 导出
+
+
+
+
+
+
+
+
+
+
+ {{d.row[column.key]}}
+
+
+
+
+
+ {{d.row[column.key]}}
+
+
+
+
+
+
+ 修改
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{dict.label}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/system/device/components/rechargeRecord.vue b/src/views/system/device/components/rechargeRecord.vue
index 4408129..d1e9776 100644
--- a/src/views/system/device/components/rechargeRecord.vue
+++ b/src/views/system/device/components/rechargeRecord.vue
@@ -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);
}
}
},
diff --git a/src/views/system/device/index.vue b/src/views/system/device/index.vue
index cb8ed65..1f3cb5e 100644
--- a/src/views/system/device/index.vue
+++ b/src/views/system/device/index.vue
@@ -229,34 +229,24 @@
-
+
-
-
-
-
-
-
-
+
+
+
+
-
-
-
-
+
+
-
-
-
-
+
+
-
-
-
-
+
+
-
-
+
@@ -272,11 +262,38 @@
{{serviceUnit(form.serviceType)}}
-
-
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 元
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 元
+
+