优化

src/utils/constants.js

@@ -227,7 +227,7 @@ showType:[
     value:3
   },
 ],
-sourceId:process.env.NODE_ENV === 'production'?3:1,
+sourceId:process.env.NODE_ENV === 'production'?5:1,
 
 //更新周期
 updateCycle:[

src/views/report/components/allocationTask/components/allocationTask.vue

@@ -112,6 +112,9 @@ export default {
         return ''
       }
     },
+    groupField:{
+      
+    },
     customFields: {
       type: Array,
       default: () => {
@@ -191,6 +194,7 @@ export default {
         searchQuery: this.oldSearchOption,//检索条件
         customFields: this.customFields,
         orderDTOList: [],//排序信息
+        groupField:this.groupField
       }
       await this.$api.QueryPatent(params).then(res => {
         if (res.code == 200) {
@@ -304,6 +308,7 @@ export default {
           projectId: this.projectId,
           searchQuery: this.oldSearchOption,//列表上方检索条件
           customFields: this.customFields,//统计检索
+          groupField:this.groupField
         },//检索内容条件
         markedFields: this.markedFields,//自定义栏位
         personAssignedDTOList: this.tableData.map(item => {

src/views/report/components/allocationTask/index.vue

@@ -1,7 +1,7 @@
 <template>
   <!-- 分配任务 -->
   <div class="height_100">
-    <allocationTask :projectId="projectId" :oldSearchOption="searchOption" :customFields="customFields" :projectType="projectType"></allocationTask>
+    <allocationTask :projectId="projectId" :oldSearchOption="searchOption" :groupField="groupField" :customFields="customFields" :projectType="projectType"></allocationTask>
   </div>
 </template>
 
@@ -27,6 +27,9 @@ export default {
       // return ''
       return this.$route.query.searchOption
     },
+    groupField(){
+      return this.$route.query.groupField
+    },
     customFields() {//自定义字段检索条件
       if(this.$route.query.customFields){
         return JSON.parse(this.$route.query.customFields)

src/views/report/components/details/components/basicMessage.vue

@@ -194,7 +194,11 @@ export default {
       cardingOpinion:''
     };
   },
-  watch: {},
+  watch: {
+    projectId(){
+      this.getReportMessage()
+    }
+  },
   computed: {
     ...mapGetters(['userinfo'])
   },

src/views/report/components/mixins/index.js

@@ -28,7 +28,7 @@ export default {
         this.$message.warning('项目审核中')
         return
       }
-      this.$router.replace({
+      const router = this.$router.resolve({
         path: '/reportDetails',
         query: {
           projectId: row.id,
@@ -40,7 +40,7 @@ export default {
           projectType:2
         }
       })
-
+      window.open(router.href, '_self')
 
     },
     checkPatentDetails(row){

src/views/report/components/patentList/index.vue

@@ -1,7 +1,7 @@
 <template>
   <!--  -->
   <div>
-    <patentList :projectId="projectId" :taskId="taskId" :taskType="taskType" :reportType="reportType" :isResult="isResult" :handlerType="handlerType"></patentList>
+    <patentList :projectId="projectId" :projectName="projectName" :projectType="projectType" :taskId="taskId" :taskType="taskType" :reportType="reportType" :isResult="isResult" :handlerType="handlerType"></patentList>
   </div>
 </template>
 
@@ -21,10 +21,10 @@ export default {
       return this.$route.query.projectId || 0
     },
     projectName() {
-      return this.$route.query.projectId || 0
+      return this.$route.query.projectName
     },
     projectType() {
-      return this.$route.query.projectId || 0
+      return this.$route.query.projectType
     },
     taskId() {
       return this.$route.query.taskId