From 00a7a61df86db969f2ba61c508d02ba4709ce3d4 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期五, 05 六月 2026 10:09:06 +0800
Subject: [PATCH] 改bug
---
admin/src/views/business/orderManagement.vue | 28 ++++++++++++++++++++++++----
1 files changed, 24 insertions(+), 4 deletions(-)
diff --git a/admin/src/views/business/orderManagement.vue b/admin/src/views/business/orderManagement.vue
index 671ca89..f01a341 100644
--- a/admin/src/views/business/orderManagement.vue
+++ b/admin/src/views/business/orderManagement.vue
@@ -4,8 +4,8 @@
<el-form-item label="璁㈠崟缂栧彿" prop="code">
<el-input v-model="searchForm.code" clearable placeholder="璇疯緭鍏ヨ鍗曠紪鍙�" @keypress.enter.native="search"></el-input>
</el-form-item>
- <el-form-item label="鐗╁搧淇℃伅" prop="goodsInfo">
- <el-input v-model="searchForm.goodsInfo" clearable placeholder="璇疯緭鍏ョ墿鍝佷俊鎭�" @keypress.enter.native="search"></el-input>
+ <el-form-item label="鏀朵欢淇℃伅" prop="takeKeyword">
+ <el-input v-model="searchForm.takeKeyword" clearable placeholder="璇疯緭鍏ユ敹浠朵汉鎴栨敹浠朵汉鐢佃瘽" @keypress.enter.native="search"></el-input>
</el-form-item>
<el-form-item label="鍒涘缓鏃堕棿" prop="createTime1">
<el-date-picker type="daterange" v-model="searchForm.createTime1" clearable value-format="yyyy-MM-dd"
@@ -66,9 +66,29 @@
</template>
</el-table-column>
<el-table-column prop="goodsInfo" label="鐗╁搧淇℃伅" min-width="120px"></el-table-column>
+
+ <el-table-column prop="goodsInfo" label="鏀朵欢淇℃伅" min-width="140px">
+ <template slot-scope="{row}">
+ {{ row.takeUser || '-' }}
+ {{ row.takePhone || '-' }}
+ </template>
+ </el-table-column>
+ <el-table-column prop="goodsInfo" label="瀵勪欢闂ㄥ簵" min-width="120px">
+ <template slot-scope="{row}">
+ {{ row.depositShopName || '-' }}
+ </template>
+ </el-table-column>
+ <el-table-column prop="goodsInfo" label="鏀朵欢闂ㄥ簵" min-width="120px">
+ <template slot-scope="{row}">
+ <template v-if="row.type !== 0 && row.takeShopId">
+ {{ row.takeShopName || '-' }}
+ </template>
+ </template>
+ </el-table-column>
+
<el-table-column label="绫诲瀷" min-width="80px">
<template slot-scope="{row}">
- <span v-if="row.type === 0">灏卞湴瀛樺彇</span>
+ <span v-if="row.type === 0">灏卞湴瀵勫瓨</span>
<span v-else-if="row.type === 1">鍚屽煄瀵勯��</span>
<span v-else>-</span>
</template>
@@ -159,7 +179,7 @@
return {
searchForm: {
code: '',
- goodsInfo: '',
+ takeKeyword: '',
createTime1: '',
createStartTime: '',
createEndTime: '',
--
Gitblit v1.9.3