更新了镇公司任务

api/task.js

@@ -44,9 +44,14 @@ export const taskOtherTaskCommit = (data) => oahttp.post('/task/commit_other_tas
 /**
  * 任务:服务任务详情
  */
-export const serviceTaskDetails = (data) => oahttp.get('/task/service_task_detail', data)
+export const townTaskDetails = (data) => oahttp.get('/task/service_task_detail', data)
 
 /**
  * 任务:提交督促小组服务团队学习任务
  */
 export const serviceTask4Commit = (data) => oahttp.post('/task/commit_town_task_type4', data)
+
+/**
+ * 任务:数字农贸宣传、加工业务建设和招商任务提交
+ */
+export const marketTask10Commit = (data) => oahttp.post('/task/commit_town_task_type_marketing_director_10', data)

components/task/taskItem.vue

@@ -66,7 +66,7 @@
                   <block v-else>进行中</block>
                 </block>
                 <block
-                  v-else-if="datas.type == 44||datas.type == 45||datas.type == 46||datas.type == 47||datas.type == 48||datas.type == 49||datas.type == 50">
+                  v-else-if="townService(datas.type)">
                   <block v-if="datas.type == 44">
                     {{extend.total-extend.not_done_count||0}}/{{extend.total||0}}
                   </block>
@@ -119,7 +119,12 @@
     },
     data() {
       return {
-        extend: {}
+        extend: {},
+        // 以下从左至右分别为: 服务部长,市场部长,负责人
+        taskRoleTypeList: ['town_task_type', 'town_task_type_marketing_director', 'town_task_type_master'],
+        townServiceList: [44,45,46,47,48,49,50], // 镇农科服务部长任务
+        navToTownServiceList: [44,45,46,48,49,50], // 镇农科服务部长跳转/subpkg/townTask/townTask的任务  0
+        navToTownMarketList: [51,53,54,55,57,58,59] // 镇农科市场部长跳转/subpkg/townTask/townTask的任务  1
       };
     },
     mounted() {
@@ -145,6 +150,10 @@
         // if ((this.$props.datas.type != 31) && this.$props.datas.status !== 2 && this.$props.datas.status !== 1) {
         // 	return this.$props.datas.status == 3 ? Toast('任务已完成!') : Toast('任务已结束!');
         // }
+        if(this.navToTownServiceList.includes(this.$props.datas.type)) 
+          return this.navTo(`/subpkg/townTask/townTask?task_id=${this.$props.datas?.id}&type_value=${this.taskRoleTypeList[0]}`);
+        if(this.navToTownMarketList.includes(this.$props.datas.type)) 
+          return this.navTo(`/subpkg/townTask/townTask?task_id=${this.$props.datas?.id}&type_value=${this.taskRoleTypeList[1]}`);
         switch (this.$props.datas.type) {
           case 31:
             if (this.$store.state.app.userInfo.admin_id) this.navTo(
@@ -165,32 +174,21 @@
           case 35:
             this.navTo(`/subpkg/buyShare/buyShare?task_id=${this.$props.datas?.id}`);
             break;
-          case 44:
-            this.navTo(`/subpkg/serviceTask/serviceTask?task_id=${this.$props.datas?.id}`);
-            break;
-          case 45:
-            this.navTo(`/subpkg/serviceTask/serviceTask?task_id=${this.$props.datas?.id}`);
-            break;
-          case 46:
-            this.navTo(`/subpkg/serviceTask/serviceTask?task_id=${this.$props.datas?.id}`);
-            break;
           case 47:
-            this.navTo(`/subpkg/serviceTask/serviceTask4?task_id=${this.$props.datas?.id}`);
+            this.navTo(`/subpkg/townTask/serviceTask4?task_id=${this.$props.datas?.id}`);
             break;
-          case 48:
+          case 60:
-            this.navTo(`/subpkg/serviceTask/serviceTask?task_id=${this.$props.datas?.id}`);
+            this.navTo(`/subpkg/townTask/marketTask10?task_id=${this.$props.datas?.id}&stage=${this.$props.datas?.stage}`);
-            break;
-          case 49:
-            this.navTo(`/subpkg/serviceTask/serviceTask?task_id=${this.$props.datas?.id}`);
-            break;
-          case 50:
-            this.navTo(`/subpkg/serviceTask/serviceTask?task_id=${this.$props.datas?.id}`);
             break;
           default:
             this.navTo('');
             break;
         }
       },
+      // 服务部长任务
+      townService(type){
+        return this.townServiceList.includes(type);
+      },
       isTimeInRange() {
         const now = new Date();
         const startTime = new Date(now.getTime());

config/app.js

@@ -2,8 +2,8 @@ let httpApiThree;
 let httpApi; // 总域名
 let httpApiTwo; // 物流系统域名
 
-// const env = 'dev'; // 开发
+const env = 'dev'; // 开发
-const env = 'prod'; // 生产
+// const env = 'prod'; // 生产
 // const env = 'prew';    // 预上线
 // const env = 'local'; // 本地
 

pages.json

@@ -294,8 +294,7 @@
 
     }
   ],
-  "subPackages": [
+  "subPackages": [{
-    {
     "root": "pages/views",
     "name": "views",
     "pages": [{
@@ -824,8 +823,16 @@
           "navigationBarTextStyle": "white"
         }
 
+      },{
+        "path": "townTask/marketTask10",
+        "style": {
+          "navigationBarTitleText": "任务详情",
+          "enablePullDownRefresh": false,
+          "navigationBarBackgroundColor": "#0122C7",
+          "navigationBarTextStyle": "white"
+        }
       }, {
-      "path": "serviceTask/serviceTask4",
+        "path": "townTask/serviceTask4",
         "style": {
           "navigationBarTitleText": "督促团队学习",
           "enablePullDownRefresh": false,
@@ -833,9 +840,9 @@
           "navigationBarTextStyle": "white"
         }
       }, {
-      "path": "serviceTask/serviceTask",
+        "path": "townTask/townTask",
         "style": {
-        "navigationBarTitleText": "任务",
+          "navigationBarTitleText": "任务详情",
           "enablePullDownRefresh": false,
           "navigationBarBackgroundColor": "#0122C7",
           "navigationBarTextStyle": "white"
@@ -850,7 +857,8 @@
           "navigationBarTextStyle": "white"
         }
 
-    }]
+      }
+    ]
   }],
   "globalStyle": {
     "navigationBarTextStyle": "black",

subpkg/townTask/marketTask10.vue

@@ -0,0 +1,277 @@
+<template>
+  <view class="task_page">
+    <u-skeleton v-if="skeleton" :class="{'loading': skeleton}" :animate="true" title rows="5" rows-width="92%"
+      rowsHeight="56">
+    </u-skeleton>
+    <block v-else>
+      <view class="card">
+        <view class="c_title">{{`任务名称: ${taskInfo.title||''}`}}</view>
+        <view>{{taskInfo.content||''}}</view>
+      </view>
+      <view class="card">
+        <view class="c_title">任务完成证明</view>
+        <view class="file">
+          <view class="file_item" v-for="(item, index) in imgList" :key="'file'+index">
+            <image class="image" :src="item" @click="priview(index)"></image>
+            <image v-if="taskInfo.status==2" class="del" src="/static/icons/delete.png" @click.stop="deleteFile(index)">
+            </image>
+          </view>
+          <view v-if="taskInfo.status==2" class="file_btn" @click="chooseFile">
+            <image src="/static/icons/plus.png"></image>
+          </view>
+          <view class="file_empty" v-for="k in placeholderLength" :key="'empty'+k"></view>
+        </view>
+      </view>
+      <view class="card" style="margin-bottom: 160rpx;">
+        <view class="c_title">补充说明</view>
+        <u--textarea :disabled="taskInfo.status!=2" v-model="remark" placeholder="请输入内容"
+          placeholderStyle="font-size: 22rpx;" count maxlength="500" autoHeight
+          style="font-size: 28rpx;background-color: #eee;min-height: 100px;padding-bottom: 50rpx;"></u--textarea>
+      </view>
+      <mybtn v-if="taskInfo.status==2" text="确认提交" @click="$u.throttle(submit, 1500)"></mybtn>
+      <mybtn v-else-if="taskInfo.status==3" text="已完成" :my_btn_disabled="true" @click="showToast('任务已完成!')"></mybtn>
+      <mybtn v-else-if="taskInfo.status==5" text="已关闭" :my_btn_disabled="true" @click="showToast('任务已关闭!')"></mybtn>
+      <!-- <mybtn v-else-if="approve_status==3" text="已驳回,请重新提交" @click="toUpdate"></mybtn> -->
+      <mybtn v-else text="已提交,请等待审核" :my_btn_disabled="true" @click="showToast('请耐心等待审核结果')"></mybtn>
+    </block>
+  </view>
+</template>
+
+<script>
+  import {
+    upLoadImage,
+  } from "@/api/file.js";
+  import { Toast } from "../../libs/uniApi";
+  import { townTaskDetails, marketTask10Commit } from "@/api/task.js"
+  export default {
+    data() {
+      return {
+        skeleton: true,
+        other: {
+          annex: [], // 图片列表
+          is_commit: 0, // 是否提交
+          note: "", // 详情描述
+          video_annex: [] // 视频列表
+        },
+        taskInfo: {
+          id: '',
+          title: '',
+          content: '',
+          extend: {},
+          status: 0
+        },
+        sign_in_table: '',
+        remark: '',
+        imgList: [], // 上传的图片列表
+        stage: 1, // 任务进行的状态
+        stage1: {},
+        stage2: {},
+        stage3: {},
+        stage4: {},
+      }
+    },
+    onLoad(options) {
+      options.task_id ? this.taskInfo.id = options.task_id : null;
+      options.stage ? this.stage = +options.stage : null;
+      this.initTask();
+    },
+    onShow() {},
+    computed: {
+      // 占位长度
+      placeholderLength() {
+        if (this.taskInfo.status != 2) return this.imgList.length % 3 == 0 ? 0 : 3 - this.imgList.length % 3;
+        return (this.imgList.length + 1) % 3 == 0 ? 0 : 3 - (this.imgList.length + 1) % 3;
+      },
+    },
+    methods: {
+      async initTask() {
+        this.skeleton = true;
+        let res = await townTaskDetails({
+          id: this.taskInfo.id
+        });
+        this.taskInfo = res.data;
+        // console.log(this.taskInfo);
+        // this.sign_in_table = this.taskInfo?.extend?.town_task_type_4?.sign_in_table;
+        // this.remark = this.taskInfo?.extend?.town_task_type_4?.remark;
+        // this.imgList = JSON.parse(JSON.stringify(this.taskInfo?.extend?.town_task_type_4?.imgList || []));
+        this.skeleton = false;
+      },
+      // 提交
+      async submit() {
+        if (this.imgList.length < 1) return Toast('证明数量不得小于1');
+        let that = this;
+        switch (that.stage) {
+          case 1:
+            that.stage1 = { file: that.imgList, remark: that.remark };
+            break;
+          case 2:
+            that.stage2 = { file: that.imgList, remark: that.remark };
+            break;
+          case 3:
+            that.stage3 = { file: that.imgList, remark: that.remark };
+            break;
+          case 4:
+            that.stage4 = { file: that.imgList, remark: that.remark };
+            break;
+        }
+        await marketTask10Commit({
+          id: this.taskInfo.id,
+          stage: this.stage,
+          stage1: this.stage1,
+          stage2: this.stage2,
+          stage3: this.stage3,
+          stage4: this.stage4,
+        });
+        this.other.is_commit = 1;
+        Toast('提交成功');
+        uni.navigateBack();
+      },
+      showToast(str) {
+        Toast(str)
+      },
+      chooseFile() {
+        uni.chooseImage({
+          count: 5,
+          sizeType: ['compressed'],
+          success: async (res) => {
+            for (let item of res.tempFiles) {
+              let ul = await upLoadImage({
+                filePath: item.path,
+                name: 'file'
+              });
+              this.imgList.push(ul.data.uri);
+            }
+          }
+        });
+      },
+      priview(index) {
+        uni.previewImage({
+          urls: this.imgList,
+          current: index,
+          longPressActions: {
+            itemList: ['删除'],
+            itemColor: '#ff0000',
+            success(e) {
+              if (e.tapIndex == 0) this.deleteFile(e.index);
+            }
+          },
+        })
+      },
+      chooseOneFile() {
+        uni.chooseImage({
+          count: 1,
+          sizeType: ['compressed'],
+          success: async (res) => {
+            let ul = await upLoadImage({
+              filePath: res.tempFilePaths[0],
+              name: 'file'
+            });
+            this.sign_in_table = ul.data.uri;
+          }
+        });
+      },
+      priviewOne(index) {
+        uni.previewImage({
+          urls: [this.sign_in_table],
+          current: index,
+          longPressActions: {
+            itemList: ['删除'],
+            itemColor: '#ff0000',
+            success(e) {
+              if (e.tapIndex == 0) this.sign_in_table = '';
+            }
+          },
+        })
+      },
+      // 删除已上传文件
+      deleteFile(index) {
+        this.imgList.splice(index, 1);
+      },
+    },
+  }
+</script>
+
+<style lang="scss">
+  .task_page {
+    padding-top: 30rpx;
+
+    .card {
+      margin: 0 auto;
+      margin-bottom: 28rpx;
+      width: 694rpx;
+      background-color: #fff;
+      border-radius: 26rpx;
+      padding: 28rpx;
+
+      .c_title {
+        font-size: 32rpx;
+        font-weight: bold;
+        color: #333333;
+        margin-bottom: 20rpx;
+      }
+
+      .file {
+        display: flex;
+        justify-content: left;
+        flex-wrap: wrap;
+
+        &_item {
+          flex-shrink: 0;
+          width: 200rpx;
+          height: 200rpx;
+          margin: 0 auto;
+          margin-bottom: 16rpx;
+          border: 2px solid #ccc;
+          border-radius: 10rpx;
+          overflow: hidden;
+          position: relative;
+
+          .image {
+            width: 100%;
+            height: 100%;
+          }
+
+          .del {
+            position: absolute;
+            height: 40rpx;
+            width: 40rpx;
+            top: 10rpx;
+            right: 10rpx;
+          }
+        }
+
+        &_btn {
+          flex-shrink: 0;
+          width: 200rpx;
+          height: 200rpx;
+          margin: 0 auto;
+          margin-bottom: 16rpx;
+          border: 2px solid #ccc;
+          display: flex;
+          justify-content: center;
+          align-items: center;
+          flex-direction: column;
+          border-radius: 10rpx;
+
+          image {
+            width: 100rpx;
+            height: 100rpx;
+          }
+        }
+
+        &_empty {
+          flex-shrink: 0;
+          width: 200rpx;
+          height: 200rpx;
+          margin: 0 auto;
+          margin-bottom: 16rpx;
+          border: 2px solid transparent;
+        }
+      }
+    }
+
+    .loading {
+      padding: 28rpx;
+    }
+  }
+</style>

subpkg/townTask/serviceTask4.vue

@@ -57,7 +57,7 @@
     upLoadImage,
   } from "@/api/file.js";
   import { Toast } from "../../libs/uniApi";
-  import { serviceTaskDetails, serviceTask4Commit } from "@/api/task.js"
+  import { townTaskDetails, serviceTask4Commit } from "@/api/task.js"
   export default {
     data() {
       return {
@@ -95,7 +95,7 @@
     methods: {
       async initTask() {
         this.skeleton = true;
-        let res = await serviceTaskDetails({
+        let res = await townTaskDetails({
           id: this.taskInfo.id
         });
         this.taskInfo = res.data;

subpkg/townTask/townTask.vue

@@ -18,7 +18,7 @@
 
 <script>
   import { Toast } from "../../libs/uniApi";
-  import { serviceTaskDetails } from "@/api/task.js"
+  import { townTaskDetails } from "@/api/task.js"
   import { dictDataListsTypeValue } from "@/api/oaPbulic.js"
   export default {
     data() {
@@ -30,23 +30,25 @@
           extend: {}
         },
         remark: '',
-        skeleton: true
+        skeleton: true,
+        type_value: 'town_task_type', // 任务类型
       }
     },
     onLoad(options) {
       options.task_id?this.taskInfo.id=options.task_id:null;
+      options.type_value?this.type_value=options.type_value:null;
       this.initTask();
     },
     onShow() {},
     methods: {
       async initTask(){
         this.skeleton = true;
-        let res = await serviceTaskDetails({
+        let res = await townTaskDetails({
           id: this.taskInfo.id
         });
         this.taskInfo = res.data;
         let dict = await dictDataListsTypeValue({
-          type_value: 'town_task_type'
+          type_value: this.type_value
         })
         dict.data.forEach((item)=>{
           if(item.id==this.taskInfo.type){