From 027384067dd6f28f494a0929ba7035ae52b46b33 Mon Sep 17 00:00:00 2001
From: weipengfei <2187978347@qq.com>
Date: Sat, 5 Aug 2023 12:02:12 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=BB=8A=E6=97=A5=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/companyFinance/companyFinance.vue |   2 +-
 components/taskCard/taskCardTow.vue          | 118 +++++++
 pages.json                                   |  13 +-
 pages/oaTask/oaTask.vue                      | 330 ++-----------------
 static/server/server.js                      |   2 +-
 subpkg/fileTask/fileTask.vue                 | 157 +++++++++
 subpkg/taskAdmin/taskAdmin.vue               | 110 +------
 7 files changed, 326 insertions(+), 406 deletions(-)
 create mode 100644 components/taskCard/taskCardTow.vue
 create mode 100644 subpkg/fileTask/fileTask.vue

diff --git a/components/companyFinance/companyFinance.vue b/components/companyFinance/companyFinance.vue
index db5b281..b8271b4 100644
--- a/components/companyFinance/companyFinance.vue
+++ b/components/companyFinance/companyFinance.vue
@@ -46,7 +46,7 @@
 
 <script>
   import { accountMonthList, accountDateList } from "@/api/company.js"
-import { Toast } from "../../libs/uniApi";
+  import { Toast } from "../../libs/uniApi";
   export default {
     name: "companyFinance",
     data() {
diff --git a/components/taskCard/taskCardTow.vue b/components/taskCard/taskCardTow.vue
new file mode 100644
index 0000000..d6c7677
--- /dev/null
+++ b/components/taskCard/taskCardTow.vue
@@ -0,0 +1,118 @@
+<template>
+  <view class="task_card">
+    <view class="top">
+      <view class="title" :class="item%3?'title_tow':''">完成OA移动端界面设计移动端界面设计</view>
+      <view class="price">
+        <!-- <text>收益</text> -->
+        <image src="../../static/icons/price.png"></image>
+        <text>11.00</text>
+      </view>
+    </view>
+    <view class="center">
+      关于设计app常用页面的美化按照原型图美化页面
+    </view>
+    <view class="bottom">
+      <view class="left">负责人：张三三</view>
+      <view class="right">指派时间：2023-03-25 23:59</view>
+    </view>
+  </view>
+</template>
+
+<script>
+  export default {
+    name: "taskCard",
+    props: ['task'],
+    data() {
+      return {
+
+      };
+    }
+  }
+</script>
+
+<style lang="scss">
+  .task_card {
+    margin: 0 auto;
+    margin-bottom: 28rpx;
+    width: 694rpx;
+    background: #FFFFFF;
+    border-radius: 21rpx 21rpx 21rpx 21rpx;
+    opacity: 1;
+    box-sizing: border-box;
+    padding: 25rpx;
+    display: flex;
+    justify-content: space-between;
+    flex-direction: column;
+    
+    .top {
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      margin-bottom: 8rpx;
+    
+      .title {
+        font-size: 28rpx;
+        font-weight: 500;
+        line-height: 35rpx;
+    
+        &::before {
+          content: '未完成';
+          display: inline-block;
+          color: #F24848;
+          padding: 2px 8px;
+          background: #FFE4E4;
+          margin-right: 20rpx;
+          border-radius: 7rpx 7rpx 7rpx 7rpx;
+        }
+      }
+    
+      .title_tow {
+        &::before {
+          content: '已完成';
+          display: inline-block;
+          color: #3274F9;
+          padding: 2px 8px;
+          background: #E4EDFF;
+          margin-right: 20rpx;
+          border-radius: 7rpx 7rpx 7rpx 7rpx;
+        }
+      }
+    
+      .price {
+        width: 158rpx;
+        // width: 200rpx;
+        height: 49rpx;
+        background: #FFF1DB;
+        border-radius: 74rpx 74rpx 74rpx 74rpx;
+        display: flex;
+        justify-content: center;
+        align-items: center;
+        color: #F9AA32;
+        
+    
+        image {
+          width: 28.99rpx;
+          height: 28.99rpx;
+          margin-right: 5.5rpx;
+        }
+      }
+    }
+    
+    .center {
+      font-size: 25rpx;
+      font-weight: 400;
+      color: #333333;
+      line-height: 35rpx;
+      margin-bottom: 8rpx;
+    }
+    
+    .bottom {
+      display: flex;
+      justify-content: space-between;
+      font-size: 25rpx;
+      font-weight: 400;
+      color: #999999;
+      line-height: 35rpx;
+    }
+  }
+</style>
\ No newline at end of file
diff --git a/pages.json b/pages.json
index 61c61a9..c6f8a3a 100644
--- a/pages.json
+++ b/pages.json
@@ -404,7 +404,7 @@
     }, {
       "path": "dispatching/dispatching",
       "style": {
-        "navigationBarTitleText": "宣传配送",
+        "navigationBarTitleText": "任务:宣传配送",
         "enablePullDownRefresh": false,
         "navigationBarBackgroundColor": "#3175f9",
         "navigationBarTextStyle": "white"
@@ -413,7 +413,16 @@
     }, {
       "path": "blockTransaction/blockTransaction",
       "style": {
-        "navigationBarTitleText": "片区交易金额",
+        "navigationBarTitleText": "任务:片区交易",
+        "enablePullDownRefresh": false,
+        "navigationBarBackgroundColor": "#3175f9",
+        "navigationBarTextStyle": "white"
+      }
+
+    }, {
+      "path": "fileTask/fileTask",
+      "style": {
+        "navigationBarTitleText": "任务:档案更新",
         "enablePullDownRefresh": false,
         "navigationBarBackgroundColor": "#3175f9",
         "navigationBarTextStyle": "white"
diff --git a/pages/oaTask/oaTask.vue b/pages/oaTask/oaTask.vue
index b185b17..b951d17 100644
--- a/pages/oaTask/oaTask.vue
+++ b/pages/oaTask/oaTask.vue
@@ -1,339 +1,65 @@
 <template>
   <view class="all_box">
-    <!-- 任务搜索框 -->
-    <!-- <view class="task_box">
-      <u-search shape="round" placeholder="搜索任务状态、优先级、部门等"></u-search>
-      <view>
-        <u-popup :show="show" @close="close" @open="open" mode="top" overlayStyle="position: fixed;top:100rpx">
-          <view class="search_box">
-            <view class="">
-              <view class="first_order" v-for="item in orderData" :key="item.id" :class="item.id==typeid?'choose':''">
-                <text>{{item.first_order}}</text>
-              </view>
-            </view>
-            <view class="second_order">
-              <view class="second" v-for="item in orderList" :key="item.id" @click="getInfo(item.info,item.id)">
-                {{item.info}}
-              </view>
-            </view>
-          </view>
-        </u-popup>
-        <view @click="show = true" class="screening" :class="show?'choose_style':''">筛选</view>
-      </view>
-    </view> -->
-    <!-- 新建任务 -->
-    <!-- <view class="new_task" @click="goNewTask">+新建任务</view> -->
-    <!-- 事件列表 -->
     <view class="task_list">
       <!-- <taskCard class="task_card" v-for="item in 10" :key="item"></taskCard> -->
-      <u-empty icon="/static/img/empty/data.png"></u-empty>
+      <view v-for="item in 10" :key="item" @click="naviTo('/subpkg/dispatching/dispatching')">
+        <task-item></task-item>
+      </view>
+      <!-- <u-empty icon="/static/img/empty/data.png" text="没有任务"></u-empty> -->
     </view>
-    <!-- <u-loadmore :status="status" :loading-text="loadingText" :loadmore-text="loadmoreText" :nomore-text="nomoreText" /> -->
-    <!-- <tabbar></tabbar> -->
+    <!-- <u-loadmore v-else :status="loadConfig.status" :loading-text="loadConfig.loadingText"
+        :loadmore-text="loadConfig.loadmoreText" :nomore-text="loadConfig.nomoreText" /> -->
   </view>
 </template>
 
 <script>
   import { getTaskListApi } from '@/api/oa'
   import { Toast } from '@/libs/uniApi.js'
-  
-  // import tabbar from '../components/tabbar'
+  import taskItem from "@/components/task/taskItem.vue"
   export default {
-    components: {
-      // tabbar
+    components:{
+      taskItem
     },
     data() {
       return {
-        status: 'loadmore',
-        params: {
-          page: '1',
-          limit: '10',
-          flow_status: "1",
+        loadConfig:{
+          page: 1,
+          limit: 15,
+          lastpage: '',
+          loadingText: '努力加载中',
+          loadmoreText: '轻轻上拉',
+          nomoreText: '我也是有底线的~~',
+          status: 'loadmore'
         },
-        lastpage: '',
-        loadingText: '努力加载中',
-        loadmoreText: '轻轻上拉',
-        nomoreText: '我也是有底线的~~',
-        orderList: [{
-          id: 1,
-          info: '未开始'
-        }, {
-          id: 2,
-          info: '进行中'
-        }, {
-          id: 3,
-          info: '待验收'
-        }, {
-          id: 5,
-          info: '已关闭'
-        }, {
-          id: 6,
-          info: '已验收'
-        }, ],
-        orderData: [{
-          id: 1,
-          first_order: '任务状态',
-        }, ],
-        show: false,
-        typeid: 1,
-        eventData: [],
+        list: []
       }
     },
-    onReady() {
-      uni.setNavigationBarColor({
-        frontColor: '#ffffff',
-        backgroundColor: '#3175f9'
-      })
-    },
     onLoad() {
 
     },
     onShow() {
-      // this.params.page = '1'
-      // this.eventData = []
-      // //获取任务列表
-      // this.getTaskList(this.params)
-    },
-    onPageScroll() {
-      //页面滚动关闭筛选
-      this.close()
+      
     },
     methods: {
-      //获取任务列表
-      async getTaskList(data) {
-        const res = await getTaskListApi(data)
-        this.eventData = [...this.eventData, ...res.data]
-        if (this.eventData.length < this.params.limit) {
-          this.status = 'nomore'
-        }
-        this.lastpage = res.last_page
+      naviTo(url) {
+        url ?
+          uni.navigateTo({
+            url: url,
+          }) : Toast('暂未开放')
       },
-      open() {
-
-      },
-      close() {
-        this.show = false
-      },
-      //选中筛选字段
-      getInfo(val, status) {
-		  Toast('开发中')
-		  return
-        this.eventData = []
-        this.params = {
-          page: '1',
-          limit: '10',
-          flow_status: status
-        }
-        this.params.flow_status = status + ''
-        this.getTaskList(this.params)
-        this.close()
-      },
-      //跳转到新建任务列表
-      goNewTask() {
-        uni.navigateTo({
-          url: "/pages/views/new_task"
-        })
-      }
-
     },
     onPullDownRefresh() {
       this.close()
       uni.stopPullDownRefresh()
     },
     onReachBottom() {
-      if (this.params.page < this.lastpage) {
-        this.params.page++
-        this.getTaskList(this.params)
-        // this.status = 'loading'
-      } else {
-        this.status = 'nomore'
-        return
-      }
+      
     },
   }
 </script>
 
 <style lang="scss" scoped>
-  /deep/.u-search__content {
-    width: 527rpx;
-    height: 63rpx;
-
-  }
-
-  /deep/.u-search__action--active {
-    display: none;
-  }
-
-  /deep/.u-search {
-    width: 527rpx;
-    height: 63rpx;
-    display: flex;
-    flex: none;
-  }
-
-  /deep/.u-popup__content {
-
-    top: 100rpx;
-  }
-
-  .all_box {
-    padding-bottom: 21rpx;
-  }
-
-  .task_box {
-    margin: 0 auto;
-    width: 750rpx;
-    height: 98rpx;
-    background: #FFFFFF;
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-    padding: 0 28rpx;
-
-    .screening {
-      margin-left: 10px;
-      width: 149rpx;
-      height: 63rpx;
-      line-height: 63rpx;
-      text-align: center;
-      background: #FFFFFF;
-      border-radius: 35rpx;
-      border: 2rpx solid #E6E5E5;
-      color: #666;
-      font-size: 28rpx;
-    }
-
-    .choose_style {
-      background-color: #3274F9;
-      color: #fff;
-    }
-  }
-
-  // 筛选按钮
-  .search_box {
-    width: 750rpx;
-    // height: 368rpx;
-    background: #FFFFFF;
-    display: flex;
-
-    .first_order {
-      width: 250rpx;
-      height: 73rpx;
-      text-align: center;
-      color: #666666;
-      font-size: 28rpx;
-      line-height: 73rpx;
-      background-color: #f5f5f5;
-
-    }
-
-    .choose {
-      background-color: #fff;
-      color: #3274F9;
-    }
-
-    .second_order {
-      text-align: center;
-      width: 500rpx;
-
-      .second {
-        line-height: 73rpx;
-        height: 73rpx;
-        border-bottom: 2rpx solid #E6E6E6;
-      }
-    }
-
-  }
-
-  // 新建任务
-  .new_task {
-    margin: 0 auto;
-    margin-top: 21rpx;
-    width: 500rpx;
-    height: 66rpx;
-    line-height: 66rpx;
-    color: #fff;
-    text-align: center;
-    border-radius: 30rpx;
-    background-color: $theme-oa-color;
-  }
-  
-  .task_list{
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    flex-direction: column;
-    // padding-top: 21rpx;
-    .task_card{
-      margin-bottom: 21rpx;
-    }
-  }
-
-  .eventList_box {
-    margin: 0 auto;
-    margin-top: 21rpx;
-    width: 694rpx;
-    height: 345rpx;
-    background: #FFFFFF;
-    padding: 0 24.5rpx;
-    border-radius: 7rpx;
-
-    .head_box {
-      width: 100%;
-      height: 82rpx;
-      display: flex;
-      align-items: center;
-      justify-content: space-between;
-
-      .title {
-        text-overflow: ellipsis;
-        /* 溢出显示省略号 */
-        overflow: hidden;
-        /* 溢出隐藏 */
-        white-space: nowrap;
-        /* 强制不换行 */
-        color: #333333;
-        width: 445rpx;
-        font-weight: 500;
-        font-size: 32rpx;
-      }
-
-      .status {
-        font-size: 32rpx;
-        color: #34A853;
-      }
-
-      .another_color {
-        color: #F9AA32;
-      }
-    }
-
-    .line {
-      width: 646rpx;
-      height: 0rpx;
-      border-bottom: 1rpx solid #CCCCCC;
-      margin-bottom: 14.02rpx;
-    }
-
-    .responsible {
-      width: 100%;
-      display: flex;
-      justify-content: space-between;
-      align-items: center;
-      height: 39rpx;
-      font-size: 28rpx;
-      margin-bottom: 7.01rpx;
-
-      .department {
-        font-size: 25rpx;
-        color: $theme-oa-color;
-      }
-    }
-
-    .end_time {
-      margin-top: 14rpx;
-      font-size: 25rpx;
-      color: #999;
-    }
-  }
+ .task_list{
+   padding-top: 28rpx;
+ }
 </style>
diff --git a/static/server/server.js b/static/server/server.js
index ab0d8a8..ace0a5d 100644
--- a/static/server/server.js
+++ b/static/server/server.js
@@ -224,7 +224,7 @@ export const oaHomeData = [
   {
     text: '任务管理',
     icon: prefix + 'oa/bxsq@2x.png',
-    // url: '/subpkg/taskAdmin/taskAdmin',
+    url: '/subpkg/taskAdmin/taskAdmin',
   },
   {
     text: '档案管理',
diff --git a/subpkg/fileTask/fileTask.vue b/subpkg/fileTask/fileTask.vue
new file mode 100644
index 0000000..68b3243
--- /dev/null
+++ b/subpkg/fileTask/fileTask.vue
@@ -0,0 +1,157 @@
+<template>
+  <view class="">
+    <view class="item" v-for="(item, index) in 10" :key="item.id">
+      <view class="top">
+        <image class="avatar" src="../../static/img/public/record.png"></image>
+        <view class="body">
+          <view class="t_top">
+            <!-- <view>姓名:<text class="name">{{item.name}}</text></view>
+            <view>电话:<text class="mobile">{{item.phone}}</text></view> -->
+            <view>姓名:<text class="name">张三</text></view>
+            <view>电话:<text class="mobile">18555566665</text></view>
+          </view>
+          <!-- <view class="t_bottom">片区:<text class="address">{{item.address}}</text></view> -->
+          <view class="t_bottom">片区:<text class="address">地址</text></view>
+        </view>
+      </view>
+      <u-line color="#cccccc"></u-line>
+      <view class="bottom">
+        <!-- <view>更新时间: {{item.create_time}}</view> -->
+        <view>更新时间: 2023-05-09</view>
+        <view class="right">
+          <view v-if="item%3==0" class="update" @click="toast('已更新')">
+            已更新
+          </view>
+          <view v-else class="un_update" @click="toast('未更新')">
+            未更新
+          </view>
+          <view class="look" @click="navTo('/subpkg/updateArchives/updateArchives?id='+item.id)">
+            更新需求
+          </view>
+        </view>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script>
+import { Toast } from '../../libs/uniApi'
+export default {
+  data() {
+    return {
+       
+    }
+  },
+  onLoad() {},
+  onShow() {},
+  methods: {
+    navTo(url) {
+      if(url){
+        uni.showLoading({
+          title: '加载中',
+          mask: true
+        })
+        uni.navigateTo({
+          url: url,
+          success() {
+            uni.hideLoading()
+          }
+        })
+      }
+      else Toast('暂未开放');
+    },
+    toast(str){
+      Toast(str)
+    }
+  },
+  onPullDownRefresh() {
+      uni.stopPullDownRefresh()
+    }
+  }
+</script>
+
+<style lang="scss">
+.item {
+      margin: 0 auto;
+      width: 694rpx;
+      // height: 201rpx;
+      background: #FFFFFF;
+      border-radius: 14rpx 14rpx 14rpx 14rpx;
+      opacity: 1;
+      margin-bottom: 28rpx;
+      box-sizing: border-box;
+      padding: 28rpx;
+      font-size: 24.53rpx;
+      color: #999999FF;
+      
+      &:nth-child(1){
+        margin-top: 28rpx;
+      }
+
+      .top {
+        display: flex;
+        align-items: center;
+        width: 100%;
+
+        .avatar {
+          width: 120rpx;
+          height: 120rpx;
+          margin-right: 18rpx;
+        }
+
+        .body{
+          flex: 1;
+          .t_top{
+            display: flex;
+            justify-content: space-between;
+            margin-bottom: 18rpx;
+            .name{
+              font-size: 32rpx;
+              color: #333;
+            }
+            .mobile{
+              font-size: 28rpx;
+              color: #333;
+            }
+          }
+          .t_bottom{
+            width: 500rpx;
+            overflow: hidden;
+            white-space: nowrap;
+            text-overflow: ellipsis;
+            .address{
+              font-size: 28rpx;
+              color: #333;
+            }
+          }
+        }
+      }
+
+      .bottom {
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+        margin-top: 20rpx;
+        font-size: 25rpx;
+        
+        .right{
+          font-size: 28rpx;
+          display: flex;
+          .look{
+            color: $theme-oa-color;
+          }
+          .update{
+            color: #34A853;
+            margin-right: 38rpx;
+          }
+          .un_update{
+            color: #FA5151FF;
+            margin-right: 38rpx;
+          }
+        }
+
+      }
+
+
+    }
+</style>
diff --git a/subpkg/taskAdmin/taskAdmin.vue b/subpkg/taskAdmin/taskAdmin.vue
index a3a2028..3a27308 100644
--- a/subpkg/taskAdmin/taskAdmin.vue
+++ b/subpkg/taskAdmin/taskAdmin.vue
@@ -11,29 +11,22 @@
     </view>
     <view class="task_list">
       <uni-section class="title" titleFontSize="32rpx" :title="'任务清单 '+ nowYMD" type="line"></uni-section>
-      <view class="task_card" v-for="item in 10" :key="item">
-        <view class="top">
-          <view class="title" :class="item%3?'title_tow':''">完成OA移动端界面设计移动端界面设计</view>
-          <view class="price">
-            <!-- <text>收益</text> -->
-            <image src="../../static/icons/price.png"></image>
-            <text>11.00</text>
-          </view>
-        </view>
-        <view class="center">
-          关于设计app常用页面的美化按照原型图美化页面
-        </view>
-        <view class="bottom">
-          <view class="left">负责人：张三三</view>
-          <view class="right">指派时间：2023-03-25 23:59</view>
-        </view>
+      <view v-for="item in 5" :key="item">
+        <taskItem></taskItem>
       </view>
+      <!-- <u-empty icon="/static/img/empty/data.png" text="没有任务"></u-empty> -->
+      <!-- <u-loadmore :status="loadConfig.status" :loading-text="loadConfig.loadingText"
+        :loadmore-text="loadConfig.loadmoreText" :nomore-text="loadConfig.nomoreText" /> -->
     </view>
   </view>
 </template>
 
 <script>
+  import taskItem from "@/components/task/taskItem.vue"
   export default {
+    components:{
+      taskItem
+    },
     data() {
       return {
         current: 0,
@@ -119,89 +112,6 @@
       background-color: transparent;
     }
 
-    .task_card {
-      margin: 0 auto;
-      margin-bottom: 28rpx;
-      width: 694rpx;
-      background: #FFFFFF;
-      border-radius: 21rpx 21rpx 21rpx 21rpx;
-      opacity: 1;
-      box-sizing: border-box;
-      padding: 25rpx;
-      display: flex;
-      justify-content: space-between;
-      flex-direction: column;
-      
-      .top {
-        display: flex;
-        justify-content: space-between;
-        align-items: center;
-        margin-bottom: 8rpx;
-      
-        .title {
-          font-size: 28rpx;
-          font-weight: 500;
-          line-height: 35rpx;
-      
-          &::before {
-            content: '未完成';
-            display: inline-block;
-            color: #F24848;
-            padding: 2px 8px;
-            background: #FFE4E4;
-            margin-right: 20rpx;
-            border-radius: 7rpx 7rpx 7rpx 7rpx;
-          }
-        }
-      
-        .title_tow {
-          &::before {
-            content: '已完成';
-            display: inline-block;
-            color: #3274F9;
-            padding: 2px 8px;
-            background: #E4EDFF;
-            margin-right: 20rpx;
-            border-radius: 7rpx 7rpx 7rpx 7rpx;
-          }
-        }
-      
-        .price {
-          width: 158rpx;
-          // width: 200rpx;
-          height: 49rpx;
-          background: #FFF1DB;
-          border-radius: 74rpx 74rpx 74rpx 74rpx;
-          display: flex;
-          justify-content: center;
-          align-items: center;
-          color: #F9AA32;
-          
-      
-          image {
-            width: 28.99rpx;
-            height: 28.99rpx;
-            margin-right: 5.5rpx;
-          }
-        }
-      }
-      
-      .center {
-        font-size: 25rpx;
-        font-weight: 400;
-        color: #333333;
-        line-height: 35rpx;
-        margin-bottom: 8rpx;
-      }
-      
-      .bottom {
-        display: flex;
-        justify-content: space-between;
-        font-size: 25rpx;
-        font-weight: 400;
-        color: #999999;
-        line-height: 35rpx;
-      }
-    }
+    
   }
 </style>
\ No newline at end of file