From 2a62d833e04d7e46ea3f27f94475b8cf29d0f459 Mon Sep 17 00:00:00 2001
From: lideqin <694785430@qq.com>
Date: Tue, 30 Jul 2024 14:34:58 +0800
Subject: [PATCH] =?UTF-8?q?[update]=20=E4=BF=AE=E6=94=B9bug87521,=E6=A0=87?=
 =?UTF-8?q?=E5=87=86=E8=AF=A6=E6=83=85=E9=A1=B5=E6=9C=80=E6=96=B0=E7=A8=BF?=
 =?UTF-8?q?=E4=BB=B6=E5=AD=97=E6=AE=B5=E7=9A=84=E6=89=80=E6=9C=89=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E9=83=BD=E5=8F=AF=E4=BB=A5=E6=9F=A5=E7=9C=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../detail/EnterpriseStandardDetail.vue        | 16 +++++++---------
 .../detail/ForeignStandardDetailPage.vue       | 18 ++++++++----------
 2 files changed, 15 insertions(+), 19 deletions(-)

diff --git a/src/views/enterpriseStandardLibrary/standard/detail/EnterpriseStandardDetail.vue b/src/views/enterpriseStandardLibrary/standard/detail/EnterpriseStandardDetail.vue
index 39dbfca..f656114 100644
--- a/src/views/enterpriseStandardLibrary/standard/detail/EnterpriseStandardDetail.vue
+++ b/src/views/enterpriseStandardLibrary/standard/detail/EnterpriseStandardDetail.vue
@@ -64,19 +64,19 @@
           <template v-if="detailData[formItem.dbFieldName]">
             <div class="detail-page-process-manuscript-file" v-for="file in detailData[formItem.dbFieldName + 'List']" :key="file.id">
               <div class="detail-page-process-manuscript-file-info"
-                   :class="newestManuScriptField.includes(formItem.dbFieldName) && file.id !== manuScriptNewestFileId ? 'disabled-file-info' : ''">
+                   :class="newestManuScriptField.includes(formItem.dbFieldName) && formItem.dbFieldName !== manuScriptNewestFileField ? 'disabled-file-info' : ''">
                 <a-icon type="link" />
                 <div class="detail-page-process-manuscript-file-name" @click="handlePreview(file, formItem)">{{ file.fileName }}</div>
               </div>
               <div class="detail-page-process-manuscript-file-operate">
                 <!--                下载-->
                 <a-button type="link" icon="download" @click="handleDownload(file)" v-has="'enterpriseStandard:detail:download'"
-                          :disabled="newestManuScriptField.includes(formItem.dbFieldName) && file.id !== manuScriptNewestFileId">
+                          :disabled="newestManuScriptField.includes(formItem.dbFieldName) && formItem.dbFieldName !== manuScriptNewestFileField">
                   {{ $t('download') }}
                 </a-button>
                 <!--                无水印下载-->
                 <a-button type="link" @click="downloadDraftNoWater(file)" v-has="'enterpriseStandard:detail:noWaterDownload'"
-                          :disabled="newestManuScriptField.includes(formItem.dbFieldName) && file.id !== manuScriptNewestFileId">
+                          :disabled="newestManuScriptField.includes(formItem.dbFieldName) && formItem.dbFieldName !== manuScriptNewestFileField">
                   <i class="iconfont icon-water-drop-slash"></i>
                   {{ $t('unwatermarkedDownload') }}
                 </a-button>
@@ -195,8 +195,8 @@ export default {
       standardFields: ['substitute_standard_number', 'replaced_by_standard_number', 'reference_standard', 'referenced_standard'],
       // 参与只允许查看最新稿件排序的字段顺序(发布稿>征求意见稿)
       newestManuScriptField: ['publish_of_original', 'draft_for_comment'],
-      // 过程稿件中可以查看的最新文件id
-      manuScriptNewestFileId: '',
+      // 过程稿件中可以查看的最新字段
+      manuScriptNewestFileField: '',
       filePerm: { // 上传文件根据权限控制只能查看，没有权限的除了系统管理员外不可见不可下载
         associated_file: 'enterpriseStandard:associatedFile:look' // 关联文件
       }
@@ -284,9 +284,7 @@ export default {
           if (this.detailData.standard_state !== EnterpriseStandardStatus.ABOLISH.value) {
             for (const item of this.newestManuScriptField) {
               if (this.detailData[item]) {
-                // 从文件列表里面获取
-                const sortFileIdArr = this.detailData[item].split(',').sort((a, b) => b - a) // 日期只精确到天，用id更能区分
-                this.manuScriptNewestFileId = sortFileIdArr[0]
+                this.manuScriptNewestFileField = item
                 break
               }
             }
@@ -312,7 +310,7 @@ export default {
       if (!file || !file.url) {
         return
       }
-      if (formItem && this.newestManuScriptField.includes(formItem.dbFieldName) && file.id !== this.manuScriptNewestFileId) {
+      if (formItem && this.newestManuScriptField.includes(formItem.dbFieldName) && formItem.dbFieldName !== this.manuScriptNewestFileField) {
         // 参与最新稿件不预览的不是最新的稿件不能预览
         return
       }
diff --git a/src/views/standardRegulationLibrary/foreignStandard/detail/ForeignStandardDetailPage.vue b/src/views/standardRegulationLibrary/foreignStandard/detail/ForeignStandardDetailPage.vue
index 9cdb041..907f482 100644
--- a/src/views/standardRegulationLibrary/foreignStandard/detail/ForeignStandardDetailPage.vue
+++ b/src/views/standardRegulationLibrary/foreignStandard/detail/ForeignStandardDetailPage.vue
@@ -85,19 +85,19 @@
                  v-for="file in detailData[formItem.dbFieldName + 'List']"
                  :key="file.id">
               <div class="detail-page-process-manuscript-file-info"
-                   :class="newestManuScriptField.includes(formItem.dbFieldName) && file.id !== manuScriptNewestFileId ? 'disabled-file-info' : ''">
+                   :class="newestManuScriptField.includes(formItem.dbFieldName) && formItem.dbFieldName !== manuScriptNewestFileField ? 'disabled-file-info' : ''">
                 <a-icon type="link" />
                 <div class="detail-page-process-manuscript-file-name" @click="handlePreview(file, formItem)">{{ file.fileName }}</div>
               </div>
               <div class="detail-page-process-manuscript-file-operate">
                 <!--                下载-->
                 <a-button type="link" icon="download" v-has="btnPermission.download" @click="handleWatermarkedDownload(file)"
-                          :disabled="newestManuScriptField.includes(formItem.dbFieldName) && file.id !== manuScriptNewestFileId">
+                          :disabled="newestManuScriptField.includes(formItem.dbFieldName) && formItem.dbFieldName !== manuScriptNewestFileField">
                   {{ $t('download') }}
                 </a-button>
                 <!--                无水印下载-->
                 <a-button type="link" v-has="btnPermission.unwatermarkedDownload" @click="handleDownload(file)"
-                          :disabled="newestManuScriptField.includes(formItem.dbFieldName) && file.id !== manuScriptNewestFileId">
+                          :disabled="newestManuScriptField.includes(formItem.dbFieldName) && formItem.dbFieldName !== manuScriptNewestFileField">
                   <i class="iconfont icon-water-drop-slash"></i>
                   {{ $t('unwatermarkedDownload') }}
                 </a-button>
@@ -175,8 +175,8 @@ export default {
       showViewAllField: ['part_name'], // 需要显示展示查看全部按钮的字段
       // 参与只允许查看最新稿件排序的字段顺序(发布稿>TBT通报文件>报批稿>送审稿>征求意见稿>草案)
       newestManuScriptField: ['publish_of_original', 'tbt_file', 'draft_for_review', 'draft_for_approval', 'draft_for_comment', 'draft'],
-      // 过程稿件中可以查看的最新文件id
-      manuScriptNewestFileId: '',
+      // 过程稿件中可以查看的最新字段
+      manuScriptNewestFileField: '',
       retractableFlag: {}, // 面板展开收起的标识
       // 业务基本信息有几个部分
       formPartList: [],
@@ -248,13 +248,11 @@ export default {
               this.$set(this.detailData, item + 'List', fileInfoList)
             }
           })
-          // 不是废止状态的话，获取过程稿件中可以查看的最新文件id
+          // 不是废止状态的话，获取过程稿件中有文件的第一个字段
           if (this.detailData.standard_state !== StandardStatus.ABOLISH.value) {
             for (const item of this.newestManuScriptField) {
               if (this.detailData[item]) {
-                // 从文件列表里面获取
-                const sortFileIdArr = this.detailData[item].split(',').sort((a, b) => b - a) // 日期只精确到天，用id更能区分
-                this.manuScriptNewestFileId = sortFileIdArr[0]
+                this.manuScriptNewestFileField = item
                 break
               }
             }
@@ -313,7 +311,7 @@ export default {
       if (!file || !file.url) {
         return
       }
-      if (formItem && this.newestManuScriptField.includes(formItem.dbFieldName) && file.id !== this.manuScriptNewestFileId) {
+      if (formItem && this.newestManuScriptField.includes(formItem.dbFieldName) && formItem.dbFieldName !== this.manuScriptNewestFileField) {
         // 参与最新稿件不预览的不是最新的稿件不能预览
         return
       }