From 3d460140b7af3a281b54d17b457c8aff12b9d5c2 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期一, 15 九月 2025 17:09:52 +0800
Subject: [PATCH] 前端
---
admin/src/views/business/orders.vue | 36 ++++++++++++++++++++++++++----------
1 files changed, 26 insertions(+), 10 deletions(-)
diff --git a/admin/src/views/business/orders.vue b/admin/src/views/business/orders.vue
index d984741..706d5df 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>
@@ -89,14 +89,14 @@
</template>
</el-table-column>
<el-table-column prop="orderContent" label="璁㈠崟鍐呭" width="200px" :show-overflow-tooltip='true'></el-table-column>
- <el-table-column prop="releaseName" label="鍙戝崟鏂�" width="200px">
+ <el-table-column prop="releaseName" label="鍙戝崟鏂�" min-width="100px" :show-overflow-tooltip='true'>
<template slot-scope="{row}">
- {{(row.releaseName||'鍖垮悕') +' - ' +(row.releasePhone||'鏃�') }}
+ <span v-if="row.releaseName || row.releasePhone">{{(row.releaseName||'') +' - ' +(row.releasePhone||'') }}</span>
</template>
</el-table-column>
- <el-table-column prop="acceptName" label="鎺ュ崟鏂�" width="200px">
+ <el-table-column prop="acceptName" label="鎺ュ崟鏂�" min-width="100px" :show-overflow-tooltip='true'>
<template slot-scope="{row}">
- {{(row.acceptName||'鍖垮悕') +' - ' +(row.acceptPhone ||'鏃�') }}
+ <span v-if="row.acceptName || row.acceptPhone">{{(row.acceptName||'') +' - ' +(row.acceptPhone ||'') }}</span>
</template>
</el-table-column>
<el-table-column prop="createTime" label="鍙戝竷鏃堕棿" min-width="150px"></el-table-column>
@@ -125,7 +125,7 @@
fixed="right"
>
<template slot-scope="{row}">
- <el-button type="text" class="redstate" @click="cancelDo(row)" v-if="row.status>-1 && row.status<4" icon="el-icon-delete" v-permissions="['business:orders:update']">鍙栨秷</el-button>
+ <el-button type="text" class="redstate" @click="cancelDo(row)" v-if="row.status!=5 && row.status!=4&& row.status!=99" icon="el-icon-delete" v-permissions="['business:orders:update']">鍙栨秷</el-button>
<el-button type="text" @click="openDetail( row)" icon="el-icon-info" >璇︽儏</el-button>
</template>
</el-table-column>
@@ -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