From e5454b769d44a34af423bf87ac8a740bf8c20341 Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期二, 29 四月 2025 13:25:29 +0800
Subject: [PATCH] Merge branch 'dev' into dev_tides

---
 src/views/business/finishedProductSampling/components/addQuarterItem.vue |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/views/business/finishedProductSampling/components/addQuarterItem.vue b/src/views/business/finishedProductSampling/components/addQuarterItem.vue
index 63e6888..c4b20b1 100644
--- a/src/views/business/finishedProductSampling/components/addQuarterItem.vue
+++ b/src/views/business/finishedProductSampling/components/addQuarterItem.vue
@@ -12,7 +12,8 @@
         </div>
       </div>
       <div>
-        <el-table v-loading="tableLoading" :data="quarterItems" border height="420" style="width: 100%">
+        <el-table v-loading="tableLoading" :data="quarterItems" border height="420" style="width: 100%"
+                  :header-cell-style="{ background: '#f8f8f9', color: '#515a6e' }">
           <el-table-column label="浜у搧绫诲瀷" prop="productType" width="200">
             <template slot-scope="{row}">
               <template>
@@ -278,7 +279,7 @@
       }
     },
     getUserList(){
-      selectUserCondition({ type: 0 }).then((res) => {
+      selectUserCondition().then((res) => {
         this.userList = res.data;
       })
     },

--
Gitblit v1.9.3