|
|
@@ -163,7 +163,8 @@
|
|
|
}
|
|
|
return []
|
|
|
|
|
|
- }
|
|
|
+ },
|
|
|
+
|
|
|
},
|
|
|
mounted() {
|
|
|
this.getList()
|
|
|
@@ -199,13 +200,22 @@
|
|
|
},
|
|
|
//点击任务名称
|
|
|
rowTaskType(row) {
|
|
|
- // console.log(this.row)
|
|
|
row.reportType = this.row.type
|
|
|
row.reportName = this.row.name
|
|
|
row.reportId = this.row.id
|
|
|
row.signPatentNo = this.row.signPatentNo
|
|
|
this.$s.setSession('params', row)
|
|
|
- if (row.type==1) {
|
|
|
+
|
|
|
+ var reportType = null
|
|
|
+ if(row.taskStatus == 0){
|
|
|
+ if(row.handlePersonId == this.row.createPersonId || row.handlePersonId == this.row.personId){
|
|
|
+ reportType = row.reportType
|
|
|
+ }
|
|
|
+ }else{
|
|
|
+ reportType = row.reportType
|
|
|
+ }
|
|
|
+
|
|
|
+ // if (row.type==1) {
|
|
|
let a=this.$router.resolve({
|
|
|
path: '/Incomplete',
|
|
|
query: {
|
|
|
@@ -214,24 +224,27 @@
|
|
|
reportId:row.reportId,
|
|
|
type:row.type,
|
|
|
signPatentNo: row.signPatentNo,
|
|
|
- reportType:3,
|
|
|
- taskWorkRemak:0,
|
|
|
+ reportName:row.reportName,
|
|
|
+ reportType:reportType,
|
|
|
+ taskWorkRemak:row.type==1?0:null,
|
|
|
}
|
|
|
})
|
|
|
window.open(a.href,"_blank")
|
|
|
- } else {
|
|
|
- let a=this.$router.resolve({
|
|
|
- path: '/Incomplete',
|
|
|
- query: {
|
|
|
- taskStatus: this.queryParams.taskStatus,
|
|
|
- taskId: row.id,
|
|
|
- reportId:row.reportId,
|
|
|
- type:row.type,
|
|
|
- signPatentNo:row.signPatentNo,
|
|
|
- }
|
|
|
- })
|
|
|
- window.open(a.href,"_blank")
|
|
|
- }
|
|
|
+ // } else {
|
|
|
+ // let a=this.$router.resolve({
|
|
|
+ // path: '/Incomplete',
|
|
|
+ // query: {
|
|
|
+ // taskStatus: this.queryParams.taskStatus,
|
|
|
+ // taskId: row.id,
|
|
|
+ // reportId:row.reportId,
|
|
|
+ // reportType:row.reportType,
|
|
|
+ // type:row.type,
|
|
|
+ // signPatentNo:row.signPatentNo,
|
|
|
+ // reportName:row.reportName
|
|
|
+ // }
|
|
|
+ // })
|
|
|
+ // window.open(a.href,"_blank")
|
|
|
+ // }
|
|
|
|
|
|
},
|
|
|
|
