From dcf5a1a22f7ce5b3f7339bba103bfe1107431c03 Mon Sep 17 00:00:00 2001 From: zmj <1493694146@qq.com> Date: Sat, 18 Nov 2023 20:17:03 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/task.js | 15 + components/task/taskItem.vue | 20 +- subpkg/townTask/gatherRecords.vue | 14 +- subpkg/townTask/townGather.vue | 51 +- subpkg/townTask/villageTask6.vue | 801 ++++++++++++++++-------------- 5 files changed, 491 insertions(+), 410 deletions(-) diff --git a/api/task.js b/api/task.js index 0857f58..c7a2958 100644 --- a/api/task.js +++ b/api/task.js @@ -97,4 +97,19 @@ export const commit_town_service_manager_task_6API = (data) => oahttp.post('/tas * 促成村联络人员入股 */ export const commit_town_master_task_6API = (data) => oahttp.post('/task/commit_town_master_task_6', + data) +/** + * 应用软件推广 + */ +export const commit_town_master_task_type_2API = (data) => oahttp.post('/task/commit_town_master_task_type_2', + data) +/** + * 应用软件推广 + */ +export const commit_town_master_task_type_7API = (data) => oahttp.post('/task/commit_town_master_task_type_7', + data) +/** + * 应用软件推广 + */ +export const commit_town_master_task_type_8API = (data) => oahttp.post('/task/commit_town_master_task_type_8', data) \ No newline at end of file diff --git a/components/task/taskItem.vue b/components/task/taskItem.vue index ff886fb..422f16c 100644 --- a/components/task/taskItem.vue +++ b/components/task/taskItem.vue @@ -145,11 +145,10 @@ "village_task_type_7", ], // 村管理跳转/subpkg/townTask/townTask的任务 1 navToVillageListA: [ - "town_task_type_master_2", "town_task_type_master_4", "town_task_type_master_5", - "town_task_type_master_7", - "town_task_type_master_8" + // "", + ], // 村管理跳转/subpkg/townTask/townTask的任务 1 navToList: ["village_task_type_4", "village_task_type_5", "town_task_type_6", "town_task_type_master_6", ], @@ -243,9 +242,24 @@ case "village_task_type_8": this.navTo(`/subpkg/townTask/villageTask6?task_id=${this.$props.datas?.id}`); break; + case "town_task_type_master_2": + this.navTo( + `/subpkg/townTask/villageTask6?task_id=${this.$props.datas?.id}&type_value=${this.$props.datas.task_type_value}` + ); + break; case "town_task_type_master_3": this.navTo(`/subpkg/townTask/gatherRecords?task_id=${this.$props.datas?.id}`); break; + case "town_task_type_master_7": + this.navTo( + `/subpkg/townTask/villageTask6?task_id=${this.$props.datas?.id}&type_value=${this.$props.datas.task_type_value}` + ); + break; + case "town_task_type_master_8": + this.navTo( + `/subpkg/townTask/villageTask6?task_id=${this.$props.datas?.id}&type_value=${this.$props.datas.task_type_value}` + ); + break; default: this.navTo(''); break; diff --git a/subpkg/townTask/gatherRecords.vue b/subpkg/townTask/gatherRecords.vue index a0a6815..f2c56d5 100644 --- a/subpkg/townTask/gatherRecords.vue +++ b/subpkg/townTask/gatherRecords.vue @@ -5,7 +5,7 @@ lineWidth='100' inactiveStyle='color:white' activeStyle="color:white"> - @@ -18,14 +18,14 @@ - 法人姓名: {{item.planting[0].entityName}} + 法人姓名: {{item.entityName}} - 联系电话: {{item.planting[0].phone}} + 联系电话: {{item.phone}} - @@ -37,10 +37,10 @@ - 店主姓名: {{item.supply[0].storeName}} + 店主姓名: {{item.storeName}} - 联系电话: {{item.supply[0].shopkeeperPhone}} + 联系电话: {{item.shopkeeperPhone}} @@ -72,7 +72,7 @@ data() { return { show: false, - gatherList: [], + gatherList: {}, page: 1, task_id: "", tabLists: [{ diff --git a/subpkg/townTask/townGather.vue b/subpkg/townTask/townGather.vue index 7b99696..96b5532 100644 --- a/subpkg/townTask/townGather.vue +++ b/subpkg/townTask/townGather.vue @@ -381,6 +381,7 @@ taskId: "", readonly: false, landPlanList: ['自己养', '出租', '代养', '租更多地扩大养殖'], + pas_Info: {}, breedingTypeList: [{ id: 1, name: "水产" @@ -460,23 +461,37 @@ } }, onLoad(option) { + + this.taskId = option.task_id if (option.type == 'supply') this.page = 0 - if (option.index) { - townMasterTask3List({ - id: option.task_id - }).then(res => { + + townMasterTask3List({ + id: option.task_id + }).then(res => { + this.pas_Info = res.data.template_info.extend.purchase_sales_info + if (option.index) { this.readonly = true this.flag = true + console.log(option, 6464) if (option.type == 'supply') { - this.formData1 = res.data.template_info.extend.purchase_sales_info[option.index]?.supply[0] + this.formData1 = this.pas_Info.supply[option.index] } else { - this.formData = res.data.template_info.extend.purchase_sales_info[option.index]?.planting[ - 0] + this.formData = this.pas_Info.planting[option.index] } + } + + + + // if (option.type == 'supply') { + // this.formData1 = res.data.template_info.extend.purchase_sales_info[option.index]?.supply[0] + // } else { + // this.formData = res.data.template_info.extend.purchase_sales_info[option.index]?.planting[ + // 0] + // } + + }) - }) - } // } this.flag = true @@ -580,26 +595,20 @@ this.formData[data.value] = e.detail.value; }, async commit() { + if (this.page) { + this.pas_Info.planting.push(this.formData) + await townMasterTask3Commit({ id: Number(this.taskId), - purchase_sales_info: { - planting: [{ - ...this.formData - }], - - } + purchase_sales_info: this.pas_Info }) - } else { + this.pas_Info.supply.push(this.formData1) await townMasterTask3Commit({ id: Number(this.taskId), - purchase_sales_info: { - supply: [{ - ...this.formData1 - }], - } + purchase_sales_info: this.pas_Info }) } Toast("操作成功") diff --git a/subpkg/townTask/villageTask6.vue b/subpkg/townTask/villageTask6.vue index 8e78425..eb7b1eb 100644 --- a/subpkg/townTask/villageTask6.vue +++ b/subpkg/townTask/villageTask6.vue @@ -1,401 +1,444 @@ \ No newline at end of file