From 55ba702c1df240929e68df3b42fa9cb0607378b8 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期一, 08 九月 2025 10:58:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0.1' into 2.0.1
---
admin/src/views/business/goodsorder.vue | 26 +++++++-------------------
1 files changed, 7 insertions(+), 19 deletions(-)
diff --git a/admin/src/views/business/goodsorder.vue b/admin/src/views/business/goodsorder.vue
index e862a01..178e05b 100644
--- a/admin/src/views/business/goodsorder.vue
+++ b/admin/src/views/business/goodsorder.vue
@@ -35,16 +35,10 @@
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-form-item label="璁㈠崟绫诲瀷" prop="type">
+ <el-select v-model="searchForm.type" placeholder="璇烽�夋嫨">
+ <el-option label="绉熻溅鎶奸噾" :value="0"> </el-option>
+ <el-option label="濂楅鍗¤喘涔�" :value="1"> </el-option>
</el-select>
</el-form-item>
<section>
@@ -67,8 +61,8 @@
<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>
+ <span v-if="row.type === 0">绉熻溅鎶奸噾</span>
+ <span v-if="row.type === 1">濂楅鍗¤喘涔�</span>
</template>
</el-table-column>
<el-table-column prop="onlineOrderid" label="浜ゆ槗鍗曞彿" min-width="225px" align="center"></el-table-column>
@@ -161,16 +155,11 @@
payStatus: '',
payWay: '',
payDate: '',
- type: '',
+ type: 0,
closeMoney: '',
startDate: '',
endDate: '',
-<<<<<<< HEAD
bikeType: ''
-=======
- type: 0
-
->>>>>>> 32dbee794a7f1b0e407eaf8aa17fa55d9c4f6883
},
value1: [new Date(), new Date()]
}
@@ -226,7 +215,6 @@
})
})
.catch(() => {})
-
},
refenMoney({id}) {
getGoodsorderCanBanlanceDTO({orderId:id})
--
Gitblit v1.9.3