更新任务模板

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)

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;

manifest.json

@@ -3,8 +3,8 @@
     // "appid" : "__UNI__3A527D1",
     "appid" : "__UNI__B5B1EDD",
     "description" : "",
-    "versionName" : "1.2.4",
+    "versionName" : "1.2.5",
-    "versionCode" : 124,
+    "versionCode" : 125,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {

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)

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)

subpkg/townTask/villageTask6.vue

@@ -47,6 +47,12 @@
         <view class="file_empty" v-for="k in placeholderLengthVideo" :key="'empty_v'+k"></view>
       </view>
     </view>
+    <view class="card">
+      <view class="title" style="margin-bottom: 16rpx;">补充说明</view>
+      <u--textarea :disabled="other.is_commit==1" v-model="note" placeholder="请输入内容"
+        placeholderStyle="font-size: 22rpx;" style="font-size: 28rpx;background-color: #eee;min-height: 100px;"
+        autoHeight maxlength="-1"></u--textarea>
+    </view>
     <!-- <mybtn text="确认提交" @click="$u.throttle(submit, 1500)"></mybtn> -->
     <mybtn v-if="!other.is_commit" text="确认提交" @click="$u.throttle(submit, 1500)"></mybtn>
     <mybtn v-else-if="taskInfo.status==3" text="已完成" :my_btn_disabled="true" @click="showToast('任务已完成')"></mybtn>
@@ -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;