From d4c30733c43735c45cf55e984304d16d85944345 Mon Sep 17 00:00:00 2001
From: lideqin <694785430@qq.com>
Date: Thu, 21 Sep 2023 17:02:00 +0800
Subject: [PATCH] =?UTF-8?q?[update]=20=E8=81=94=E8=B0=83=E4=BC=81=E6=A0=87?=
 =?UTF-8?q?=E7=9A=84=E9=83=A8=E5=88=86=E5=AF=BC=E5=87=BA=EF=BC=8C=E8=A7=A3?=
 =?UTF-8?q?=E5=86=B3table=E4=B8=AD=E6=AF=8F=E4=B8=AAcolumns=E9=83=BD?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AEdataIndex=E4=BC=9A=E6=9C=89=E6=A8=AA=E5=90=91?=
 =?UTF-8?q?=E6=BB=9A=E5=8A=A8=E6=9D=A1=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/jero/JTable.vue                   | 16 ++++++++++++----
 .../check/CheckList.vue                          |  3 ++-
 .../enterpriseStandardLibrary/plan/PlanList.vue  |  3 ++-
 .../publicize/EnterpriseStandardPublicize.vue    |  3 ++-
 .../receivedShare/ReceivedShare.vue              |  7 ++++---
 src/views/personalCenter/sentShare/SentShare.vue |  7 ++++---
 6 files changed, 26 insertions(+), 13 deletions(-)

diff --git a/src/components/jero/JTable.vue b/src/components/jero/JTable.vue
index d62c8099..1e69109b 100644
--- a/src/components/jero/JTable.vue
+++ b/src/components/jero/JTable.vue
@@ -52,7 +52,7 @@
               <!--  不需要更多按钮  -->
               <template v-for="(operation, index) in operSpecialJudge(record)">
                 <a :key="index" @click="operationClick(operation,record)">{{ operation.text }}</a>
-                <a-divider :key="index" type="vertical" v-if="index !== operSpecialJudge(record).length - 1"/>
+                <a-divider type="vertical" v-if="index !== operSpecialJudge(record).length - 1"/>
               </template>
             </template>
           </template>
@@ -80,7 +80,7 @@
             <template v-else-if="getLineOperationList(record).length > 0">
               <template v-for="(operation, index) in getLineOperationList(record)">
                 <a :key="index" @click="operationClick(operation,record)">{{ operation.text }}</a>
-                <a-divider :key="index" type="vertical" v-if="index !== getLineOperationList(record).length - 1"/>
+                <a-divider type="vertical" v-if="index !== getLineOperationList(record).length - 1"/>
               </template>
             </template>
           </template>
@@ -446,8 +446,7 @@ export default {
           col = columns.find(col => getKey(col) === key) || {}
         }
         // 没有开启拖拽 或 没有宽度 或 有定位，都不能拖拽（防止布局异常，至少有一列不设width并且不能有fixed）
-        // 或者是最后一列也不能拖拽
-        if (!col.width || !!col.fixed || col.title === columns[columns.length - 1].title) {
+        if (!col.width || !!col.fixed) {
           return <th {...restProps}>{children}</th>
         }
         // 开始拖拽监听
@@ -484,6 +483,7 @@ export default {
         const onDrag = (x) => {
           return x >= (col.minWidth || this.columnMinWidth)
         }
+        // 解决都有dataIndex时会有横向滚动条的问题，让最后一列的拖拽容器宽度为0
         return (
           <th
             {...restProps}
@@ -649,5 +649,13 @@ export default {
       touch-action: none;
     }
   }
+  // 解决每行都有dataIndex时会有横向滚动条的问题
+  .resize-table-th:last-child {
+    border-right: none;
+    .table-draggable-handle {
+      width: 0px !important;
+      min-width: 0px !important;
+    }
+  }
 }
 </style>
diff --git a/src/views/enterpriseStandardLibrary/check/CheckList.vue b/src/views/enterpriseStandardLibrary/check/CheckList.vue
index 5065f1ca..7da67373 100644
--- a/src/views/enterpriseStandardLibrary/check/CheckList.vue
+++ b/src/views/enterpriseStandardLibrary/check/CheckList.vue
@@ -300,7 +300,8 @@ export default {
       ],
       url: {
         list: '/enterprise/inspect/page',
-        exportPostponeDataUrl: '', // 导出延期数据
+        exportXlsUrl: '/enterprise/inspect/exportData',
+        exportPostponeDataUrl: '/enterprise/inspect/exportDataWithDelay', // 导出延期数据
         exportRectificationPlanUrl: '' // 导出整改计划
       },
       operationList: [
diff --git a/src/views/enterpriseStandardLibrary/plan/PlanList.vue b/src/views/enterpriseStandardLibrary/plan/PlanList.vue
index 2643be48..56a0cb31 100644
--- a/src/views/enterpriseStandardLibrary/plan/PlanList.vue
+++ b/src/views/enterpriseStandardLibrary/plan/PlanList.vue
@@ -396,7 +396,8 @@ export default {
         }
       ],
       url: {
-        list: '/enterprise/plan/page'
+        list: '/enterprise/plan/page',
+        exportXlsUrl: '/enterprise/plan/exportData'
       }
     }
   },
diff --git a/src/views/enterpriseStandardLibrary/publicize/EnterpriseStandardPublicize.vue b/src/views/enterpriseStandardLibrary/publicize/EnterpriseStandardPublicize.vue
index fae574ab..3159410e 100644
--- a/src/views/enterpriseStandardLibrary/publicize/EnterpriseStandardPublicize.vue
+++ b/src/views/enterpriseStandardLibrary/publicize/EnterpriseStandardPublicize.vue
@@ -178,7 +178,8 @@ export default {
         }
       ],
       url: {
-        list: '/enterprise/declare/page'
+        list: '/enterprise/declare/page',
+        exportXlsUrl: '/enterprise/declare/exportData'
       }
     }
   },
diff --git a/src/views/personalCenter/receivedShare/ReceivedShare.vue b/src/views/personalCenter/receivedShare/ReceivedShare.vue
index d5671012..c702d1f9 100644
--- a/src/views/personalCenter/receivedShare/ReceivedShare.vue
+++ b/src/views/personalCenter/receivedShare/ReceivedShare.vue
@@ -53,9 +53,9 @@
         <!-- 标题字段 -->
         <template v-slot:titleSlot="{text, record}">
           <a-tooltip overlay-class-name="tooltip-style">
-            <template slot="title">{{ record.title || record.title === 0 ? record.title : global.emptyLine }}</template>
-            <a v-if="record.title && record.source !== '4'" class="link-a" @click="handleGoDetail(record)">{{ record.title }}</a>
-            <div v-else class="table-text">{{ record.title || record.title === 0 ? record.title : global.emptyLine }}</div>
+            <template slot="title">{{ text || text === 0 ? text : global.emptyLine }}</template>
+            <a v-if="text && record.source !== '4'" class="link-a" @click="handleGoDetail(record)">{{ text }}</a>
+            <div v-else class="table-text">{{ text || text === 0 ? text : global.emptyLine }}</div>
           </a-tooltip>
         </template>
 
@@ -93,6 +93,7 @@ export default {
           title: this.$t('personalCenter.receivedShare.title'),
           align: 'center',
           width: 180,
+          dataIndex: 'rubric',
           scopedSlots: { customRender: 'titleSlot' }
         },
         {
diff --git a/src/views/personalCenter/sentShare/SentShare.vue b/src/views/personalCenter/sentShare/SentShare.vue
index 7f47a993..d4e33856 100644
--- a/src/views/personalCenter/sentShare/SentShare.vue
+++ b/src/views/personalCenter/sentShare/SentShare.vue
@@ -53,9 +53,9 @@
         <!-- 标题字段 -->
         <template v-slot:titleSlot="{text, record}">
           <a-tooltip overlay-class-name="tooltip-style">
-            <template slot="title">{{ record.title || record.title === 0 ? record.title : global.emptyLine }}</template>
-            <a v-if="record.title && record.source !== '4'" class="link-a" @click="handleGoDetail(record)">{{ record.title }}</a>
-            <div v-else class="table-text">{{ record.title || record.title === 0 ? record.title : global.emptyLine }}</div>
+            <template slot="title">{{ text || text === 0 ? text : global.emptyLine }}</template>
+            <a v-if="text && record.source !== '4'" class="link-a" @click="handleGoDetail(record)">{{ text }}</a>
+            <div v-else class="table-text">{{ text || text === 0 ? text : global.emptyLine }}</div>
           </a-tooltip>
         </template>
 
@@ -93,6 +93,7 @@ export default {
           title: this.$t('personalCenter.sentShare.title'),
           align: 'center',
           width: 180,
+          dataIndex: 'rubric',
           scopedSlots: { customRender: 'titleSlot' }
         },
         {