From 3d46f89ff6c600f60d97f4541443540be20460c1 Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期五, 26 六月 2026 18:07:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/3.0.1' into 3.0.1
---
admin/src/views/business/goodsorder.vue | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/admin/src/views/business/goodsorder.vue b/admin/src/views/business/goodsorder.vue
index d96ba6b..8500788 100644
--- a/admin/src/views/business/goodsorder.vue
+++ b/admin/src/views/business/goodsorder.vue
@@ -35,12 +35,12 @@
value-format="yyyy-MM-dd HH:mm:ss"
></el-date-picker>
</el-form-item>
- <el-form-item label="璁㈠崟绫诲瀷" prop="type">
+<!-- <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>
+ </el-form-item>-->
<section>
<el-button type="primary" @click="search">鎼滅储</el-button>
<el-button @click="reset">閲嶇疆</el-button>
@@ -155,7 +155,7 @@
payStatus: '',
payWay: '',
payDate: '',
- type: '',
+ type: 0,
closeMoney: '',
startDate: '',
endDate: '',
--
Gitblit v1.9.3