From 25908f5bd4a2dae4625b49d325525849feb676a4 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期五, 28 二月 2025 09:32:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0.1' into 2.0.1
---
admin/src/views/business/onlinePayStatistics.vue | 5
admin/src/views/combo/record.vue | 4
admin/src/views/combo/components/SaleDetail.vue | 17 ++--
admin/src/views/business/bikeRepair.vue | 5
admin/src/views/combo/components/OrderDetail.vue | 6
admin/src/views/business/goodsorder.vue | 5
admin/src/views/combo/order.vue | 24 +++--
admin/package-lock.json | 5 +
admin/src/components/common/Paginations.vue | 40 ++++++++++
admin/package.json | 1
admin/src/api/business/combo.js | 9 ++
admin/src/views/combo/components/ComboDetail.vue | 24 +++---
admin/src/views/combo/components/Refund.vue | 3
admin/src/views/business/memberRides.vue | 4
admin/src/views/business/bikeRetakeRecord.vue | 6
admin/src/views/combo/components/Edit.vue | 8 +-
admin/src/components/base/BasePageTemp.vue | 8 +
admin/src/views/combo/index.vue | 20 ++++
18 files changed, 139 insertions(+), 55 deletions(-)
diff --git a/admin/package-lock.json b/admin/package-lock.json
index dcbeba0..92bcd97 100644
--- a/admin/package-lock.json
+++ b/admin/package-lock.json
@@ -5266,6 +5266,11 @@
"integrity": "sha512-hBSVCvSmWC+QypYObzwGOd9wqdDpOt+0wl0KbU+R+uuZBS1jN8VsD1ss3irQDknRj5NvxiTF6oj/nDRnN/UQNw==",
"dev": true
},
+ "dayjs": {
+ "version": "1.11.13",
+ "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.13.tgz",
+ "integrity": "sha512-oaMBel6gjolK862uaPQOVTA7q3TZhuSvuMQAAglQDOWYO9A91IrAOUJEyKVlqJlHE0vq5p5UXxzdPfMH/x6xNg=="
+ },
"de-indent": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/de-indent/-/de-indent-1.0.2.tgz",
diff --git a/admin/package.json b/admin/package.json
index 228ca86..56f3575 100644
--- a/admin/package.json
+++ b/admin/package.json
@@ -21,6 +21,7 @@
"@wangeditor/editor-for-vue": "^1.0.2",
"axios": "^0.21.1",
"core-js": "^3.6.5",
+ "dayjs": "^1.11.13",
"echarts": "^5.4.2",
"ele-calendar": "^2.0.0",
"element-ui": "^2.15.13",
diff --git a/admin/src/api/business/combo.js b/admin/src/api/business/combo.js
index ed20247..d63366d 100644
--- a/admin/src/api/business/combo.js
+++ b/admin/src/api/business/combo.js
@@ -10,6 +10,15 @@
trim: true
})
}
+export function comboUpdatePost(data) {
+ return request.post('/business/discount/updStatus', data, {
+ trim: true
+ })
+}
+
+export function comboDelPost(id) {
+ return request.get(`/business/discount/delete/${id}`)
+}
export function comboListPost(data) {
return request.post('/business/discount/page', data, {
trim: true
diff --git a/admin/src/components/base/BasePageTemp.vue b/admin/src/components/base/BasePageTemp.vue
index af01469..85784ce 100644
--- a/admin/src/components/base/BasePageTemp.vue
+++ b/admin/src/components/base/BasePageTemp.vue
@@ -1,5 +1,5 @@
<script>
-import Pagination from '@/components/common/Pagination'
+import Pagination from '@/components/common/Paginations'
import QueryForm from '@/components/common/QueryForm'
export default {
name: 'BasePageTemp',
@@ -7,7 +7,7 @@
Pagination,
QueryForm,
},
- data () {
+ data() {
return {
loading: false,
pagination: {
@@ -21,11 +21,13 @@
}
},
methods: {
- getList(){},
+ getList() { },
clear() {
this.filters = {}
this.pagination.pageSize = 10
this.pagination.page = 1
+ console.log('-----');
+
this.getList()
},
handleSizeChange(capacity) {
diff --git a/admin/src/components/common/Paginations.vue b/admin/src/components/common/Paginations.vue
new file mode 100644
index 0000000..384d728
--- /dev/null
+++ b/admin/src/components/common/Paginations.vue
@@ -0,0 +1,40 @@
+<template>
+ <div class="table-pagination">
+ <el-pagination
+ :current-page="pagination.page"
+ :page-sizes="pagination.pageSizes||[10, 20, 30, 40]"
+ :page-size="pagination.pageSize"
+ layout="total, sizes, prev, pager, next, jumper"
+ :total="pagination.total"
+ @size-change="sizeChange"
+ @current-change="currentChange"
+ background>
+ </el-pagination>
+ </div>
+</template>
+
+<script>
+export default {
+ name: 'Pagination',
+ props: {
+ pagination: {
+ type: Object,
+ default: function () {
+ return {}
+ }
+ }
+ },
+ data () {
+ return {
+ }
+ },
+ methods: {
+ sizeChange (value) {
+ this.$emit('size-change', value)
+ },
+ currentChange (value) {
+ this.$emit('current-change', value)
+ }
+ }
+}
+</script>
diff --git a/admin/src/views/business/bikeRepair.vue b/admin/src/views/business/bikeRepair.vue
index 251ce4a..35fc3dd 100644
--- a/admin/src/views/business/bikeRepair.vue
+++ b/admin/src/views/business/bikeRepair.vue
@@ -107,7 +107,7 @@
import Pagination from '@/components/common/Pagination'
import OperaRepairDealWindow from '@/components/business/OperaRepairDealWindow'
import RepairDetailWindow from '@/components/business/RepairDetailWindow'
-import { formatDateTime } from '@/utils/util'
+import dayjs from 'dayjs'
import { getFileList } from '@/api/business/bikeRepair'
export default {
name: 'BikeRepair',
@@ -150,7 +150,8 @@
'field.id': 'id',
'field.main': 'id'
})
- // this.searchForm.startDate = formatDateTime(new Date(), 'yyyy-MM-dd') + ' 00:00:00'
+ this.searchForm.startDate = dayjs().format('YYYY-MM-DD') + ' 00:00:00'
+ this.searchForm.endDate = dayjs().format('YYYY-MM-DD') + ' 23:59:59'
this.search()
},
methods: {
diff --git a/admin/src/views/business/bikeRetakeRecord.vue b/admin/src/views/business/bikeRetakeRecord.vue
index babeb93..471f844 100644
--- a/admin/src/views/business/bikeRetakeRecord.vue
+++ b/admin/src/views/business/bikeRetakeRecord.vue
@@ -106,7 +106,7 @@
import BaseTable from '@/components/base/BaseTable'
import TableLayout from '@/layouts/TableLayout'
import Pagination from '@/components/common/Pagination'
-import { formatDateTime } from '@/utils/util'
+import dayjs from 'dayjs'
export default {
name: 'MemberRides',
extends: BaseTable,
@@ -165,8 +165,8 @@
'field.id': 'id',
'field.main': 'id'
})
- // this.searchForm.startDate = formatDateTime(new Date(), 'yyyy-MM-dd') + ' 00:00:00'
- // this.searchForm.endDate = formatDateTime(new Date(), 'yyyy-MM-dd') + ' 23:59:59'
+ this.searchForm.startDate = dayjs().format('YYYY-MM-DD') + ' 00:00:00'
+ this.searchForm.endDate = dayjs().format('YYYY-MM-DD') + ' 23:59:59'
this.search()
},
methods: {
diff --git a/admin/src/views/business/goodsorder.vue b/admin/src/views/business/goodsorder.vue
index 275e639..41d831a 100644
--- a/admin/src/views/business/goodsorder.vue
+++ b/admin/src/views/business/goodsorder.vue
@@ -116,7 +116,7 @@
import GoodsOrderDetail from '@/components/business/goodsOrderDetail'
import BackGoodsorderWindow from '@/components/business/backGoodsorderWindow'
import { getDetail, getGoodsorderCanBanlanceDTO, closerGoodsorder } from '@/api/business/goodsorder'
-import { formatDateTime } from '@/utils/util'
+import dayjs from 'dayjs'
export default {
name: 'Goodsorder',
extends: BaseTable,
@@ -159,7 +159,8 @@
'field.id': 'id',
'field.main': 'id'
})
- // this.searchForm.startDate = formatDateTime(new Date(), 'yyyy-MM-dd') + ' 00:00:00'
+ this.searchForm.startDate = dayjs().format('YYYY-MM-DD') + ' 00:00:00'
+ this.searchForm.endDate = dayjs().format('YYYY-MM-DD') + ' 23:59:59'
this.search()
},
methods: {
diff --git a/admin/src/views/business/memberRides.vue b/admin/src/views/business/memberRides.vue
index e9d0139..09a12c2 100644
--- a/admin/src/views/business/memberRides.vue
+++ b/admin/src/views/business/memberRides.vue
@@ -108,7 +108,7 @@
import BaseTable from '@/components/base/BaseTable'
import TableLayout from '@/layouts/TableLayout'
import Pagination from '@/components/common/Pagination'
-import { formatDateTime } from '@/utils/util'
+import dayjs from 'dayjs'
export default {
name: 'MemberRides',
extends: BaseTable,
@@ -167,6 +167,8 @@
'field.id': 'id',
'field.main': 'id'
})
+ this.searchForm.startDate = dayjs().format('YYYY-MM-DD') + ' 00:00:00'
+ this.searchForm.endDate = dayjs().format('YYYY-MM-DD') + ' 23:59:59'
// this.searchForm.startDate = formatDateTime(new Date(), 'yyyy-MM-dd') + ' 00:00:00'
// this.searchForm.endDate = formatDateTime(new Date(), 'yyyy-MM-dd') + ' 23:59:59'
this.search()
diff --git a/admin/src/views/business/onlinePayStatistics.vue b/admin/src/views/business/onlinePayStatistics.vue
index 55f7ca8..5178a32 100644
--- a/admin/src/views/business/onlinePayStatistics.vue
+++ b/admin/src/views/business/onlinePayStatistics.vue
@@ -55,7 +55,7 @@
import BaseTable from '@/components/base/BaseTable'
import TableLayout from '@/layouts/TableLayout'
import { fetchList } from '@/api/business/onlinePayStatistics'
-import { formatDateTime } from '@/utils/util'
+import dayjs from 'dayjs'
export default {
name: 'PricingParam',
extends: BaseTable,
@@ -71,7 +71,8 @@
}
},
created () {
- // this.searchForm.startDate = formatDateTime(new Date(), 'yyyy-MM-dd') + ' 00:00:00'
+ this.searchForm.startDate = dayjs().format('YYYY-MM-DD') + ' 00:00:00'
+ this.searchForm.endDate = dayjs().format('YYYY-MM-DD') + ' 23:59:59'
this.search()
},
methods: {
diff --git a/admin/src/views/combo/components/ComboDetail.vue b/admin/src/views/combo/components/ComboDetail.vue
index 6ab44db..ea24c96 100644
--- a/admin/src/views/combo/components/ComboDetail.vue
+++ b/admin/src/views/combo/components/ComboDetail.vue
@@ -10,13 +10,13 @@
<span class="title">{{ detail.name }}</span>
<span class="status">{{ detail.status == '0' ? '宸插惎鐢�' : '绂佺敤' }}</span>
</div>
- <div class="placeholder9 mt10">姣忔棩閿�鍞檺閲忥細{{ detail.saleDayLimit }}</div>
+ <div class="placeholder9 mt10">姣忔棩閿�鍞檺閲忥細{{ detail.saleDayLimit || '涓嶉檺棰�' }}</div>
</div>
</div>
<div class="right">
<div class="item">
<div class="key">鎬诲彂鏀炬暟閲�</div>
- <div class="value">{{ detail.saleLimit || '涓嶉檺棰�' }}</div>
+ <div class="value">{{ detail.saleLimit || '-' }}</div>
</div>
<div class="item">
<div class="key">宸查攢鍞暟閲�</div>
@@ -25,15 +25,15 @@
<div class="item">
<div class="key">鍓╀綑鏁伴噺</div>
<div v-if="detail.saleLimit" class="value">{{ detail.saleLimit - detail.saleNum }}</div>
- <div v-else class="value">涓嶉檺棰�</div>
+ <div v-else class="value">-</div>
</div>
</div>
</div>
<div class="createTime_wrap">
<span class="item">鍒涘缓鏃堕棿锛歿{ detail.createDate }}</span>
- <span class="item">鍒涘缓浜猴細{{ detail.creator }}</span>
+ <span class="item">鍒涘缓浜猴細{{ detail.creatorName }}</span>
<span class="item">鏈�鍚庢洿鏂版椂闂达細{{ detail.editDate }}</span>
- <span class="item">鏇存柊浜猴細{{ detail.editor }}</span>
+ <span class="item">鏇存柊浜猴細{{ detail.editorName }}</span>
</div>
</div>
<div class="separate" />
@@ -55,7 +55,7 @@
<div class="line">
<div class="key">濂楅绠�浠嬶細</div>
<div class="value">
- <div>{{ detail.desc }}</div>
+ <div>{{ detail.descs }}</div>
</div>
</div>
@@ -66,22 +66,22 @@
</div>
<div class="line">
<div class="key">浣跨敤鏃堕棿锛�</div>
- <div class="value" v-if="detail.useType == 0">{{ detail.useStartDate }} 鑷� {{ detail.useEndDate }}</div>
- <div class="value" v-if="detail.useType == 1">璐拱鍚巤{ detail.useDays }}澶╁唴鏈夋晥</div>
- <div class="value" v-if="detail.useType == 2">鑷獅{ detail.useStartDate }} 鍚� {{ detail.useDays }}澶╁唴鏈夋晥</div>
+ <div class="value" v-if="detail.useType == 0">{{ detail.useStartDate }} 鑷� {{ detail.useEndDate }}鍐呮湁鏁�</div>
+ <div class="value" v-if="detail.useType == 1">璐拱鍚庣珛鍗崇敓鏁堬紝鏈夋晥鏈焮{ detail.useDays }}澶�</div>
+ <div class="value" v-if="detail.useType == 2">鑷獅{ detail.useStartDate }}璧穥{ detail.useDays }}澶╁唴鏈夋晥</div>
</div>
<div class="line">
<div class="key">閫傜敤鑼冨洿锛�</div>
- <div class="value">{{ detail.useWorkday == 1 && '宸ヤ綔鏃�' }} {{ detail.useWorkday && detail.useHoliday && '|' }} {{ detail.useHoliday == 1 && '鑺傚亣鏃�' }}</div>
+ <div class="value">{{ detail.useWorkday == 1 ? '宸ヤ綔鏃�' : ''}} {{ detail.useWorkday && detail.useHoliday ? '|' : '' }} {{ detail.useHoliday == 1 ? '鑺傚亣鏃�' : '' }}</div>
</div>
<div class="line">
<div class="key">閫傜敤椤圭洰锛�</div>
- <div class="value">{{ detail.isbike == 1 && '鑷杞�' }} {{ detail.isbike && detail.iselecbike && '|' }} {{ detail.iselecbike == 1 && '鐢靛姩杞�' }}</div>
+ <div class="value">{{ detail.isbike == 1 ? '鑷杞�' : '' }} {{ detail.isbike && detail.iselecbike ? '|' : '' }} {{ detail.iselecbike == 1 ? '鐢靛姩杞�' :'' }}</div>
</div>
<div class="line">
<div class="key">鎬婚檺棰濓細</div>
- <div class="value">{{ detail.saleLimit || '涓嶉檺鍒�' }}</div>
+ <div class="value">{{ detail.saleLimit || '涓嶉檺棰�' }}</div>
</div>
<div class="line">
<div class="key">姣忔棩闄愰锛�</div>
diff --git a/admin/src/views/combo/components/Edit.vue b/admin/src/views/combo/components/Edit.vue
index 51b16fd..ee6f0a0 100644
--- a/admin/src/views/combo/components/Edit.vue
+++ b/admin/src/views/combo/components/Edit.vue
@@ -100,13 +100,13 @@
</div>
</el-form-item>
<el-form-item label="鎬婚檺棰�">
- <el-input class="w400" v-model="param.saleLimit" oninput="value=value.replace(/^(0+)|[^\d]+/g, '').slice(0, 12)"
+ <el-input class="w400" v-model="param.saleLimit" oninput="value=value.replace(/^(-1+)|[^\d]+/g, '').slice(0, 12)"
placeholder="璇疯緭鍏ユ�诲彂鍞暟閲�" v-trim />
<div class="placeholder9">璇疯緭鍏ユ�诲彂鍞暟閲忥紝閿�閲忓ぇ浜庤鏁伴噺鍚庯紝涓嶅啀鏀寔閿�鍞紱涓虹┖琛ㄧず涓嶉檺鍒�</div>
</el-form-item>
<el-form-item label="鏃ラ檺棰�">
<el-input class="w400" v-model="param.saleDayLimit"
- oninput="value=value.replace(/^(0+)|[^\d]+/g, '').slice(0, 12)" placeholder="璇疯緭鍏ュ崟鏃ュ彂鍞暟閲�" v-trim />
+ oninput="value=value.replace(/^(-1+)|[^\d]+/g, '').slice(0, 12)" placeholder="璇疯緭鍏ュ崟鏃ュ彂鍞暟閲�" v-trim />
<div class="placeholder9">璇疯緭鍏ユ棩鍙戝敭鏁伴噺锛屽綋鏃ラ攢閲忓ぇ浜庤鏁伴噺鍚庯紝涓嶅啀鏀寔閿�鍞紱涓虹┖琛ㄧず涓嶉檺鍒�</div>
</el-form-item>
@@ -227,10 +227,10 @@
comboDetailPost(id).then(res => {
this.param = res
this.$set(this.param, 'saleDate', [res.startDate, res.endDate])
- if (res.useStartDate && res.useEndDate) {
+ if (res.useStartDate && res.useEndDate && res.type != 0) {
this.$set(this.param, 'useDate', [res.useStartDate, res.useEndDate])
}
- this.$set(this.param, id, type == 'copy' ? null : this.param.id)
+ this.$set(this.param, 'id', type == 'copy' ? null : this.param.id)
})
},
}
diff --git a/admin/src/views/combo/components/OrderDetail.vue b/admin/src/views/combo/components/OrderDetail.vue
index 075ca64..7aac679 100644
--- a/admin/src/views/combo/components/OrderDetail.vue
+++ b/admin/src/views/combo/components/OrderDetail.vue
@@ -1,5 +1,5 @@
<template>
- <GlobalWindow :title="title" width="1000px" :visible.sync="visible" :confirm-working="isWorking">
+ <GlobalWindow :title="title" width="1100px" :visible.sync="visible" :confirm-working="isWorking">
<div class="title">璁㈠崟淇℃伅</div>
<div class="info_warp">
<div class="item">
@@ -32,7 +32,7 @@
</div>
<div class="item">
<div class="la">瀹屾垚鏃堕棿锛�</div>
- <div class="val">{{ info.closeDate }}</div>
+ <div class="val">{{ info.payDate }}</div>
</div>
<div class="item">
<div class="la">澶囨敞锛�</div>
@@ -59,7 +59,7 @@
<el-table-column prop="name" min-width="100px" label="濂楅鍗�" show-overflow-tooltip align="center"></el-table-column>
<el-table-column prop="refundType" label="鏈夋晥鏈�" min-width="160px" align="center">
<template slot-scope="{row}">
- {{ row.startDate }} 鑷� {{ row.endDate }}
+ {{ row.useStartDate }} 鑷� {{ row.useEndDate }}
</template>
</el-table-column>
<el-table-column label="鏁伴噺" width="80px" align="center">
diff --git a/admin/src/views/combo/components/Refund.vue b/admin/src/views/combo/components/Refund.vue
index 776030f..c619c90 100644
--- a/admin/src/views/combo/components/Refund.vue
+++ b/admin/src/views/combo/components/Refund.vue
@@ -72,7 +72,8 @@
comboReDetailPost({ orderId: id }).then(res => {
if (res) {
this.form = res
- this.form.backType = 0
+ // this.form.backType = 0
+ this.$set(this.form, 'backType', 0)
this.form.orderId = id
}
})
diff --git a/admin/src/views/combo/components/SaleDetail.vue b/admin/src/views/combo/components/SaleDetail.vue
index 7d1dd41..8fb3e0b 100644
--- a/admin/src/views/combo/components/SaleDetail.vue
+++ b/admin/src/views/combo/components/SaleDetail.vue
@@ -4,7 +4,7 @@
<div class="modal_title">濂楅鍚嶇О锛歿{ detail.name }}</div>
<div class="place">
<span>濂楅鍙凤細{{ detail.code }}</span>
- <span v-if="detail.useType == 1">鏈夋晥鏈燂細{{ detail.useDays }}澶�</span>
+ <span v-if="detail.useType == 1">鏈夋晥鏈燂細{{ detail.useStartDate }}鑷硔{ detail.useEndDate }}</span>
<span v-if="detail.useType == 0">鏈夋晥鏈燂細{{ detail.useStartDate }}鑷硔{ detail.useEndDate }}</span>
<span v-if="detail.useType == 2">鏈夋晥鏈燂細{{ detail.useStartDate }}鑷硔{ detail.useEndDate }}</span>
</div>
@@ -16,8 +16,8 @@
<div style="border-bottom: 2px solid #e5e7ec; margin-top: 1px;">{{ activeTab == 0 ? '浣跨敤鎯呭喌' : '鎿嶄綔鎯呭喌' }}锛歿{ pagination.total }}娆�</div>
</div>
<el-table v-if="activeTab == 0" v-loading="loading" :data="list" stripe border>
- <el-table-column prop="createDate" align="center" label="浣跨敤鏃堕棿" min-width="100" show-overflow-tooltip />
- <el-table-column prop="discountMemberId" align="center" label="鍏宠仈璁㈠崟" min-width="120" show-overflow-tooltip />
+ <el-table-column prop="createDate" align="center" label="浣跨敤鏃堕棿" min-width="120" show-overflow-tooltip />
+ <el-table-column prop="goodsorderId" align="center" label="鍏宠仈璁㈠崟" min-width="140" show-overflow-tooltip />
<el-table-column prop="" align="center" label="楠戣溅鏃堕暱" min-width="80" show-overflow-tooltip>
<template v-slot="{ row }">
{{ row.rideTime }}鍒嗛挓
@@ -26,16 +26,16 @@
<el-table-column prop="ridePrice" align="center" label="鎶垫墸閲戦" min-width="100" show-overflow-tooltip />
</el-table>
<el-table v-if="activeTab == 2" v-loading="loading" :data="list" stripe border>
- <el-table-column prop="createDate" align="center" label="鎿嶄綔鏃堕棿" min-width="100" show-overflow-tooltip />
+ <el-table-column prop="createDate" align="center" label="鎿嶄綔鏃堕棿" min-width="120" show-overflow-tooltip />
<el-table-column prop="info" align="center" label="鎿嶄綔绫诲瀷" min-width="100" show-overflow-tooltip>
<template v-slot="{ row }">
<span v-if="row.type == 0">鐢ㄦ埛楠戣浣跨敤</span>
- <span v-if="row.type == 1">骞冲彴浣滃簾</span>
- <span v-if="row.type == 2">骞冲彴璋冩暣</span>
+ <span v-if="row.type == 1">濂楅浣滃簾</span>
+ <span v-if="row.type == 2">濂楅璋冩暣</span>
</template>
</el-table-column>
- <el-table-column prop="editInfo" align="center" label="鎿嶄綔澶囨敞" min-width="100" show-overflow-tooltip />
- <el-table-column prop="creatorName" align="center" label="鎿嶄綔浜�" min-width="100" show-overflow-tooltip />
+ <el-table-column prop="editInfo" align="center" label="鎿嶄綔澶囨敞" min-width="200" show-overflow-tooltip />
+ <el-table-column prop="creatorName" align="center" label="鎿嶄綔浜�" min-width="80" show-overflow-tooltip />
</el-table>
<div class="table_btns">
<Pagination @size-change="handleSizeChange" @current-change="getList" :pagination="pagination" />
@@ -75,6 +75,7 @@
getDetail(row) {
comboSalerDetailPost(row.id).then(res => {
this.detail = res
+ this.activeTab = '0'
this.getList()
}, () => {
diff --git a/admin/src/views/combo/index.vue b/admin/src/views/combo/index.vue
index d32263e..5951710 100644
--- a/admin/src/views/combo/index.vue
+++ b/admin/src/views/combo/index.vue
@@ -49,7 +49,7 @@
<div>
<span v-if="row.status == 0" @click="handleEdit(row, 'copy')" class="primaryColor pointer">澶嶅埗</span>
<span v-if="row.status == 1" @click="handleEdit(row)" class="primaryColor pointer mr10">缂栬緫</span>
- <span v-if="row.status == 1" @click="handleDetail(row)" class="red pointer">鍒犻櫎</span>
+ <span v-if="row.status == 1" @click="handleDel(row)" class="red pointer">鍒犻櫎</span>
</div>
</template>
</el-table-column>
@@ -68,7 +68,7 @@
import TableLayout from '@/layouts/TableLayout'
import Edit from './components/Edit'
import ComboDetail from './components/ComboDetail.vue'
-import { comboListPost, comboEditPost } from '@/api/business/combo.js'
+import { comboListPost, comboUpdatePost, comboDelPost } from '@/api/business/combo.js'
import { Message } from 'element-ui'
export default {
extends: BasePageTemp,
@@ -130,12 +130,26 @@
})
},
changeStatus(row) {
- comboEditPost({ ...row }).then(res => {
+ comboUpdatePost({ ...row }).then(res => {
if (res.code == 200) {
return Message.success('鏇存柊鎴愬姛')
}
})
},
+ handleDel(row) {
+ this.$confirm('鎮ㄧ‘璁よ鍒犻櫎褰撳墠濂楅鍚楋紵', '鎻愮ず', {
+ confirmButtonText: '纭畾',
+ cancelButtonText: '鍙栨秷',
+ type: 'warning',
+ }).then(() => {
+ comboDelPost(row.id).then(res => {
+ if (res) {
+ Message.success('鍒犻櫎鎴愬姛')
+ this.getList()
+ }
+ })
+ })
+ },
handleEdit(row, type = 'edit') {
this.isShowEdit = true
this.$nextTick(() => {
diff --git a/admin/src/views/combo/order.vue b/admin/src/views/combo/order.vue
index e123a37..bee9272 100644
--- a/admin/src/views/combo/order.vue
+++ b/admin/src/views/combo/order.vue
@@ -15,7 +15,7 @@
<el-table-column prop="money" align="center" label="鍚堣(鍏�)" min-width="80" show-overflow-tooltip />
<el-table-column prop="money" align="center" label="瀹炰粯(鍏�)" min-width="80" show-overflow-tooltip />
<el-table-column prop="refundMoney" align="center" label="宸查��閲戦(鍏�)" min-width="100" show-overflow-tooltip />
- <el-table-column prop="memberId" align="center" label="鐢ㄦ埛淇℃伅" min-width="200" show-overflow-tooltip />
+ <el-table-column prop="openid" align="center" label="鐢ㄦ埛淇℃伅" min-width="200" show-overflow-tooltip />
<el-table-column prop="payWay" align="center" label="鏀粯鏂瑰紡" min-width="80" show-overflow-tooltip>
<template v-slot="{ row }">
<span v-if="row.payWay == 0">寰俊鏀粯</span>
@@ -35,7 +35,7 @@
</el-table-column>
<el-table-column prop="refundUserName" align="center" label="鎿嶄綔浜�" min-width="80" show-overflow-tooltip />
<el-table-column prop="createDate" align="center" label="鍒涘缓鏃堕棿" min-width="160" show-overflow-tooltip />
- <el-table-column label="鎿嶄綔" fixed="right" align="center" min-width="80" show-overflow-tooltip>
+ <el-table-column label="鎿嶄綔" fixed="right" align="center" min-width="120" show-overflow-tooltip>
<template v-slot="{ row }">
<span @click="handleDetail(row.id)" class="primaryColor pointer">鏌ョ湅璇︽儏</span>
<span v-if="row.status == 1 && (row.refundMoney < row.money)" @click="handRefund(row.id)"
@@ -62,6 +62,7 @@
comboListOrderEx,
comboOrderDetailPost
} from '@/api/business/combo.js'
+import dayjs from 'dayjs'
export default {
extends: BasePageTemp,
components: {
@@ -105,7 +106,7 @@
},
{
filed: 'selDate',
- type: 'date',
+ type: 'daterange',
label: '鏀粯鏃堕棿',
},
{
@@ -119,6 +120,8 @@
}
},
created() {
+ let date = dayjs().format('YYYY-MM-DD')
+ this.$set(this.filters, 'selDate', [date, date])
this.getList()
// this.initData()
},
@@ -144,8 +147,8 @@
.then(() => {
this.loading = true
if (filters.selDate && filters.selDate.length > 0) {
- filters.startDate = filters.selDate[0]
- filters.endDate = filters.selDate[1]
+ filters.startDate = filters.selDate[0] + ' 00:00:00'
+ filters.endDate = filters.selDate[1] + ' 00:00:00'
} else {
filters.startDate = null
filters.endDate = null
@@ -153,7 +156,10 @@
comboListOrderEx({
page: 1,
capacity: 1000000,
- model: filters
+ model: {
+ ...filters,
+ type: 1
+ },
})
.then(response => {
this.download(response)
@@ -175,14 +181,14 @@
getList(page) {
const { pagination, filters } = this
this.loading = true
- if (page) { pagination.page = page }
if (filters.selDate && filters.selDate.length > 0) {
- filters.startDate = filters.selDate[0]
- filters.endDate = filters.selDate[1]
+ filters.startDate = filters.selDate[0] + ' 00:00:00'
+ filters.endDate = filters.selDate[1] + ' 00:00:00'
} else {
filters.startDate = null
filters.endDate = null
}
+ if (page) { pagination.page = page }
comboOrderPost({
model: {
...filters,
diff --git a/admin/src/views/combo/record.vue b/admin/src/views/combo/record.vue
index 8d8b0c7..4333ac9 100644
--- a/admin/src/views/combo/record.vue
+++ b/admin/src/views/combo/record.vue
@@ -1,7 +1,7 @@
<template>
<div class="main_app">
<Breadcrumb />
- <QueryForm v-model="querys" :query-form-config="queryFormConfig" @handleQuery="getList(1)" @clear="clearQueryForm">
+ <QueryForm v-model="filters" :query-form-config="queryFormConfig" @handleQuery="getList(1)" @clear="clearQueryForm">
</QueryForm>
<div class="table_btns">
<el-button plain type="primary" @click="handleEx">瀵煎嚭</el-button>
@@ -249,7 +249,7 @@
},
clearQueryForm() {
// eslint-disable-next-line no-unused-vars
- this.querys = {}
+ this.filters = {}
this.getList(1)
},
// 鎵撳紑modal 鍐荤粨 瑙ｅ喕 浣滃簾
--
Gitblit v1.9.3