diff --git a/api/task.js b/api/task.js index 06c7593..471ea33 100644 --- a/api/task.js +++ b/api/task.js @@ -51,6 +51,11 @@ export const townTaskDetails = (data) => oahttp.get('/task/service_task_detail', */ export const serviceTask4Commit = (data) => oahttp.post('/task/commit_town_task_type4', data) +/** + * 任务:数字农贸宣传、加工业务建设和招商任务详情 + */ +export const marketTask10Detail = (data) => oahttp.post('/task/town_task_type_marketing_director_10_detail', data) + /** * 任务:数字农贸宣传、加工业务建设和招商任务提交 */ diff --git a/subpkg/townTask/marketTask10.vue b/subpkg/townTask/marketTask10.vue index 6b153dd..dbb15b4 100644 --- a/subpkg/townTask/marketTask10.vue +++ b/subpkg/townTask/marketTask10.vue @@ -30,7 +30,7 @@ 补充说明 - @@ -98,16 +98,22 @@ // approve_status 状态 0待审核,1审核中,2审核通过,3审核不通过,4撤销审核 this.taskInfo = res.data; if(!this.taskInfo.approve_status)this.taskInfo.approve_status=0; - if(this.taskInfo?.extend?.file){ + if(this.taskInfo?.extend?.stage){ // 判断该任务是否提交过 if(this.taskInfo.extend.stage4?.is_commit==1)this.other.is_commit = 1; else if(this.taskInfo.extend.stage3?.is_commit==1)this.other.is_commit = 1; else if(this.taskInfo.extend.stage2?.is_commit==1)this.other.is_commit = 1; else if(this.taskInfo.extend.stage1?.is_commit==1)this.other.is_commit = 1; else this.other.is_commit = 0; - let task = JSON.parse(JSON.stringify(this.taskInfo.extend)) - this.imgList = task.file; - this.remark = task.remark; + let task; + switch(+this.taskInfo?.extend?.stage){ + case 1: task = this.taskInfo.extend.stage1;break; + case 2: task = this.taskInfo.extend.stage2;break; + case 3: task = this.taskInfo.extend.stage3;break; + case 4: task = this.taskInfo.extend.stage4;break; + } + this.imgList = task?.file||[]; + this.remark = task?.remark; } // this.sign_in_table = this.taskInfo?.extend?.town_task_type_4?.sign_in_table; // this.remark = this.taskInfo?.extend?.town_task_type_4?.remark;