From 2453adb36f089f417d8948a9b6a9ee4b9d710bb3 Mon Sep 17 00:00:00 2001
From: zhutianqi <ztq_qi@sina.com>
Date: Tue, 30 Nov 2021 17:40:49 +0800
Subject: [PATCH] commit

---
 src/components/CustomFormComponents/File.vue        | 13 ++++++++++++-
 src/pages/details/otherStandardDetails/index.vue    |  9 +++++----
 .../components/EnterpriseStandardDatabase.vue       |  4 ++--
 .../foreignRegulationsDatabase/index.vue            |  2 +-
 .../foreignStandardsAndRegulations/index.vue        |  3 +--
 5 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/src/components/CustomFormComponents/File.vue b/src/components/CustomFormComponents/File.vue
index 5a64f5188..371d7977e 100644
--- a/src/components/CustomFormComponents/File.vue
+++ b/src/components/CustomFormComponents/File.vue
@@ -22,13 +22,23 @@
           v-if="reUpload || showUploadBtn">{{ uploadText || '重新上传' }}</el-button>
       </ul>
       <template style="margin-left: 105px;" v-else>
+        <ul class="file-file__wrap">
+          <li class="file-item"
+              v-for="(file, index) in showFileList"
+              :key="index"
+              :title="file.name"
+              @click="handlePreview(file)">
+            {{ file.name }}
+          </li>
+        </ul>
         <el-button
             size="small"
             @click="clickButtonToUpload('opinionFileList')"
             icon="el-icon-upload"
             class="form-upload-btn"
         >
-          {{ (value === 'null' || value === '' || value == null) && (!processModel || (processModel && !disabled)) ? '点击上传' : '查看已上传的文件' }}
+<!--          {{ (value === 'null' || value === '' || value == null) && (!processModel || (processModel && !disabled)) ? '点击上传' : '查看已上传的文件' }}-->
+          上传
         </el-button>
       </template>
       <el-dialog
@@ -152,6 +162,7 @@ export default {
     }
   },
   mounted() {
+    this.getShowFileList()
     if (this.showFileModel) {
       this.getShowFileList()
     }
diff --git a/src/pages/details/otherStandardDetails/index.vue b/src/pages/details/otherStandardDetails/index.vue
index e3641c239..ebfc39406 100644
--- a/src/pages/details/otherStandardDetails/index.vue
+++ b/src/pages/details/otherStandardDetails/index.vue
@@ -126,7 +126,7 @@
                     </p>
                     <template v-for="(child, childIndex) in item.child2">
                       <p class="half">
-                        <label style=" margin-right: 143px;">{{ child.attrName }}</label>
+                        <label style=" margin-right: 150px;">{{ child.attrName }}</label>
                         <span>{{ child.value || '-' }}</span>
                       </p>
                     </template>
@@ -3282,7 +3282,9 @@ export default {
 <style lang="less" scoped>
 @import '~@/assets/styles/mixins';
 @import '~@/assets/styles/style';
-
+/deep/.el-collapse-item__header {
+  border-bottom: none !important;
+}
 /deep/ .decomposition-btn {
   position: absolute;
   top: 6px;
@@ -3294,7 +3296,6 @@ export default {
   color: #07C160;
   border: 1px solid #07C160;
   background: rgba(1, 193, 96, 0.1);
-
   /deep/ .icon-separate {
     display: inline-block;
     margin-right: 3px;
@@ -3598,7 +3599,7 @@ export default {
         }
 
         & > div:not(.modular-item-more) {
-          border-bottom: 1px solid #E5E5E5;
+          /*border-bottom: 1px solid #E5E5E5;*/
           min-height: 43px;
           line-height: 43px;
 
diff --git a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
index 4af25a6c3..193910268 100644
--- a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
+++ b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
@@ -477,13 +477,12 @@
         <!--    新增样式     -->
         <div class="demo-drawer-content">
           <el-form
-            v-if="reloadAddForm"
+            v-if="reloadAddForm && modalshowflag"
             ref="sarBussionessStandForm"
             :model="sarBussionessStandEO"
             :rules="sarBussionessStandRules"
             class="label-input-form"
           >
-
 <!--            <custom-input-for-standards-->
 <!--              :config="{-->
 <!--                attrName: '代替企标编号',-->
@@ -1212,6 +1211,7 @@
       >
           <div class="demo-drawer-content">
               <el-form :model="productModelAdd"
+                       v-if="productModal"
                        ref="productModelAdd"
                        :rules="productRules"
                        class="label-input-form"
diff --git a/src/pages/regulatoryRepository/foreignRegulationsDatabase/index.vue b/src/pages/regulatoryRepository/foreignRegulationsDatabase/index.vue
index 266d15605..3eb4b26f4 100644
--- a/src/pages/regulatoryRepository/foreignRegulationsDatabase/index.vue
+++ b/src/pages/regulatoryRepository/foreignRegulationsDatabase/index.vue
@@ -355,7 +355,7 @@
         <!--    新增样式     -->
         <div class="demo-drawer-content">
           <el-form
-                  v-if="reloadAddForm"
+                  v-if="reloadAddForm && modalshowflag"
                   ref="sarLawsStandEO"
                   :model="sarLawsStandEO"
                   :rules="sarLawsStandRules"
diff --git a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
index b6a04f46e..abfba54fd 100644
--- a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
+++ b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
@@ -770,7 +770,7 @@
         <!-- 新增样式 -->
         <div class="demo-drawer-content">
           <el-form
-            v-if="reloadAddForm"
+            v-if="reloadAddForm && modalshowflag"
             ref="sarStandardsInfoForm"
             :model="sarStandardsInfoEO"
             :rules="sarStandardsInfoRules"
@@ -4272,7 +4272,6 @@ export default {
           }
         })
       } else if (this.ocrList.length === 1 && type === '2'){
-        console.log('4228',this.ocrList)
         this.selectStandardPro(this.ocrList[0], 'edit')
       }
     },