From 02a9f8e792d447218067080906f1fc09c3d0bfc7 Mon Sep 17 00:00:00 2001
From: lideqin <694785430@qq.com>
Date: Thu, 21 Sep 2023 14:56:48 +0800
Subject: [PATCH] =?UTF-8?q?[update]=20=E8=A7=A3=E5=86=B3columns=E6=AF=8F?=
 =?UTF-8?q?=E4=B8=80=E4=B8=AA=E9=83=BD=E5=86=99dataIndex=E4=BC=9A=E6=9C=89?=
 =?UTF-8?q?=E4=B8=80=E4=B8=AA=E6=A8=AA=E5=90=91=E6=BB=9A=E5=8A=A8=E6=9D=A1?=
 =?UTF-8?q?=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                     |  3 ++-
 .../publicize/EnterpriseStandardPublicize.vue      | 14 ++++++--------
 .../reviewPlan/ReviewPlanList.vue                  | 10 ++--------
 .../browsingHistory/BrowsingHistory.vue            | 11 ++---------
 .../personalCenter/receivedShare/ReceivedShare.vue | 11 ++---------
 src/views/personalCenter/sentShare/SentShare.vue   | 11 ++---------
 6 files changed, 16 insertions(+), 44 deletions(-)

diff --git a/src/components/jero/JTable.vue b/src/components/jero/JTable.vue
index c475803b..d62c8099 100644
--- a/src/components/jero/JTable.vue
+++ b/src/components/jero/JTable.vue
@@ -446,7 +446,8 @@ export default {
           col = columns.find(col => getKey(col) === key) || {}
         }
         // 没有开启拖拽 或 没有宽度 或 有定位，都不能拖拽（防止布局异常，至少有一列不设width并且不能有fixed）
-        if (!col.width || !!col.fixed) {
+        // 或者是最后一列也不能拖拽
+        if (!col.width || !!col.fixed || col.title === columns[columns.length - 1].title) {
           return <th {...restProps}>{children}</th>
         }
         // 开始拖拽监听
diff --git a/src/views/enterpriseStandardLibrary/publicize/EnterpriseStandardPublicize.vue b/src/views/enterpriseStandardLibrary/publicize/EnterpriseStandardPublicize.vue
index d3ba1584..fae574ab 100644
--- a/src/views/enterpriseStandardLibrary/publicize/EnterpriseStandardPublicize.vue
+++ b/src/views/enterpriseStandardLibrary/publicize/EnterpriseStandardPublicize.vue
@@ -53,11 +53,6 @@
       </a-button>
       <a-button icon="upload" type="primary" ghost v-has="'enterpriseStandardLibrary:publicize:fileExport'"
                 @click="handleFileExport($t('enterpriseStandardLibrary.publicize.fileExportName'))">{{ $t('exportWithFile') }}</a-button>
-      <!--        模板下载-->
-      <a-button type="primary" icon="download" ghost v-has="'enterpriseStandardLibrary:publicize:templateDownload'"
-                @click="downTemplate('enterpriseStandardLibrary.publicize.templateName')">
-        {{ $t('templateDownload') }}
-      </a-button>
     </div>
 
     <div>
@@ -87,15 +82,17 @@
         <template v-slot:enterpriseStandardName="{text, record}">
           <a-tooltip overlay-class-name="tooltip-style">
             <template slot="title">{{ text || text === 0 ? text : global.emptyLine }}</template>
-            <a class="link-a" @click="handleGoDetail(record)">{{ text }}</a>
+            <a v-if="text" class="link-a" @click="handleGoDetail(record)">{{ text }}</a>
+            <div v-else class="table-text">{{ global.emptyLine }}</div>
           </a-tooltip>
         </template>
 
         <!--    相关材料   -->
         <template v-slot:relatedMaterial="{text, record}">
           <a-tooltip overlay-class-name="tooltip-style">
-            <template slot="title">{{ record.declareFileName || record.declareFileName === 0 ? record.declareFileName : global.emptyLine }}</template>
-            <a class="link-a" @click="handleRelatedMaterialClick(record)">{{ record.declareFileName }}</a>
+            <template slot="title">{{ text || text === 0 ? text : global.emptyLine }}</template>
+            <a v-if="text" class="link-a" @click="handleRelatedMaterialClick(record)">{{ text }}</a>
+            <div v-else class="table-text">{{ global.emptyLine }}</div>
           </a-tooltip>
         </template>
 
@@ -176,6 +173,7 @@ export default {
           title: this.$t('enterpriseStandardLibrary.publicize.relatedMaterial'),
           align: 'center',
           width: 180,
+          dataIndex: 'declareFileName',
           scopedSlots: { customRender: 'relatedMaterial' }
         }
       ],
diff --git a/src/views/enterpriseStandardLibrary/reviewPlan/ReviewPlanList.vue b/src/views/enterpriseStandardLibrary/reviewPlan/ReviewPlanList.vue
index 750cf0fa..1377d52e 100644
--- a/src/views/enterpriseStandardLibrary/reviewPlan/ReviewPlanList.vue
+++ b/src/views/enterpriseStandardLibrary/reviewPlan/ReviewPlanList.vue
@@ -89,13 +89,6 @@
             <div class="table-text">{{ text || text === 0 ? text : global.emptyLine }}</div>
           </a-tooltip>
         </template>
-        <!--  主起草单位： 为了去掉横向滚动条  -->
-        <template slot="mainDraftingUnit" slot-scope="{record}">
-          <a-tooltip overlay-class-name="tooltip-style">
-            <template slot="title">{{ record.mainDraftingUnit || record.mainDraftingUnit === 0 ? record.mainDraftingUnit : global.emptyLine }}</template>
-            <div class="table-text">{{ record.mainDraftingUnit || record.mainDraftingUnit === 0 ? record.mainDraftingUnit : global.emptyLine }}</div>
-          </a-tooltip>
-        </template>
 
       </j-table>
     </div>
@@ -170,7 +163,8 @@ export default {
           title: this.$t('enterpriseStandardLibrary.reviewPlan.mainDraftingUnit'),
           align: 'center',
           width: 180,
-          scopedSlots: { customRender: 'mainDraftingUnit' }
+          dataIndex: 'mainDraftingUnit',
+          scopedSlots: { customRender: 'text' }
         }
       ],
       labelCol: {
diff --git a/src/views/personalCenter/browsingHistory/BrowsingHistory.vue b/src/views/personalCenter/browsingHistory/BrowsingHistory.vue
index 993dc458..807dc635 100644
--- a/src/views/personalCenter/browsingHistory/BrowsingHistory.vue
+++ b/src/views/personalCenter/browsingHistory/BrowsingHistory.vue
@@ -36,14 +36,6 @@
           </a-tooltip>
         </template>
 
-        <!--浏览时间，单独写出来是解决会有滚动条的问题-->
-        <template slot="browsingTime" slot-scope="{text, record}">
-          <a-tooltip overlay-class-name="tooltip-style">
-            <template slot="title">{{ record.browsingTime || record.browsingTime === 0 ? record.browsingTime : global.emptyLine }}</template>
-            <div class="table-text">{{ record.browsingTime || record.browsingTime === 0 ? record.browsingTime : global.emptyLine }}</div>
-          </a-tooltip>
-        </template>
-
       </j-table>
     </div>
   </a-card>
@@ -80,7 +72,8 @@ export default {
           title: this.$t('personalCenter.browsingHistory.browsingTime'),
           align: 'center',
           width: 180,
-          scopedSlots: { customRender: 'browsingTime' }
+          dataIndex: 'browsingTime',
+          scopedSlots: { customRender: 'text' }
         }
       ],
       url: {
diff --git a/src/views/personalCenter/receivedShare/ReceivedShare.vue b/src/views/personalCenter/receivedShare/ReceivedShare.vue
index f1d3d6be..d5671012 100644
--- a/src/views/personalCenter/receivedShare/ReceivedShare.vue
+++ b/src/views/personalCenter/receivedShare/ReceivedShare.vue
@@ -59,14 +59,6 @@
           </a-tooltip>
         </template>
 
-        <!--  接收时间，单独写出来是解决会有滚动条的问题  -->
-        <template slot="receiptTime" slot-scope="{text, record}">
-          <a-tooltip overlay-class-name="tooltip-style">
-            <template slot="title">{{ record.sharingTime || record.sharingTime === 0 ? record.sharingTime : global.emptyLine }}</template>
-            <div class="table-text">{{ record.sharingTime || record.sharingTime === 0 ? record.sharingTime : global.emptyLine }}</div>
-          </a-tooltip>
-        </template>
-
       </j-table>
     </div>
   </a-card>
@@ -114,7 +106,8 @@ export default {
           title: this.$t('personalCenter.receivedShare.receiptTime'),
           align: 'center',
           width: 180,
-          scopedSlots: { customRender: 'receiptTime' }
+          dataIndex: 'sharingTime',
+          scopedSlots: { customRender: 'text' }
         }
       ],
       url: {
diff --git a/src/views/personalCenter/sentShare/SentShare.vue b/src/views/personalCenter/sentShare/SentShare.vue
index 7a294008..7f47a993 100644
--- a/src/views/personalCenter/sentShare/SentShare.vue
+++ b/src/views/personalCenter/sentShare/SentShare.vue
@@ -59,14 +59,6 @@
           </a-tooltip>
         </template>
 
-        <!--  转发时间，单独写出来是解决会有滚动条的问题  -->
-        <template slot="transmitTime" slot-scope="{text, record}">
-          <a-tooltip overlay-class-name="tooltip-style">
-            <template slot="title">{{ record.sharingTime || record.sharingTime === 0 ? record.sharingTime : global.emptyLine }}</template>
-            <div class="table-text">{{ record.sharingTime || record.sharingTime === 0 ? record.sharingTime : global.emptyLine }}</div>
-          </a-tooltip>
-        </template>
-
       </j-table>
     </div>
   </a-card>
@@ -114,7 +106,8 @@ export default {
           title: this.$t('personalCenter.sentShare.transmitTime'),
           align: 'center',
           width: 180,
-          scopedSlots: { customRender: 'transmitTime' }
+          dataIndex: 'sharingTime',
+          scopedSlots: { customRender: 'text' }
         }
       ],
       url: {