From cc6ab7021c3aef6ca3bbf05f8bcb5bfe0e6f6096 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 18 三月 2025 16:52:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0.1' into 2.0.1
---
admin/src/views/business/goodsorder.vue | 23 +++++++++++++++++++++++
1 files changed, 23 insertions(+), 0 deletions(-)
diff --git a/admin/src/views/business/goodsorder.vue b/admin/src/views/business/goodsorder.vue
index 41d831a..e862a01 100644
--- a/admin/src/views/business/goodsorder.vue
+++ b/admin/src/views/business/goodsorder.vue
@@ -35,6 +35,18 @@
value-format="yyyy-MM-dd HH:mm:ss"
></el-date-picker>
</el-form-item>
+ <el-form-item label="璁㈠崟绫诲瀷" prop="bikeType">
+ <el-select v-model="searchForm.bikeType" placeholder="璇烽�夋嫨">
+ <el-option
+ label="鍗曡溅绫诲瀷"
+ :value="3">
+ </el-option>
+ <el-option
+ label="鐢佃溅绫诲瀷"
+ :value="4">
+ </el-option>
+ </el-select>
+ </el-form-item>
<section>
<el-button type="primary" @click="search">鎼滅储</el-button>
<el-button @click="reset">閲嶇疆</el-button>
@@ -53,10 +65,17 @@
>
<el-table-column prop="openid" 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 label="璁㈠崟绫诲瀷" min-width="100px" align="center">
+ <template slot-scope="{row}">
+ <span v-if="row.bikeType === 3">鍗曡溅绫诲瀷</span>
+ <span v-if="row.bikeType === 4">鐢佃溅绫诲瀷</span>
+ </template>
+ </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="145px" align="center"></el-table-column>
<el-table-column prop="refundMoney" label="閫�鎶奸噾(鍏冿級" min-width="90px" align="center"></el-table-column>
+ <el-table-column prop="discountMoney" label="浼樻儬閲戦" min-width="90px" align="center"></el-table-column>
<el-table-column prop="closeMoney" label="缁撶畻閲戦(鍏冿級" min-width="100px" align="center">
<template slot-scope="{row}">
<span v-if="row.closeMoney > row.money">{{row.money}}</span>
@@ -146,8 +165,12 @@
closeMoney: '',
startDate: '',
endDate: '',
+<<<<<<< HEAD
+ bikeType: ''
+=======
type: 0
+>>>>>>> 32dbee794a7f1b0e407eaf8aa17fa55d9c4f6883
},
value1: [new Date(), new Date()]
}
--
Gitblit v1.9.3