From 0508210e20228fd35cb7a6fe2adb1e585192311f Mon Sep 17 00:00:00 2001
From: weipengfei <2187978347@qq.com>
Date: Mon, 23 Oct 2023 16:19:46 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=9D=91=E4=BB=BB=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/task/taskItem.vue     |   8 +-
 pages.json                       |   8 +
 subpkg/townTask/serviceTask4.vue |   6 +-
 subpkg/townTask/villageTask6.vue | 391 +++++++++++++++++++++++++++++++
 4 files changed, 409 insertions(+), 4 deletions(-)
 create mode 100644 subpkg/townTask/villageTask6.vue

diff --git a/components/task/taskItem.vue b/components/task/taskItem.vue
index f2da66b..cf35d05 100644
--- a/components/task/taskItem.vue
+++ b/components/task/taskItem.vue
@@ -124,7 +124,8 @@
         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,52,53,54,55,57,58,59] // 镇农科市场部长跳转/subpkg/townTask/townTask的任务  1
+        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
       };
     },
     mounted() {
@@ -154,6 +155,8 @@
           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]}`);
+        if(this.navToVillageList.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(
@@ -180,6 +183,9 @@
           case 60:
             this.navTo(`/subpkg/townTask/marketTask10?task_id=${this.$props.datas?.id}&stage=${this.$props.datas?.stage}`);
             break;
+          case 67:
+            this.navTo(`/subpkg/townTask/villageTask6?task_id=${this.$props.datas?.id}`);
+            break;
           default:
             this.navTo('');
             break;
diff --git a/pages.json b/pages.json
index aaf620c..21a7afa 100644
--- a/pages.json
+++ b/pages.json
@@ -852,6 +852,14 @@
 					"navigationBarBackgroundColor": "#0122C7",
 					"navigationBarTextStyle": "white"
 				}
+			}, {
+				"path": "townTask/villageTask6",
+				"style": {
+					"navigationBarTitleText": "任务详情",
+					"enablePullDownRefresh": false,
+					"navigationBarBackgroundColor": "#0122C7",
+					"navigationBarTextStyle": "white"
+				}
 			}, {
 				"path": "townTask/serviceTask4",
 				"style": {
diff --git a/subpkg/townTask/serviceTask4.vue b/subpkg/townTask/serviceTask4.vue
index dd6b68b..c6ba897 100644
--- a/subpkg/townTask/serviceTask4.vue
+++ b/subpkg/townTask/serviceTask4.vue
@@ -27,14 +27,14 @@
         <view class="file">
           <view v-if="sign_in_table" class="file_item">
             <image class="image" :src="sign_in_table" @click="priviewOne(index)"></image>
-            <image v-if="taskInfo.status==2" class="del" src="/static/icons/delete.png"
+            <image v-if="taskInfo.status==2 && other.is_commit==0" class="del" src="/static/icons/delete.png"
               @click.stop="deleteFile(index, 'sign_in_table')">
             </image>
           </view>
-          <view v-if="taskInfo.status==2" class="file_btn" @click="chooseOneFile">
+          <view v-if="taskInfo.status==2 && other.is_commit==0 && !sign_in_table" class="file_btn" @click="chooseOneFile">
             <image src="/static/icons/plus.png"></image>
           </view>
-          <view v-else class="file_empty"></view>
+          <view class="file_empty"></view>
           <view class="file_empty"></view>
         </view>
       </view>
diff --git a/subpkg/townTask/villageTask6.vue b/subpkg/townTask/villageTask6.vue
new file mode 100644
index 0000000..483cac1
--- /dev/null
+++ b/subpkg/townTask/villageTask6.vue
@@ -0,0 +1,391 @@
+<template>
+  <view style="padding-top: 28rpx;padding-bottom: 160rpx;">
+    <view class="card">
+      <view class="title">任务名称: {{taskInfo.title}}</view>
+      <view>{{taskInfo.content||''}}</view>
+    </view>
+    <view class="card">
+      <view class="title">任务描述</view>
+      <u-line style="margin: 14rpx 0;"></u-line>
+      <view class="text">{{taskInfo.content}}</view>
+    </view>
+    <view class="card" v-if="approve_status==3">
+      <view class="title" style="color: #FF7C32;">驳回提示</view>
+      <u-line style="margin: 14rpx 0;"></u-line>
+      <view class="text" style="color: #FF7C32;">{{deny_notes}}</view>
+      <button v-if="other.is_commit==1" class="btn" @click="toUpdate">去修改</button>
+    </view>
+    <view class="card">
+      <!-- 图片 -->
+      <view class="title" style="margin-bottom: 16rpx;">图片凭证</view>
+      <view class="file">
+        <view class="file_item" v-for="(item, index) in fileList" :key="'file'+index">
+          <image class="image" :src="item" @click="priview(index)"></image>
+          <image v-if="!other.is_commit" class="del" src="/static/icons/delete.png" @click.stop="deleteFile(index)">
+          </image>
+        </view>
+        <view v-if="!other.is_commit && this.fileList.length<9" 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">
+      <!-- 视频 -->
+      <view class="title" style="margin-bottom: 16rpx;">视频凭证</view>
+      <view class="file">
+        <view class="file_item" v-for="(item, index) in videoList" :key="'file_v'+index">
+          <image class="image" src="/static/img/task/video_bg.png" @click="videoshow(item)"></image>
+          <image v-if="!other.is_commit" class="del" src="/static/icons/delete.png"
+            @click.stop="deleteFile(index, 'video')">
+          </image>
+        </view>
+        <view v-if="!other.is_commit && this.videoList.length<9" class="file_btn" @click="chooseVideo">
+          <image src="/static/icons/plus.png"></image>
+        </view>
+        <view class="file_empty" v-for="k in placeholderLengthVideo" :key="'empty_v'+k"></view>
+      </view>
+    </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>
+    <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>
+    <!--视频预览弹窗-->
+    <view v-if="show_video" class="video-count">
+      <video id="myVideo" class="videoLink" autoplay loop muted show-mute-btn enable-play-gesture
+        vslide-gesture-in-fullscreen :src="video_src"></video>
+    </view>
+    <view class='mask' catchtouchmove="true" :hidden='show_video==false' @tap="show_video=false"></view>
+  </view>
+</template>
+
+<script>
+  import {
+    upLoadImage,
+    VIDEO_URL
+  } from "@/api/file.js"
+  import {
+    taskOtherTaskDetail,
+    taskOtherTaskCommit
+  } from "@/api/task.js"
+  import { Toast } from "../../libs/uniApi";
+  export default {
+    data() {
+      return {
+        task_id: -1,
+        taskInfo: {},
+        approve_status: 0, // 审核状态： 1待审核，2已通过，3已驳回
+        deny_notes: '', // 驳回提示
+        other: {
+          annex: [], // 图片列表
+          is_commit: 0, // 是否提交
+          note: "", // 详情描述
+          video_annex: [] // 视频列表
+        },
+        list1: [{
+          name: '图片',
+        }, {
+          name: '视频',
+        }],
+        current: 0,
+        note: '',
+        fileList: [],
+        videoList: [],
+        video_src: '',
+        show_video: false
+      };
+    },
+    onLoad(options) {
+      this.task_id = options.task_id;
+      this.initDetail();
+    },
+    computed: {
+      // 占位长度 
+      placeholderLength() {
+        if(this.fileList.length==9)return 0;
+        if (this.other.is_commit == 1) return this.fileList.length % 3 == 0 ? 0 : 3 - this.fileList.length % 3;
+        return (this.fileList.length + 1) % 3 == 0 ? 0 : 3 - (this.fileList.length + 1) % 3;
+      },
+      placeholderLengthVideo() {
+        if(this.videoList.length==9)return 0;
+        if (this.other.is_commit == 1) return this.videoList.length % 3 == 0 ? 0 : 3 - this.videoList.length % 3;
+        return (this.videoList.length + 1) % 3 == 0 ? 0 : 3 - (this.videoList.length + 1) % 3;
+      },
+    },
+    methods: {
+      // 初始化
+      initDetail() {
+        taskOtherTaskDetail({ id: this.task_id }).then((res) => {
+          this.taskInfo = res.data;
+          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;
+          res.data?.extend?.other?.annex ? this.fileList = res.data?.extend?.other?.annex : null;
+          res.data?.extend?.other?.video_annex ? this.videoList = res.data?.extend?.other?.video_annex : null;
+          // this.other.is_commit = 0;
+        })
+      },
+      // 被驳回时点击重新修改
+      toUpdate() {
+        this.other.is_commit = 0;
+      },
+      // 判断内容是否更改, 返回true代表更改
+      isReject(){
+        if (this.approve_status == 3) { // 被驳回，重新提交需要修改内容后方可提交
+          let other = {
+            note: this.note,
+            annex: this.fileList,
+            video_annex: this.videoList
+          }
+          let flag = true;
+          if(JSON.stringify(other)==JSON.stringify({
+            note: this.other.note,
+            annex: this.other.annex,
+            video_annex: this.other.video_annex
+          })) flag = false;
+          if (!flag) {
+            Toast('未检测到您的修改，请修改后提交')
+          } 
+          return flag;
+        }
+        else return true;
+      },
+      // 提交
+      async submit() {
+        if(!this.isReject())return; // 判断是否进行更改
+        if (this.note.trim() == '') return Toast('详情描述不能为空');
+        await taskOtherTaskCommit({
+          id: this.task_id,
+          note: this.note,
+          annex: this.fileList,
+          video_annex: this.videoList
+        });
+        this.other.is_commit = 1;
+        this.approve_status = 1;
+        Toast('提交成功');
+      },
+      clickTabs(item) {
+        this.current = item.index;
+      },
+      showToast(str) {
+        Toast(str)
+      },
+      chooseFile() {
+        uni.chooseImage({
+          sizeType: ['compressed'],
+          success: async (res) => {
+            for (let item of res.tempFiles) {
+              let ul = await upLoadImage({
+                filePath: item.path,
+                name: 'file'
+              });
+              this.fileList.push(ul.data.uri);
+            }
+          }
+        });
+      },
+      chooseVideo() {
+        uni.chooseVideo({
+          sourceType: ['album', 'camera'], // 视频选择的来源，可以是相册或摄像头
+          maxDuration: 60, // 视频最大时长，单位秒
+          success: (res) => {
+            const video = res.tempFilePath;
+            let timer;
+            let title = '上传中';
+            timer = setInterval(() => {
+              uni.showLoading({
+                title: title
+              })
+            }, 1000)
+            // 上传视频文件
+            let uploadTask = uni.uploadFile({
+              url: VIDEO_URL,
+              filePath: video,
+              name: 'file',
+              header: {
+                token: this.$store.state.app.token
+              },
+              success: (uploadFileRes) => {
+                clearInterval(timer);
+                uni.hideLoading();
+                uploadFileRes.data = JSON.parse(uploadFileRes.data)
+                if (uploadFileRes.data.code == 1) {
+                  this.videoList.push(uploadFileRes.data.data.uri)
+                } else Toast('网络错误')
+              },
+              fail: (err) => {
+                clearInterval(timer);
+                uni.hideLoading();
+                Toast('网络错误')
+              }
+            })
+            uploadTask.onProgressUpdate((fileRes) => {
+              title = `上传中...${fileRes.progress}%`;
+            })
+          },
+          fail() {
+            Toast('用户取消上传')
+          }
+        });
+      },
+      priview(index) {
+        uni.previewImage({
+          urls: this.fileList,
+          current: index,
+          longPressActions: {
+            itemList: ['删除'],
+            itemColor: '#ff0000',
+            success(e) {
+              if (e.tapIndex == 0) this.deleteFile(e.index);
+            }
+          },
+        })
+      },
+      /*查看视频*/
+      videoshow(src) {
+        this.video_src = src;
+        this.show_video = true;
+        this.$nextTick(() => {
+          this.videoContext = uni.createVideoContext('myVideo', this);
+          this.videoContext.play();
+        })
+      },
+      // 删除已上传文件
+      deleteFile(index, type = 'image') {
+        if (type == 'image') this.fileList.splice(index, 1);
+        else if (type == 'video') this.videoList.splice(index, 1);
+      },
+      navTo(url) {
+        if (url) {
+          uni.showLoading({
+            title: '加载中',
+            mask: true
+          });
+          uni.navigateTo({
+            url: url,
+            success() {
+              uni.hideLoading()
+            }
+          })
+        } else Toast('暂未开放')
+      },
+    }
+  }
+</script>
+
+<style lang="scss">
+  ::v-deep .u-tabs__wrapper__nav__item__text {
+    font-size: 28rpx !important;
+  }
+
+  .video-count {
+    position: fixed;
+    width: 600rpx;
+    height: 500rpx;
+    top: 50%;
+    left: 50%;
+    margin-left: -300rpx;
+    margin-top: -250rpx;
+    z-index: 100;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+
+    .videoLink {
+      width: 600rpx;
+      height: 500rpx;
+    }
+  }
+
+  .card {
+    margin: 0 auto;
+    margin-bottom: 28rpx;
+    width: 694rpx;
+    background: #FFFFFF;
+    border-radius: 14rpx;
+    padding: 28rpx;
+
+    .title {
+      font-size: 32rpx;
+      font-weight: bold;
+      color: #333333;
+    }
+
+    .text {
+      line-height: 50rpx;
+    }
+
+    .btn {
+      background-color: $theme-oa-color;
+      color: #FFFFFF;
+      font-size: 28rpx;
+      height: 60rpx;
+      line-height: 60rpx;
+      margin-top: 16rpx;
+    }
+
+    .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;
+      }
+    }
+
+  }
+</style>
\ No newline at end of file