From b279ec37eff2fdf5efa580e91e6a6a3ad8610485 Mon Sep 17 00:00:00 2001
From: super_liu <396572590@qq.com>
Date: Mon, 8 Nov 2021 20:56:07 +0800
Subject: [PATCH] feat: There is no way the,

---
 .../otherBussStandardDetails/index.vue        | 44 ++++++++++---------
 .../details/otherStandardDetails/index.vue    | 16 +++++--
 2 files changed, 35 insertions(+), 25 deletions(-)

diff --git a/src/pages/details/otherBussStandardDetails/index.vue b/src/pages/details/otherBussStandardDetails/index.vue
index 548e41d5b..e32ff56f3 100644
--- a/src/pages/details/otherBussStandardDetails/index.vue
+++ b/src/pages/details/otherBussStandardDetails/index.vue
@@ -71,7 +71,7 @@
                                 <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 || child.value.length === 0">-</template>
+                        <template v-if="!child.value && child.value.length === 0">-</template>
                       </p>
                     </template>
                     <p><label style=" margin-right: 157px;">中文名称</label><span>{{ sarStandardsInfoEO.standName || '-' }}</span></p>
@@ -2167,18 +2167,6 @@ export default {
         })
       })
 
-      console.log(displayLocation)
-
-      for (let i = 0; i < displayLocation.length; i++) {
-        //  sss
-        if(displayLocation[i].label !== '基础信息' && displayLocation[i].label !== '过程稿件'){
-          const childList = displayLocation[i].child.filter ( item => item.value !== null && item.value !== '');
-          if(childList.length === 0){
-            displayLocation.splice(i,1)
-          }
-        }
-      }
-
       displayLocation.forEach(location => {
         // 动态属性字段-FBGBJBD 单独添加至基础信息
         const list = displayLocation.filter ( item => item.label === '过程稿件');
@@ -2203,11 +2191,17 @@ export default {
         const fieldOthers = child.filter(field => {
           return  halfType.includes(field.attrType)
         })
-        console.log(fieldOthers)
         location.child = [...fieldOthers, ...fieldsIsTextAreaOrFile].sort(this.compare('orderNum'))
-        console.log(location)
       })
-      console.log(displayLocation)
+        for (let i = 0; i < displayLocation.length; i++) {
+            //  sss
+            if(displayLocation[i].label !== '基础信息' && displayLocation[i].label !== '过程稿件'){
+                const childList = displayLocation[i].child.filter ( item => item.value !== null && item.value !== '');
+                if(childList.length === 0){
+                    displayLocation.splice(i,1)
+                }
+            }
+        }
       this.dynamicFormField = displayLocation
       sessionStorage.setItem('displayLocation', JSON.stringify(displayLocation))
       this.loading = false
@@ -2231,6 +2225,14 @@ export default {
 <style lang="less" scoped>
 @import '~@/assets/styles/mixins';
 @import '~@/assets/styles/style';
+/deep/ .el-collapse{
+  border: none;
+}
+
+/deep/ .el-collapse-item__wrap{
+  border: none;
+}
+
 /deep/ .decomposition-btn {
   position: absolute;
   top: 6px;
@@ -2383,12 +2385,12 @@ export default {
       .modular-content{
         & > div{
           border-bottom: 1px solid #E5E5E5;
-          height: 41px;
+          height: 44px;
           .modular-content-p-name{
             display: inline-block;
             width: 220px;
-            height: 50px;
-            line-height: 50px;
+            height: 43px;
+            line-height: 43px;
             font-size: 16px;
             color: #333333;
             vertical-align: top;
@@ -2476,8 +2478,8 @@ export default {
       }
       .basic-information-content{
         & > p{
-          min-height: 40px;
-          line-height: 40px;
+          min-height: 42px;
+          line-height: 43px;
           border-bottom: 1px solid #E5E5E5;
         }
       }
diff --git a/src/pages/details/otherStandardDetails/index.vue b/src/pages/details/otherStandardDetails/index.vue
index 8496f0c9c..98d21a8d3 100644
--- a/src/pages/details/otherStandardDetails/index.vue
+++ b/src/pages/details/otherStandardDetails/index.vue
@@ -89,7 +89,7 @@
                           <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 || child.value.length === 0">-</template>
+                        <template v-if="!child.value && child.value.length === 0">-</template>
                       </p>
                     </template>
                     <p><label style=" margin-right: 150px;">中文名称</label><span>{{
@@ -3242,6 +3242,14 @@
     }
   }
 
+  /deep/ .el-collapse{
+    border: none;
+  }
+
+  /deep/ .el-collapse-item__wrap{
+    border: none;
+  }
+
   /deep/ .el-collapse-item__content {
     padding-bottom: 0px;
     font-size: 13px;
@@ -3532,8 +3540,8 @@
             .modular-content-p-name {
               display: inline-block;
               width: 220px;
-              height: 50px;
-              line-height: 50px;
+              height: 43px;
+              line-height: 43px;
               font-size: 16px;
               color: #333333;
               vertical-align: top;
@@ -3632,7 +3640,7 @@
 
         .basic-information-content {
           & > p {
-            min-height: 43px;
+            min-height: 42px;
             line-height: 43px;
             border-bottom: 1px solid #E5E5E5;
           }