|
|
|
|
@ -46,11 +46,6 @@
|
|
|
|
|
</template> |
|
|
|
|
</el-table-column> |
|
|
|
|
<el-table-column label="讨论内容" align="center" prop="content" /> |
|
|
|
|
<!-- <el-table-column label="需要的资源" align="center" prop="resources" width="180"> |
|
|
|
|
<template slot-scope="scope"> |
|
|
|
|
<span>{{resouceConvert(scope.row.resources)}}</span> |
|
|
|
|
</template> |
|
|
|
|
</el-table-column> --> |
|
|
|
|
<el-table-column label="事件图片" align="center" prop="images"> |
|
|
|
|
<template slot-scope="scope"> |
|
|
|
|
<el-image |
|
|
|
|
@ -111,7 +106,6 @@
|
|
|
|
|
<el-form-item label="讨论图片"> |
|
|
|
|
<imageUpload v-model="form.images"/> |
|
|
|
|
</el-form-item> |
|
|
|
|
|
|
|
|
|
<el-form-item label="工时" prop="workingHours"> |
|
|
|
|
<el-input v-model="form.workingHours" placeholder="请输入工时" /> |
|
|
|
|
</el-form-item> |
|
|
|
|
@ -129,15 +123,6 @@
|
|
|
|
|
<el-date-picker clearable v-model="form.executeTime" type="datetime" value-format="timestamp" |
|
|
|
|
placeholder="选择" /> |
|
|
|
|
</el-form-item> |
|
|
|
|
|
|
|
|
|
<!-- <el-button type="primary" @click="addResource">添加资源</el-button> |
|
|
|
|
<el-form-item label="资源选择" v-for="(item,index) in form.resources" :key="index"> |
|
|
|
|
<el-cascader :options="twoList" clearable v-model="item.resourceId" @change="(obj)=>ziyuanxuanze(item,index,obj)"> |
|
|
|
|
</el-cascader> |
|
|
|
|
<el-input v-model="item.num"/> |
|
|
|
|
<el-button @click="deleteResource(item)">删除</el-button> |
|
|
|
|
</el-form-item> --> |
|
|
|
|
|
|
|
|
|
</el-form> |
|
|
|
|
<div slot="footer" class="dialog-footer"> |
|
|
|
|
<el-button type="primary" @click="submitForm">确 定</el-button> |
|
|
|
|
@ -154,8 +139,6 @@ import Editor from '@/components/Editor';
|
|
|
|
|
import { getProjectPage } from "@/api/farm/project"; |
|
|
|
|
import { getTaskPage } from "@/api/farm/task"; |
|
|
|
|
import { getTaskCatePage } from "@/api/farm/taskCate"; |
|
|
|
|
// import { getResourcePage } from "@/api/farm/resource"; |
|
|
|
|
// import { getResourceTypePage } from "@/api/farm/resourceType"; |
|
|
|
|
import { getCpUserPage } from "@/api/system/cpUser"; |
|
|
|
|
|
|
|
|
|
export default { |
|
|
|
|
@ -204,11 +187,6 @@ export default {
|
|
|
|
|
taskList:[], |
|
|
|
|
selectTaskList:[], //对应项目的任务 |
|
|
|
|
taskCateList:[], |
|
|
|
|
|
|
|
|
|
// resourceTypeList:[], // 资源类型 |
|
|
|
|
// resourceList:[], //资源名称 |
|
|
|
|
// twoList:[], |
|
|
|
|
|
|
|
|
|
cpUserList:[], //所有cpUser |
|
|
|
|
selectCpUserList:[] //参与人 |
|
|
|
|
}; |
|
|
|
|
@ -217,9 +195,6 @@ export default {
|
|
|
|
|
created() { |
|
|
|
|
this.getProject(); |
|
|
|
|
this.getTaskCateList(); |
|
|
|
|
// this.getResourceTypeList(); |
|
|
|
|
// this.getResource(); |
|
|
|
|
// this.twoRescoure(); |
|
|
|
|
this.getCpUserList(); |
|
|
|
|
}, |
|
|
|
|
methods: { |
|
|
|
|
@ -242,54 +217,6 @@ export default {
|
|
|
|
|
}) |
|
|
|
|
return executorPersonName; |
|
|
|
|
}, |
|
|
|
|
// twoRescoure() { |
|
|
|
|
// let firstList = []; |
|
|
|
|
// this.resourceTypeList.forEach((type) => { |
|
|
|
|
// let secondList = []; |
|
|
|
|
// this.resourceList.forEach((res) => { |
|
|
|
|
// if (res.resourceType == type.id) { |
|
|
|
|
// secondList.push({ value: res.id, label: res.name }); |
|
|
|
|
// } |
|
|
|
|
// }) |
|
|
|
|
// firstList.push({ value: type.id, label: type.name, children: secondList }); |
|
|
|
|
// }) |
|
|
|
|
// this.twoList = firstList; |
|
|
|
|
// }, |
|
|
|
|
// ziyuanxuanze(item,index,obj){ |
|
|
|
|
// this.form.resource[index].reource = obj[1]; |
|
|
|
|
// }, |
|
|
|
|
// addResource(){ |
|
|
|
|
// let resourceTmp = {reource:0,num:1} |
|
|
|
|
// this.form.resources = this.form.resources.concat(resourceTmp); |
|
|
|
|
// }, |
|
|
|
|
// deleteResource(item){ |
|
|
|
|
// this.form.resources = this.form.resources.filter(res => res!=item) |
|
|
|
|
// }, |
|
|
|
|
// resouceConvert(resources){ |
|
|
|
|
// let resouceMsg = ""; |
|
|
|
|
// resources.forEach(res =>{ |
|
|
|
|
// let typeName = this.resourceTypeList.filter(type => type.id == res.resourceId[0])[0].name; |
|
|
|
|
// let name = this.resourceList.filter(name => name.id == res.resourceId[1])[0].name; |
|
|
|
|
// resouceMsg += typeName +"/" + name +":" + res.num +"\n"; |
|
|
|
|
// }) |
|
|
|
|
// return resouceMsg; |
|
|
|
|
// }, |
|
|
|
|
// getResourceTypeList() { |
|
|
|
|
// getResourceTypePage({ |
|
|
|
|
// pageNo: 1, |
|
|
|
|
// pageSize: 100 |
|
|
|
|
// }).then(res => { |
|
|
|
|
// this.resourceTypeList = res.data.list; |
|
|
|
|
// }) |
|
|
|
|
// }, |
|
|
|
|
// getResource() { |
|
|
|
|
// getResourcePage({ |
|
|
|
|
// pageNo: 1, |
|
|
|
|
// pageSize: 10, |
|
|
|
|
// }).then(res => { |
|
|
|
|
// this.resourceList = res.data.list; |
|
|
|
|
// }) |
|
|
|
|
// }, |
|
|
|
|
getTaskCateList() { |
|
|
|
|
getTaskCatePage({ |
|
|
|
|
pageNo: 1, |
|
|
|
|
@ -303,7 +230,7 @@ export default {
|
|
|
|
|
getProjectPage({ |
|
|
|
|
pageNo: 1, |
|
|
|
|
pageSize: 400, |
|
|
|
|
name: null, |
|
|
|
|
state: 'STARTING' //只看进行中的项目 |
|
|
|
|
}).then(res=>{ |
|
|
|
|
this.projectList = res.data.list; |
|
|
|
|
this.getTask(); |
|
|
|
|
@ -314,8 +241,9 @@ export default {
|
|
|
|
|
getTaskPage({ |
|
|
|
|
pageNo: 1, |
|
|
|
|
pageSize: 400, |
|
|
|
|
name: null, |
|
|
|
|
draft:false |
|
|
|
|
draft:false, |
|
|
|
|
status:'STARTED' //只能看已开始的任务 |
|
|
|
|
|
|
|
|
|
}).then(res=>{ |
|
|
|
|
this.taskList = res.data.list; |
|
|
|
|
this.getList(); |
|
|
|
|
|
zhanyunjiu
3 years ago