From d1c09f376eadfda46c8e45948c0b3d1d412c861a Mon Sep 17 00:00:00 2001
From: shenyanpei <shenyanpei>
Date: Mon, 8 Nov 2021 14:17:14 +0800
Subject: [PATCH 1/9] =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=B8=85=E7=A9=BA?=
 =?UTF-8?q?=E5=88=B7=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../accessStandardsAndRegulations/page/listOfCountries.vue  | 6 +++---
 .../accessStandardsAndRegulations/page/listOther.vue        | 6 +++---
 .../accessStandardsAndRegulations/page/listProject.vue      | 6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue
index 94e6144d4..49b0ddd9d 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue
@@ -292,16 +292,16 @@ export default {
     },
     pageChange(page) {
       this.sarSarAccessEOSearch.page = page;
-      // this.searchSarAccess();
+      this.searchSarAccess();
     },
     pageSizeChange(pageSize) {
       this.sarSarAccessEOSearch.pageSize = this.$store.getters.userInfo.configContent;
-      // this.searchSarAccess();
+      this.searchSarAccess();
     },
     clearSearch() {
       this.sarSarAccessEOSearch.countryArea = "";
       this.sarSarAccessEOSearch.detailedListName = "";
-      // this.searchSarAccess();
+      this.searchSarAccess();
     },
     // 新增相关
     openModal(row, optType) {
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOther.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOther.vue
index 4fe2fbc89..3faec3093 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOther.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOther.vue
@@ -286,16 +286,16 @@ export default {
     },
     pageChange(page) {
       this.sarSarAccessEOSearch.page = page;
-      // this.searchSarAccess();
+      this.searchSarAccess();
     },
     pageSizeChange(pageSize) {
       this.sarSarAccessEOSearch.pageSize = this.$store.getters.userInfo.configContent;
-      // this.searchSarAccess();
+      this.searchSarAccess();
     },
     clearSearch() {
       this.sarSarAccessEOSearch.detailedList = ''
       this.sarSarAccessEOSearch.detailedListName = ''
-      // this.searchSarAccess();
+      this.searchSarAccess();
     },
     // 新增相关
     openModal(row, optType) {
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listProject.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listProject.vue
index dd98fb6a7..032525351 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listProject.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listProject.vue
@@ -304,17 +304,17 @@ export default {
     },
     pageChange(page) {
       this.sarSarAccessEOSearch.page = page;
-      // this.searchSarAccess();
+      this.searchSarAccess();
     },
     pageSizeChange(pageSize) {
       this.sarSarAccessEOSearch.pageSize = this.$store.getters.userInfo.configContent;
-      // this.searchSarAccess();
+      this.searchSarAccess();
     },
     //清空
     clearSearch() {
       this.sarSarAccessEOSearch.projectName = ''
       this.sarSarAccessEOSearch.detailedListName = ''
-      // this.searchSarAccess()
+      this.searchSarAccess()
 
     },
     // 新增相关

From 812a1397286f64004ed72c9ba5b2d95b27b0f9e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Mon, 8 Nov 2021 14:23:08 +0800
Subject: [PATCH 2/9] =?UTF-8?q?=E6=B8=85=E5=8D=95=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E9=87=8D=E5=A4=8D=E8=B0=83=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../accessStandardsAndRegulations/index.vue   | 52 +++++++------------
 1 file changed, 19 insertions(+), 33 deletions(-)

diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/index.vue
index 3181806be..29554bd4f 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/index.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/index.vue
@@ -2,19 +2,17 @@
 <template>
   <div id="accessStandardsAndRegulations" class="v-class">
     <el-tabs v-model="tabValue" style="height: 100%;">
-      <el-tab-pane v-for="(item,index) in list" :key="index" :label="item.label" :name="item.name">
-        <div v-if="tabValue === 'listOfCountries'" style="position: absolute;top: 0;left: 0;right: 0;bottom: 0;">
-          <list-of-countries></list-of-countries>
-        </div>
-        <div v-else-if="tabValue === 'listProject'" style="position: absolute;top: 0;left: 0;right: 0;bottom: 0;">
-          <list-project></list-project>
-        </div>
-        <div v-else-if="tabValue === 'listOther'" style="position: absolute;top: 0;left: 0;right: 0;bottom: 0;">
-          <list-other></list-other>
-        </div>
-        <div v-else-if="tabValue === 'localProductsOrProjectLibrary'" style="position: absolute;top: 0;left: 0;right: 0;bottom: 0;">
-          <local-products-or-project-library></local-products-or-project-library>
-        </div>
+      <el-tab-pane label="国家/地区清单" name="listOfCountries" v-if="country">
+        <list-of-countries></list-of-countries>
+      </el-tab-pane>
+      <el-tab-pane label="车型类别清单" name="listProject" v-if="project">
+        <list-project></list-project>
+      </el-tab-pane>
+      <el-tab-pane label="其他清单" name="listOther" v-if="other">
+        <list-other></list-other>
+      </el-tab-pane>
+      <el-tab-pane label="项目清单" name="localProductsOrProjectLibrary" v-if="library">
+        <local-products-or-project-library></local-products-or-project-library>
       </el-tab-pane>
     </el-tabs>
   </div>
@@ -30,6 +28,10 @@ export default {
   name: "AccessStandardsAndRegulations",
   data() {
     return {
+      country: false,
+      project: false,
+      other: false,
+      library: false,
       list: [],
       tabValue: "listOfCountries",
       menuName: ["国家/地区清单", "车型类别清单", "其他清单", "项目清单"]
@@ -58,29 +60,13 @@ export default {
         if (menuID.indexOf(entity.id) >= 0 && menuData.indexOf(entity.id) == -1) {
           menuData.push(entity.id);
           if (entity.id === "b05b562950cb6d0aef539fad30b7386a") {
-            list.push({
-              label: "国家/地区清单",
-              name: "listOfCountries"
-            });
-            continue;
+            this.country = true
           } else if (entity.id === "63e05705d0c8013162caa34f9fe52865") {
-            list.push({
-              label: "车型类别清单",
-              name: "listProject"
-            });
-            continue;
+            this.project = true
           }else if (entity.id === "5a75523729b04102a565167004d640e9") {
-            list.push({
-              label: "其他清单",
-              name: "listOther"
-            });
-            continue;
+            this.other = true
           } else if (entity.id === "a1170d77f4332e5f45ce520e63b00e15") {
-            list.push({
-              label: "项目清单",
-              name: "localProductsOrProjectLibrary"
-            });
-            continue;
+             this.library = true
           }
         }
       }

From 266f5f4b53d1854756259f6b02ffb6373ac3e2eb Mon Sep 17 00:00:00 2001
From: yanyizhou <2311759275@qq.com>
Date: Mon, 8 Nov 2021 14:28:31 +0800
Subject: [PATCH 3/9] =?UTF-8?q?=20=E6=A0=87=E5=87=86=E5=86=85=E5=AE=B9?=
 =?UTF-8?q?=E8=87=AA=E5=8A=A8=E8=AF=86=E5=88=AB-=E7=BC=96=E8=BE=91=20?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=9A=84=E6=97=B6=E5=80=99=E6=9C=89=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=20=E7=BC=96=E8=BE=91=20=E6=9C=AA=E6=94=B9=E5=86=99=20?=
 =?UTF-8?q?=E4=BF=9D=E5=AD=98=20=E5=8D=B4=E6=8F=90=E9=86=92=E4=B8=8D?=
 =?UTF-8?q?=E8=83=BD=E4=B8=BA=E7=A9=BA=20=20=E6=9B=B4=E6=94=B9=E4=B8=BA?=
 =?UTF-8?q?=E6=9C=89=E6=95=B0=E6=8D=AE=E5=9B=9E=E6=98=BE=EF=BC=8C=E5=B9=B6?=
 =?UTF-8?q?=E4=B8=94=E7=9B=B4=E6=8E=A5=E4=BF=9D=E5=AD=98=E4=B8=8D=E4=BC=9A?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA=E4=B8=BA=E7=A9=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/localTool/standardRecognition/index.vue | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/pages/localTool/standardRecognition/index.vue b/src/pages/localTool/standardRecognition/index.vue
index c99d5509d..6ecabdb49 100644
--- a/src/pages/localTool/standardRecognition/index.vue
+++ b/src/pages/localTool/standardRecognition/index.vue
@@ -163,10 +163,17 @@
               ref="importFileAboutStand"
           >
             <el-button
+                v-if="uploadFilesdfEo.fileName === ''"
                 type="primary"
                 class="common-button-primary"
-            >{{ $t("m.upload")+' PDF'}}</el-button
-            >
+            >{{ $t("m.upload")+' PDF'}}</el-button>
+            <div v-else>
+              <el-input readonly v-model="uploadFilesdfEo.fileName" class="bead-input" style="width: 62%;margin-right: 14px"></el-input>
+              <el-button
+                  type="primary"
+                  class="common-button-primary"
+              >{{ $t("m.upload")+' PDF'}}</el-button>
+            </div>
           </el-upload>
         </el-form-item>
         <el-form-item
@@ -572,9 +579,11 @@ export default {
     },
     // 编辑
     editOcrRecord(row) {
+      console.log('575',row)
       this.modalType = "2";
       this.title = "编辑信息";
       this.btnName = "保存";
+      this.uploadFilesdfEo.fileName = row.fileName
       this.uploadModal = true;
       this.uploadFilesdfEo.standNumber = JSON.parse(
         JSON.stringify(row)

From c8bfc7c0515583f773b8025345c3caf72d6ef8d8 Mon Sep 17 00:00:00 2001
From: shenyanpei <shenyanpei>
Date: Mon, 8 Nov 2021 14:48:06 +0800
Subject: [PATCH 4/9] =?UTF-8?q?=E9=80=89=E6=8B=A9=E4=BA=BA=E6=A1=86?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/roleTree/index.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/components/roleTree/index.vue b/src/components/roleTree/index.vue
index 93406e0ea..572e5cda8 100644
--- a/src/components/roleTree/index.vue
+++ b/src/components/roleTree/index.vue
@@ -149,7 +149,8 @@
             },
             getChildren (node, resolve) {
                 this.$http.get('SarInstitution/institution/getNext', {
-                    institutionId: node.key
+                    institutionId: node.key,
+                    userName: this.filterText
                 }, {}, res => {
                     resolve(res)
                 })

From 33e25d0ed7703265fe3177eed39b56042f96181f Mon Sep 17 00:00:00 2001
From: yanyizhou <2311759275@qq.com>
Date: Mon, 8 Nov 2021 15:09:51 +0800
Subject: [PATCH 5/9] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95=20-=20?=
 =?UTF-8?q?=E9=87=8D=E7=82=B9=E6=A0=87=E5=87=86=E8=B7=9F=E8=B8=AA=E6=B8=85?=
 =?UTF-8?q?=E5=8D=95tab?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../accessStandardsAndRegulations/index.vue          | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/index.vue
index 29554bd4f..043764560 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/index.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/index.vue
@@ -8,6 +8,9 @@
       <el-tab-pane label="车型类别清单" name="listProject" v-if="project">
         <list-project></list-project>
       </el-tab-pane>
+      <el-tab-pane label="重点标准跟踪清单" name="listTracking" v-if="tracking">
+        <list-tracking></list-tracking>
+      </el-tab-pane>
       <el-tab-pane label="其他清单" name="listOther" v-if="other">
         <list-other></list-other>
       </el-tab-pane>
@@ -21,6 +24,7 @@
 <script>
 import listOfCountries from "../accessStandardsAndRegulations/page/listOfCountries";
 import listProject from "../accessStandardsAndRegulations/page/listProject";
+import listTracking from "../accessStandardsAndRegulations/page/listTracking";
 import listOther from "../accessStandardsAndRegulations/page/listOther";
 import localProductsOrProjectLibrary from "../localProductsOrProjectLibrary/index";
 
@@ -30,11 +34,12 @@ export default {
     return {
       country: false,
       project: false,
+      tracking: false,
       other: false,
       library: false,
       list: [],
       tabValue: "listOfCountries",
-      menuName: ["国家/地区清单", "车型类别清单", "其他清单", "项目清单"]
+      menuName: ["国家/地区清单", "车型类别清单", "重点标准跟踪清单", "其他清单", "项目清单"]
     };
   },
   methods: {
@@ -42,6 +47,7 @@ export default {
   components: {
     localProductsOrProjectLibrary,
     listOfCountries,
+    listTracking,
     listProject,
     listOther
   },
@@ -52,7 +58,7 @@ export default {
     var list = [];
     const menuList = this.$store.getters.getMenuList;
     let menuData = [];
-    let menuID = ["b05b562950cb6d0aef539fad30b7386a", "63e05705d0c8013162caa34f9fe52865", "a1170d77f4332e5f45ce520e63b00e15", "5a75523729b04102a565167004d640e9"];
+    let menuID = ["b05b562950cb6d0aef539fad30b7386a", "63e05705d0c8013162caa34f9fe52865","418123d180abf67bd2c46d5a694baaa5", "a1170d77f4332e5f45ce520e63b00e15", "5a75523729b04102a565167004d640e9"];
     this.menuName.forEach(item => {
       for (let i = 0; i < menuList.length; i++) {
         let entity = menuList[i];
@@ -63,6 +69,8 @@ export default {
             this.country = true
           } else if (entity.id === "63e05705d0c8013162caa34f9fe52865") {
             this.project = true
+          }else if (entity.id === "418123d180abf67bd2c46d5a694baaa5") {
+            this.tracking = true
           }else if (entity.id === "5a75523729b04102a565167004d640e9") {
             this.other = true
           } else if (entity.id === "a1170d77f4332e5f45ce520e63b00e15") {

From 954467256618fcec6f302ccf9080d50e0386ee9a Mon Sep 17 00:00:00 2001
From: super_liu <396572590@qq.com>
Date: Mon, 8 Nov 2021 17:12:33 +0800
Subject: [PATCH 6/9] feat: There is no way the

---
 .../otherBussStandardDetails/index.vue        | 388 +++++++++++++-----
 .../details/otherStandardDetails/index.vue    |  13 +-
 .../components/EnterpriseStandardDatabase.vue |   7 +-
 3 files changed, 302 insertions(+), 106 deletions(-)

diff --git a/src/pages/details/otherBussStandardDetails/index.vue b/src/pages/details/otherBussStandardDetails/index.vue
index 3bbd4c9cf..c6b8c090e 100644
--- a/src/pages/details/otherBussStandardDetails/index.vue
+++ b/src/pages/details/otherBussStandardDetails/index.vue
@@ -15,129 +15,169 @@
         :key="index"
         v-if="item.isShowImp === '0'"
       >
-        <div class="modular-header" v-if="item.label !== '基础信息'">
-          <div class="modular-header-title"><i class="icon-modular-title"/><span>{{ item.label }}</span></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>
-          <!-- <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>
-        <div class="modular-content">
-          <template v-if = "item.label === '基础信息'">
-            <div class="details-content-modular basic-information" style="margin-bottom: 0">
-              <div class="basic-information-content">
-              <p style="color: #C42626;"><label style=" margin-right: 171px;">企标号</label><span>{{ sarStandardsInfoEO.standCode }}</span></p>
-              <p><label style=" margin-right: 157px;">中文名称</label><span>{{ sarStandardsInfoEO.standName || '-' }}</span></p>
-              <p><label style=" margin-right: 157px;">英文名称</label><span>{{ sarStandardsInfoEO.standEnName || '-' }}</span></p>
-              <p>
-                <label style=" margin-right: 156px;"
-                        title="“修订中”为现行有效版本；“已修订”标准的有效性需根据实际实施情况判定"
-                >文本状态</label><span style="color: #409EFF;">{{ sarStandardsInfoEO.standStatusShow || '-' }}</span>
-              </p>
-              <p><label style=" margin-right: 157px;">发布日期</label><span>{{ sarStandardsInfoEO.issueTime || '-' }}</span></p>
-              <p style="border: none;"><label style=" margin-right: 122px;">标准实施日期</label><span>{{ sarStandardsInfoEO.putTime || '-' }}</span></p>
-            </div>
-            </div>
-          </template>
-          <template
-            v-for="(child, childIndex) in item.child"
-            v-if="child.isShowImp === '0'"
-          >
-            <div
-              :key="childIndex"
-              class="modular-item"
-              :class="halfClass(child, item.child[childIndex + 1], childIndex)"
-            >
-              <label class="modular-content-p-name" :title="child.attrName">{{ child.attrName }}</label>
-              <span
-                v-if="child.attrField === 'ZYQCR'"
-                class="modular-content-p-val clearfix"
-                :title="child.value || '-'"
+        <el-collapse v-model="activeNames" @change="handleChange">
+          <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>
+              <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="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">
+              <template v-if = "item.label === '基础信息'">
+                <div class="details-content-modular basic-information" style="margin-bottom: 0">
+                  <div class="basic-information-content">
+                    <p class="half" style="color: #C42626;"><label style=" margin-right: 171px;">企标号</label><span>{{ sarStandardsInfoEO.standCode }}</span></p>
+                    <template v-for="(child, childIndex) in item.child1">
+                      <p class="half files-title"
+                         v-for="(file, fileIndex) in child1Func(child.value)"
+                      >
+                        <label style=" margin-right: 102px;">{{ child.attrName }}</label>
+                        <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>
+                      <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 class="time-text">上传时间：{{ dateFormat(file.modifyTime) }}</span>-->
+                      </span>
+<!--                        <el-button-->
+<!--                                v-if="child.attrField === itemNam "-->
+<!--                                v-for="(itemNam,index) in itemExistList"-->
+<!--                                :key="index"-->
+<!--                                @click="showItemsModel(child.attrField)"-->
+<!--                                class="decomposition-btn"-->
+<!--                                style="right:62px"-->
+<!--                                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>
+                      </p>
+                    </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>
+                    <p class="half">
+                      <label style=" margin-right: 156px;"
+                             title="“修订中”为现行有效版本；“已修订”标准的有效性需根据实际实施情况判定"
+                      >文本状态</label><span style="color: #409EFF;">{{ sarStandardsInfoEO.standStatusShow || '-' }}</span>
+                    </p>
+                    <p class="half"><label style=" margin-right: 157px;">发布日期</label><span>{{ sarStandardsInfoEO.issueTime || '-' }}</span></p>
+                    <p class="half" style=""><label style=" margin-right: 122px;">标准实施日期</label><span>{{ sarStandardsInfoEO.putTime || '-' }}</span></p>
+                  </div>
+                </div>
+              </template>
+              <template
+                      v-for="(child, childIndex) in item.child"
+                      v-if="child.isShowImp === '0'"
               >
+                <div
+                        :key="childIndex"
+                        :class="item.label !== '过程稿件' ? 'modular-item half' : 'modular-item'"
+                >
+                  <label class="modular-content-p-name" :title="child.attrName">{{ child.attrName }}</label>
+                  <span
+                          v-if="child.attrField === 'ZYQCR'"
+                          class="modular-content-p-val clearfix"
+                          :title="child.value || '-'"
+                  >
                 <template v-if="child.value">
                   {{ child.value }}
                   <put-question-button
-                    style="float: right;"
-                    :resId="sarStandardsInfoEO.id"
-                    :resType="saveStandType"
+                          style="float: right;"
+                          :resId="sarStandardsInfoEO.id"
+                          :resType="saveStandType"
                   ></put-question-button>
                 </template>
                 <template v-else>
                   {{ '-' }}
                 </template>
               </span>
-              <!--规范性引用文件-->
-              <template v-else-if="child.attrField === 'GFXYYWJ' && child.value">
-                <p class="modular-content-p-val">
+                  <!--规范性引用文件-->
+                  <template v-else-if="child.attrField === 'GFXYYWJ' && child.value">
+                    <p class="modular-content-p-val">
                   <span v-for="(item, index) in child.value.split(',')" :key="index">
                     <a @click="showReplaceStandInfo(item)" style="cursor: pointer;color: #0c91e5;margin-right: 5px;" class="span-line">{{item}}</a>
                   </span>
-                </p>
-              </template>
-              <!--相关流程-->
-              <template v-else-if="child.attrField === 'XGLC' && child.value">
-                <p class="modular-content-p-val">
+                    </p>
+                  </template>
+                  <!--相关流程-->
+                  <template v-else-if="child.attrField === 'XGLC' && child.value">
+                    <p class="modular-content-p-val">
                   <span v-for="(item, index) in child.value.split(',')" :key="index">
                     <a @click="processCenterClick(item)" style="cursor: pointer;color: #0c91e5;margin-right: 5px;" class="span-line">{{item}}</a>
                   </span>
-                </p>
-              </template>
-              <!--相关计划-->
-              <template v-else-if="child.attrField === 'XGJH' && child.value">
+                    </p>
+                  </template>
+                  <!--相关计划-->
+                  <template v-else-if="child.attrField === 'XGJH' && child.value">
                 <span
-                    v-if="child.value.length === 0"
-                    class="modular-content-p-val"
-                    :title="'-'"
+                        v-if="child.value.length === 0"
+                        class="modular-content-p-val"
+                        :title="'-'"
                 >
                   {{ '-' }}
                 </span>
-                <p v-else class="modular-content-p-val">
+                    <p v-else class="modular-content-p-val">
                   <span v-for="(item, index) in child.value" :key="index">
                     <a @click="showXGJH(item)" style="cursor: pointer;color: #0c91e5;margin-right: 5px;" class="span-line">查看计划</a>
                   </span>
-                </p>
-              </template>
-              <span
-                  v-else-if="child.attrField === 'SVPPS'"
-                  class="modular-content-p-val"
-                  :title="child.tips || '-'"
-              >
+                    </p>
+                  </template>
+                  <span
+                          v-else-if="child.attrField === 'SVPPS'"
+                          class="modular-content-p-val"
+                          :title="child.tips || '-'"
+                  >
                 {{ !child.value || child.value === 'null' ? '-' : child.value }}
               </span>
-              <span
-                v-else-if="child.attrType !== 'FILE'"
-                class="modular-content-p-val"
-                :title="child.value || '-'"
-              >
+                  <span
+                          v-else-if="child.attrType !== 'FILE'"
+                          class="modular-content-p-val"
+                          :title="child.value || '-'"
+                  >
                 {{ child.value || '-' }}
               </span>
-              <div v-else class="modular-content-p-flies">
-                <p
-                  class="files-title"
-                  v-for="(file, fileIndex) in child.value"
-                  :key="fileIndex"
-                >
-                  <a @click="openFileInPdf(file.id, file.oldFileName)" target="_blank">{{ file.oldFileName }}</a>
-                  <i title="下载" @click="downloadFile(file.id)" class="icon-download" v-btn-permission="'9882f477aad895ec56a7464f3e9c0b11'"/>
-                  <i title="下载带水印" @click="downloadFileByWater(file.id, file.fileSuffix)" class="icon-download2" v-btn-permission="'9bab2662fbd9d0507b39be813371a597'"/>
-                  <span class="time-text">上传时间：{{ dateFormat(file.modifyTime) }}</span>
-                </p>
-<!--                <el-button-->
-<!--                  @click="showItemsModel(child.attrField)"-->
-<!--                  class="decomposition-btn"-->
-<!--                  icon="icon-separate"-->
-<!--                >标准分解单</el-button>-->
-              </div>
-            </div>
+                  <div v-else class="modular-content-p-flies">
+                    <p
+                            class="files-title"
+                            v-for="(file, fileIndex) in child.value"
+                            :key="fileIndex"
+                    >
+                      <a @click="openFileInPdf(file.id, file.oldFileName)" target="_blank">{{ file.oldFileName }}</a>
+                      <i title="下载" @click="downloadFile(file.id)" class="icon-download" v-btn-permission="'9882f477aad895ec56a7464f3e9c0b11'"/>
+                      <i title="下载带水印" @click="downloadFileByWater(file.id, file.fileSuffix)" class="icon-download2" v-btn-permission="'9bab2662fbd9d0507b39be813371a597'"/>
+                      <!--                  <span class="time-text">上传时间：{{ dateFormat(file.modifyTime) }}</span>-->
+                    </p>
+                    <!--                <el-button-->
+                    <!--                  @click="showItemsModel(child.attrField)"-->
+                    <!--                  class="decomposition-btn"-->
+                    <!--                  icon="icon-separate"-->
+                    <!--                >标准分解单</el-button>-->
+                  </div>
+                </div>
 
-          </template>
-        </div>
+              </template>
+            </div>
+          </el-collapse-item>
+        </el-collapse>
       </div>
     </div>
     <div v-show="!isMoreAwayBtn" class="more" @click="moreClick">更多<img src="@/assets/images/shangqi/img/more.png"></div>
@@ -518,6 +558,40 @@
         <el-button type="primary" @click="relateDialogClose()">关 闭</el-button>
       </span>
     </el-dialog>
+    <el-dialog
+            title="更多发布稿"
+            :visible.sync="relateDialog1"
+            class="relateClass"
+            width="40%"
+            :before-close="relateDialogClose1">
+      <div
+              v-for="(file, index) in relateNowList1"
+              :key="index"
+              v-if="relateNowList1"
+              style="margin-bottom: 10px;line-height: 20px;max-height: 300px"
+      >
+        {{ index + 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)"
+                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'"
+        />
+        <div v-if="relateNowList.length >1">
+          <el-divider></el-divider>
+        </div>
+      </div>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="relateDialogClose1">关 闭</el-button>
+      </div>
+    </el-dialog>
     <!--      导入失败-->
     <el-dialog :visible.sync="importFailed" :close-on-click-modal="false" width="400px">
       <p slot="title" style="color:#f60">
@@ -874,13 +948,26 @@ export default {
   components: {
     PutQuestionButton
   },
+  filters: {
+    ellipsis (value) {
+      if (!value) return ''
+      if (value.length > 12) {
+        return value.slice(0,12) + '...'
+      }
+      return value
+    }
+  },
   data () {
     return {
+      activeNames: ['基础信息'],
+      activeState: false,
       visiblePlanCheck: false,
       form: {},
       relateDialog: false,
+      relateDialog1: false,
       relateList: [],
       relateNowList: [],
+      relateNowList1: [],
       sarType: sarType,
       loading: true,
       showItemInfoModal: false,
@@ -1079,6 +1166,22 @@ export default {
   watch: {
   },
   methods: {
+    child1Func(child1){
+      const list = []
+      if(child1 && child1.length > 1){
+        list.push(child1[0])
+        return list
+      }
+      return child1
+    },
+    handleChange(val) {
+      console.log(val)
+    },
+    handleChange1(val) {
+      if(val && val === '基础信息'){
+        this.activeState = true;
+      }
+    },
     getPlanStatusName(status) {
       switch (status) {
         case "1":
@@ -1913,6 +2016,10 @@ export default {
         })
       }
     },
+    relateEvent1(list){
+      this.relateDialog1 = true
+      this.relateNowList1 = list
+    },
     // 更新LOG
     relateEvent () {
       this.$http.get('lawss/sarUpdLog/getLogList', {
@@ -1942,6 +2049,10 @@ export default {
 
       })
     },
+    relateDialogClose1() {
+      this.relateDialog1 = false
+      this.relateNowList = []
+    },
     relateDialogClose () {
       this.relateDialog = false
       this.relateNowList = []
@@ -2051,17 +2162,42 @@ export default {
           }
         })
       })
+
+      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 === '过程稿件');
+        if(location.label === '基础信息' && list && list.length > 0){
+          if (!list[0].child) {
+            location['child1'] = []
+          }else {
+            console.log(list)
+            const childList = list[0].child.filter ( item => item.attrField === 'FBGBUSS');
+            location['child1'] = childList
+          }
+        }
+
         const child = location.child || []
         const halfType = ['INPUT_STR', 'DATE_PICKER', 'SEL_OPTION', 'INPUT_NUM']
         const fieldsIsTextAreaOrFile = child.filter(field => {
-          return !halfType.includes(field.attrType)
+          return field.attrField !== 'FBGBUSS' && !halfType.includes(field.attrType)
         })
         const fieldOthers = child.filter(field => {
-          return halfType.includes(field.attrType)
+          return  halfType.includes(field.attrType)
         })
+        console.log(fieldOthers)
         location.child = [...fieldOthers, ...fieldsIsTextAreaOrFile].sort(this.compare('orderNum'))
       })
+      console.log(displayLocation)
       this.dynamicFormField = displayLocation
       sessionStorage.setItem('displayLocation', JSON.stringify(displayLocation))
       this.loading = false
@@ -2085,6 +2221,55 @@ export default {
 <style lang="less" scoped>
 @import '~@/assets/styles/mixins';
 @import '~@/assets/styles/style';
+/deep/ .decomposition-btn {
+  position: absolute;
+  top: 6px;
+  right: 0;
+  padding: 0 10px;
+  height: 30px;
+  line-height: 30px;
+  font-size: 14px;
+  color: #07C160;
+  border: 1px solid #07C160;
+  background: rgba(1, 193, 96, 0.1);
+
+  /deep/ .icon-separate {
+    display: inline-block;
+    margin-right: 3px;
+    width: 16px;
+    height: 16px;
+    background-repeat: no-repeat;
+    background-size: 100% 100%;
+    background-position: center center;
+    vertical-align: sub;
+    background-image: url("~assets/images/shangqi/standardDetails/separate.png");
+  }
+}
+/deep/ .icon-download {
+  display: inline-block;
+  margin-left: 3px;
+  width: 18px;
+  height: 16px;
+  background-repeat: no-repeat;
+  background-size: 100% 100%;
+  background-position: center center;
+  vertical-align: sub;
+  cursor: pointer;
+  background-image: url("~assets/images/shangqi/img/download.png");
+}
+
+/deep/ .icon-download2 {
+  display: inline-block;
+  margin-left: 3px;
+  width: 18px;
+  height: 16px;
+  background-repeat: no-repeat;
+  background-size: 100% 100%;
+  background-position: center center;
+  vertical-align: sub;
+  cursor: pointer;
+  background-image: url("~assets/images/shangqi/img/download2.png");
+}
 .other-standard-details{
   padding: 15px 30px 0;
   width: 1200px;
@@ -2108,6 +2293,7 @@ export default {
         display: flex;
         align-items: center;
         justify-content: space-between;
+        width: 100%;
         height: 50px;
         border-bottom: 1px solid #E5E5E5;
         .modular-header-title{
@@ -2122,7 +2308,8 @@ export default {
             background-size: 100% 100%;
             background-position: center center;
             background-image: url("~assets/images/shangqi/standardDetails/modular-title.png");
-            vertical-align: top;
+            position: relative;
+            top: 2px;
           }
           & > span{
             padding-left: 10px;
@@ -2186,6 +2373,7 @@ export default {
       .modular-content{
         & > div{
           border-bottom: 1px solid #E5E5E5;
+          height: 41px;
           .modular-content-p-name{
             display: inline-block;
             width: 220px;
@@ -2278,8 +2466,8 @@ export default {
       }
       .basic-information-content{
         & > p{
-          min-height: 55px;
-          line-height: 55px;
+          min-height: 40px;
+          line-height: 40px;
           border-bottom: 1px solid #E5E5E5;
         }
       }
diff --git a/src/pages/details/otherStandardDetails/index.vue b/src/pages/details/otherStandardDetails/index.vue
index ce703e2fa..44ca508f3 100644
--- a/src/pages/details/otherStandardDetails/index.vue
+++ b/src/pages/details/otherStandardDetails/index.vue
@@ -18,7 +18,7 @@
               v-if="item.isShowImp === '0'"
       >
         <el-collapse v-model="activeNames" @change="handleChange">
-          <el-collapse-item  :name="item.label">
+          <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>
@@ -93,7 +93,7 @@
                     <p><label style=" margin-right: 150px;">中文名称</label><span>{{
                     sarStandardsInfoEO.standName || '-'
                   }}</span></p>
-                    <p><label style=" margin-right: 150px;">英文名称</label><span>{{
+                    <p v-if="activeState"><label style=" margin-right: 150px;">英文名称</label><span>{{
                     sarStandardsInfoEO.standEnName || '-'
                   }}</span></p>
                     <p class="half">
@@ -1415,6 +1415,7 @@
     data() {
       return {
         activeNames: ['基础信息'],
+        activeState: false,
         itemExistList:[],
         interpretationContent: '',
         relatedTermsDrawerVisible: false,
@@ -1720,7 +1721,12 @@
         return child1
       },
       handleChange(val) {
-        console.log(val);
+        console.log(val)
+      },
+      handleChange1(val) {
+        if(val && val === '基础信息'){
+          this.activeState = true;
+        }
       },
       judgeSuffix(fileName){
         if ('pdf'===fileName.substring(fileName.lastIndexOf('.') + 1)){
@@ -3161,7 +3167,6 @@
           location.half = half
           location.showAll = false
         })
-
         this.$http.get('sarLawsAttrDetailedList/sar-laws-attr-detailed-list', {
           id: this.$route.params.id
         }, {
diff --git a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
index e88d0a094..883e3fe46 100644
--- a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
+++ b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
@@ -181,9 +181,12 @@
 <!--                    <el-option v-for="opt in standSortOptions" :value="opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}</el-option>-->
 <!--                  </el-select>-->
 <!--                </el-form-item>-->
-                <el-formItem label="标准号/名称" prop="numberName" class="search-item">
-                  <el-input v-model="sarBussionessSearch.numberName" clearable placeholder="根据标准号/名称查找" :maxlength="100" @keyup.enter.native="getBussionStandTableBtn(sarBussionessSearch)"/>
+                <el-formItem label="标准号" prop="numberName" class="search-item">
+                  <el-input v-model="sarBussionessSearch.standCode" clearable placeholder="根据标准号查找" :maxlength="100" @keyup.enter.native="getBussionStandTableBtn(sarBussionessSearch)"/>
                 </el-formItem>
+                  <el-formItem label="标准名称" prop="standName" class="search-item">
+                      <el-input v-model="sarBussionessSearch.standName" clearable placeholder="根据标准名称查找" :maxlength="100" @keyup.enter.native="getBussionStandTableBtn(sarBussionessSearch)"/>
+                  </el-formItem>
                 <el-form-item class="search-item btn-box">
                     <el-button
                             :loading="searching"

From c0fa07e8dd3fcbe11c522db9403db8a5c4b15300 Mon Sep 17 00:00:00 2001
From: super_liu <396572590@qq.com>
Date: Mon, 8 Nov 2021 17:14:21 +0800
Subject: [PATCH 7/9] feat: There is no way the,

---
 src/pages/details/otherBussStandardDetails/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/details/otherBussStandardDetails/index.vue b/src/pages/details/otherBussStandardDetails/index.vue
index c6b8c090e..cd8235e34 100644
--- a/src/pages/details/otherBussStandardDetails/index.vue
+++ b/src/pages/details/otherBussStandardDetails/index.vue
@@ -180,7 +180,7 @@
         </el-collapse>
       </div>
     </div>
-    <div v-show="!isMoreAwayBtn" class="more" @click="moreClick">更多<img src="@/assets/images/shangqi/img/more.png"></div>
+<!--    <div v-show="!isMoreAwayBtn" class="more" @click="moreClick">更多<img src="@/assets/images/shangqi/img/more.png"></div>-->
     <!--    <div v-show="isMoreAwayBtn" class="put-away" @click="putAwayClick">收起<img src="@/assets/images/shangqi/img/more.png"></div>-->
     <!--查看标准条目列表-->
     <el-drawer

From 32ef42939db01c47a3b73872ee0bf51c97be5b66 Mon Sep 17 00:00:00 2001
From: shenyanpei <shenyanpei>
Date: Mon, 8 Nov 2021 17:35:45 +0800
Subject: [PATCH 8/9] =?UTF-8?q?=E5=B1=9E=E6=80=A7=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../attributeCustom/components/other.vue      | 674 ++++++++++++++++++
 .../config/pages/attributeCustom/index.vue    |   9 +-
 2 files changed, 682 insertions(+), 1 deletion(-)
 create mode 100644 src/pages/config/pages/attributeCustom/components/other.vue

diff --git a/src/pages/config/pages/attributeCustom/components/other.vue b/src/pages/config/pages/attributeCustom/components/other.vue
new file mode 100644
index 000000000..461ea9542
--- /dev/null
+++ b/src/pages/config/pages/attributeCustom/components/other.vue
@@ -0,0 +1,674 @@
+<!-- 配置管理 - 属性自定义 - 其他 -->
+<template>
+  <div class="attribute-custom v-class">
+    <div class="action-bar1">
+      <el-button class="common-button-primary add-button" size="mini" type="primary" v-btn-permission="''" @click="showAddModel"><i class="el-icon-plus"></i>新增</el-button>
+    </div>
+    <loading :loading="attributeDataLoading">数据处理中</loading>
+    <div class="content">
+      <el-table
+        style="width: 100%;"
+        :data="attributeList"
+        height="100%"
+        border
+        ref="selections"
+        :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
+       fontWeight: 'bold', height: '48px'}"
+        @on-selection-change="handleSelectone"
+      >
+        <el-table-column
+          type="selection"
+          width="55"
+          align="center"
+        >
+        </el-table-column>
+        <el-table-column
+          prop="sarType"
+          label="所属模块"
+          width="140"
+        >
+          <template slot-scope="scope">
+            {{ getSarTypeText(scope.row.sarType) }}
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="attrField"
+          label="属性字段"
+        >
+        </el-table-column>
+        <el-table-column
+          prop="attrName"
+          label="属性名称"
+        >
+        </el-table-column>
+        <el-table-column
+          prop="attrType"
+          label="属性类型"
+        >
+          <template slot-scope="scope">
+            {{ getAttrTypeText(scope.row.attrType) }}
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="attrLen"
+          label="字段长度"
+          width="120"
+        >
+        </el-table-column>
+        <el-table-column
+          prop="orderNum"
+          label="展示顺序"
+          width="100"
+        >
+        </el-table-column>
+        <el-table-column label="操作" align="center" width="50" fixed="right">
+          <template slot-scope="scope">
+            <div @click.stop style="display: inline-block">
+              <el-dropdown trigger="click" @command="handleCommand">
+                <i class="iconfont">&#xe61e;</i>
+                <el-dropdown-menu slot="dropdown">
+                  <el-dropdown-item :command="[scope.row, '编辑']" v-btn-permission="'b1e60ec7b60389713bf5b450ec2d1115'">编辑</el-dropdown-item>
+                  <el-dropdown-item :disabled="scope.row.isEdit==='1'" v-btn-permission="'c157be4e073787ea6c4a04bd39686c2d'" :command="[scope.row, '删除']">删除</el-dropdown-item>
+                </el-dropdown-menu>
+              </el-dropdown>
+            </div>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+    <pagination :total="total" :pageChange="pageNo" :pageSizeChange="pageSize" @pageChange="pageChange" @pageSizeChange="pageSizeChange"></pagination>
+    <!-- 新建抽屉-->
+    <el-drawer
+      :title="attributeTitle"
+      :visible.sync="showInfoModal"
+      size="800px"
+      :styles="styles"
+      :wrapperClosable="false"
+      @close="cancelModel"
+    >
+      <div class="demo-drawer-content">
+        <el-form
+          ref="attributeEO"
+          :model="attributeEO"
+          :rules="attributeEOFormRules"
+          class="label-input-form"
+          label-width="150px"
+        >
+          <input v-model="attributeEO.id" v-show="false">
+          <el-form-item label="所属模块" prop="sarType" class="add-form-item" v-show="false">
+            <el-input v-model="attributeEO.sarType" ></el-input>
+          </el-form-item>
+          <el-form-item label="属性字段" prop="attrField" class="add-form-item" :class="{'form-item-disabled': addOrEdit === 'edit'}">
+            <el-input v-model.trim="attributeEO.attrField" :disabled="addOrEdit === 'edit'" placeholder="请输入属性字段" clearable/>
+          </el-form-item>
+          <el-form-item label="属性名称" prop="attrName" class="add-form-item">
+            <el-input v-model.trim="attributeEO.attrName" placeholder="请输入属性名称" clearable/>
+          </el-form-item>
+          <el-form-item label="属性类型" prop="attrType" class="add-form-item" :class="{'form-item-disabled': addOrEdit === 'edit'}">
+            <el-select v-model="attributeEO.attrType" placeholder="请选择" :disabled="addOrEdit === 'edit'" filterable>
+              <el-option
+                v-for="item in attrTypeOptions"
+                :label="item.label"
+                :value="item.value"
+                :key="item.value"
+              ></el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="选项值" prop="selVal" class="add-form-item" v-if="attributeEO.attrType === 'SEL_OPTION' || attributeEO.attrType === 'SEL_OPTS'">
+            <el-select v-model="attributeEO.selVal" placeholder="请选择" :disabled="addOrEdit === 'edit'" filterable>
+              <el-option
+                v-for="item in relateDicIdOptions"
+                :label="item.label"
+                :value="item.value"
+                :key="item.value"
+              ></el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="字段长度" prop="attrLen" class="add-form-item">
+            <el-input v-model.number="attributeEO.attrLen" :disabled="addOrEdit === 'edit'" placeholder="只允许输入正整数" number  :maxlength="4"/>
+          </el-form-item>
+          <el-form-item label="展示顺序" prop="orderNum" class="add-form-item">
+            <el-input v-model.number="attributeEO.orderNum" placeholder="只允许输入正整数" number  :maxlength="3"/>
+          </el-form-item>
+          <el-form-item label="是否必填" prop="isMust" class="add-form-item">
+            <el-select v-model="attributeEO.isMust">
+              <el-option v-for="opt in isMustOptions" :key="opt.value" :value="opt.value" :label="opt.label">{{ opt.label }}</el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="是否展示" prop="isShowImp" class="add-form-item">
+            <el-select v-model="attributeEO.isShowImp">
+              <el-option
+                v-for="opt in isMustOptions"
+                :key="opt.value"
+                :value="opt.value"
+                :label="opt.label"
+              ></el-option>
+            </el-select>
+          </el-form-item>
+        </el-form>
+      </div>
+      <div id="roleFormButton" class="demo-drawer-footer">
+        <el-button class="common-button-primary" icon="el-icon-check" type="primary" @click="saveInfo()">提交</el-button>
+        <el-button class="common-button-default" icon="el-icon-close" @click="cancelModel">取消</el-button>
+      </div>
+    </el-drawer>
+
+<!--    <el-dialog
+      destroy-on-close
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      :visible.sync="displayLocationFormDialogVisible"
+      :title="displayLocationFormDialogTilte"
+      @on-ok="handleDisplayLocationFormDialogSubmit('displayLocationDialogForm')"
+      @on-cancel="handleDisplayLocationFormDialogReset('displayLocationDialogForm')"
+      width="400px"
+    >
+      <el-form
+        ref="displayLocationDialogForm"
+        :model="displayLocationDialogFormData"
+        :rules="displayLocationDialogFormRules"
+        label-width="100px"
+        class="label-input-form"
+      >
+        <el-form-item label="区域名称" prop="areaName" class="add-form-item">
+          <el-input v-model="displayLocationDialogFormData.areaName" placeholder="请输入区域名称"></el-input>
+        </el-form-item>
+        <el-form-item label="所属模块" prop="sarType" class="add-form-item">
+          <el-select v-model="displayLocationDialogFormData.sarType" filterable>
+            <el-option
+              v-for="item in sarTypeLocationOptions"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="排序号" prop="showIndex" class="add-form-item">
+          <el-input v-model.number="displayLocationDialogFormData.showIndex" placeholder="请输入排序号"></el-input>
+        </el-form-item>
+      </el-form>
+      <span slot="footer" class="dialog-footer">
+        <el-button class="common-button-default" @click="handleDisplayLocationFormDialogReset('displayLocationDialogForm')">取 消</el-button>
+        <el-button class="common-button-primary" type="primary" @click="handleDisplayLocationFormDialogSubmit('displayLocationDialogForm')">确 定</el-button>
+      </span>
+    </el-dialog>-->
+  </div>
+</template>
+
+<script>
+const sarType = 'OTHER'
+export default {
+  name: 'attribute-custom',
+  data () {
+    return {
+      sarType: sarType,
+      displayLocationDialogTableConfig: {
+        columns: [
+          {
+            title: '展示区域',
+            key: 'areaName'
+          },
+          {
+            title: '排序号',
+            key: 'showIndex'
+          },
+          {
+            title: '操作',
+            slot: 'operations'
+          }
+        ],
+        page: {
+          pageSize: 100,
+          currentPage: 1,
+          total: 0
+        },
+        loading: false
+      },
+      displayLocationDialogTableData: [],
+      displayLocationDialogVisible: false,
+      displayLocationFormDialogVisible: false,
+      defaultDisplayLocationDialogFormData: {
+        areaName: '',
+        sarType: '',
+        showIndex: ''
+      },
+      displayLocationDialogFormData: {
+        areaName: '',
+        showIndex: ''
+      },
+      displayLocationDialogFormRules: {
+        areaName: [
+          { required: true, message: '请输入展示区域', trigger: 'blur' },
+          { type: 'string', max: 100, message: '最多输入100字', trigger: 'blur' }
+        ],
+        sarType: [
+          {required: true, message: '所属模块不能为空', trigger: 'change'}
+        ],
+        showIndex: [
+          { type: 'number', required: true, message: '不能为空且为正整数', trigger: 'blur' },
+          { type: 'number', min: 0, max: 999, message: '请输入0-999之间的整数', trigger: 'blur' }
+        ]
+      },
+      attributeDataLoading: false,
+      attributeList: [],
+      total: 0,
+      pageNo: 1,
+      pageSize: this.$store.getters.userInfo.configContent,
+      attributeEO: {
+        id: '',
+        attrField: '',
+        attrName: '',
+        attrLen: '',
+        attrType: '',
+        orderNum: '',
+        isMust: '1',
+        isShowImp: '0',
+        selVal: '',
+        isSearch: '1',
+        sarType: 'OTHER',
+        isWarn: '1'
+      },
+      attrTypeOptions: [
+        { label: '输入框（字符串）', value: 'INPUT_STR' },
+        { label: '输入框（数字）', value: 'INPUT_NUM' },
+        { label: '单选下拉框', value: 'SEL_OPTION' },
+        { label: '多选下拉框', value: 'SEL_OPTS' },
+        { label: '单日期选择', value: 'DATE_PICKER' },
+        { label: '多日期选择', value: 'DATE_PIC_OPTS' },
+        { label: '文件', value: 'FILE' },
+        { label: '文本框', value: 'TEXTAREA' }
+      ],
+      sarTypeLocationOptions: [
+        // { label: '国内政策', value: 'INLAND_LAWS' },
+        { label: '国内外政策', value: 'Other' }
+      ],
+      isMustOptions: [
+        { label: '是', value: '0' },
+        { label: '否', value: '1' }
+      ],
+      showRegionOptions: [],
+      relateDicIdOptions: [],
+      attributeTitle: '',
+      showInfoModal: false,
+      attributeEOFormRules: {
+        sarType: [
+          {required: true, message: '所属模块不能为空', trigger: 'change'}
+        ],
+        attrField: [
+          {required: true, message: '属性字段不能为空', trigger: 'blur'},
+          {type: 'string', max: 50, message: '最多输入50位', trigger: 'blur'},
+          {type: 'string', validator: this.verify.validFieldOracle, trigger: 'blur'}
+        ],
+        attrName: [
+          {required: true, message: '属性名称不能为空', trigger: 'blur'},
+          {type: 'string', max: 100, message: '最多输入100位', trigger: 'blur'}
+        ],
+        attrType: [
+          {required: true, message: '属性类型不能为空', trigger: 'change'}
+        ],
+        attrLen: [
+          {type: 'number', required: true, message: '字段长度不能为空且为正整数', trigger: 'blur'},
+          {type: 'string', validator: this.verify.validStandNumInCompile2, trigger: 'blur'}
+        ],
+        orderNum: [
+          {type: 'number', required: true, message: '展示顺序不能为空且为正整数', trigger: 'blur'},
+          {type: 'string', validator: this.verify.validStandNumInCompile2, trigger: 'blur'}
+        ],
+        isMust: [
+          {required: true, message: '是否必填不能为空', trigger: 'change'}
+        ],
+        isShowImp: [
+          {required: true, message: '是否展示必填不能为空', trigger: 'change'}
+        ],
+        showRegionId:[
+          {required:true, message:'展示区域不能为空', trigger:'change'}
+        ]
+      },
+      styles: {
+        height: 'calc(100% - 55px)',
+        overflow: 'auto',
+        paddingBottom: '53px',
+        position: 'static'
+      },
+      addOrEdit: '',
+      selectedList: []
+    }
+  },
+  computed: {
+    /*displayLocationFormDialogTilte () {
+      const formData = {...this.displayLocationDialogFormData}
+      const isEdit = !!formData.id
+      return isEdit ? '修改展示区域' : '新增展示区域'
+    }*/
+  },
+  methods: {
+    // 更多
+    handleCommand (command) {
+      switch (command[1]) {
+        case '编辑':
+          this.handleTableEdit(command[0])
+          break
+        case '删除':
+          this.handleTableDelete(command[0])
+          break
+      }
+    },
+    // 展示区域 更多
+    handleCommand2 (command) {
+      switch (command[1]) {
+        case '修改':
+          this.showAddDisplayLocationDialog(command[0])
+          break
+        case '删除':
+          this.removeDisplayLocation(command[0])
+          break
+      }
+    },
+    removeDisplayLocation (data) {
+      this.$confirm('确认删除该条数据？', {
+        confirmButtonClass: 'common-button-primary',
+        roundButton: false,
+        title: '确认删除',
+        callback: (action, instance) => {
+          if (action === 'confirm') {
+            const {id} = data
+            this.$http.delete('lawssBase/utArea/deleteById', {
+              id,
+              sarType: this.sarType
+            }, {
+              _this: this
+            }, res => {
+              this.queryDisplayLocationDialogTableData()
+            }, e => {
+              console.log(e)
+            })
+          }
+        }
+      })
+    },
+    handleDisplayLocationFormDialogSubmit (name) {
+      this.$refs[name].validate((valid) => {
+        if (valid) {
+          const formData = {...this.displayLocationDialogFormData, sarType: this.sarType}
+          const isEdit = !!formData.id
+          const url = isEdit ? 'lawssBase/utArea/updateUtArea' : 'lawssBase/utArea/createUtArea'
+          const method = isEdit ? 'putData' : 'postData'
+          this.$http[method](url, formData, {
+            _this: this
+          }, res => {
+            this.displayLocationFormDialogVisible = false
+            this.queryDisplayLocationDialogTableData()
+            // this.displayLocationDialogTableData = res.data.list
+            // this.displayLocationDialogTableConfig.page.total = res.data.count
+          }, e => {
+            console.log(e)
+          })
+        } else {
+          // this.$message.error('Fail!')
+        }
+      })
+    },
+    handleDisplayLocationFormDialogReset (name) {
+      this.displayLocationFormDialogVisible = false
+      this.$nextTick(() => {
+        this.$refs.displayLocationDialogForm.resetFields()
+      })
+    },
+    /**
+     * 打开新增展示区域管理弹框
+     */
+    showAddDisplayLocationDialog (data) {
+      if (data) {
+        // 编辑
+        this.displayLocationDialogFormData = {
+          areaName: data.areaName,
+          showIndex: data.showIndex,
+          id: data.id,
+          sarType: data.sarType
+        }
+      } else {
+        this.displayLocationDialogFormData = {...this.defaultDisplayLocationDialogFormData}
+      }
+
+      this.displayLocationFormDialogVisible = true
+    },
+    /**
+     * 查询展示区域管理弹框里的列表数据
+     */
+    queryDisplayLocationDialogTableData () {
+      return new Promise((resolve, reject) => {
+        this.$http.get('lawssBase/utArea/page', {
+          page: this.displayLocationDialogTableConfig.page.currentPage,
+          pageSize: this.displayLocationDialogTableConfig.page.pageSize,
+          sarType: this.sarType
+        }, {
+          _this: this.displayLocationDialogTableConfig,
+          loading: 'loading'
+        }, res => {
+          this.displayLocationDialogTableData = res.data.list
+          this.displayLocationDialogTableConfig.page.total = res.data.count
+          resolve(res)
+        }, e => {
+          console.log(e)
+          reject(e)
+        })
+      })
+    },
+    /**
+     * 查询新增弹框里的列表数据
+     */
+    queryDisplayLocationList (sarType) {
+      return new Promise((resolve, reject) => {
+        this.$http.get('lawssBase/utArea/getAreaList', {
+          sarType: sarType || this.sarType
+        }, {
+          _this: this
+        }, res => {
+          this.showRegionOptions = res.data || []
+          resolve(res)
+        }, e => {
+          console.log(e)
+          reject(e)
+        })
+      })
+    },
+    handleSelectone (data) {
+      this.selectedList = []
+      for (let i = 0; i < data.length; i++) {
+        this.selectedList.push(data[i].id)
+      }
+    },
+    pageChange (page) {
+      this.pageNo = page
+      this.getAttrByPage()
+    },
+    pageSizeChange (pageSize) {
+      this.pageSize = pageSize
+      this.getAttrByPage()
+    },
+    getAttrByPage () {
+      this.$http.get('lawss/sarStandAttrDetails/page', {
+          page: this.pageNo,
+          pageSize: this.pageSize,
+          sarType: this.sarType
+        }, {
+          _this: this,
+          loading: 'attributeDataLoading'
+        },
+        res => {
+          this.attributeList = res.data.list
+          this.total = res.data.count
+        }, e => {})
+      this.$refs.selections.clearSelection()
+    },
+    async showAddModel () {
+      await this.queryDisplayLocationList()
+      // this.$refs['attributeEO'] && this.$refs['attributeEO'].resetFields()
+      this.attributeEO.newWebSite = ''
+      this.addOrEdit = 'add'
+      this.attributeTitle = '新增'
+      this.showInfoModal = true
+      this.$nextTick(() => {
+        this.$refs['attributeEO'].resetFields()
+      })
+    },
+    saveInfo () {
+      this.$refs['attributeEO'].validate((valid) => {
+        if (valid) {
+          if ((this.attributeEO.attrType === 'SEL_OPTION' || this.attributeEO.attrType === 'SEL_OPTS') && (this.attributeEO.selVal == null || this.attributeEO.selVal === '')) {
+            this.$message.warning('下拉框类型字段，选项值不能为空')
+          } else {
+            if (this.addOrEdit === 'add') {
+              this.$http.postData('lawss/sarStandAttrDetails/createStandAttrDetails', this.attributeEO,
+                {
+                  _this: this
+                }, res => {
+                  if (res.ok) {
+                    this.getAttrByPage()
+                    this.showInfoModal = false
+                  } else {
+                  }
+                })
+            } else {
+              this.$http.putData('lawss/sarStandAttrDetails/updateStandAttrDetails', this.attributeEO,
+                {
+                  _this: this
+                }, res => {
+                  if (res.ok) {
+                    this.getAttrByPage()
+                    this.showInfoModal = false
+                  } else {
+                  }
+                })
+            }
+          }
+        }
+      })
+    },
+    cancelModel () {
+      this.showInfoModal = false
+      this.$refs['attributeEO'] && this.$refs['attributeEO'].resetFields()
+    },
+    deleteAttr () {
+      if (this.selectedList.length === 0) {
+        this.$message.error('请先选择要删除的数据！')
+      } else {
+        this.$confirm('确认删除选中数据？', {
+          title: '提示',
+          confirmButtonClass: 'common-button-primary',
+          roundButton: false,
+          callback: (action, instance) => {
+            if (action === 'confirm') {
+              this.$http.put('lawss/sarStandAttrDetails/deleteByIds', {
+                ids: this.selectedList.join(','),
+                sarType: this.sarType
+              }, {
+                _this: this
+              }, res => {
+                this.getAttrByPage()
+              }, e => {
+              })
+            }
+          }
+        })
+      }
+    },
+    getDictionarySelList () {
+      this.$http.get('sys/dictionary/getDictionaryCodeSelList', {
+          sarType: this.sarType
+        }, {
+          _this: this
+        },
+        res => {
+          this.relateDicIdOptions = res.data
+        }, e => {})
+    },
+    getAttrTypeText (type) {
+      let texts = ''
+      if (type === 'INPUT_STR') {
+        texts = '输入框（字符串）'
+      } else if (type === 'INPUT_NUM') {
+        texts = '输入框（数字）'
+      } else if (type === 'SEL_OPTION') {
+        texts = '单选下拉框'
+      } else if (type === 'SEL_OPTS') {
+        texts = '多选下拉框'
+      } else if (type === 'DATE_PICKER') {
+        texts = '单日期选择'
+      } else if (type === 'DATE_PIC_OPTS') {
+        texts = '多日期选择'
+      } else if (type === 'FILE') {
+        texts = '文件'
+      } else if (type === 'TEXTAREA') {
+        texts = '文本框'
+      }
+      return texts
+    },
+    getSarTypeText (type) {
+      let texts = ''
+      if (type === 'OTHER') {
+        texts = '其他'
+      }
+      return texts
+    },
+    async handleTableEdit (params) {
+      await this.queryDisplayLocationList(params.sarType)
+      // this.$refs['attributeEO'] && this.$refs['attributeEO'].resetFields()
+      this.addOrEdit = 'edit'
+      this.attributeTitle = '编辑'
+      this.showInfoModal = true
+      this.attributeEO = JSON.parse(JSON.stringify(params))
+    },
+    handleTableDelete (params) {
+      this.selectedList = []
+      this.selectedList.push(params.id)
+      this.deleteAttr()
+    },
+    async handleSarTypeChange (sarType) {
+      this.attributeEO.showRegionId = ''
+      await this.queryDisplayLocationList(sarType)
+    }
+  },
+  mounted () {
+    this.getAttrByPage()
+    this.getDictionarySelList()
+  }
+}
+</script>
+
+<style lang="less" scoped>
+@import '~@/assets/styles/mixins';
+.attribute-custom{
+  background: #FFF;
+  height: 100%;
+  position: relative;
+  display: flex;
+  flex-direction: column;
+  flex: auto;
+  .action-bar{
+    padding: 0;
+  }
+  .content {
+    padding: 0;
+    overflow-y: auto;
+    flex: auto;
+    display: flex;
+    flex-direction: column;
+    //height: calc(~'100% - 50px - 56px');
+  }
+  .pagination {
+    position: static;
+    /deep/ .pagination-slot {
+      padding: 0;
+    }
+  }
+  .modalStyle{
+    padding: 14px;
+    font-size: 15px;
+  }
+  .sysMenuTreeDiv{
+    height: 400px;
+    overflow-y: auto;
+  }
+}
+</style>
diff --git a/src/pages/config/pages/attributeCustom/index.vue b/src/pages/config/pages/attributeCustom/index.vue
index b07ad6d53..c9aab0979 100644
--- a/src/pages/config/pages/attributeCustom/index.vue
+++ b/src/pages/config/pages/attributeCustom/index.vue
@@ -16,6 +16,11 @@
           <buss v-if="tabValue === 'buss'"></buss>
         </div>
       </el-tab-pane>
+<!--      <el-tab-pane label="其他" name="other">
+        <div style="position: absolute;top: 0;left: 0;right: 0;bottom: 0;">
+          <other v-if="tabValue === 'other'"></other>
+        </div>
+      </el-tab-pane>-->
     </el-tabs>
   </div>
 </template>
@@ -24,12 +29,14 @@
 import Laws from './components/laws'
 import Stand from './components/stand'
 import Buss from './components/buss'
+/*import Other from './components/other'*/
 export default {
   name: 'index',
   components: {
     Laws,
     Stand,
-    Buss
+    Buss,
+    // Other
   },
   data () {
     return {

From 381c5bc1251b3664330dfcdc66a7e56c32efb56d Mon Sep 17 00:00:00 2001
From: super_liu <396572590@qq.com>
Date: Mon, 8 Nov 2021 17:51:12 +0800
Subject: [PATCH 9/9] feat: There is no way the,

---
 .../otherBussStandardDetails/index.vue        | 72 ++++++++++-------
 .../details/otherStandardDetails/index.vue    | 81 ++++++++++---------
 2 files changed, 84 insertions(+), 69 deletions(-)

diff --git a/src/pages/details/otherBussStandardDetails/index.vue b/src/pages/details/otherBussStandardDetails/index.vue
index cd8235e34..548e41d5b 100644
--- a/src/pages/details/otherBussStandardDetails/index.vue
+++ b/src/pages/details/otherBussStandardDetails/index.vue
@@ -39,37 +39,39 @@
                     <p class="half" style="color: #C42626;"><label style=" margin-right: 171px;">企标号</label><span>{{ sarStandardsInfoEO.standCode }}</span></p>
                     <template v-for="(child, childIndex) in item.child1">
                       <p class="half files-title"
-                         v-for="(file, fileIndex) in child1Func(child.value)"
                       >
                         <label style=" margin-right: 102px;">{{ child.attrName }}</label>
-                        <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>
-                      <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 class="time-text">上传时间：{{ dateFormat(file.modifyTime) }}</span>-->
-                      </span>
-<!--                        <el-button-->
-<!--                                v-if="child.attrField === itemNam "-->
-<!--                                v-for="(itemNam,index) in itemExistList"-->
-<!--                                :key="index"-->
-<!--                                @click="showItemsModel(child.attrField)"-->
-<!--                                class="decomposition-btn"-->
-<!--                                style="right:62px"-->
-<!--                                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>
+                        <template 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>
+                            <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 class="time-text">上传时间：{{ dateFormat(file.modifyTime) }}</span>-->
+                            </span>
+                                <!--                        <el-button-->
+                                <!--                                v-if="child.attrField === itemNam "-->
+                                <!--                                v-for="(itemNam,index) in itemExistList"-->
+                                <!--                                :key="index"-->
+                                <!--                                @click="showItemsModel(child.attrField)"-->
+                                <!--                                class="decomposition-btn"-->
+                                <!--                                style="right:62px"-->
+                                <!--                                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>
+                        </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>
@@ -1168,6 +1170,7 @@ export default {
   methods: {
     child1Func(child1){
       const list = []
+      console.log(child1)
       if(child1 && child1.length > 1){
         list.push(child1[0])
         return list
@@ -2130,6 +2133,7 @@ export default {
       const [displayLocation, {attrInfoMap: dynamicFormField}, formFieldList] = values
       // const relatedPlansRes = await this.queryRelatedPlans()
       // const relatedPlans = relatedPlansRes.list
+      console.log(formFieldList)
       formFieldList.forEach((field) => {
         displayLocation.forEach((location) => {
           location.isShowImp = '0'
@@ -2157,12 +2161,14 @@ export default {
               // }
             }
           }
-          if (location.label === '文本信息') {
+          if (location.label === '过程稿件') {
             location.isShowImp = '0'
           }
         })
       })
 
+      console.log(displayLocation)
+
       for (let i = 0; i < displayLocation.length; i++) {
         //  sss
         if(displayLocation[i].label !== '基础信息' && displayLocation[i].label !== '过程稿件'){
@@ -2176,13 +2182,16 @@ export default {
       displayLocation.forEach(location => {
         // 动态属性字段-FBGBJBD 单独添加至基础信息
         const list = displayLocation.filter ( item => item.label === '过程稿件');
+        console.log(list)
         if(location.label === '基础信息' && list && list.length > 0){
           if (!list[0].child) {
             location['child1'] = []
           }else {
-            console.log(list)
             const childList = list[0].child.filter ( item => item.attrField === 'FBGBUSS');
+            console.log(childList)
+            console.log(childList.length)
             location['child1'] = childList
+            console.log(location['child1'])
           }
         }
 
@@ -2196,6 +2205,7 @@ export default {
         })
         console.log(fieldOthers)
         location.child = [...fieldOthers, ...fieldsIsTextAreaOrFile].sort(this.compare('orderNum'))
+        console.log(location)
       })
       console.log(displayLocation)
       this.dynamicFormField = displayLocation
diff --git a/src/pages/details/otherStandardDetails/index.vue b/src/pages/details/otherStandardDetails/index.vue
index 44ca508f3..8496f0c9c 100644
--- a/src/pages/details/otherStandardDetails/index.vue
+++ b/src/pages/details/otherStandardDetails/index.vue
@@ -57,37 +57,39 @@
                     <!--                <p><label style=" margin-right: 150px;">标准年份</label><span>{{ sarStandardsInfoEO.standYear || '-' }}</span></p>-->
                     <template v-for="(child, childIndex) in item.child1">
                       <p class="half files-title"
-                         v-for="(file, fileIndex) in child1Func(child.value)"
                       >
                         <label style=" margin-right: 102px;">{{ child.attrName }}</label>
-                        <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>
-                      <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 class="time-text">上传时间：{{ dateFormat(file.modifyTime) }}</span>-->
-                      </span>
-                        <el-button
-                                v-if="child.attrField === itemNam "
-                                v-for="(itemNam,index) in itemExistList"
-                                :key="index"
-                                @click="showItemsModel(child.attrField)"
-                                class="decomposition-btn"
-                                style="right:62px"
-                                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>
+                        <template 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>
+                          <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 class="time-text">上传时间：{{ dateFormat(file.modifyTime) }}</span>-->
+                          </span>
+                          <el-button
+                                  v-if="child.attrField === itemNam "
+                                  v-for="(itemNam,index) in itemExistList"
+                                  :key="index"
+                                  @click="showItemsModel(child.attrField)"
+                                  class="decomposition-btn"
+                                  style="right:62px"
+                                  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>
+                        </template>
+                        <template v-if="child.value || child.value.length === 0">-</template>
                       </p>
                     </template>
                     <p><label style=" margin-right: 150px;">中文名称</label><span>{{
@@ -3112,18 +3114,10 @@
           })
         })
 
-        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 === '过程稿件');
+          console.log()
           if(location.label === '基础信息' && list && list.length > 0){
             if (!list[0].child) {
               location['child1'] = []
@@ -3167,6 +3161,17 @@
           location.half = half
           location.showAll = false
         })
+
+        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.$http.get('sarLawsAttrDetailedList/sar-laws-attr-detailed-list', {
           id: this.$route.params.id
         }, {