From 07f8628a9fdcb032bf653296b2a2e9960afb90e2 Mon Sep 17 00:00:00 2001 From: weipengfei <2187978347@qq.com> Date: Wed, 25 Oct 2023 15:15:08 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=BB=BB=E5=8A=A1=E6=A8=A1?= =?UTF-8?q?=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/task.js | 7 ++++++- components/task/taskItem.vue | 5 ++++- manifest.json | 4 ++-- subpkg/townTask/marketTask10.vue | 5 ++++- subpkg/townTask/serviceTask4.vue | 5 ++++- subpkg/townTask/villageTask6.vue | 16 +++++++++++++--- 6 files changed, 33 insertions(+), 9 deletions(-) diff --git a/api/task.js b/api/task.js index 471ea33..284cf17 100644 --- a/api/task.js +++ b/api/task.js @@ -54,9 +54,14 @@ export const serviceTask4Commit = (data) => oahttp.post('/task/commit_town_task_ /** * 任务:数字农贸宣传、加工业务建设和招商任务详情 */ -export const marketTask10Detail = (data) => oahttp.post('/task/town_task_type_marketing_director_10_detail', data) +export const marketTask10Detail = (data) => oahttp.get('/task/town_task_type_marketing_director_10_detail', data) /** * 任务:数字农贸宣传、加工业务建设和招商任务提交 */ export const marketTask10Commit = (data) => oahttp.post('/task/commit_town_task_type_marketing_director_10', data) + +/** + * 任务:提交村公司任务-信息平台铺设任务接口 + */ +export const villageTask6Commit = (data) => oahttp.post('/task/commit_village_task_type_6', data) diff --git a/components/task/taskItem.vue b/components/task/taskItem.vue index cf35d05..2812b14 100644 --- a/components/task/taskItem.vue +++ b/components/task/taskItem.vue @@ -125,7 +125,7 @@ townServiceList: [44,45,46,47,48,49,50], // 镇农科服务部长任务 navToTownServiceList: [44,45,46,48,49,50], // 镇农科服务部长跳转/subpkg/townTask/townTask的任务 0 navToTownMarketList: [51,52,53,54,55,57,58,59], // 镇农科市场部长跳转/subpkg/townTask/townTask的任务 1 - navToVillageList: [62,63,64,65,66,68,69] // 村管理跳转/subpkg/townTask/townTask的任务 1 + navToVillageList: [62,63,64,65,66,68] // 村管理跳转/subpkg/townTask/townTask的任务 1 }; }, mounted() { @@ -186,6 +186,9 @@ case 67: this.navTo(`/subpkg/townTask/villageTask6?task_id=${this.$props.datas?.id}`); break; + case 69: + this.navTo(`/subpkg/townTask/villageTask6?task_id=${this.$props.datas?.id}`); + break; default: this.navTo(''); break; diff --git a/manifest.json b/manifest.json index db31491..012ab06 100644 --- a/manifest.json +++ b/manifest.json @@ -3,8 +3,8 @@ // "appid" : "__UNI__3A527D1", "appid" : "__UNI__B5B1EDD", "description" : "", - "versionName" : "1.2.4", - "versionCode" : 124, + "versionName" : "1.2.5", + "versionCode" : 125, "transformPx" : false, /* 5+App特有相关 */ "app-plus" : { diff --git a/subpkg/townTask/marketTask10.vue b/subpkg/townTask/marketTask10.vue index dbb15b4..bfc6e5f 100644 --- a/subpkg/townTask/marketTask10.vue +++ b/subpkg/townTask/marketTask10.vue @@ -171,8 +171,11 @@ stage4: this.stage4, }); this.other.is_commit = 1; + this.taskInfo.approve_status = 1; Toast('提交成功'); - uni.navigateBack(); + this.$u.sleep(500).then(()=>{ + uni.navigateBack() + }) }, showToast(str) { Toast(str) diff --git a/subpkg/townTask/serviceTask4.vue b/subpkg/townTask/serviceTask4.vue index c6ba897..dd59cc5 100644 --- a/subpkg/townTask/serviceTask4.vue +++ b/subpkg/townTask/serviceTask4.vue @@ -117,8 +117,11 @@ study_content: this.study_content }); this.other.is_commit = 1; + // this.taskInfo.approve_status = 1; Toast('提交成功'); - uni.navigateBack(); + this.$u.sleep(500).then(()=>{ + uni.navigateBack() + }) }, showToast(str) { Toast(str) diff --git a/subpkg/townTask/villageTask6.vue b/subpkg/townTask/villageTask6.vue index 483cac1..8e78425 100644 --- a/subpkg/townTask/villageTask6.vue +++ b/subpkg/townTask/villageTask6.vue @@ -47,6 +47,12 @@ + + 补充说明 + + @@ -69,7 +75,8 @@ } from "@/api/file.js" import { taskOtherTaskDetail, - taskOtherTaskCommit + taskOtherTaskCommit, + villageTask6Commit } from "@/api/task.js" import { Toast } from "../../libs/uniApi"; export default { @@ -120,7 +127,7 @@ initDetail() { taskOtherTaskDetail({ id: this.task_id }).then((res) => { this.taskInfo = res.data; - this.other = JSON.parse(JSON.stringify(res.data?.extend?.other)); // 深拷贝 + this.other = JSON.parse(JSON.stringify(res.data?.extend?.other||{})); // 深拷贝 this.approve_status = res.data?.approve_status; this.deny_notes = res.data?.deny_notes; res.data?.extend?.other?.note ? this.note = res.data?.extend?.other?.note : null; @@ -158,7 +165,7 @@ async submit() { if(!this.isReject())return; // 判断是否进行更改 if (this.note.trim() == '') return Toast('详情描述不能为空'); - await taskOtherTaskCommit({ + await villageTask6Commit({ id: this.task_id, note: this.note, annex: this.fileList, @@ -167,6 +174,9 @@ this.other.is_commit = 1; this.approve_status = 1; Toast('提交成功'); + this.$u.sleep(500).then(()=>{ + uni.navigateBack() + }) }, clickTabs(item) { this.current = item.index;