1

src/views/report/InvalidResponse/components/flowPath/flowPath.vue

@@ -45,15 +45,13 @@
         <el-timeline-item v-for="item in timelineList" :timestamp="item.occurredTime" :key="item.id" placement="top">
           <div v-if="item.showCasePhase" class="timelinePosition">{{ item.casePhase }}</div>
           <el-card>
-            <div v-if="item.documentType">
-              <p><span>文档类型：</span><span style="font-weight:bold;color:red">{{ item.documentType }}</span></p>
+            <div style="float: right;margin-top:10px">
+                <span style="margin-right: 10px;"  @click="edit(item)"><el-link>编辑</el-link></span>
+                <span  @click="dele(item)"><el-link>删除</el-link></span>
             </div>
             <div>
-              <span>{{ timeType[item.flowType] || (item.documentType?`${item.documentType}日`:'时间') }}：</span><span>{{ item.occurredTime}}</span>
-              <div style="float: right;">
-                  <span style="margin-right: 10px;"  @click="edit(item)"><el-link>编辑</el-link></span>
-                  <span  @click="dele(item)"><el-link>删除</el-link></span>
-              </div>
+              <p v-if="item.documentType"><span>文档类型：</span><span style="font-weight:bold;color:red">{{ item.documentType }}</span></p>
+              <p><span>{{ timeType[item.flowType] || (item.documentType?`${item.documentType}日`:'时间') }}：</span><span>{{ item.occurredTime}}</span></p> 
             </div>
             <div v-if="item.flowType==31">
               <p><span>口审时间：</span><span>{{ item.oralTrailVO.oralDate }}</span></p>
@@ -104,7 +102,7 @@
 import responseDialog from '../dialog/editFlowPath.vue'
 
 export default {
-  props:['projectId','signPatentNo','taskId'],
+  props:['projectId','signPatentNo','taskId','actType'],
   components: {
     responseDialog,
   },
@@ -136,7 +134,11 @@ export default {
     }
   },
   computed: {},
-  watch: {},
+  watch: {
+    actType(){
+      this.setMenuList()
+    },
+  },
   async created() {
     await this.getMenuList()
   },
@@ -153,25 +155,33 @@ export default {
         if(response.code == 200){
           var data = response.data.data
           this.currentMenuList = data
-          let arr = []
-          for(let i = 0;i<data.length;i++){
-            let item = data[i]
-            let obj = arr.find(a=>{
-              return a.casePhase == item.casePhase
-            })
-            if(!obj){
-              obj = {
-                casePhase : item.casePhase,
-                children:[]
-              }
-              arr.push(obj)
-            }
-            obj.children.push(item)
-          }
-          this.menuList = arr
+          this.setMenuList()
         }
       })
     },
+    //设置菜单
+    setMenuList(){
+      let arr = []
+      let data = this.currentMenuList
+      for(let i = 0;i<data.length;i++){
+        let item = data[i]
+        if((item.actType == 0||item.actType == 1) && item.actType != this.actType){
+          continue;
+        }
+        let obj = arr.find(a=>{
+          return a.casePhase == item.casePhase
+        })
+        if(!obj){
+          obj = {
+            casePhase : item.casePhase,
+            children:[]
+          }
+          arr.push(obj)
+        }
+        obj.children.push(item)
+      }
+      this.menuList = arr
+    },
     getList() {
       this.queryParams.projectId = this.projectId
       // 1正序

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

@@ -401,7 +401,7 @@
             </div>
             <div v-show="show.showFlowPath">
                 <el-card shadow="always">
-                    <flow-Path :projectId="projectId" @changeFlowPath="changeFlowPath"></flow-Path>
+                    <flow-Path :projectId="projectId" :actType="reportMessage.actType" @changeFlowPath="changeFlowPath"></flow-Path>
                 </el-card>
             </div>
         </div>

src/views/report/components/dialog/addAndEditReport.vue

@@ -261,7 +261,7 @@
         </template>
         <template v-if="form.reportType == 7 && !form.id">
           <div>
-            <el-form-item label="无效请求书" prop="flowPath">
+            <el-form-item :label="form.actType == 1?'无效请求书':'无效宣告受理通知书'" prop="flowPath">
               <div v-if="form.flowPath">
                 <div v-if="form.flowPath.systemFileList && form.flowPath.systemFileList.length>0">
                   <div v-for="item in form.flowPath.systemFileList" :key="item.guid">
@@ -270,7 +270,7 @@
                 </div>
               </div>
               <div v-else>
-                <el-button type="text" size="small" @click="addFlowPath">添加无效请求书</el-button>
+                <el-button type="text" size="small" @click="addFlowPath">添加{{form.actType == 1?'无效请求书':'无效宣告受理通知书'}}</el-button>
 
               </div>
             </el-form-item>
@@ -539,6 +539,7 @@ export default {
       let str = this.form.applicantAgency//请求人代理所
       this.$set(this.form,'applicantAgency',this.form.rightHolderAgency)
       this.$set(this.form,'rightHolderAgency',str)
+      this.$set(this.form,'flowPath',null)
     },
     // 打开处理人 人员弹窗
     showHeadDialog() {
@@ -1283,7 +1284,7 @@ export default {
           this.$emit('getList', '新增成功')
           // response.data是创建成功后返回的报告id
           this.splitClaim(response.data)
-          this.saveFlowPath(response.data)
+          this.saveFlowPath(response.data,this.form.actType)
           this.handleClose(response.data)
           
         }
@@ -1312,7 +1313,7 @@ export default {
               this.$message.success('报告创建成功并发送审核')
               this.$emit('getList', true)
               this.handleCloseTask()
-              this.saveFlowPath2(response.data)
+              this.saveFlowPath2(response.data,this.form.actType)
               this.handleClose()
             }
           }).catch(error => {
@@ -1350,19 +1351,38 @@ export default {
       this.$set(this.form,'flowPath',val)
     },
     addFlowPath(){
-      this.$refs.addFlowPath.open({
-            "id": 1,
-            "flowName": "无效请求书",
-            "casePhase": "无效",
-            "caseChildPhase": "无效受理",
-            "flowType": 1
-        },
+      let type = {
+        "id": 1,
+        "flowName": "请求人无效请求书",
+        "casePhase": "无效",
+        "caseChildPhase": "递交请求人无效请求书",
+        "flowType": 1,
+        "priority": 1,
+        "ifShow": true,
+        "documentType": "交文",
+        "calOfficialDeadline": "1月",
+        "actType": "1"
+      }
+      if(this.form.actType == 0){
+        type = {
+          "id": 29,
+          "flowName": "合议组无效宣告受理通知书",
+          "casePhase": "无效",
+          "caseChildPhase": "收到合议组无效宣告受理通知书",
+          "flowType": 29,
+          "priority": 6,
+          "ifShow": true,
+          "documentType": "收文",
+          "calOfficialDeadline": "1月"
+        }
+      }
+      this.$refs.addFlowPath.open(type,
         {
           systemFileList:[]
         }
       )
     },
-    saveFlowPath2(taskId){
+    saveFlowPath2(taskId,actType){
       let params = {
         current:1,
         size:10,
@@ -1373,19 +1393,23 @@ export default {
         if (response.code == 200) {
           var data = response.data.data
           var projectId = data[0].projectId
-          this.saveFlowPath(projectId)
+          this.saveFlowPath(projectId,actType)
         }
       }).catch(error => {
       })
     },
-    saveFlowPath(projectId){
+    saveFlowPath(projectId,actType){
       this.addPatentToReport(projectId)
       if(!this.form.flowPath || this.form.id){
         return false
       }
       var form = JSON.parse(JSON.stringify(this.form.flowPath))
       form.projectId = projectId
-      this.$api.addInvalidRequestFile(form).then(response=>{
+      let api = 'addInvalidRequestFile'
+      if(actType == 0){
+        api='addReportAffairCase'
+      }
+      this.$api[api](form).then(response=>{
         if(response.code == 200){
         }
       })