From 91039aa769d33b6c588fd9bb2cae994abd8aa954 Mon Sep 17 00:00:00 2001
From: haoxuan <haoxuan>
Date: 星期二, 07 五月 2024 18:01:05 +0800
Subject: [PATCH] 机台管理模块 修改搜索的默认文字+调整纤度检验详情的样式

---
 src/views/productManage/silkRegisterForm/addPage.vue |   10 +++++++---
 src/views/employeeSalary/machineManage/index.vue     |    2 +-
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/views/employeeSalary/machineManage/index.vue b/src/views/employeeSalary/machineManage/index.vue
index f3099c5..3f48bf2 100644
--- a/src/views/employeeSalary/machineManage/index.vue
+++ b/src/views/employeeSalary/machineManage/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="container">
     <div class="filter-card">
-      <CommonSearch ref="searchRef" :show-add="false" :amount-view="false" placeholder="璇疯緭鍏ュ叧閿瘝" @searchClick="onFilterSearch">
+      <CommonSearch ref="searchRef" :show-add="false" :amount-view="false" placeholder="璇疯緭鍏ュ伐浜哄鍚�/宸ュ彿/杞﹂棿鍚嶇О" @searchClick="onFilterSearch">
         <template slot="leftButton">
           <el-button size="small" type="primary" @click="addBtnClick" >鏂板</el-button>
           <!-- <el-button size="small" type="primary" @click="exportClick">瀵煎叆</el-button> -->
diff --git a/src/views/productManage/silkRegisterForm/addPage.vue b/src/views/productManage/silkRegisterForm/addPage.vue
index 24bcbdb..9a29a21 100644
--- a/src/views/productManage/silkRegisterForm/addPage.vue
+++ b/src/views/productManage/silkRegisterForm/addPage.vue
@@ -255,7 +255,7 @@
               :header-cell-style="{ background: '#f1f3f8',color: '#000009', 'font-size': '12px', 'font-family': 'PingFangSC' }"
               border
             >
-              <el-table-column label="杞﹀彿" prop="ID" width="100">
+              <el-table-column label="杞﹀彿" prop="position" width="90">
               </el-table-column>
               <el-table-column
                 label="涓嬪樊绾ゅ害"
@@ -1134,16 +1134,20 @@
     .form-box-t {
       width: 100%;
       height: 60px;
-      overflow: hidden;
+      overflow-x: auto;
 
       .form-item {
-        width: calc(16% - 5px);
+        max-width: calc(16% - 5px);
+        min-width:210px;
         margin-right: 10px;
         float: left;
 
         &:nth-of-type(6n) {
           margin-right: 0;
         }
+        &:last-child{
+          float:right;
+        }
       }
     }
 

--
Gitblit v1.8.0