From e4f9739d74323aacf09d139700f22a383910ee97 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期三, 04 三月 2026 10:38:32 +0800
Subject: [PATCH] 合并

---
 admin/src/views/business/goodsorder.vue |   30 +++++++++++++-----------------
 1 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/admin/src/views/business/goodsorder.vue b/admin/src/views/business/goodsorder.vue
index 2b1f52f..dfb5f49 100644
--- a/admin/src/views/business/goodsorder.vue
+++ b/admin/src/views/business/goodsorder.vue
@@ -2,7 +2,6 @@
   <TableLayout :permissions="['business:goodsorder:query']">
     <!-- 鎼滅储琛ㄥ崟 -->
     <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
-      <!-- 0寰呮敮浠� 1寰呭彂璐� 2寰呮敹璐� 3浜ゆ槗瀹屾垚 4宸插叧闂� 5閮ㄥ垎鍙戣揣 -->
       <div>
         <el-tabs v-model="status" @tab-click="handleClick">
           <el-tab-pane
@@ -23,30 +22,29 @@
       </div>
       <div>
         <el-form-item label="璁㈠崟缂栧彿" prop="code">
-          <el-input v-model="searchForm.code" placeholder="璇疯緭鍏ヨ鍗曠紪鍙�" type="number" clearable @keypress.enter.native="search"></el-input>
+          <el-input v-model="searchForm.code" style="width: 150px" placeholder="璁㈠崟缂栧彿" type="number" clearable @keypress.enter.native="search"></el-input>
         </el-form-item>
         <el-form-item label="鏀惰揣浜�" prop="nickName">
-          <el-input v-model="searchForm.nickName" placeholder="璇疯緭鍏ュ鍚�/鎵嬫満鍙�" clearable  @keypress.enter.native="search"></el-input>
+          <el-input v-model="searchForm.nickName"  style="width: 150px" placeholder="濮撳悕/鎵嬫満鍙�" clearable  @keypress.enter.native="search"></el-input>
         </el-form-item>
         <el-form-item label="鍙栬揣鏂瑰紡" prop="receiveType">
-          <el-select v-model="searchForm.receiveType"    placeholder="璇烽�夋嫨鍙栬揣鏂瑰紡" clearable   @change="search" >
+          <el-select v-model="searchForm.receiveType"     style="width: 150px" placeholder="鍙栬揣鏂瑰紡" clearable   @change="search" >
             <el-option :key="0" :value="0" label="蹇�掗厤閫�"></el-option>
             <el-option :key="1" :value="1" label="鑷彁"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="鍟嗗搧鍚嶇О" prop="shopName">
-          <el-input v-model="searchForm.goodsName" placeholder="璇疯緭鍏ュ晢鍝佸悕绉�" clearable @keypress.enter.native="search"></el-input>
+          <el-input v-model="searchForm.goodsName"  style="width: 150px" placeholder="鍟嗗搧鍚嶇О" clearable @keypress.enter.native="search"></el-input>
         </el-form-item>
         <el-form-item label="褰掑睘缁忛攢鍟�" prop="shopName">
-          <el-input v-model="searchForm.shopName" placeholder="璇疯緭鍏ョ粡閿�鍟嗗悕绉�" clearable @keypress.enter.native="search"></el-input>
+          <el-input v-model="searchForm.shopName"  style="width: 150px" placeholder="缁忛攢鍟嗗悕绉�" clearable @keypress.enter.native="search"></el-input>
         </el-form-item>
         <el-form-item label="鏀粯鍗曞彿" prop="payOrderId">
-          <el-input v-model="searchForm.payOrderId" placeholder="璇疯緭鍏ユ敮浠樺崟鍙�" clearable  @keypress.enter.native="search"></el-input>
+          <el-input v-model="searchForm.payOrderId"  style="width: 150px" placeholder="鏀粯鍗曞彿" clearable  @keypress.enter.native="search"></el-input>
         </el-form-item>
-        <div class="date-style" style="display: inline">
           <el-form-item label="璁㈠崟鏃堕棿" prop="starttime" >
             <el-date-picker
-                style="width: 180px"
+                style="width: 200px"
                 clearable
                 @change="search"
                 v-model="searchForm.starttime"
@@ -59,7 +57,7 @@
           </el-form-item>
           <el-form-item label="-" label-width="10px" prop="endtime" >
             <el-date-picker
-                style="width: 180px"
+                style="width: 200px"
                 clearable
                      v-model="searchForm.endtime"
                 type="datetime"
@@ -70,14 +68,12 @@
                 placeholder="鎴鏃堕棿"
             ></el-date-picker>
           </el-form-item>
-        </div>
+        <section>
+          <el-button type="primary" @click="search">鎼滅储</el-button>
+          <el-button @click="reset">閲嶇疆</el-button>
+          <el-button type="primary" :loading="isWorking.export" v-permissions="['business:goodsorder:exportExcel']" @click="exportExcel">瀵煎嚭</el-button>
+        </section>
       </div>
-
-      <section>
-        <el-button type="primary" @click="search">鎼滅储</el-button>
-        <el-button @click="reset">閲嶇疆</el-button>
-        <el-button type="primary" :loading="isWorking.export" v-permissions="['business:goodsorder:exportExcel']" @click="exportExcel">瀵煎嚭</el-button>
-      </section>
     </el-form>
     <!-- 琛ㄦ牸鍜屽垎椤� -->
     <template v-slot:table-wrap>

--
Gitblit v1.9.3