From 7d00bbfa51d525cda7db8e4056decbbfd8b2f19e Mon Sep 17 00:00:00 2001
From: super_liu <396572590@qq.com>
Date: Fri, 30 Jul 2021 00:47:40 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=9B=BD=E5=86=85=E5=A4=96=E6=A0=87?=
 =?UTF-8?q?=E5=87=86=20=E5=8F=8D=E5=90=91=E6=A0=87=E5=87=86=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../CustomFormComponents/InputForStandards.vue |  4 ++++
 .../details/otherStandardDetails/index.vue     |  6 +++---
 .../domesticStandardsAndRegulations/index.vue  | 18 ++++++++++++++++++
 3 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/src/components/CustomFormComponents/InputForStandards.vue b/src/components/CustomFormComponents/InputForStandards.vue
index 3b9d5a974..946f39711 100644
--- a/src/components/CustomFormComponents/InputForStandards.vue
+++ b/src/components/CustomFormComponents/InputForStandards.vue
@@ -186,6 +186,7 @@ export default {
       replaceLawsNumRow: [], // 代替政策号 数组内容
       replaceTotal: 0,
       selectedListRep: [],
+      ids: [],
       replaceLoading: true,
       replacePage: 1
 
@@ -297,6 +298,7 @@ export default {
     // 代替政策编号确定
     replaceLawsNumModelBt () {
       let textArr = []
+      this.ids = []
 
       if (typeof this.value === 'string') {
         if (this.value) {
@@ -322,12 +324,14 @@ export default {
         } else {
           texts = item.standSortShow !== null ? item.standSortShow + ' ' + item.standNumber : item.standNumber
         }
+        this.ids.push(item.id);
         textArr.push(texts)
         textArr = [...new Set(textArr)]
         this.replaceLawsNumModel = false
       })
       // this.SarLawsInfoEO.replaceLawsNum = textArr.join(',')
       this.$emit('input', textArr.join(','))
+      this.$emit('popoverHide', this.ids, this.config.attrField);
       this.$refs.selections.clearSelection()
     },
     // 点击查看
diff --git a/src/pages/details/otherStandardDetails/index.vue b/src/pages/details/otherStandardDetails/index.vue
index b7bc135d9..24f5c3bb9 100644
--- a/src/pages/details/otherStandardDetails/index.vue
+++ b/src/pages/details/otherStandardDetails/index.vue
@@ -72,7 +72,7 @@
               :key="child.id"
               class="modular-item"
               :class="!(childIndex === item.half.length - 1) || childIndex % 2 === 1 ? 'half' : ''"
-              v-if=" child.attrField === 'DTBJH' || child.attrField === 'YYBJ' || child.attrField === 'BYYBJ' || child.attrField === 'CBBH' || child.attrField === 'DXBZ' || child.attrField === 'XGLC' || child.attrField === 'BDTBZBH' || child.attrField === 'BFDTBZ' "
+              v-if=" child.attrField === 'DTBJH' || child.attrField === 'YYBJ' || child.attrField === 'BYYBJ' || child.attrField === 'CBBH' || child.attrField === 'DXBZ' || child.attrField === 'XGLC' || child.attrField === 'BDTBZBH' || child.attrField === 'BFDTBZ' || child.attrField === 'BBFDTBZ' "
             >
               <label class="modular-content-p-name" :title="child.attrName">{{ child.attrName }}</label>
               <span
@@ -216,7 +216,7 @@
                 </p>
               </template>
               <template
-                v-else-if="child.attrField === 'DTBJH'|| child.attrField === 'BDTBZBH' || child.attrField === 'YYBJ' || child.attrField === 'BYYBJ' || child.attrField === 'CBBH' || child.attrField === 'DXBZ' || child.attrField === 'BFDTBZ'"
+                v-else-if="child.attrField === 'DTBJH'|| child.attrField === 'BDTBZBH' || child.attrField === 'YYBJ' || child.attrField === 'BYYBJ' || child.attrField === 'CBBH' || child.attrField === 'DXBZ' || child.attrField === 'BFDTBZ' || child.attrField === 'BBFDTBZ'"
               >
                 <p class="modular-content-p-val" v-if="child.value">
                   <span v-for="(item, index) in child.value.split(',')" :key="index">
@@ -310,7 +310,7 @@
                         </p>
                     </template>
                     <template
-                            v-else-if="child.attrField === 'DTBJH'|| child.attrField === 'BDTBZBH' || child.attrField === 'YYBJ' || child.attrField === 'BYYBJ' || child.attrField === 'CBBH' || child.attrField === 'DXBZ' || child.attrField === 'BFDTBZ'"
+                            v-else-if="child.attrField === 'DTBJH'|| child.attrField === 'BDTBZBH' || child.attrField === 'YYBJ' || child.attrField === 'BYYBJ' || child.attrField === 'CBBH' || child.attrField === 'DXBZ' || child.attrField === 'BFDTBZ' || child.attrField === 'BBFDTBZ'"
                     >
                         <p class="modular-content-p-val" v-if="child.value">
                   <span v-for="(item, index) in child.value.split(',')" :key="index">
diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
index 59bd2bd9f..b47761910 100644
--- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
@@ -448,6 +448,7 @@
                       :class="field.attrField === 'BYYBJ' ? 'classDisplay' : ''"
                       v-model="sarStandardsInfoEO[field.attrField]"
                       :disabled="formdisableflag"
+                      @popoverHide="popoverHideQuery"
                     ></custom-input-for-standards>
                   </template>
                   <template v-else-if="field.attrField === 'CYCVPPSBM'">
@@ -1698,6 +1699,8 @@ export default {
         svpps: '', // 关联模块-VPPS编码
         replaceStandNum: '', // 代替标准号
         replacedStandNum: '',  // 	被代替标准号
+        replacePartStandNum: '', // 代替标准号
+        replacedPartStandNum: '',  // 	被代替标准号
         citeStand: '',  // 	引用标准
         citedStand: '',  // 	被引用标准
         synopsis: '', // 内容摘要
@@ -1744,6 +1747,8 @@ export default {
         standNature: '',
         replaceStandNum: '',
         replacedStandNum: '',
+        replacePartStandNum: '', // 代替标准号
+        replacedPartStandNum: '',  // 	被代替标准号
         interStandNum: '',
         adoptExtent: '',
         emergyKind: '',
@@ -1814,10 +1819,12 @@ export default {
         standState: '',
         standNature: '',
         replaceStandNum: '',
+        replacePartStandNum: '',
         replaceStandNumId: '',
         // replaceStandNumCope: '',
         replaceStandNumList: [],
         replacedStandNum: '',
+        replacedPartStandNum: '',
         interStandNum: '',
         adoptExtent: '',
         emergyKind: '',
@@ -2161,6 +2168,8 @@ export default {
         synopsis: '',
         // replaceStandNumCope: '',
         replacedStandNum: '',
+          replacePartStandNum: '', // 代替标准号
+          replacedPartStandNum: '',  // 	被代替标准号
         orderBy:'',
         nowOrder: '',
         nowOrderBy: '',
@@ -2223,6 +2232,11 @@ export default {
           this.url="sarModelTree/list"
           this.urlChild="sarModelTree/childByList"
       },
+      popoverHideQuery(ids,attrField){
+          console.log(ids)
+          console.log("-----------------------------")
+          console.log(attrField)
+      },
       popoverHide (checkedIds, checkedData,isShow,isLoadChild,topId) {
           if(checkedData) {
               if(checkedData.length > 0){
@@ -2742,6 +2756,8 @@ export default {
         this.sarStandardsSearch.applyArctic = ''
         this.sarStandardsSearch.replaceStandNum = ''
         this.sarStandardsSearch.replacedStandNum = ''
+        this.sarStandardsSearch.replacePartStandNum = ''
+        this.sarStandardsSearch.replacedPartStandNum = ''
         this.sarStandardsSearch.synopsis = ''
         this.sarStandardsSearch.category = ''
         this.pageChange(1)
@@ -4035,6 +4051,8 @@ export default {
               this.sarConfigStandSearch.applyArctic = ''
               this.sarConfigStandSearch.replaceStandNum = ''
               this.sarConfigStandSearch.replacedStandNum = ''
+              this.sarStandardsSearch.replacePartStandNum = ''
+              this.sarStandardsSearch.replacedPartStandNum = ''
               this.selectConfiguraStand()
             }
           }