From 4fabfe4dbd2eb28d07a4350597d314958cc1c281 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期四, 09 十月 2025 11:16:43 +0800
Subject: [PATCH] 优化
---
admin/src/views/business/goodsorder.vue | 24 ++++++++++++++++++------
1 files changed, 18 insertions(+), 6 deletions(-)
diff --git a/admin/src/views/business/goodsorder.vue b/admin/src/views/business/goodsorder.vue
index 275e639..8500788 100644
--- a/admin/src/views/business/goodsorder.vue
+++ b/admin/src/views/business/goodsorder.vue
@@ -35,6 +35,12 @@
value-format="yyyy-MM-dd HH:mm:ss"
></el-date-picker>
</el-form-item>
+<!-- <el-form-item label="璁㈠崟绫诲瀷" prop="type">
+ <el-select v-model="searchForm.type" placeholder="璇烽�夋嫨">
+ <el-option label="绉熻溅鎶奸噾" :value="0"> </el-option>
+ <el-option label="濂楅鍗¤喘涔�" :value="1"> </el-option>
+ </el-select>
+ </el-form-item>-->
<section>
<el-button type="primary" @click="search">鎼滅储</el-button>
<el-button @click="reset">閲嶇疆</el-button>
@@ -53,10 +59,17 @@
>
<el-table-column prop="openid" label="鐢ㄦ埛" min-width="225px" align="center"></el-table-column>
<el-table-column prop="id" label="璁㈠崟缂栧彿" min-width="235px" align="center"></el-table-column>
+ <el-table-column label="璁㈠崟绫诲瀷" min-width="100px" align="center">
+ <template slot-scope="{row}">
+ <span v-if="row.type === 0">绉熻溅鎶奸噾</span>
+ <span v-if="row.type === 1">濂楅鍗¤喘涔�</span>
+ </template>
+ </el-table-column>
<el-table-column prop="onlineOrderid" label="浜ゆ槗鍗曞彿" min-width="225px" align="center"></el-table-column>
<el-table-column prop="money" label="鎶奸噾(鍏�)" min-width="80px" align="center"></el-table-column>
<el-table-column prop="payDate" label="浜ゆ娂閲戞椂闂�" min-width="145px" align="center"></el-table-column>
<el-table-column prop="refundMoney" label="閫�鎶奸噾(鍏冿級" min-width="90px" align="center"></el-table-column>
+ <el-table-column prop="discountMoney" label="浼樻儬閲戦" min-width="90px" align="center"></el-table-column>
<el-table-column prop="closeMoney" label="缁撶畻閲戦(鍏冿級" min-width="100px" align="center">
<template slot-scope="{row}">
<span v-if="row.closeMoney > row.money">{{row.money}}</span>
@@ -116,7 +129,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,
@@ -142,12 +155,11 @@
payStatus: '',
payWay: '',
payDate: '',
- type: '',
+ type: 0,
closeMoney: '',
startDate: '',
endDate: '',
- type: 0
-
+ bikeType: ''
},
value1: [new Date(), new Date()]
}
@@ -159,7 +171,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: {
@@ -202,7 +215,6 @@
})
})
.catch(() => {})
-
},
refenMoney({id}) {
getGoodsorderCanBanlanceDTO({orderId:id})
--
Gitblit v1.9.3