|
@@ -3,15 +3,18 @@
|
|
|
<div class="title h1" v-if="!isModifyMode">任务</div>
|
|
|
<div class="create-body">
|
|
|
<div class="title h2" v-if="!isModifyMode">基本信息</div>
|
|
|
- <el-form :model="task" :rules="rules" ref="task" label-width="120px" class="demo-task" style="margin-left: 100px;width: 700px">
|
|
|
+ <el-form :model="task" :rules="rules" ref="task" label-width="120px" class="demo-task"
|
|
|
+ style="margin-left: 100px;width: 700px">
|
|
|
<el-form-item label="任务名称" prop="title">
|
|
|
<el-input size="small" v-if="isModifyMode" v-model="task.title"></el-input>
|
|
|
- <span v-if="!isModifyMode">{{task.title}}</span>
|
|
|
- <el-tag v-if="!isModifyMode" :type="task.statusVO&&task.statusVO.style">{{task.statusVO ? task.statusVO.text:''}}</el-tag>
|
|
|
+ <span v-if="!isModifyMode">{{task.title}}</span>
|
|
|
+ <el-tag v-if="!isModifyMode" :type="task.statusVO&&task.statusVO.style">{{task.statusVO ?
|
|
|
+ task.statusVO.text:''}}
|
|
|
+ </el-tag>
|
|
|
</el-form-item>
|
|
|
<el-form-item label="任务描述" prop="desc">
|
|
|
<el-input autosize v-if="isModifyMode" type="textarea" v-model="task.description"></el-input>
|
|
|
- <span v-if="!isModifyMode">{{task.description}}</span>
|
|
|
+ <span v-if="!isModifyMode">{{task.description}}</span>
|
|
|
</el-form-item>
|
|
|
<el-form-item label="任务报价" prop="quotePrice">
|
|
|
<el-input size="small" type="number" v-if="isModifyMode" v-model="task.quotePrice">
|
|
@@ -214,9 +217,9 @@
|
|
|
<el-col :span="6">{{item.userVO.userName}}</el-col>
|
|
|
<el-col :span="6">{{item.userVO.email}}</el-col>
|
|
|
<el-col :span="6">
|
|
|
- <el-tag type="success" v-if="item.crowdReportVOS">已提交报告</el-tag>
|
|
|
- <el-tag type="info" v-if="!item.crowdReportVOS">未提交报告</el-tag>
|
|
|
- </el-col>
|
|
|
+ <el-tag type="success" v-if="item.crowdReportVOS">已提交报告</el-tag>
|
|
|
+ <el-tag type="info" v-if="!item.crowdReportVOS">未提交报告</el-tag>
|
|
|
+ </el-col>
|
|
|
<el-col :span="6">
|
|
|
<el-tag type="success" v-if="item.isCommitted">已提交任务</el-tag>
|
|
|
<el-tag type="info" v-if="!item.isCommitted">未提交任务</el-tag>
|
|
@@ -226,8 +229,8 @@
|
|
|
<report-list v-bind:reports="item.crowdReportVOS" v-bind:taskId="taskId" v-bind:projectId="projectId"/>
|
|
|
</el-collapse-item>
|
|
|
</el-collapse>
|
|
|
-<!-- <report-list v-if="isAgency" v-bind:reports="reportList" v-bind:taskId="taskId" v-bind:projectId="projectId"/>-->
|
|
|
-<!-- <report-list v-bind:reports="reportList" v-bind:taskId="taskId" v-bind:projectId="projectId"/>-->
|
|
|
+ <!-- <report-list v-if="isAgency" v-bind:reports="reportList" v-bind:taskId="taskId" v-bind:projectId="projectId"/>-->
|
|
|
+ <!-- <report-list v-bind:reports="reportList" v-bind:taskId="taskId" v-bind:projectId="projectId"/>-->
|
|
|
</div>
|
|
|
</div>
|
|
|
</template>
|
|
@@ -279,7 +282,7 @@
|
|
|
update: false,
|
|
|
uploadReport: false
|
|
|
},
|
|
|
- crowdReportUrl:'',
|
|
|
+ crowdReportUrl: '',
|
|
|
task: {
|
|
|
agencyId: '',
|
|
|
status: '',
|
|
@@ -294,12 +297,12 @@
|
|
|
fixedPrice: '',
|
|
|
doc: [],
|
|
|
requireDocUrl: '',
|
|
|
- participantCount:1,
|
|
|
- title:'',
|
|
|
- description:'',
|
|
|
- endPointVO:{
|
|
|
- caseId:'',
|
|
|
- examId:''
|
|
|
+ participantCount: 1,
|
|
|
+ title: '',
|
|
|
+ description: '',
|
|
|
+ endPointVO: {
|
|
|
+ caseId: '',
|
|
|
+ examId: ''
|
|
|
}
|
|
|
},
|
|
|
reportList: [],
|
|
@@ -334,7 +337,7 @@
|
|
|
{required: true, message: '请输入任务名称', trigger: 'blur'},
|
|
|
{min: 5, max: 50, message: '任务名称长度在 5 到 50 个字符', trigger: 'blur'}
|
|
|
],
|
|
|
- serviceType: [
|
|
|
+ serviceType: [
|
|
|
{required: true, message: '测试类型不可为空', trigger: 'change'},
|
|
|
],
|
|
|
desc: [{required: false, message: '请填写描述', trigger: 'blur'}],
|
|
@@ -365,7 +368,7 @@
|
|
|
],
|
|
|
datetime: [{required: true, message: '截止时间不可为空', trigger: 'blur'}],
|
|
|
},
|
|
|
- acceptedUserList:[],
|
|
|
+ acceptedUserList: [],
|
|
|
}
|
|
|
},
|
|
|
watch: {
|
|
@@ -412,8 +415,8 @@
|
|
|
},
|
|
|
|
|
|
//北斗测试报告填写跳转
|
|
|
- gotoWriteReport(){
|
|
|
- window.open(this.crowdReportUrl,'_blank');
|
|
|
+ gotoWriteReport() {
|
|
|
+ window.open(this.crowdReportUrl, '_blank');
|
|
|
},
|
|
|
|
|
|
//跳转至项目详情页面
|
|
@@ -505,7 +508,8 @@
|
|
|
this.task.agencyId = res.crowdTaskVO.agencyId
|
|
|
this.task.status = res.crowdTaskVO.status
|
|
|
this.task.statusVO = res.crowdTaskVO.statusVO
|
|
|
- this.task.endPointVO = res.crowdTaskVO.endPointVO
|
|
|
+ this.task.endPointVO = res.crowdTaskVO.endPointVO ?
|
|
|
+ res.crowdTaskVO.endPointVO : {caseId: '', examId: ''}
|
|
|
this.taskOperationControl = res.taskOperationControl
|
|
|
this.acceptedUserList = res.acceptedUserList;
|
|
|
this.crowdReportUrl = res.crowdTaskVO.writeReportUrl;
|
|
@@ -527,18 +531,18 @@
|
|
|
})
|
|
|
},
|
|
|
|
|
|
- dateFormat (date, format) {
|
|
|
+ dateFormat(date, format) {
|
|
|
date = new Date(date)
|
|
|
let o = {
|
|
|
- 'M+' : date.getMonth() + 1, //month
|
|
|
- 'd+' : date.getDate(), //day
|
|
|
- 'H+' : date.getHours(), //hour+8小时
|
|
|
- 'm+' : date.getMinutes(), //minute
|
|
|
- 's+' : date.getSeconds(), //second
|
|
|
- 'q+' : Math.floor((date.getMonth() + 3) / 3), //quarter
|
|
|
- 'S' : date.getMilliseconds() //millisecond
|
|
|
+ 'M+': date.getMonth() + 1, //month
|
|
|
+ 'd+': date.getDate(), //day
|
|
|
+ 'H+': date.getHours(), //hour+8小时
|
|
|
+ 'm+': date.getMinutes(), //minute
|
|
|
+ 's+': date.getSeconds(), //second
|
|
|
+ 'q+': Math.floor((date.getMonth() + 3) / 3), //quarter
|
|
|
+ 'S': date.getMilliseconds() //millisecond
|
|
|
}
|
|
|
- if (/(y+)/.test(format)){
|
|
|
+ if (/(y+)/.test(format)) {
|
|
|
format = format.replace(RegExp.$1, (date.getFullYear() + '').substr(4 - RegExp.$1.length));
|
|
|
}
|
|
|
|
|
@@ -566,7 +570,7 @@
|
|
|
fixedPrice: this.task.fixedPrice,
|
|
|
requirementFile: this.task.requireDocUrl,
|
|
|
participantCount: this.task.participantCount,
|
|
|
- endpoint:this.task.endPointVO
|
|
|
+ endpoint: this.task.endPointVO
|
|
|
}
|
|
|
//console.log(newTask)
|
|
|
updateTask(this.projectId, this.taskId, newTask, this.updateTaskSuccess, this.updateTaskFail)
|
|
@@ -616,10 +620,10 @@
|
|
|
}
|
|
|
formData.append('file', param.file)
|
|
|
Http.upload(Apis.FILE.REQUIREMENT_FILE.replace('{userId}', this.user.userVO.id), formData, config).then((res) => {
|
|
|
- notify('success', '上传成功')
|
|
|
+ notify('success', '上传成功')
|
|
|
this.uploadRequireDocSuccess(res)
|
|
|
}).catch((error) => {
|
|
|
- notify('error', '上传失败:' + error.data)
|
|
|
+ notify('error', '上传失败:' + error.data)
|
|
|
this.uploadRequireDocFail(error)
|
|
|
})
|
|
|
},
|
|
@@ -829,7 +833,7 @@
|
|
|
overflow: auto;
|
|
|
}
|
|
|
|
|
|
- .el-collapse-item__content{
|
|
|
+ .el-collapse-item__content {
|
|
|
padding-bottom: 0 !important;
|
|
|
}
|
|
|
</style>
|