From 37b1176f4b37260bd455891898ed1258c6421607 Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期四, 21 八月 2025 15:28:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin/src/views/business/orders.vue | 26 +++++++++++++++++++++-----
1 files changed, 21 insertions(+), 5 deletions(-)
diff --git a/admin/src/views/business/orders.vue b/admin/src/views/business/orders.vue
index d984741..037ccd1 100644
--- a/admin/src/views/business/orders.vue
+++ b/admin/src/views/business/orders.vue
@@ -3,13 +3,13 @@
<!-- 鎼滅储琛ㄥ崟 -->
<el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
<el-form-item label="璁㈠崟鍙�" prop="releaseMemberId">
- <el-input v-model="searchForm.code" style="width: 120px" placeholder="璇疯緭鍏ヨ鍗曞彿" @keypress.enter.native="search"></el-input>
+ <el-input v-model="searchForm.code" style="width: 120px" clearable placeholder="璇疯緭鍏ヨ鍗曞彿" @keypress.enter.native="search"></el-input>
</el-form-item>
<el-form-item label="鎺ュ崟鏂�" prop="acceptName">
- <el-input v-model="searchForm.acceptName" style="width: 120px" placeholder="璇疯緭鍏ユ帴鍗曟柟" @keypress.enter.native="search"></el-input>
+ <el-input v-model="searchForm.acceptName" style="width: 120px" clearable placeholder="璇疯緭鍏ュ悕绉�" @keypress.enter.native="search"></el-input>
</el-form-item>
<el-form-item label="鍙戝崟鏂�" prop="releaseName">
- <el-input v-model="searchForm.releaseName" style="width: 120px" placeholder="璇疯緭鍏ュ彂鍗曟柟" @keypress.enter.native="search"></el-input>
+ <el-input v-model="searchForm.releaseName" style="width: 120px" clearable placeholder="璇疯緭鍏ュ悕绉�" @keypress.enter.native="search"></el-input>
</el-form-item>
<el-form-item label="璁㈠崟绫诲瀷" prop="type">
<el-select v-model="searchForm.type" style="width: 120px" @keypress.enter.native="search" clearable placeholder="璁㈠崟绫诲瀷">
@@ -19,7 +19,7 @@
</el-select>
</el-form-item>
<el-form-item label="璁㈠崟鐘舵��" prop="status">
- <el-select v-model="searchForm.status" style="width: 120px" @keypress.enter.native="search" clearable placeholder="鐘舵��">
+ <el-select v-model="searchForm.status" style="width: 100px" @keypress.enter.native="search" clearable placeholder="鐘舵��">
<el-option label="寰呮敮浠�" :value="0"></el-option>
<el-option label="寰呮帴鍗�" :value="1"></el-option>
<el-option label="宸叉帴鍗�" :value="2"></el-option>
@@ -179,6 +179,22 @@
})
this.search()
},
+ reset () {
+ this.searchForm = {
+ acceptName: null,
+ releaseName: null,
+ type: null,
+ createTimeEnd: null,
+ createTimeStart: null,
+ acceptTimeStart: null,
+ acceptTimeEnd: null,
+ doneTimeStart: null,
+ doneTimeEnd: null,
+ status: null,
+ code: null
+ }
+ this.search()
+ },
methods: {
openDetail (row) {
this.$refs.OperaOrderDetailWindow.open('璁㈠崟璇︽儏', row )
@@ -198,7 +214,7 @@
.finally(() => {
this.dealing = false
})
- })
+ })
}
}
}
--
Gitblit v1.9.3