|
|
@@ -45,9 +45,12 @@
|
|
|
<span v-else>处 理</span>
|
|
|
<el-dropdown-menu slot="dropdown" style="text-align: center;">
|
|
|
<el-dropdown-item command="1" v-if="[6].includes(scope.row.type)">查看审核记录</el-dropdown-item>
|
|
|
- <el-dropdown-item command="4" v-if="scope.row.status != 3 || scope.row.createName == userinfo.name">编 辑</el-dropdown-item>
|
|
|
- <el-dropdown-item command="3" v-if="[6].includes(scope.row.type)">完 成</el-dropdown-item>
|
|
|
- <el-dropdown-item command="2" v-if="scope.row.createName == userinfo.name || (scope.row.type == 5 && !scope.row.handlerName.includes('@'))" divided style="color: red;">取 消</el-dropdown-item>
|
|
|
+ <el-dropdown-item command="4" v-if="scope.row.status != 3 || scope.row.createName == userinfo.name">编
|
|
|
+ 辑</el-dropdown-item>
|
|
|
+ <el-dropdown-item command="3" v-if="[6].includes(scope.row.type) && scope.row.status==2">完 成</el-dropdown-item>
|
|
|
+ <el-dropdown-item command="2"
|
|
|
+ v-if="scope.row.createName == userinfo.name || (scope.row.type == 5 && !scope.row.handlerName.includes('@'))"
|
|
|
+ divided style="color: red;">取 消</el-dropdown-item>
|
|
|
</el-dropdown-menu>
|
|
|
</el-dropdown>
|
|
|
</div>
|
|
|
@@ -65,7 +68,7 @@
|
|
|
|
|
|
<auditRecords ref="auditRecords"></auditRecords>
|
|
|
<createTask ref="createTaskDialog" :id="id" @isCreate="isCreate"></createTask>
|
|
|
- <handleTask1 ref="handleTask1Dialog"></handleTask1>
|
|
|
+ <handleTask1 ref="handleTask1Dialog" @isSuccess="isSuccess"></handleTask1>
|
|
|
<handleTask2 ref="handleTask2Dialog" @isSuccess="isSuccess"></handleTask2>
|
|
|
</div>
|
|
|
</template>
|
|
|
@@ -244,10 +247,10 @@ export default {
|
|
|
this.$refs.auditRecords.open(row)
|
|
|
break;
|
|
|
case '2'://取消任务//发起人和审核人可以取消任务，外部人员不能取消任务
|
|
|
- this.deleteTask(row)
|
|
|
+ this.finishClose(row, 5)
|
|
|
break;
|
|
|
case '3'://完成任务
|
|
|
- this.finish(row)
|
|
|
+ this.finishClose(row, 3)
|
|
|
break;
|
|
|
case '4'://编辑任务
|
|
|
this.handleEdit(row)
|
|
|
@@ -261,30 +264,41 @@ export default {
|
|
|
handleEdit(row) {
|
|
|
this.$refs.createTaskDialog.open(row)
|
|
|
},
|
|
|
- // 完成任务
|
|
|
- finish(row) {
|
|
|
+ // 取消/完成任务
|
|
|
+ finishClose(row, status) {
|
|
|
+ this.finishCloses([row.id], status)
|
|
|
+ },
|
|
|
+ finishCloses(ids, status) {
|
|
|
let params = {
|
|
|
- id : row.id
|
|
|
+ ids: ids,
|
|
|
+ status: status
|
|
|
}
|
|
|
- this.$api.status(params).then(res => {
|
|
|
- if (res.code == 200) {
|
|
|
- this.$message.success('任务已置为完成')
|
|
|
- this.getList()
|
|
|
- }
|
|
|
- })
|
|
|
- },
|
|
|
- // 取消任务
|
|
|
- deleteTask(row) {
|
|
|
- this.deleteTasks([row.id])
|
|
|
- },
|
|
|
- deleteTasks(ids) {
|
|
|
- this.$api.dele(ids).then(response => {
|
|
|
- if (response.code == 200) {
|
|
|
- this.$message.success('取消任务成功')
|
|
|
- this.queryParams.current = 1
|
|
|
- this.getList()
|
|
|
- }
|
|
|
- })
|
|
|
+ var str =''
|
|
|
+ if (status == 3) {
|
|
|
+ str = '此操作会将任务置为完成,操作不可逆, 是否继续?'
|
|
|
+ } else if (status == 5) {
|
|
|
+ str = '此操作会将任务置为取消,操作不可逆, 是否继续?'
|
|
|
+ }
|
|
|
+ this.$confirm(str, '提示', {
|
|
|
+ confirmButtonText: '确定',
|
|
|
+ cancelButtonText: '取消',
|
|
|
+ type: 'warning'
|
|
|
+ }).then(() => {
|
|
|
+ this.$api.status(params).then(response => {
|
|
|
+ if (response.code == 200) {
|
|
|
+ if (status == 3) {
|
|
|
+ this.$message.success('完成任务成功')
|
|
|
+ } else if (status == 5) {
|
|
|
+ this.$message.success('取消任务成功')
|
|
|
+ }
|
|
|
+ this.queryParams.current = 1
|
|
|
+ this.getList()
|
|
|
+ }
|
|
|
+ })
|
|
|
+ }).catch(() => {
|
|
|
+ this.$message.info('操作已取消')
|
|
|
+ });
|
|
|
+
|
|
|
},
|
|
|
//处理任务
|
|
|
handleTask(row) {
|
|
|
@@ -292,7 +306,7 @@ export default {
|
|
|
this.handleTypeTask2(row)
|
|
|
} else {
|
|
|
// if (row.status != 3) {/
|
|
|
- this.handleTypeTask(row)
|
|
|
+ this.handleTypeTask(row)
|
|
|
// }
|
|
|
}
|
|
|
|
|
|
@@ -324,10 +338,10 @@ export default {
|
|
|
handleTypeTask(row) {
|
|
|
switch (row.type) {
|
|
|
case 1://项目开卷审核任务
|
|
|
- this.getPatentMining(2)
|
|
|
+ this.getPatentMining(row,2)
|
|
|
break;
|
|
|
case 5://任务审核任务
|
|
|
- row.disabled=false
|
|
|
+ row.disabled = false
|
|
|
let router = this.$router.resolve({
|
|
|
path: '/handleExamine',
|
|
|
query: {
|
|
|
@@ -337,7 +351,7 @@ export default {
|
|
|
window.open(router.href, '_blank')
|
|
|
break;
|
|
|
case 6://文件分配任务
|
|
|
- row.projectId=this.id//项目id
|
|
|
+ row.projectId = this.id//项目id
|
|
|
this.$refs.handleTask2Dialog.open(row, true)
|
|
|
break;
|
|
|
|
|
|
@@ -349,10 +363,10 @@ export default {
|
|
|
handleTypeTask2(row) {
|
|
|
switch (row.type) {
|
|
|
case 1://项目开卷审核任务
|
|
|
- this.getPatentMining(1)
|
|
|
+ this.getPatentMining(row,1)
|
|
|
break;
|
|
|
case 5://任务审核任务
|
|
|
- row.disabled=true
|
|
|
+ row.disabled = true
|
|
|
let router = this.$router.resolve({
|
|
|
path: '/handleExamine',
|
|
|
query: {
|
|
|
@@ -373,12 +387,12 @@ export default {
|
|
|
getPatentMining(val) {
|
|
|
let params = {
|
|
|
current: 1,
|
|
|
- size:10,
|
|
|
+ size: 10,
|
|
|
searchQuery: `id=${this.id}`,//检索条件
|
|
|
}
|
|
|
this.$api.queryPatentDigProject(params).then(res => {
|
|
|
if (res.code == 200) {
|
|
|
- this.$refs.handleTask1Dialog.open(res.data.data[0], val)
|
|
|
+ this.$refs.handleTask1Dialog.open(res.data.data[0],row, val)
|
|
|
}
|
|
|
})
|
|
|
},
|
|
|
@@ -426,8 +440,30 @@ export default {
|
|
|
type: 'type',
|
|
|
})
|
|
|
|
|
|
+ var obj = this.searchFiled.find(item => { return item.label == '任务状态' })
|
|
|
+ if (obj) {
|
|
|
+ obj.options = []
|
|
|
+ for (let key in this.taskStatus) {
|
|
|
+ obj.options.push({
|
|
|
+ label: this.taskStatus[key],
|
|
|
+ value: key
|
|
|
+ })
|
|
|
+ }
|
|
|
+ }
|
|
|
+ var obj2 = this.searchFiled.find(item => { return item.label == '任务类型' })
|
|
|
+ if (obj) {
|
|
|
+ obj2.options = []
|
|
|
+ for (let key in this.taskType) {
|
|
|
+ obj2.options.push({
|
|
|
+ label: this.taskType[key],
|
|
|
+ value: key
|
|
|
+ })
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
}
|
|
|
})
|
|
|
+
|
|
|
// this.showView = false
|
|
|
// this.$nextTick(() => {
|
|
|
// this.showView = true
|
zhuhao