From 28972c351ea79b4721750f6970e88263b64c64aa Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期四, 13 三月 2025 16:03:36 +0800
Subject: [PATCH] 表格样式整体修改

---
 src/views/business/productOrder/components/add.vue |  262 +++++++++++++++++++++++++++++++---------------------
 1 files changed, 156 insertions(+), 106 deletions(-)

diff --git a/src/views/business/productOrder/components/add.vue b/src/views/business/productOrder/components/add.vue
index 6681783..e2d0238 100644
--- a/src/views/business/productOrder/components/add.vue
+++ b/src/views/business/productOrder/components/add.vue
@@ -2,9 +2,7 @@
   <div class="app-container">
     <div v-show="!cableConfigShow&&!auxiliaryShow">
       <div style="display: flex;justify-content: space-between;align-items:center;">
-        <div>
-          濮旀墭鍗曚俊鎭�
-        </div>
+        <div>濮旀墭鍗曚俊鎭�</div>
         <div>
           <el-cascader
             v-model="addObj.quarterItemId"
@@ -41,96 +39,146 @@
     <div v-show="!cableConfigShow&&!auxiliaryShow" style="margin-top: 10px">
       <div class="search">
         <el-form ref="addObj" :inline="true" :model="addObj" :rules="addObjRules" label-width="108px" label-position="right">
-          <el-form-item label="濮旀墭缂栧彿:">
-            <el-input v-model="addObj.entrustCode" clearable disabled placeholder="绯荤粺鐢熸垚" size="small"></el-input>
-          </el-form-item>
-          <el-form-item label="妫�楠岀被鍒�:" prop="orderType">
-            <el-select v-model="addObj.orderType" :disabled="active>1&&tabIndex!=4" clearable size="small" style="width: 100%;">
-              <el-option v-for="(a, ai) in dict.type.check_type1" :key="ai" :label="a.label" :value="a.value"></el-option>
-            </el-select>
-          </el-form-item>
-          <el-form-item label="鍒跺崟浜�:">
-            <el-input v-model="addObj.custom" disabled size="small" clearable></el-input>
-          </el-form-item>
-          <el-form-item label="濮旀墭鍗曚綅:" prop="company">
-            <el-input v-model="addObj.company" disabled placeholder="閫夋嫨濮旀墭鍗曚綅" size="small" style="width: 208px">
-              <template slot="append">
-                <el-button slot="append" :disabled="active>1&&tabIndex!=4" icon="el-icon-search"
-                           @click="openCompanyList"></el-button>
-              </template>
-            </el-input>
-          </el-form-item>
-          <el-form-item label="鑱旂郴鏂瑰紡:" prop="phone">
-            <el-input v-model="addObj.phone" :disabled="active>1&&tabIndex!=4" clearable placeholder="閫夋嫨濮旀墭瀹㈡埛" size="small"></el-input>
-          </el-form-item>
-          <el-form-item label="绱ф�ョ▼搴�:" prop="type">
-            <el-select v-model="addObj.type" :disabled="active>1&&tabIndex!=4" clearable size="small">
-              <el-option v-for="(a, ai) in dict.type.urgency_level" :key="ai" :label="a.label" :value="a.value"></el-option>
-            </el-select>
-          </el-form-item>
-          <el-form-item label="鏍峰搧鍚嶇О:" prop="sample">
-            <el-input v-model="addObj.sample" disabled size="small" style="width: 208px">
-              <template slot="append"><el-button slot="append" :disabled="active>1&&tabIndex!=4" icon="el-icon-search"
-                                                 @click="selectStandardTree = true"></el-button></template>
-            </el-input>
-          </el-form-item>
-          <el-form-item label="鏍峰搧鏁伴噺:" prop="sampleNum" style="margin-right: 0">
-            <el-input-number v-model="addObj.sampleNum" :disabled="active>1" :max="100" :min="1" :precision="0"
-                             size="small" @change="addStandardTree"></el-input-number>
-          </el-form-item>
-          <el-form-item label="鏍峰搧鐘舵��:" prop="sampleStatus">
-            <el-select v-model="addObj.sampleStatus" :disabled="active>1&&tabIndex!=4" size="small">
-              <el-option v-for="(a,ai) in dict.type.sample_status_list" :key="ai" :label="a.label" :value="a.value"></el-option>
-            </el-select>
-          </el-form-item>
-          <el-form-item label="鎶芥鏁伴噺:" prop="testQuantity">
-            <el-input v-model="addObj.testQuantity" :disabled="active>1&&tabIndex!=4" clearable size="small"></el-input>
-          </el-form-item>
-          <el-form-item label="鏉ユ牱鏂瑰紡:" prop="formType">
-            <el-select v-model="addObj.formType" :disabled="active>1&&tabIndex!=4" size="small" clearable>
-              <el-option v-for="(a,ai) in dict.type.form_type" :key="ai" :label="a.label" :value="a.value"></el-option>
-            </el-select>
-          </el-form-item>
-          <el-form-item label="鐢熶骇鍗曚綅:" prop="production">
-            <el-input v-model="addObj.production" :disabled="active>1&&tabIndex!=4" clearable placeholder="璇疯緭鍏�"
-                      size="small"></el-input>
-          </el-form-item>
-          <el-form-item label="鐢熶骇鍗曚綅EN:" prop="productionEn">
-            <el-input v-model="addObj.productionEn" :disabled="active>1&&tabIndex!=4" clearable placeholder="璇疯緭鍏�"
-                      size="small"></el-input>
-          </el-form-item>
-          <el-form-item label="鏍峰搧澶勭悊鏂瑰紡:">
-            <el-radio-group v-model="addObj.processing" :disabled="active>1&&tabIndex!=4" size="mini">
-              <el-radio :label="0" border style="margin-right: 0">濮旀墭鍗曚綅鍙栧洖</el-radio>
-              <el-radio :label="1" border>瀹為獙瀹ゅ鐞�</el-radio>
-            </el-radio-group>
-          </el-form-item>
-          <el-form-item label="鏄惁鐣欐牱:">
-            <el-radio-group v-model="addObj.isLeave" border :disabled="active>1&&tabIndex!=4" size="mini">
-              <el-radio :label="0" border style="margin-right: 0">涓嶇暀鏍�</el-radio>
-              <el-radio :label="1" border>鐣欐牱</el-radio>
-            </el-radio-group>
-          </el-form-item>
-          <el-form-item label="鎶ュ憡鍙戦�佹柟寮�:">
-            <el-radio-group v-model="addObj.send" :disabled="active>1&&tabIndex!=4" size="mini">
-              <el-radio :label="1" border style="margin-right: 0">鑷彇</el-radio>
-              <el-radio :label="0" border>鍏朵粬</el-radio>
-            </el-radio-group>
-          </el-form-item>
-          <el-form-item label="濮旀墭浜�:">
-            <el-input v-model="addObj.prepareUser" :disabled="active>1&&tabIndex!=4" :placeholder="active>1 ? '' : '璇疯緭鍏�'" clearable size="small"></el-input>
-          </el-form-item>
-          <el-form-item label="濮旀墭浜鸿嫳鏂�:">
-            <el-input v-model="addObj.prepareUserEn" :disabled="active>1&&tabIndex!=4" :placeholder="active>1 ? '' : '璇疯緭鍏�'" clearable size="small"></el-input>
-          </el-form-item>
-          <el-form-item label="澶囨敞:">
-            <el-input v-model="addObj.remark" :autosize="{ minRows: 2, maxRows: 2}" :disabled="active>1&&tabIndex!=4" :placeholder="active>1 ? '' : '璇疯緭鍏�'" clearable
-                      size="small" style="width: 100%" type="textarea"></el-input>
-          </el-form-item>
-          <el-form-item label="澶囨敞鑻辨枃:">
-            <el-input v-model="addObj.remarkEn" :autosize="{ minRows: 2, maxRows: 2}" :disabled="active>1&&tabIndex!=4" :placeholder="active>1 ? '' : '璇疯緭鍏�'" clearable
-                      size="small" type="textarea"></el-input>
-          </el-form-item>
+          <el-row>
+            <el-col :span="6">
+              <el-form-item label="濮旀墭缂栧彿:">
+                <el-input v-model="addObj.entrustCode" clearable disabled placeholder="绯荤粺鐢熸垚" size="small"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="妫�楠岀被鍒�:" prop="orderType">
+                <el-select v-model="addObj.orderType" :disabled="active>1&&tabIndex!=4" clearable size="small" style="width: 100%;">
+                  <el-option v-for="(a, ai) in dict.type.check_type1" :key="ai" :label="a.label" :value="a.value"></el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="鍒跺崟浜�:">
+                <el-input v-model="addObj.custom" disabled size="small" clearable></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="濮旀墭鍗曚綅:" prop="company">
+                <el-input v-model="addObj.company" disabled placeholder="閫夋嫨濮旀墭鍗曚綅" size="small" style="width: 208px">
+                  <template slot="append">
+                    <el-button slot="append" :disabled="active>1&&tabIndex!=4" icon="el-icon-search"
+                               @click="openCompanyList"></el-button>
+                  </template>
+                </el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="6">
+              <el-form-item label="鑱旂郴鏂瑰紡:" prop="phone">
+                <el-input v-model="addObj.phone" :disabled="active>1&&tabIndex!=4" clearable placeholder="閫夋嫨濮旀墭瀹㈡埛" size="small"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="绱ф�ョ▼搴�:" prop="type">
+                <el-select v-model="addObj.type" :disabled="active>1&&tabIndex!=4" clearable size="small">
+                  <el-option v-for="(a, ai) in dict.type.urgency_level" :key="ai" :label="a.label" :value="a.value"></el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="鏍峰搧鍚嶇О:" prop="sample">
+                <el-input v-model="addObj.sample" disabled size="small" style="width: 208px">
+                  <template slot="append"><el-button slot="append" :disabled="active>1&&tabIndex!=4" icon="el-icon-search"
+                                                     @click="selectStandardTree = true"></el-button></template>
+                </el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="鏍峰搧鏁伴噺:" prop="sampleNum" style="margin-right: 0">
+                <el-input-number v-model="addObj.sampleNum" :disabled="active>1" :max="100" :min="1" :precision="0"
+                                 size="small" @change="addStandardTree"></el-input-number>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="6">
+              <el-form-item label="鏍峰搧鐘舵��:" prop="sampleStatus">
+                <el-select v-model="addObj.sampleStatus" :disabled="active>1&&tabIndex!=4" size="small">
+                  <el-option v-for="(a,ai) in dict.type.sample_status_list" :key="ai" :label="a.label" :value="a.value"></el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="鎶芥鏁伴噺:" prop="testQuantity">
+                <el-input v-model="addObj.testQuantity" :disabled="active>1&&tabIndex!=4" clearable size="small"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="鏉ユ牱鏂瑰紡:" prop="formType">
+                <el-select v-model="addObj.formType" :disabled="active>1&&tabIndex!=4" size="small" clearable>
+                  <el-option v-for="(a,ai) in dict.type.form_type" :key="ai" :label="a.label" :value="a.value"></el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="鎶ュ憡鍙戦�佹柟寮�:">
+                <el-radio-group v-model="addObj.send" :disabled="active>1&&tabIndex!=4" size="mini">
+                  <el-radio :label="1" border style="margin-right: 0">鑷彇</el-radio>
+                  <el-radio :label="0" border>鍏朵粬</el-radio>
+                </el-radio-group>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="6">
+              <el-form-item label="鏍峰搧澶勭悊鏂瑰紡:">
+                <el-radio-group v-model="addObj.processing" :disabled="active>1&&tabIndex!=4" size="mini" style="display: flex; flex-direction: column;">
+                  <el-radio :label="0" border style="margin-right: 0">濮旀墭鍗曚綅鍙栧洖</el-radio>
+                  <el-radio :label="1" border>瀹為獙瀹ゅ鐞�</el-radio>
+                </el-radio-group>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="鐢熶骇鍗曚綅:" prop="production">
+                <el-input v-model="addObj.production" :disabled="active>1&&tabIndex!=4" clearable placeholder="璇疯緭鍏�"
+                          size="small"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="鐢熶骇鍗曚綅EN:" prop="productionEn">
+                <el-input v-model="addObj.productionEn" :disabled="active>1&&tabIndex!=4" clearable placeholder="璇疯緭鍏�"
+                          size="small"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="鏄惁鐣欐牱:">
+                <el-radio-group v-model="addObj.isLeave" border :disabled="active>1&&tabIndex!=4" size="mini">
+                  <el-radio :label="0" border style="margin-right: 0">涓嶇暀鏍�</el-radio>
+                  <el-radio :label="1" border>鐣欐牱</el-radio>
+                </el-radio-group>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="6">
+              <el-form-item label="濮旀墭浜�:">
+                <el-input v-model="addObj.prepareUser" :disabled="active>1&&tabIndex!=4" :placeholder="active>1 ? '' : '璇疯緭鍏�'" clearable size="small"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="濮旀墭浜鸿嫳鏂�:">
+                <el-input v-model="addObj.prepareUserEn" :disabled="active>1&&tabIndex!=4" :placeholder="active>1 ? '' : '璇疯緭鍏�'" clearable size="small"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="澶囨敞:">
+                <el-input v-model="addObj.remark" :autosize="{ minRows: 2, maxRows: 2}" :disabled="active>1&&tabIndex!=4" :placeholder="active>1 ? '' : '璇疯緭鍏�'" clearable
+                          size="small" style="width: 100%" type="textarea"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="澶囨敞鑻辨枃:">
+                <el-input v-model="addObj.remarkEn" :autosize="{ minRows: 2, maxRows: 2}" :disabled="active>1&&tabIndex!=4" :placeholder="active>1 ? '' : '璇疯緭鍏�'" clearable
+                          size="small" type="textarea"></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
           <el-row>
             <el-col :span="6">
               <el-form-item label="鏍峰搧鍚嶇О:">
@@ -154,10 +202,10 @@
         </el-form>
       </div>
       <div>
-        <div style="display: flex;justify-content: space-between;">
+        <div style="display: flex;justify-content: space-between;background-color: #F5F7FB;margin-bottom: 6px">
           <div v-if="active==1">
             <el-form :inline="true" :model="addObj1" label-width="90px">
-              <el-form-item label="鏍峰搧鍨嬪彿:" style="margin-bottom: 6px">
+              <el-form-item label="鏍峰搧鍨嬪彿:" style="margin-bottom: 6px;margin-top: 6px">
                 <el-select v-model="model" :placeholder="active>1 ? '' : '璇疯緭鍏�'"
                            allow-create clearable default-first-option filterable
                            size="small"
@@ -166,7 +214,7 @@
                   </el-option>
                 </el-select>
               </el-form-item>
-              <el-form-item label="妫�楠屾爣鍑�:">
+              <el-form-item label="妫�楠屾爣鍑�:" style="margin-bottom: 6px;margin-top: 6px">
                 <el-select v-model="standardMethodListId" :loading="methodLoad"
                            :placeholder="active>1 ? '' : '璇疯緭鍏�'" clearable size="small"
                            @change="changeStandardMethodListId" @focus="methodFocus">
@@ -176,7 +224,7 @@
               </el-form-item>
             </el-form>
           </div>
-          <div style="display: flex;align-items: center;margin-bottom: 10px">
+          <div style="display: flex;align-items: center;margin-bottom: 6px;margin-top: 6px">
             <span style="width: 150px;font-size: 14px;text-align: right;">鐗规畩鏍囧噯锛�</span>
             <el-input v-model="specialStandardMethod" :disabled="!isSpecial" clearable size="small"></el-input>
             <el-button v-show="active==1" size="small" style="margin-left: 10px"
@@ -184,6 +232,7 @@
           </div>
         </div>
         <el-table ref="sampleTable" :data="sampleList" border class="el-table sampleTable" highlight-current-row
+                  :header-cell-style="{ background: '#f8f8f9', color: '#515a6e' }"
           max-height="400px" tooltip-effect="dark" @selection-change="selectSample" @row-click="rowClick">
           <el-table-column v-if="active==1" :selectable="selectable" type="selection" width="60"></el-table-column>
           <el-table-column align="center" label="搴忓彿" type="index" width="65"></el-table-column>
@@ -247,7 +296,10 @@
             </template>
           </el-table-column>
         </el-table>
-        <el-table ref="productTable" v-loading="getProductLoad" :data="productList" :row-class-name="tableRowClassName" border class="el-table"
+        <el-table ref="productTable" v-loading="getProductLoad" :data="productList"
+                  :row-class-name="tableRowClassName" border class="el-table"
+                  :header-cell-style="{ background: '#f8f8f9', color: '#515a6e' }" border
+                  :key="upIndex"
           max-height="400px" style="margin-bottom: 10px;" tooltip-effect="dark"
           @select="selectOne" @selection-change="selectProduct" @select-all="handleAll">
           <el-table-column v-if="active==1" :selectable="selectable0" type="selection" width="65"></el-table-column>
@@ -686,6 +738,7 @@
       sampleViewEn: null,
       expandedKeys: [],
       sampleList: [],
+      upIndex: 0,
       sampleIds: [],
       methodList: [],
       addSampleDia: false,
@@ -847,6 +900,10 @@
       // 缂栬緫瑕佹眰鍊艰〃鏍�
       editSpecial () {
         this.isSpecial = true
+        this.$nextTick(() => {
+          this.$refs.productTable.doLayout();
+          this.upIndex++
+        });
       },
       getQuarterOnOrderList () {
         getQuarterOnOrder().then(res => {
@@ -1247,7 +1304,6 @@
             company: this.addObj.company
           }).then(res => {
             this.saveLoad = false
-            if (res.code == 201) return
             this.$message.success('鎻愪氦鎴愬姛')
             selectOrderManDay({
               id: this.currentId
@@ -1285,10 +1341,6 @@
           userId: this.distributeData.userId,
           sonLaboratory:this.distributeData.sonLaboratory
         }).then(res => {
-          if (res.code === 201) {
-            this.upLoad = false
-            return
-          }
           this.$message.success('鎻愪氦鎴愬姛')
           this.upLoad = false
           this.issuedDialogVisible = false
@@ -1622,9 +1674,6 @@
           delInsOrderTemplate({
             id: row.id
           }).then(res => {
-            if (res.code === 201) {
-              return
-            }
             this.$message.success('鍒犻櫎鎴愬姛')
             this.selectInsOrderTemplate()
           }).catch(e => {
@@ -1709,6 +1758,7 @@
           this.$refs.sampleTable.setCurrentRow(row)
           this.$nextTick(() => {
             this.$refs.productTable.doLayout();
+            this.upIndex++
           });
           setTimeout(() => {
             this.productList.forEach(a => {

--
Gitblit v1.9.3