From 969d3507163720cd59e5c78e3e0a7e0bdb47c366 Mon Sep 17 00:00:00 2001
From: Mr.Zhang <710666463@qq.com>
Date: 星期二, 24 十月 2023 09:09:25 +0800
Subject: [PATCH] 企业端
---
admin/src/views/business/goodsorder.vue | 30 +++++++++++++++++++-----------
1 files changed, 19 insertions(+), 11 deletions(-)
diff --git a/admin/src/views/business/goodsorder.vue b/admin/src/views/business/goodsorder.vue
index e6a06dc..0cf5dd2 100644
--- a/admin/src/views/business/goodsorder.vue
+++ b/admin/src/views/business/goodsorder.vue
@@ -3,7 +3,7 @@
<!-- 鎼滅储琛ㄥ崟 -->
<el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
<el-form-item label="鐢ㄦ埛" prop="openid">
- <el-input v-model="searchForm.openid" placeholder="璇疯緭鍏�" @keypress.enter.native="search"></el-input>
+ <el-input v-model="searchForm.openid" placeholder="璇疯緭鍏ョ敤鎴�" @keypress.enter.native="search"></el-input>
</el-form-item>
<el-form-item label="璁㈠崟缂栧彿" prop="code">
<el-input v-model="searchForm.code" placeholder="璇疯緭鍏ヨ鍗曠紪鍙�" @keypress.enter.native="search"></el-input>
@@ -11,8 +11,8 @@
<el-form-item label="浜ゆ槗鍗曞彿" prop="onlineOrderid">
<el-input v-model="searchForm.onlineOrderid" placeholder="璇疯緭鍏ヤ氦鏄撳崟鍙�" @keypress.enter.native="search"></el-input>
</el-form-item>
- <el-form-item label="鏄惁缁撶畻" prop="status">
- <el-select v-model="searchForm.status" placeholder="璇烽�夋嫨">
+ <el-form-item label="鏄惁缁撶畻" prop="closeStatus">
+ <el-select v-model="searchForm.closeStatus" placeholder="璇烽�夋嫨">
<el-option
label="鏈粨绠�"
:value="0">
@@ -30,8 +30,10 @@
@change="selectDate"
range-separator="鑷�"
start-placeholder="寮�濮嬫棩鏈�"
- end-placeholder="缁撴潫鏃ユ湡">
- </el-date-picker>
+ end-placeholder="缁撴潫鏃ユ湡"
+ format="yyyy-MM-dd"
+ value-format="yyyy-MM-dd HH:mm:ss"
+ ></el-date-picker>
</el-form-item>
<section>
<el-button type="primary" @click="search">鎼滅储</el-button>
@@ -50,13 +52,14 @@
border
>
<el-table-column prop="openid" label="鐢ㄦ埛" min-width="225px" align="center"></el-table-column>
- <el-table-column prop="id" 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 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="140px" align="center"></el-table-column>
- <el-table-column prop="refundMoney" label="閫�鎶奸噾(鍏冿級" min-width="80px" align="center"></el-table-column>
- <el-table-column prop="closeMoney" label="缁撶畻閲戦(鍏冿級" min-width="90px" align="center"></el-table-column>
- <el-table-column prop="closeDate" label="閫�娆剧粨绠楁椂闂�" min-width="140px" 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="closeMoney" label="缁撶畻閲戦(鍏冿級" min-width="100px" align="center"></el-table-column>
+ <el-table-column prop="closeDate" label="缁撶畻鏃堕棿" min-width="140px" align="center"></el-table-column>
+ <el-table-column prop="refundDate" label="閫�娆炬椂闂�" min-width="140px" align="center"></el-table-column>
<!-- <el-table-column prop="createDate" label="鍒涘缓鏃堕棿" min-width="100px"></el-table-column>
@@ -108,6 +111,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'
export default {
name: 'Goodsorder',
extends: BaseTable,
@@ -127,6 +131,7 @@
openid: '',
money: '',
status: '',
+ closeStatus: '',
preOrderid: '',
onlineOrderid: '',
payStatus: '',
@@ -138,7 +143,7 @@
endDate: '',
},
- value1: []
+ value1: [new Date(), new Date()]
}
},
created () {
@@ -148,11 +153,14 @@
'field.id': 'id',
'field.main': 'id'
})
+ this.searchForm.startDate = formatDateTime(new Date(), 'yyyy-MM-dd') + ' 00:00:00'
this.search()
},
methods: {
reset() {
this.value1 = []
+ this.searchForm.startDate = ''
+ this.searchForm.endDate = ''
this.$refs.searchForm.resetFields()
this.search()
},
--
Gitblit v1.9.3