From a8efb3aae2a9f6846a656d0471f2cc47197a5e06 Mon Sep 17 00:00:00 2001
From: zhangyichen <5277314+zacty@user.noreply.gitee.com>
Date: Thu, 7 Apr 2022 17:07:59 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug=2052445=20=E6=B5=B7?=
 =?UTF-8?q?=E5=A4=96=E6=A0=87=E5=87=86=E6=B3=95=E8=A7=84:=E6=9F=A5?=
 =?UTF-8?q?=E7=9C=8B=E7=95=8C=E9=9D=A2,=E5=8F=91=E5=B8=83=E7=A8=BF?=
 =?UTF-8?q?=E9=82=A3=E4=B8=80=E8=A1=8C=E6=8B=89=E5=AE=BD=20=E8=AE=A9?=
 =?UTF-8?q?=E5=90=8E=E9=9D=A2=E7=9A=84=E6=8C=89=E9=92=AE=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E4=B8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/details/otherStandardDetails/index.vue | 16 +++++++++++-----
 .../foreignStandardsAndRegulations/index.vue     | 11 +++--------
 2 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/src/pages/details/otherStandardDetails/index.vue b/src/pages/details/otherStandardDetails/index.vue
index b86d6a15d..e6dd6ee42 100644
--- a/src/pages/details/otherStandardDetails/index.vue
+++ b/src/pages/details/otherStandardDetails/index.vue
@@ -64,15 +64,15 @@
                         sarStandardsInfoEO.standEnName || '-'
                       }}</span></p>
                     <!--发布稿（必读）-->
-                    <template v-for="(child, childIndex) in item.child1">
-                      <div class="files-titles" style="border-bottom: 1px solid #E5E5E5">
+                    <template v-for="(child, childIndex) in item.child1" v-if="child.value && child.value.length > 0">
+                      <p class="files-titles" style="border-bottom: 1px solid #E5E5E5">
                         <label style="float: left">{{ child.attrName }}</label>
                         <template v-if="child.value && child.value.length > 0">
                           <!--                          单个文件时-->
                           <div style="position: relative;margin-left: 214px; line-height: 32px">
                             <div v-for="(file, fileIndex) in child1Func(child.value)" style="display: flex;">
                           <span v-if="child.value && child.value.length > 0 && child.value.length === 1" style="display: flex; align-items: center;">
-                            <a style="font-size: 16px;color: #409EFF;cursor: pointer;"
+                            <a style="font-size: 16px;color: #409EFF;cursor: pointer;display: inline-block"
                                @click="openFileInPdf(file.id, file.oldFileName)" target="_blank"
                                :title="file.oldFileName">{{ file.oldFileName | ellipsis50}}</a>
                             <i
@@ -251,7 +251,13 @@
                             <template v-if="child.value === null">-</template>
                           </p>
                         </template>
-                      </div>
+                      </p>
+
+
+
+
+
+
                       <p class="half" style="margin-left: -48px">
                         <label style=" margin-right: 150px;"
                                title="“计划修订”、“修订中”均为现行有效版本；“已修订”标准的有效性根据实际实施情况判定。"
@@ -3907,7 +3913,7 @@ export default {
   a {
     overflow: hidden;
     text-overflow: ellipsis;
-    width: calc(~'100% - 40px');
+    max-width: 780px;
     white-space: nowrap;
     display: block;
   }
diff --git a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
index 1f8e3a39b..62fa258af 100644
--- a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
+++ b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
@@ -101,7 +101,7 @@
                     class="common-button-primary"
                     size="mini"
                     v-btn-permission="'366c89d1c54465faca96aaed26a158b1'"
-                    @click="searchBtnClick(standCommonlySearch, 1)">
+                    @click="searchBtnClick(standCommonlySearch)">
                     查询
                   </el-button>
                   <el-button
@@ -2707,7 +2707,6 @@ export default {
       this.modalShowRoleFlag = true
     },
     checkedRole2(data) {
-      console.log(data, '哈哈哈哈')
       let idList = ''
       let nameList = ''
       data.forEach(item => {
@@ -2718,7 +2717,6 @@ export default {
         idList += item.id
         nameList += item.name
       })
-      console.log(nameList , '额鹅鹅鹅饿')
       if (this.drawerTitle === '选择我司署名人') {
         this.sarStandardsInfoEO['WSSMR'] = nameList
       } else if (this.drawerTitle === '选择责任工程师') {
@@ -3147,8 +3145,8 @@ export default {
       this.getDomesticStandardTable()
     },
     // 点击搜索按钮
-    searchBtnClick(type) {
-      this.getDomesticStandardTable(undefined ,type)
+    searchBtnClick() {
+      this.getDomesticStandardTable()
     },
     // 搜索
     getDomesticStandardTableBtn(item) {
@@ -4017,9 +4015,6 @@ export default {
           }
           if ((this.stahndinfoList.length === 0 || this.stahndinfoList === []) && this.standCommonlySearch.page !== 1) {
             this.pageChange(1)
-          }
-          if (type === 1) {
-
           }
           this.stahndinfoList = res.data.list
           this.total = res.data.count