|
|
@@ -46,6 +46,7 @@
|
|
|
<el-radio :label="0">协同</el-radio>
|
|
|
<el-radio :label="1">非协同</el-radio>
|
|
|
</el-radio-group>
|
|
|
+ {{task.endPoint.collaborativeType}}
|
|
|
<span v-if="!isModifyMode">{{ task.endPoint.collaborativeType ? '非协同' : '协同' }}</span>
|
|
|
</el-form-item>
|
|
|
|
|
|
@@ -145,7 +146,7 @@
|
|
|
<a :href="task.endPoint.threePageUrl"><el-link :underline="false" type="primary"><i
|
|
|
class="el-icon-document"></i>下载文档</el-link></a>
|
|
|
</span>
|
|
|
- <span v-if="isModifyMode"> <a href="http://mooctest-site.oss-cn-shanghai.aliyuncs.com/excel-template.xlsx"> <i class="el-icon-document"></i>示例下载</a></span>
|
|
|
+ <span v-if="isModifyMode&&task.endPoint.threePageUrl"> <a href="http://mooctest-site.oss-cn-shanghai.aliyuncs.com/excel-template.xlsx"> <i class="el-icon-document"></i>示例下载</a></span>
|
|
|
</span>
|
|
|
</el-form-item>
|
|
|
|
|
|
@@ -176,7 +177,7 @@
|
|
|
<el-button size="mini" @click="toProject()">项目详情</el-button>
|
|
|
|
|
|
<el-popover
|
|
|
- placement="top-start"r
|
|
|
+ placement="top-start"
|
|
|
title="确认拒绝?"
|
|
|
width="200"
|
|
|
trigger="hover"
|
|
|
@@ -393,7 +394,7 @@ export default {
|
|
|
title: '',
|
|
|
description: '',
|
|
|
endPoint: {
|
|
|
- collaborativeType:0,
|
|
|
+ collaborativeType:-1,
|
|
|
token: '',
|
|
|
threePageUrl:''
|
|
|
},
|
|
|
@@ -532,18 +533,18 @@ export default {
|
|
|
window.open(this.task.endPoint.token)
|
|
|
},
|
|
|
//根据短链接获取生成databoard
|
|
|
- getTaskDataBoard() {
|
|
|
- this.showLoading()
|
|
|
- Http.put(`/api/project/${this.projectId}/task/${this.taskId}/addToken`, {"token": this.shortLink}).then((res) => {
|
|
|
- this.taskOperationControl = res.taskOperationControl;
|
|
|
- this.task.endPoint = res.crowdTaskVO.endPointVO;
|
|
|
- this.shortLink = res.crowdTaskVO.endPointVO.token;
|
|
|
- if (this.shortLink != '') {
|
|
|
- this.editShortLink = false;
|
|
|
- }
|
|
|
- this.hideLoading()
|
|
|
- })
|
|
|
- },
|
|
|
+ // getTaskDataBoard() {
|
|
|
+ // this.showLoading()
|
|
|
+ // Http.put(`/api/project/${this.projectId}/task/${this.taskId}/addToken`, {"token": this.shortLink}).then((res) => {
|
|
|
+ // this.taskOperationControl = res.taskOperationControl;
|
|
|
+ // this.task.endPoint = res.crowdTaskVO.endPointVO;
|
|
|
+ // this.shortLink = res.crowdTaskVO.endPointVO.token;
|
|
|
+ // if (this.shortLink != '') {
|
|
|
+ // this.editShortLink = false;
|
|
|
+ // }
|
|
|
+ // this.hideLoading()
|
|
|
+ // })
|
|
|
+ // },
|
|
|
getServiceByCode(code) {
|
|
|
let serviceName = this.serviceType.filter((item) => {
|
|
|
return item.code === code;
|
|
|
@@ -561,7 +562,6 @@ export default {
|
|
|
this.$refs.task.clearValidate('endPoint');
|
|
|
} else {
|
|
|
this.task.resource = '2';
|
|
|
- this.task.endPoint.collaborativeType = 0;
|
|
|
}
|
|
|
},
|
|
|
init() {
|
|
|
@@ -682,7 +682,6 @@ export default {
|
|
|
//获取任务详情成功时回调函数
|
|
|
getTaskDetailSuccess(res) {
|
|
|
this.hideLoading()
|
|
|
- // console.log(res)
|
|
|
this.task = res.crowdTaskVO
|
|
|
this.taskId = res.crowdTaskVO.id
|
|
|
this.projectId = res.crowdTaskVO.projectId
|
|
|
@@ -707,7 +706,7 @@ export default {
|
|
|
this.task.status = res.crowdTaskVO.status
|
|
|
this.task.statusVO = res.crowdTaskVO.statusVO
|
|
|
this.task.writeReportUrl = res.crowdTaskVO.writeReportUrl
|
|
|
- this.task.endPoint = res.crowdTaskVO.endPointVO ? res.crowdTaskVO.endPointVO : {}
|
|
|
+ this.task.endPoint = {...res.crowdTaskVO.endPointVO};
|
|
|
this.taskOperationControl = res.taskOperationControl;
|
|
|
this.acceptedUserList = res.acceptedUserList;
|
|
|
this.crowdReportUrl = res.crowdTaskVO.writeReportUrl;
|
|
|
@@ -727,6 +726,7 @@ export default {
|
|
|
// console.log(res.crowdTaskVO.endPointVO.token)
|
|
|
// console.log(this.editShortLink)
|
|
|
// console.log(this.isModifyMode)
|
|
|
+ console.log(this.task)
|
|
|
},
|
|
|
//获取任务详情失败时回调函数
|
|
|
getTaskDetailFail(error) {
|
|
|
@@ -813,13 +813,13 @@ export default {
|
|
|
this.task.datetime = new Date(res.crowdTaskVO.datetime)
|
|
|
this.task.quotePrice = res.crowdTaskVO.quotePrice
|
|
|
this.task.fixedPrice = res.crowdTaskVO.fixedPrice
|
|
|
- // this.task.endPointVO = res.crowdTaskVO.endPointVO
|
|
|
+ this.task.endPoint = res.crowdTaskVO.endPointVO
|
|
|
this.task.doc = []
|
|
|
this.task.requireDocUrl = res.crowdTaskVO.requirementFile
|
|
|
this.task.participantCount = res.crowdTaskVO.participantCount
|
|
|
- this.task.endPoint = res.crowdTaskVO.endPointVO ? res.crowdTaskVO.endPointVO : {
|
|
|
- serverCode: '',
|
|
|
- }
|
|
|
+ // this.task.endPoint = res.crowdTaskVO.endPointVO ? res.crowdTaskVO.endPointVO : {
|
|
|
+ // serverCode: '',
|
|
|
+ // }
|
|
|
this.task.createTime = res.crowdTaskVO.createTime,
|
|
|
this.reportList = res.crowdReportVOList
|
|
|
this.crowdReportUrl = res.crowdTaskVO.writeReportUrl;
|
|
|
@@ -828,7 +828,6 @@ export default {
|
|
|
this.serviceName = this.getServiceByCode(res.crowdTaskVO.serviceType)
|
|
|
this.getWordCloudByDescription()
|
|
|
this.hideLoading()
|
|
|
-
|
|
|
notify('success', '修改成功')
|
|
|
},
|
|
|
//更新任务信息失败时回调函数
|
|
|
@@ -864,7 +863,8 @@ export default {
|
|
|
Http.upload(Apis.FILE.REQUIREMENT_FILE.replace('{userId}', this.user.userVO.id), formData, config).then((res) => {
|
|
|
notify('success', '上传成功')
|
|
|
this.task.endPoint.threePageUrl = res.data
|
|
|
- console.log("this.task.endPoint.threePageUrl " + this.task.endPoint.threePageUrl)
|
|
|
+ this.task.endPoint.threePageUrl = res.data;
|
|
|
+ this.$refs.task.validateField('endPoint.threePageUrl');
|
|
|
}).catch((error) => {
|
|
|
// notify('error', '上传失败:' + error.data)
|
|
|
this.uploadRequireDocFail(error)
|