From 4384ad3db8f10b7add5f287681c069d4efb1e0ee Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期三, 16 七月 2025 11:54:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin/src/views/business/orders.vue | 70 ++++++++++++++++++++++++-----------
1 files changed, 48 insertions(+), 22 deletions(-)
diff --git a/admin/src/views/business/orders.vue b/admin/src/views/business/orders.vue
index e449613..bca5db6 100644
--- a/admin/src/views/business/orders.vue
+++ b/admin/src/views/business/orders.vue
@@ -28,27 +28,34 @@
<el-option label="宸插彇娑�" :value="99"></el-option>
</el-select>
</el-form-item>
- <el-form-item label="鍙戝竷鏃堕棿" style="width: 380px;" label-width="100px" >
- <el-date-picker type="datetime" style="width: 120px" v-model="searchForm.createTimeStart" clearable value-format="yyyy-MM-dd HH:mm:ss"
- placeholder="寮�濮嬫椂闂�" />-
- <el-date-picker type="datetime" style="width: 120px" v-model="searchForm.createTimeEnd" clearable value-format="yyyy-MM-dd HH:mm:ss"
+ <el-form-item label="鍙戝竷鏃堕棿" prop="createTimeStart" label-width="100px" >
+ <el-date-picker type="datetime" style="width: 150px" v-model="searchForm.createTimeStart" clearable value-format="yyyy-MM-dd HH:mm:ss"
+ placeholder="寮�濮嬫椂闂�" /> -
+ </el-form-item>
+ <el-form-item label="" prop="createTimeEnd" label-width="0px" >
+ <el-date-picker type="datetime" style="width: 150px" v-model="searchForm.createTimeEnd" clearable value-format="yyyy-MM-dd HH:mm:ss"
placeholder="缁撴潫鏃堕棿" />
</el-form-item>
- <el-form-item label="鎺ュ崟鏃堕棿" style="width: 380px;" label-width="100px" >
- <el-date-picker type="datetime" style="width: 120px" v-model="searchForm.acceptTimeStart" clearable value-format="yyyy-MM-dd HH:mm:ss"
- placeholder="寮�濮嬫椂闂�" />-
- <el-date-picker type="datetime" style="width: 120px" v-model="searchForm.acceptTimeEnd" clearable value-format="yyyy-MM-dd HH:mm:ss"
+ <el-form-item label="鎺ュ崟鏃堕棿" prop="acceptTimeStart" label-width="100px" >
+ <el-date-picker type="datetime" style="width: 150px" v-model="searchForm.acceptTimeStart" clearable value-format="yyyy-MM-dd HH:mm:ss"
+ placeholder="寮�濮嬫椂闂�" /> -
+ </el-form-item>
+ <el-form-item label="" prop="acceptTimeEnd" label-width="0px" >
+ <el-date-picker type="datetime" style="width: 150px" v-model="searchForm.acceptTimeEnd" clearable value-format="yyyy-MM-dd HH:mm:ss"
placeholder="缁撴潫鏃堕棿" />
</el-form-item>
- <el-form-item label="瀹屾垚鏃堕棿" style="width: 380px;" label-width="100px" >
- <el-date-picker type="datetime" style="width: 120px" v-model="searchForm.doneTimeStart" clearable value-format="yyyy-MM-dd HH:mm:ss"
- placeholder="寮�濮嬫椂闂�" />-
- <el-date-picker type="datetime" style="width: 120px" v-model="searchForm.doneTimeEnd" clearable value-format="yyyy-MM-dd HH:mm:ss"
+ <el-form-item label="瀹屾垚鏃堕棿" prop="doneTimeStart" label-width="100px" >
+ <el-date-picker type="datetime" style="width: 150px" v-model="searchForm.doneTimeStart" clearable value-format="yyyy-MM-dd HH:mm:ss"
+ placeholder="寮�濮嬫椂闂�" /> -
+ </el-form-item>
+ <el-form-item label="" prop="doneTimeEnd" label-width="0px" >
+ <el-date-picker type="datetime" style="width: 150px" v-model="searchForm.doneTimeEnd" clearable value-format="yyyy-MM-dd HH:mm:ss"
placeholder="缁撴潫鏃堕棿" />
</el-form-item>
<section>
<el-button type="primary" @click="search">鎼滅储</el-button>
<el-button @click="reset">閲嶇疆</el-button>
+ <el-button type="primary" :loading="isWorking.export" @click="exportExcel">瀵煎嚭</el-button>
</section>
</el-form>
<!-- 琛ㄦ牸鍜屽垎椤� -->
@@ -69,7 +76,11 @@
<span style="cursor: pointer;color: #2E68EC" @click="openDetail(row)">{{row.code}}</span>
</template>
</el-table-column>
- <el-table-column prop="statusName" label="璁㈠崟鐘舵��" min-width="100px" > </el-table-column>
+ <el-table-column prop="statusName" label="璁㈠崟鐘舵��" min-width="100px" >
+ <template slot-scope="{row}">
+ <span :class="'orderstate'+row.status">{{row.statusName}}</span>
+ </template>
+ </el-table-column>
<el-table-column prop="type" label="璁㈠崟绫诲瀷" min-width="100px">
<template slot-scope="{row}">
<span v-if="row.type==0">鐢ㄥ伐鍗�</span>
@@ -114,7 +125,7 @@
fixed="right"
>
<template slot-scope="{row}">
- <el-button type="text" class="redstate" @click="cancenDo(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>-1 && row.status<4" 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>
@@ -127,7 +138,7 @@
</pagination>
</template>
<!-- 鏂板缓/淇敼 -->
- <OperaOrdersWindow ref="operaOrdersWindow" @success="handlePageChange"/>
+ <OperaOrderDetailWindow ref="OperaOrderDetailWindow" @success="handlePageChange"/>
</TableLayout>
</template>
@@ -135,11 +146,12 @@
import BaseTable from '@/components/base/BaseTable'
import TableLayout from '@/layouts/TableLayout'
import Pagination from '@/components/common/Pagination'
-import OperaOrdersWindow from '@/components/business/OperaOrdersWindow'
+import OperaOrderDetailWindow from '@/components/business/OperaOrderDetailWindow'
+import { cancel } from '@/api/business/orders'
export default {
name: 'Orders',
extends: BaseTable,
- components: { TableLayout, Pagination, OperaOrdersWindow },
+ components: { TableLayout, Pagination, OperaOrderDetailWindow },
data () {
return {
// 鎼滅储
@@ -154,7 +166,7 @@
doneTimeStart: null,
doneTimeEnd: null,
status: null,
- code:null
+ code: null
}
}
},
@@ -167,12 +179,26 @@
})
this.search()
},
- methods:{
+ methods: {
openDetail (row) {
- // this.$refs.OperaMemberDetailWindow.open('鐢ㄦ埛璇︽儏', row.id)
+ this.$refs.OperaOrderDetailWindow.open('璁㈠崟璇︽儏', row )
},
- cancenDo(row){
-
+ cancelDo (row) {
+ this.$dialog.actionConfirm('鎮ㄧ‘璁ゃ�愬彇娑堛�戣璁㈠崟鍚楋紵', '鎿嶄綔纭')
+ .then(() => {
+ this.dealing = true
+ cancel(row.id)
+ .then(res => {
+ this.$tip.apiSuccess('鎿嶄綔鎴愬姛')
+ this.search()
+ })
+ .catch(e => {
+ this.$tip.apiFailed(e)
+ })
+ .finally(() => {
+ this.dealing = false
+ })
+ })
}
}
}
--
Gitblit v1.9.3