From 79c64d3f8785833daeb3dc39bc0b5129f335a6d2 Mon Sep 17 00:00:00 2001
From: qq787203167 <787203167@qq.com>
Date: Thu, 30 Jun 2022 19:55:56 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=85=E9=81=93=E5=B7=B2?=
 =?UTF-8?q?=E7=9F=A5bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/tableCollection/index.vue  | 65 +++++++++++--------
 1 file changed, 38 insertions(+), 27 deletions(-)

diff --git a/jero-web/src/components/tableCollection/index.vue b/jero-web/src/components/tableCollection/index.vue
index 9a6f0ca00..21f1d508d 100644
--- a/jero-web/src/components/tableCollection/index.vue
+++ b/jero-web/src/components/tableCollection/index.vue
@@ -1,22 +1,24 @@
 <template>
   <div style="height: 100%">
     <div class="box">
+      <!--      -->
       <a-table
         class="table"
         rowKey="id"
         :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
         :pagination="false"
-        :scroll="{x: true}"
+        :scroll="{x: '100%',y:'calc(100vh - 160px)'}"
         :data-source="dataSource"
         :loading="loading"
+        sticky
+        :components="components"
         :columns="columns"
         :rowClassName="rowClassName"
-        :components="components"
         @change="tableOnChange"
         @onHeaderRow='onHeaderRow'
       >
         <span slot="titleName" slot-scope="text,record" :title="text">
-                  {{ text && text.length > 10 ? text.slice(0, 9) + '...' : text }}
+                  {{ text }}
         </span>
         <div :slot="'titleName'+(index+1)" v-for="(item,index) in content">
           <span style='padding-right: 20px'>{{ item.db_field_txt }} </span>
@@ -26,7 +28,8 @@
         <span slot="operationbtn" slot-scope="record">
            <span v-if='currentPersonRole === "homo"'>
 <!--           认证工程师  -->
-           <span v-if='record.state == "待发起收集" || record.state == "工程接口人退回" || record.state == "变更" || record.state == "Wait Collect" || record.state == "Sdt Back" || record.state == "Change"'>
+           <span
+             v-if='record.state == "待发起收集" || record.state == "工程接口人退回" || record.state == "变更" || record.state == "Wait Collect" || record.state == "Sdt Back" || record.state == "Change"'>
              <span
                @click='ondataValueTobeinitiated(record)'>{{ (record.dataValue == null || record.dataValue == 'undefined')? '--': record.dataValue}}</span>
            </span>
@@ -56,7 +59,8 @@
         <a-row :gutter='24'>
           <a-col :span='24'>
             <a-form-model-item ref='region' :label="$t('engineeringInterfacePerson')" prop='querySdt'>
-              <a-select allowClear :placeholder="$t('PleaseSelect')+$t('engineeringInterfacePerson')" v-model="Dateline.querySdt">
+              <a-select allowClear :placeholder="$t('PleaseSelect')+$t('engineeringInterfacePerson')"
+                        v-model="Dateline.querySdt">
                 <a-select-option v-for="(item, key) in querySdtList" :key="key" :value="item.value">
                     <span style="display: inline-block;width: 100%" :title=" item.label ">
                       {{ item.label }}
@@ -174,7 +178,7 @@
                 x: col.width,
                 z: 1,
                 axis: 'x',
-                draggable: true,
+                draggable: false,
                 resizable: false
               },
               on: {
@@ -213,7 +217,11 @@
         form: {},
         rules: {
           querySdt: [
-            { required: true, message: this.$t('PleaseSelect')+this.$t('engineeringInterfacePerson'), trigger: 'blur' }
+            {
+              required: true,
+              message: this.$t('PleaseSelect') + this.$t('engineeringInterfacePerson'),
+              trigger: 'blur'
+            }
           ]
         },
         wrapperCol: {
@@ -234,8 +242,8 @@
     mounted() {
     },
     methods: {
-      rowClassName(row,index) {
-        return row.changeFlag == '1'? 'yellow' : 'red'
+      rowClassName(row, index) {
+        return row.changeFlag == '1' ? 'yellow' : 'red'
       },
       // 查看配置详细信息
       onClickSee(val) {
@@ -380,7 +388,8 @@
                   align: 'center',
                   ellipsis: true,
                   sorter: res.sort,
-                  sortOrder: res.db_field_txt
+                  sortOrder: res.db_field_txt,
+                  width: 500
                 })
                 num++
                 this.content.push(res)
@@ -396,9 +405,10 @@
                   align: 'center',
                   ellipsis: true,
                   sorter: res.sort,
+                  width: 160
                 })
                 this.columns[index].scopedSlots = {
-                  customRender: 'titleName',
+                  customRender: 'titleName'
                 }
                 if (res.click) {
                   // 工程接口人列表修改
@@ -475,13 +485,13 @@
             //   })
             // })
             let tt = []
-            if(this.currentPersonRole !== 'dre') {
+            if (this.currentPersonRole !== 'dre') {
               res.result.forEach((Obj) => {
                 Object.keys(Obj).forEach((item) => {
-                  if(Obj[item] instanceof Object && Obj[item].controlType !== undefined){
+                  if (Obj[item] instanceof Object && Obj[item].controlType !== undefined) {
                     Obj[item].list.forEach((itemLi) => {
                       itemLi.isLock = 1
-                      if(itemLi.type === 'pull_more'){
+                      if (itemLi.type === 'pull_more') {
                         itemLi.dataValue = itemLi.dataValue === null ? [] : itemLi.dataValue.split(',')
                       }
                     })
@@ -492,9 +502,9 @@
             } else {
               res.result.forEach((Obj) => {
                 Object.keys(Obj).forEach((item) => {
-                  if(Obj[item] instanceof Object && Obj[item].controlType !== undefined){
+                  if (Obj[item] instanceof Object && Obj[item].controlType !== undefined) {
                     Obj[item].list.forEach((itemLi) => {
-                      if(itemLi.type === 'pull_more'){
+                      if (itemLi.type === 'pull_more') {
                         itemLi.dataValue = itemLi.dataValue === null ? [] : itemLi.dataValue.split(',')
                       }
                     })
@@ -534,7 +544,7 @@
     },
     watch: {
       currentPersonRole: {
-        handler: function(){
+        handler: function() {
           this.getTableList()
           this.getData()
         },
@@ -612,6 +622,17 @@
     margin-top: 20px;
   }
 
+  /deep/ .ant-table-tbody .yellow {
+    background-color: #ffff001f !important;
+    height: 40px !important;
+    border: none !important;
+    padding: 0 !important;
+  }
+</style>
+<style>
+  .resize-table-th {
+    position: relative;
+  }
   .table-draggable-handle {
     /* width: 10px !important; */
     height: 100% !important;
@@ -624,14 +645,4 @@
     transform: none !important;
     bottom: 0;
   }
-
-  .resize-table-th {
-    position: relative;
-  }
-  /deep/.ant-table-tbody .yellow {
-    background-color: #ffff001f !important;
-    height: 40px !important;
-    border: none !important;
-    padding: 0 !important;
-  }
 </style>