From 4051c940afd1a03b5294d2c56c6964070e044aa8 Mon Sep 17 00:00:00 2001
From: super_liu <396572590@qq.com>
Date: Tue, 9 Nov 2021 14:13:52 +0800
Subject: [PATCH] feat: There is no way the,#50946 #50742

---
 .../otherBussStandardDetails/index.vue        | 19 +++++++----
 .../details/otherStandardDetails/index.vue    | 33 +++++++++----------
 2 files changed, 28 insertions(+), 24 deletions(-)

diff --git a/src/pages/details/otherBussStandardDetails/index.vue b/src/pages/details/otherBussStandardDetails/index.vue
index 78e3d4530..881324144 100644
--- a/src/pages/details/otherBussStandardDetails/index.vue
+++ b/src/pages/details/otherBussStandardDetails/index.vue
@@ -6,8 +6,8 @@
       <span>{{sarStandardsInfoEO.standCode}}-{{sarStandardsInfoEO.standYear}} 《{{sarStandardsInfoEO.standName}}》 企标详情</span>
     </div>
     <!--主体内容-->
-    <div class="details-content">
-      <div class="details-content-modular basic-information">
+    <div class="details-content" style="position: relative">
+      <div class="details-content-modular basic-information" style="border-top: 2px dashed #D1D1D1;">
       </div>
       <div
         class="details-content-modular clearfix"
@@ -16,6 +16,16 @@
         v-if="item.isShowImp === '0'"
       >
         <el-collapse v-model="activeNames" @change="handleChange">
+          <div v-if="item.label === '基础信息'" class="details-content-modular basic-information"
+               style="border-top:none;position: absolute;right: 36px;">
+              <div class="modular-header" style="height: 50px;">
+                <div class="modular-header-btn">
+                  <el-button v-if="sarStandardsInfoEO.collectId" @click="collectClick(sarStandardsInfoEO.collectId)" title="取消收藏" class="collection-btn" icon="icon-collection" :loading="isSubmit"></el-button>
+                  <el-button v-else @click="collectClick()" title="收藏" class="collection-btn" icon="el-icon-star-off" :loading="isSubmit"></el-button>
+                  <el-button class="relation-btn" icon="icon-relation" @click="relateEvent()">更新记录</el-button>
+                </div>
+              </div>
+          </div>
           <el-collapse-item  :name="item.label" @click.native="handleChange1(item.label)">
             <template slot="title">
               <div class="modular-header" v-if="item.label !== '基础信息'">
@@ -25,11 +35,6 @@
                 <div class="modular-header-title"><i class="icon-modular-title"/><span>{{ item.label }}</span></div>
                 <!-- <div class="modular-header-title"><i class="icon-modular-title" /><span>企标信息</span>-->
                 <!--              </div>-->
-                <div class="modular-header-btn">
-                  <el-button v-if="sarStandardsInfoEO.collectId" @click="collectClick(sarStandardsInfoEO.collectId)" title="取消收藏" class="collection-btn" icon="icon-collection" :loading="isSubmit"></el-button>
-                  <el-button v-else @click="collectClick()" title="收藏" class="collection-btn" icon="el-icon-star-off" :loading="isSubmit"></el-button>
-                  <el-button class="relation-btn" icon="icon-relation" @click="relateEvent()">更新LOG</el-button>
-                </div>
               </div>
             </template>
             <div class="modular-content">
diff --git a/src/pages/details/otherStandardDetails/index.vue b/src/pages/details/otherStandardDetails/index.vue
index 98d21a8d3..737d752e6 100644
--- a/src/pages/details/otherStandardDetails/index.vue
+++ b/src/pages/details/otherStandardDetails/index.vue
@@ -8,7 +8,7 @@
         }}-{{ sarStandardsInfoEO.standYear }} 《{{ sarStandardsInfoEO.standName }}》 标准详情</span>
     </div>
     <!--主体内容-->
-    <div class="details-content">
+    <div class="details-content" style="position: relative">
       <div class="details-content-modular basic-information">
       </div>
       <div
@@ -18,25 +18,24 @@
               v-if="item.isShowImp === '0'"
       >
         <el-collapse v-model="activeNames" @change="handleChange">
+          <div v-if="item.label === '基础信息'" class="details-content-modular basic-information"
+          style="border-top:none;position: absolute;right: 36px;">
+            <div class="modular-header" style="height: 50px;">
+              <div class="modular-header-btn">
+                <el-button v-if="sarStandardsInfoEO.collectId" @click="collectClick(sarStandardsInfoEO.collectId)"
+                           title="取消收藏" class="collection-btn" icon="icon-collection" :loading="isSubmit"></el-button>
+                <el-button v-else @click="collectClick()" title="收藏" class="collection-btn" icon="el-icon-star-off"
+                           :loading="isSubmit"></el-button>
+                <el-button class="relation-btn" icon="icon-relation" @click="relateEvent()">更新记录</el-button>
+                <!--            <el-button class="relation-btn" @click="knowledgeSharing">标准问答</el-button>-->
+                <!--            <el-button class="relation-btn" @click="showItemsModel()">标准分解单</el-button>-->
+              </div>
+            </div>
+          </div>
           <el-collapse-item  :name="item.label" @click.native="handleChange1(item.label)">
             <template slot="title">
               <div class="modular-header" v-if="item.label === '基础信息'">
                 <div class="modular-header-title"><i class="icon-modular-title"/><span>{{ item.label }}</span></div>
-                <div class="details-content-modular basic-information" style="border-top:none">
-                  <div class="modular-header">
-                    <!--          <div class="modular-header-title"><i class="icon-modular-title" /><span>基础信息</span>-->
-                    <!--          </div>-->
-                    <div class="modular-header-btn">
-                      <el-button v-if="sarStandardsInfoEO.collectId" @click="collectClick(sarStandardsInfoEO.collectId)"
-                                 title="取消收藏" class="collection-btn" icon="icon-collection" :loading="isSubmit"></el-button>
-                      <el-button v-else @click="collectClick()" title="收藏" class="collection-btn" icon="el-icon-star-off"
-                                 :loading="isSubmit"></el-button>
-                      <el-button class="relation-btn" icon="icon-relation" @click="relateEvent()">更新记录</el-button>
-                      <!--            <el-button class="relation-btn" @click="knowledgeSharing">标准问答</el-button>-->
-                      <!--            <el-button class="relation-btn" @click="showItemsModel()">标准分解单</el-button>-->
-                    </div>
-                  </div>
-                </div>
               </div>
               <div class="modular-header" v-if="item.label !== '基础信息'">
                 <div class="modular-header-title"><i class="icon-modular-title"/><span>{{ item.label }}</span></div>
@@ -3145,7 +3144,7 @@
             if (['DATE_PICKER', 'SEL_OPTION', 'INPUT_NUM'].includes(field.attrType)) {
               half.push(field)
             } else {
-              if(field.attrField && field.attrField !== 'FBGBJBD'){
+              if(field.attrField && field.attrField !== 'FBGBJBD' && field.attrField !== 'SYRZ'){
                 one.push(field)
               }
             }