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

# Conflicts:
#	src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue
#	src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
#	src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue
#	src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue

src/pages/home1/components/searchGroup/index.vue

@@ -2,26 +2,27 @@
 <template>
   <div class="search-group">
     <el-select
-      v-model="selectKey"
+      v-model="checkState"
       class="search-group-item"
       placeholder="请选择"
     >
       <el-option
         v-for="item in jumpPage"
-        :key="item.selectKey"
+        :key="item.value"
         :label="item.label"
-        :value="item.selectKey"
+        :value="item.value"
       ></el-option>
     </el-select>
 
     <div class="search-condition">
       <el-input
-        v-model="keywords"
+        @keyup.native.enter="search"
+        v-model="checkContent">
         type="text"
         placeholder="请输入关键词"
         clearable
       ></el-input>
-      <el-button class="primary_button" type="primary">搜索</el-button>
+      <el-button class="primary_button" type="primary" @click="search">搜索</el-button>
     </div>
   </div>
 </template>
@@ -33,36 +34,50 @@ export default {
   mixins: [],
   data() {
     return {
-      selectKey: '',
-      keywords: '',
+      // 当前查询状态
+      checkState: 'All',
+      // 查询内容
+      checkContent: '',
       jumpPage: [
         {
-          selectKey: '选项1',
-          label: '国内外标准法规',
+          label: '全部',
+          value: 'All'
         },
         {
-          selectKey: '选项2',
-          label: '研究报告',
+          label: '国内标准法规',
+          value: 'stand'
+        },
+        {
+          label: '海外标准法规', // value没改
+          value: 'bussstand'
+        },
+        {
+          label: '国内外政策',
+          value: 'laws'
         },
         {
-          selectKey: '选项3',
           label: '企业标准',
-        },
-        {
-          selectKey: '选项4',
-          label: '动态&通知',
-        },
-        {
-          selectKey: '选项5',
-          label: '流程中心',
-        },
+          value: 'enterprise'
+        }
       ],
     }
   },
   computed: {},
   watch: {},
-  mounted() {},
-  methods: {},
+  methods: {
+    search() {
+      this.$router.push({
+        name: 'StandardSearch',
+        params: {
+          selectKey: this.checkState,
+          searchValue: this.checkContent || undefined
+        }
+      })
+    },
+  },
+  mounted(){
+
+  },
 }
 </script>
 

src/pages/home1/components/solicitopinions/index.vue

@@ -43,12 +43,13 @@ export default {
        } )
     },
     standForComments (item) {
-         this.$router.push({
-           name:'standardForComments',
-           params: {
-             id: item.id
-           }
-         },)
+      this.$store.commit('setDetailMap',this.$router.path)
+      this.$router.push({
+        name: 'consultationDetails',
+        query: {
+          item: item
+        }
+      })
     },
   },
 }

src/pages/home1/components/todoList/index.vue

@@ -50,7 +50,7 @@ export default {
       this.$router.push(this.path)
     },
     dealWith (row) { // 办理
-      // this.setHandleInfo(JSON.stringify(row))
+      this.setHandleInfo(JSON.stringify(row))
       const prcType = row.prcType
       switch(prcType) {
         case '1':
@@ -152,9 +152,9 @@ export default {
           break;
           //项目合规评估流程
         case '5' :
-          if(row.taskInfo === ''){
+          if(row.taskInfo === '标准法规部业务经理审批'){
             this.$router.push({
-              name: '',
+              name: 'xmpgStep2',
               query: {
                 taskIds: row.taskIds,
                 prcId: row.prcId,