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

src/pages/details/otherStandardDetails/index.vue

@@ -163,13 +163,13 @@
                         title="下载"
                         @click="downloadFile(file.id)"
                         class="icon-download"
-                        v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'WGJP2VRZSJ77EGH2447M' : '44KKMQHU3CNRRPNNF8VN'"
+                        v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? '02fd6eff0537c283dd071683de10689f' : 'a772afab2a6708883335500f3f86e771'"
                     />
                     <i
                         title="下载带水印"
                         @click="downloadFileByWater(file.id, file.fileSuffix)"
                         class="icon-download2"
-                        v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'EZVNMCLGSB5LWG6XRRL3' : 'VSUKQX3NZW4N8CT5VQE3'"
+                        v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'd5b28957b5105c805e90a16fd5056a45' : '824f3bf9edef83fc7488917136167232'"
                     />
                     <span class="time-text">上传时间：{{ dateFormat(file.modifyTime) }}</span>
                   </template>
@@ -179,13 +179,13 @@
                         title="下载"
                         @click="downloadFile(file.id)"
                         class="icon-download"
-                        v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'JHQALHMF6F' : 'dakDL3sNLq'"
+                        v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? '02fd6eff0537c283dd071683de10689f' : 'a772afab2a6708883335500f3f86e771'"
                     />
                     <i
                         title="下载带水印"
                         @click="downloadFileByWater(file.id, file.fileSuffix)"
                         class="icon-download2"
-                        v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'KDLDNFJHENFMF' : 'LKJSNLKFHOFN'"
+                        v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'd5b28957b5105c805e90a16fd5056a45' : '824f3bf9edef83fc7488917136167232'"
                     />
                     <span class="time-text">上传时间：{{ dateFormat(file.modifyTime) }}</span>
                   </template>
@@ -256,11 +256,13 @@
                         title="下载"
                         @click="downloadFile(file.id)"
                         class="icon-download"
+                        v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? '02fd6eff0537c283dd071683de10689f' : 'a772afab2a6708883335500f3f86e771'"
                     />
                     <i
                         title="下载带水印"
                         @click="downloadFileByWater(file.id, file.fileSuffix)"
                         class="icon-download2"
+                        v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'd5b28957b5105c805e90a16fd5056a45' : '824f3bf9edef83fc7488917136167232'"
                     />
                     <span class="time-text">上传时间：{{ dateFormat(file.modifyTime) }}</span>
                   </template>
@@ -270,13 +272,13 @@
                         title="下载"
                         @click="downloadFile(file.id)"
                         class="icon-download"
-                        v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'JHQALHMF6F' : 'dakDL3sNLq'"
+                        v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? '02fd6eff0537c283dd071683de10689f' : 'a772afab2a6708883335500f3f86e771'"
                     />
                     <i
                         title="下载带水印"
                         @click="downloadFileByWater(file.id, file.fileSuffix)"
                         class="icon-download2"
-                        v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'KDLDNFJHENFMF' : 'LKJSNLKFHOFN'"
+                        v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'd5b28957b5105c805e90a16fd5056a45' : '824f3bf9edef83fc7488917136167232'"
                     />
                     <span class="time-text">上传时间：{{ dateFormat(file.modifyTime) }}</span>
                   </template>
@@ -412,9 +414,16 @@
             width="150"
             >
           </el-table-column>
+          <el-table-column
+              show-overflow-tooltip
+              prop="itemsName"
+              label="条款内容"
+              width="150"
+          >
+          </el-table-column>
           <el-table-column
             prop="termsConditions"
-            label="内容简介"
+            label="解读内容"
             width="250"
             show-overflow-tooltip
             :resizable="false"
@@ -423,45 +432,46 @@
               <div class="table-jump" @click="itemsTextDialog(scope.row.itemsNum, scope.row.termsConditions)">{{ scope.row.termsConditions ? scope.row.termsConditions.replace(/<.*?>/ig, ' ') : '' }}</div>
             </template>
           </el-table-column>
+          <el-table-column
+              show-overflow-tooltip
+              prop="putTime"
+              label="实施日期"
+              width="150"
+          >
+          </el-table-column>
+          <el-table-column
+              show-overflow-tooltip
+              prop="putTime"
+              label="适用车型"
+              width="150"
+          >
+          </el-table-column>
           <el-table-column
             prop="responsibleUnitShow"
             label="责任部门"
             width="150">
           </el-table-column>
           <el-table-column
-            prop="foShow"
+            prop="zrgcs"
-            label="FO"
+            label="责任工程师"
             width="150">
           </el-table-column>
           <el-table-column
             prop="dutyEngineerShow"
-            label="项目评估角色"
+            label="基于上一版本差异"
             width="150">
           </el-table-column>
           <el-table-column
             show-overflow-tooltip
             prop="svppsShow"
-            label="SVPPS"
+            label="符合性状态"
             width="150">
           </el-table-column>
           <el-table-column
             prop="applyArcticShow"
-            label="适用车辆类型"
+            label="合规性分析"
             width="150">
           </el-table-column>
-          <el-table-column
-            prop="claimTypeShow"
-            label="要求类型"
-            width="150">
-          </el-table-column>
-          <el-table-column
-            prop="busStandCover"
-            label="覆盖关系"
-            width="150">
-            <template slot-scope="scope">
-              <span>{{ busStandCoverName(scope.row.busStandCover) }}</span>
-            </template>
-          </el-table-column>
           <el-table-column label="操作" align="center" width="50" fixed="right">
             <template slot-scope="scope">
               <div @click.stop>

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