From a095fb6091a43f83b341a4eacce6d2f69fd09b60 Mon Sep 17 00:00:00 2001
From: super_liu <396572590@qq.com>
Date: Thu, 17 Mar 2022 16:37:32 +0800
Subject: [PATCH] feat: There is no way the,

---
 .../pages/attributeCustom/components/laws.vue | 10 ++---
 .../details/otherLawsStandDetails/index.vue   | 39 ++++++++++++-------
 .../foreignRegulationsDatabase/index.vue      | 26 ++++++-------
 3 files changed, 42 insertions(+), 33 deletions(-)

diff --git a/src/pages/config/pages/attributeCustom/components/laws.vue b/src/pages/config/pages/attributeCustom/components/laws.vue
index 3903b5b4f..249fa4514 100644
--- a/src/pages/config/pages/attributeCustom/components/laws.vue
+++ b/src/pages/config/pages/attributeCustom/components/laws.vue
@@ -282,7 +282,7 @@
 </template>
 
 <script>
-const sarType = 'LAWS_STAND'
+const sarType = 'FOREIGN_LAWS'
 export default {
   name: 'attribute-custom',
   data () {
@@ -352,7 +352,7 @@ export default {
         showRegionId: '',
         selVal: '',
         isSearch: '1',
-        sarType: 'LAWS_STAND',
+        sarType: 'FOREIGN_LAWS',
         isWarn: '1'
       },
       attrTypeOptions: [
@@ -367,12 +367,12 @@ export default {
       ],
       sarTypeOptions: [
         // { label: '国内政策', value: 'INLAND_LAWS' },
-        { label: '国内外政策', value: 'LAWS_STAND' }
+        { label: '国内外政策', value: 'FOREIGN_LAWS' }
         // { label: '国内外政策', value: 'LAWS' }
       ],
       sarTypeLocationOptions: [
         // { label: '国内政策', value: 'INLAND_LAWS' },
-        { label: '国内外政策', value: 'LAWS_STAND' }
+        { label: '国内外政策', value: 'FOREIGN_LAWS' }
       ],
       isMustOptions: [
         { label: '是', value: '0' },
@@ -710,7 +710,7 @@ export default {
       let texts = ''
       if (type === 'INLAND_LAWS') {
         texts = '国内政策'
-      } else if (type === 'LAWS_STAND') {
+      } else if (type === 'FOREIGN_LAWS') {
         texts = '国内外政策'
       } else if (type === 'LAWS') {
         texts = '国内外通用政策'
diff --git a/src/pages/details/otherLawsStandDetails/index.vue b/src/pages/details/otherLawsStandDetails/index.vue
index 1fd76f879..e33853d64 100644
--- a/src/pages/details/otherLawsStandDetails/index.vue
+++ b/src/pages/details/otherLawsStandDetails/index.vue
@@ -13,7 +13,6 @@
           class="details-content-modular clearfix"
           v-for="(item, index) in dynamicFormField"
           :key="index"
-          v-if="item.isShowImp === '0'"
       >
         <el-collapse v-model="activeNames" @change="handleChange">
           <div v-if="item.label === '基础信息'" class="details-content-modular basic-information"
@@ -167,7 +166,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
@@ -897,7 +896,7 @@ import {dateFormat} from '../../../common/date'
 import { getBusStandFileByAttId } from 'api/process'
 
 
-const sarType = 'LAWS_STAND'
+const sarType = 'FOREIGN_LAWS'
 export default {
   name: 'OtherLawsStandDetails',
   components: {
@@ -1125,6 +1124,7 @@ export default {
       console.log(val)
     },
     handleChange1(val) {
+      console.log(val)
       if(val && val === '基础信息'){
         this.activeState = true
       }
@@ -2150,6 +2150,7 @@ export default {
           }
         })
       })
+      console.log(displayLocation)
       displayLocation.forEach(location => {
 
         // 动态属性字段-SYRZ 单独添加至基础信息
@@ -2158,17 +2159,9 @@ export default {
           if (!list2[0].child) {
             location['child2'] = []
           }else {
-            const childList = list2[0].child.filter ( item => item.attrField === 'YYRZLAWS');
-            location['child2'] = childList
-          }
-        }
-
-        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)
+            if(list2[0].child){
+              const childList = list2[0].child.filter ( item => item.attrField === 'YYRZLAWS');
+              location['child2'] = childList
             }
           }
         }
@@ -2183,8 +2176,24 @@ export default {
         })
         location.child = [...fieldOthers, ...fieldsIsTextAreaOrFile].sort(this.compare('orderNum'))
       })
-
+      for (let i = 0; i < displayLocation.length; i++) {
+        //  sss
+        if(displayLocation[i].label !== '基础信息' && displayLocation[i].label !== '过程稿件'){
+          if(displayLocation[i].child !== undefined){
+            let childList = displayLocation[i].child.filter ( item => item.value !== null && item.value !== '');
+            if(childList.length === 0){
+              displayLocation.splice(i,1)
+              i -= 1
+            }
+          }else {
+            displayLocation.splice(i,1)
+            i -= 1
+          }
+        }
+      }
+      console.log(displayLocation)
       this.dynamicFormField = displayLocation
+      console.log(this.dynamicFormField)
       sessionStorage.setItem('displayLocation', JSON.stringify(displayLocation))
       this.loading = false
     })
diff --git a/src/pages/regulatoryRepository/foreignRegulationsDatabase/index.vue b/src/pages/regulatoryRepository/foreignRegulationsDatabase/index.vue
index a2202f706..662f81ffc 100644
--- a/src/pages/regulatoryRepository/foreignRegulationsDatabase/index.vue
+++ b/src/pages/regulatoryRepository/foreignRegulationsDatabase/index.vue
@@ -1,4 +1,4 @@
-<!--企业标准库-->
+<!--国内外政策库-->
 <template>
   <div id="foreignRegulationsDatabase" :class="{ 'tree-close': sideClose }" class="v-class">
     <!--左侧树-->
@@ -1476,7 +1476,7 @@
         quoteIdList1: '',
         selectedListRep: [],
         replaceStandNumModelNum: [],
-        sarType: 'LAWS_STAND',
+        sarType: 'FOREIGN_LAWS',
         dynamicFormField: [],
         reloadAddForm: false,
         showRegionOptions: [],
@@ -1511,7 +1511,7 @@
           id: '',
           parentId: '',
           menuName: '',
-          sorDivide: 'LAWS_STAND',
+          sorDivide: 'FOREIGN_LAWS',
           displaySeq: '',
           parentIds: '',
           remarks: ''
@@ -2316,8 +2316,8 @@
       },
       // 查询二级菜单
       selectMenuList () {
-        this.$http.get('sarResource/ts-resource/getList', {
-          sorDivide: 'LAWS_STAND',
+        this.$http.get('sarResource/ts-resource/getListStand', {
+          sorDivide: 'FOREIGN_LAWS',
           userId: this.$store.getters.userInfo.userId
         }, {}, res => {
           if (res.ok) {
@@ -2519,7 +2519,7 @@
             type: 'warning'
           })
         } else {
-          this.personShareEO.resType = 'LAWS_STAND'
+          this.personShareEO.resType = 'FOREIGN_LAWS'
           this.personShareEO.resTitle = this.resPk.standName + '  ( 编号:' + this.resPk.standCode + ' )'
           this.personShareEO.resId = this.resPk.id
           this.personShareEO.recipientId = this.shareStandardSelect.join(',')
@@ -2548,7 +2548,7 @@
             type: 'warning'
           })
         } else {
-          this.personShareEO.resType = 'LAWS_STAND'
+          this.personShareEO.resType = 'FOREIGN_LAWS'
           this.personShareEO.resTitle = this.resPk.standName + '  ( 编号:' + this.resPk.standCode + ' )'
           this.personShareEO.resId = this.resPk.id
           this.personShareEO.recipientId = this.shareStandardSelect.join(',')
@@ -2657,7 +2657,7 @@
         item.isSubmit = true
         this.personCollect.collectResId = item.id
         this.personCollect.collectTitle = '  ( 编号:' + item.lawsNumber + ')'
-        this.personCollect.collectType = 'LAWS_STAND'
+        this.personCollect.collectType = 'FOREIGN_LAWS'
         this.personCollect.userId = this.$store.getters.userInfo.userId
         this.$http.postData('person/personCollect', this.personCollect, {
           _this: this
@@ -2848,7 +2848,7 @@
           name: 'OtherLawsStandDetails',
           params: {
             id: item.id,
-            pageType: 'LAWS_STAND'
+            pageType: 'FOREIGN_LAWS'
           }
         })
         window.open(routeUrl.href, '_blank')
@@ -3395,7 +3395,7 @@
               id: '',
               parentId: '',
               menuName: '',
-              sorDivide: 'LAWS_STAND',
+              sorDivide: 'FOREIGN_LAWS',
               displaySeq: '',
               remarks: '',
               parentIds: ''
@@ -3804,7 +3804,7 @@
           name: 'OtherLawsStandDetails',
           params: {
             id: row.id,
-            pageType: 'LAWS_STAND'
+            pageType: 'FOREIGN_LAWS'
           }
         })
         window.open(routeUrl.href, '_blank')
@@ -3812,7 +3812,7 @@
       // 查询二级菜单
       selectMenu () {
         this.countRootId = 0
-        this.$http.get('lawss/sarMenu/selectMenuByRole', {sorDivide: 'LAWS_STAND'}, {
+        this.$http.get('lawss/sarMenu/selectMenuByRole', {sorDivide: 'FOREIGN_LAWS'}, {
           _this: this
         }, res => {
           let treeNode = []
@@ -3878,7 +3878,7 @@
                 res => {
                   if (res.ok) {
                     const { data = {} } = res
-                    this.formFieldListData = data['LAWS_STAND']
+                    this.formFieldListData = data['FOREIGN_LAWS']
                     // 追加高级查询动态下拉框数据s
                     this.twoOptions = [
                       // {