Merge remote-tracking branch 'origin/develop' into develop

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()
             }
           }