From c3054507bfe45731183db68e5171cacd48d7aef7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Thu, 17 Feb 2022 15:00:09 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=81=E4=B8=9A=E6=A0=87=E5=87=86=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E8=B7=B3=E8=BD=AC=E5=8F=8A=E5=A4=9A=E5=8F=91=E5=B8=83?=
 =?UTF-8?q?=E7=A8=BF=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../otherBussStandardDetails/index.vue        | 43 ++++++++++++++-----
 .../components/EnterpriseStandardDatabase.vue |  2 +-
 2 files changed, 34 insertions(+), 11 deletions(-)

diff --git a/src/pages/details/otherBussStandardDetails/index.vue b/src/pages/details/otherBussStandardDetails/index.vue
index d66c41d6c..28dbc4855 100644
--- a/src/pages/details/otherBussStandardDetails/index.vue
+++ b/src/pages/details/otherBussStandardDetails/index.vue
@@ -353,12 +353,12 @@
                   <div class="basic-information-content">
                     <p class="" style="color: #C42626;"><label style=" margin-right: 171px;">企标号</label><span>{{ sarStandardsInfoEO.standCode }}</span></p>
                     <template v-for="(child, childIndex) in item.child1">
-                      <p class="files-title"
-                      >
+                      <div class="files-title" style="border-bottom: 1px solid #E5E5E5">
                         <label style=" margin-right: 172px;">{{ child.attrName }}</label>
                         <template v-if="child.value && child.value.length > 0" v-for="(file, fileIndex) in child1Func(child.value)">
-                          <span>
-                            <a style="font-size: 16px;color: #409EFF;cursor: pointer" @click="openFileInPdf(file.id, file.oldFileName)" target="_blank" :title="file.oldFileName">{{ file.oldFileName | ellipsis }}</a>
+<!--                          单个文件-->
+                          <span v-if="child.value && child.value.length > 0 && child.value.length === 1">
+                            <a style="font-size: 16px;color: #409EFF;cursor: pointer" @click="openFileInPdf(file.id, file.oldFileName)" target="_blank" :title="file.oldFileName">{{ file.oldFileName }}</a>
                             <i
                                 title="下载"
                                 @click="downloadFile(file.id)"
@@ -374,6 +374,27 @@
                             />
                             <!--                      <span class="time-text">上传时间：{{ dateFormat(file.modifyTime) }}</span>-->
                             </span>
+<!--                          多个文件-->
+                         <div v-else-if="child.value && child.value.length > 0">
+                            <span style="margin-left: 19%">
+                              <a style="font-size: 16px;color: #409EFF;cursor: pointer"
+                                 @click="openFileInPdf(file.id, file.oldFileName)" target="_blank"
+                                 :title="file.oldFileName">{{ file.oldFileName }}</a>
+                              <i
+                                title="下载"
+                                @click="downloadFile(file.id)"
+                                class="icon-download"
+                                v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'd5b28957b5105c805e90a16fd5056a45' : 'a772afab2a6708883335500f3f86e771'"
+                              />
+                              <i
+                                title="下载带水印"
+                                @click="downloadFileByWater(file.id, file.fileSuffix)"
+                                class="icon-download2"
+                                v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? '02fd6eff0537c283dd071683de10689f' : '824f3bf9edef83fc7488917136167232'"
+                              />
+                            </span>
+                        <!--                      <span class="time-text">上传时间：{{ dateFormat(file.modifyTime) }}</span>-->
+                      </div>
                           <!--                        <el-button-->
                           <!--                                v-if="child.attrField === itemNam "-->
                           <!--                                v-for="(itemNam,index) in itemExistList"-->
@@ -384,11 +405,11 @@
                           <!--                                icon="icon-separate"-->
                           <!--                        >标准分解单-->
                           <!--                        </el-button>-->
-                          <el-button v-if="child.value.length > 1" style="color:#409EFF;border: 1px solid #409EFF;background: rgba(64, 158, 255, 0.1);"
-                                     class="decomposition-btn" icon="icon-relation" @click="relateEvent1(child.value)">更多</el-button>
+<!--                          <el-button v-if="child.value.length > 1" style="color:#409EFF;border: 1px solid #409EFF;background: rgba(64, 158, 255, 0.1);"-->
+<!--                                     class="decomposition-btn" icon="icon-relation" @click="relateEvent1(child.value)">更多</el-button>-->
                         </template>
                         <template v-if="child.value === null" >-</template>
-                      </p>
+                      </div>
                     </template>
                     <p><label style="margin-right: 157px;">中文名称</label><span>{{ sarStandardsInfoEO.standName || '-' }}</span></p>
                     <p v-if="activeState"><label style=" margin-right: 157px;">英文名称</label><span>{{ sarStandardsInfoEO.standEnName || '-' }}</span></p>
@@ -1961,10 +1982,12 @@ export default {
         one: spanOneArr,
       }
     },
-    child1Func(child1){
+    child1Func(child1) {
       const list = []
-      if(child1 && child1.length > 1){
-        list.push(child1[0])
+      if (child1 && child1.length > 1) {
+        for (let i = 0; i < child1.length; i++) {
+          list.push(child1[i])
+        }
         return list
       }
       return child1
diff --git a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
index 84dbc5c83..0e75f5284 100644
--- a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
+++ b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
@@ -3374,7 +3374,7 @@ export default {
       let routeUrl = this.$router.resolve({
         name: 'OtherBussStandardDetails',
         params: {
-          id: item.standId,
+          id: item.id,
           pageType: 'BUSINESS_STAND'
         }
       })