Merge branch 'develop' of http://gitlab.91isoft.com:90/LAWS/laws-system-front-FOTON into develop

src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue

@@ -3,6 +3,10 @@
   <div id="domesticStandardDatabase" :class="{ 'tree-close': sideClose }" class="demo-spin-article v-class">
     <div class="tree-content" :class="{ 'tree-closed': sideClose }">
       <div class="tree">
+        <el-input
+            placeholder="输入国内标准法规"
+            v-model="filterText">
+        </el-input>
         <el-tree
                 ref="tree"
                 node-key="id"
@@ -11,6 +15,7 @@
                 :data="treeList"
                 highlight-current
                 @node-click="treeClick"
+                :filter-node-method="filterNode"
                 default-expand-all
                 :expand-on-click-node="false">
                 <span class="custom-tree-node" slot-scope="{ node, data }" @mouseenter="mouseenter(data)" @mouseleave="mouseleave(data)">
@@ -1286,6 +1291,7 @@ export default {
   },
   data () {
     return {
+      filterText: '', // 国内法规过滤
       props: {
         label: 'menuName',
         children: 'children'
@@ -1943,7 +1949,17 @@ export default {
       textStatusMap: {} // 文本状态id与name对应
     }
   },
+  watch: {
+    filterText(val) {
+      this.$refs.tree.filter(val);
+    }
+  },
   methods: {
+    // 国内标签过滤
+    filterNode(value, data) {
+      if (!value) return true;
+      return data.menuName.indexOf(value) !== -1;
+    },
       choiceZRR1 (type, title, id) {
           this.drawerTitle = title
           this.modalShowFlag1 = true
@@ -3123,7 +3139,7 @@ export default {
                   this.personCollect.collectType = 'INLAND_STAND'
                   this.personCollect.id = this.id
                   this.personCollect.collectResId = this.collectId
-                  this.personCollect.collectTitle = this.sarStandardsInfoEO.standName
+                  this.personCollect.collectTitle = this.sarStandardsInfoEO.standName + '(编号:'+this.sarStandardsInfoEO.standSort + this.sarStandardsInfoEO.standNumber + this.sarStandardsInfoEO.standYear +')'
                   this.personCollect.userId = this.$store.getters.userInfo.userId
                   this.$http.putData('person/personCollect/updatePersonCollect', this.personCollect, {
                     _this: this,
@@ -3204,6 +3220,7 @@ export default {
         formData.collectMenuId = undefined
       }
       formData.standType = 'INLAND'
+      formData.userId = this.$store.getters.userInfo.userId
       this.SarExportSearchEo = formData
       this.loading = true
       this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage', formData, {
@@ -3250,6 +3267,7 @@ export default {
       }
       this.sarConfigStandSearch.page = this.configPage
       // this.sarConfigStandSearch.pageSize = this.configRows
+      this.sarConfigStandSearch.userId = this.$store.getters.userInfo.userId
       this.sarConfigStandSearch.pageSize = this.$store.getters.userInfo.configContent
       this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage', this.sarConfigStandSearch, {
         _this: this,
@@ -3414,6 +3432,7 @@ export default {
         this.quoteIdList1 = []
         this.replaceStandNumForm.quoteIdList = ''
       }
+      this.replaceStandNumForm.userId = this.$store.getters.userInfo.userId
       // if (this.sarStandardsInfoEO.replaceStandNumId !== null && this.sarStandardsInfoEO.replaceStandNumId !== '') {
       //   this.replaceStandNumForm.quoteIdList = this.sarStandardsInfoEO.replaceStandNumId.toString()
       //   (this.replaceStandNumForm.quoteIdList)
@@ -3650,6 +3669,7 @@ export default {
       if (this.sarStandardsInfoEO.lawsExplainQuote !== null && this.sarStandardsInfoEO.lawsExplainQuote !== '') {
         this.lawsExplainQuoteForm.quoteIdList = this.sarStandardsInfoEO.lawsExplainQuote.toString()
       }
+      this.sarStandardsInfoEO.userId = this.$store.getters.userInfo.userId
       this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage', this.lawsExplainQuoteForm, {
         _this: this,
         loading: 'lawsExplainQuoteFormLoading'

src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue

@@ -3,6 +3,10 @@
   <div id="foreignStandardsAndRegulations" :class="{ 'tree-close': sideClose }" class="demo-spin-article v-class">
     <div class="tree-content" :class="{ 'tree-closed': sideClose }">
       <div class="tree">
+        <el-input
+            placeholder="输入海外标准法规"
+            v-model="filterText">
+        </el-input>
         <el-tree
                 ref="tree"
                 node-key="id"
@@ -11,6 +15,7 @@
                 :data="treeList"
                 highlight-current
                 @node-click="treeClick"
+                :filter-node-method="filterNode"
                 default-expand-all
                 :expand-on-click-node="false">
                 <span class="custom-tree-node" slot-scope="{ node, data }" @mouseenter="mouseenter(data)" @mouseleave="mouseleave(data)">
@@ -1741,14 +1746,23 @@ export default {
       displayLocation: [],
       orgData: [],
       delLoading: false,
-      standState: ''
+      standState: '',
+      filterText: ''
     }
   },
   props: {
   },
   watch: {
+    filterText(val) {
+      this.$refs.tree.filter(val);
+    }
   },
   methods: {
+    // 海外标签过滤
+    filterNode(value, data) {
+      if (!value) return true;
+      return data.menuName.indexOf(value) !== -1;
+    },
     choiceZRR2 (type, title, id) {
       this.drawerTitle = title
       this.modalShowFlag2 = true