Merge remote-tracking branch 'origin/master'

jiangping

2024-05-31 6be28040e74e1ff7764478174a9b5d706fe4fc39

 h5/pages/staff/task/index.vue

@@ -15,6 +15,7 @@
            <view class="box_head_item active">待处理 12</view>
            <view class="box_head_item">已处理</view>
            <view class="box_head_item">我发起的</view>
        <view class="box_head_item">抄送我的</view>
         </view>
      </scroll-view>
      <view class="box_list">
@@ -53,25 +54,47 @@
         </view>
      </view>
      <!-- 筛选 -->
      <u-popup :show="show" mode="bottom" :round="10" :closeable="true" @close="show = false">
    <u-popup
      :show="show"
      mode="bottom"
      :round="10"
      :closeable="true"
      @close="show = false"
    >
         <view class="search">
            <view class="search_head">任务筛选</view>
            <view class="search_list">
               <view class="search_list_item">
                  <view class="search_list_item_label">创建日期</view>
                  <view class="search_list_item_val">
                     <view class="search_list_item_val_row" @click="tiemShow = true" :style="{ color: search.startTime ? '#000' : '' }">{{search.startTime ? search.startTime : '开始日期'}}</view>
              <view
                class="search_list_item_val_row"
                @click="tiemShow = true"
                :style="{ color: search.startTime ? '#000' : '' }"
                >{{ search.startTime ? search.startTime : "开始日期" }}</view
              >
                     <view class="search_list_item_val_z">-</view>
                     <view class="search_list_item_val_row" @click="tiemShow1 = true" :style="{ color: search.endTime ? '#000' : '' }">{{search.endTime ? search.endTime : '结束日期'}}</view>
              <view
                class="search_list_item_val_row"
                @click="tiemShow1 = true"
                :style="{ color: search.endTime ? '#000' : '' }"
                >{{ search.endTime ? search.endTime : "结束日期" }}</view
              >
                  </view>
               </view>
               <view class="search_list_item">
                  <view class="search_list_item_label">订单来源</view>
                  <view class="search_list_item_cates">
                     <view :class="index === i ? 'search_list_item_cates_row active' : 'search_list_item_cates_row'"
              <view
                :class="
                  index === i
                    ? 'search_list_item_cates_row active'
                    : 'search_list_item_cates_row'
                "
                     v-for="(item, index) in cate"
                     :key="index"
                     @click="clickItem(index)">
                @click="clickItem(index)"
              >
                        {{item.name}}
                     </view>
                  </view>
@@ -101,6 +124,7 @@
</template>

<script>
import { taskCenter } from '@/api'
   export default {
      data() {
         return {
@@ -115,14 +139,27 @@
               startTime: '',
               endTime: ''
            },
      pagination: {},
      dataList: [],
            cate: [
               { name: '访客申请', id: 1 },
               { name: '劳务申请', id: 2 },
               { name: '用车申请', id: 3 }
            ]
         };
    }
  },
  onLoad() {
    this.getList()
      },
      methods: {
    getList() {
      const { pagination } = this
      taskCenter({
        model: {}
      }).then(res => {
        this.dataList = res.data.records
      })
    },
         handleAppr(item) {
            uni.navigateTo({
               url: '/pages/staff/task/visitorApprove'
@@ -145,7 +182,7 @@
</script>
<style>
   page {
      background-color: #F7F7F7 !important;
  background-color: #f7f7f7 !important;
   }
</style>
<style lang="scss" scoped>
@@ -156,7 +193,7 @@
         height: 190rpx;
         padding: 12rpx 30rpx;
         box-sizing: border-box;
         background: #FFFFFF;
    background: #ffffff;
         position: sticky;
         top: 0;
         left: 0;
@@ -174,7 +211,7 @@
               box-sizing: border-box;
               display: flex;
               align-items: center;
               background: #F7F7F7;
        background: #f7f7f7;
               border-radius: 50rpx;
               margin-right: 30rpx;
               image {
@@ -188,7 +225,7 @@
                  height: 100%;
                  font-size: 26rpx;
                  font-weight: 400;
                  color: #B2B2B2;
          color: #b2b2b2;
               }
            }
            .box_head_search_sha {
@@ -210,13 +247,15 @@
         .box_head_list {
            width: 100%;
            display: flex;
      justify-content: space-between;
            align-items: center;
            .active {
               border: 1rpx solid #4c99a8 !important;
               color: #4c99a8 !important;
            }
            .box_head_item {
               padding: 0 30rpx;
        text-align: center;
        flex: 1;
               height: 60rpx;
               line-height: 60rpx;
               box-sizing: border-box;
@@ -225,7 +264,10 @@
               font-size: 26rpx;
               font-weight: 400;
               color: #333333;
               margin-right: 20rpx;
        margin-right: 10rpx;
        &:nth-last-child(1) {
          margin-right: 0;
        }
            }
         }
      }
@@ -244,7 +286,7 @@
               height: 100rpx;
               padding: 0 30rpx;
               box-sizing: border-box;
               background: linear-gradient(270deg, #FEFEFF 0%, #E1F7FE 100%);
        background: linear-gradient(270deg, #fefeff 0%, #e1f7fe 100%);
               border-radius: 8rpx 8rpx 0rpx 0rpx;
               display: flex;
               align-items: center;
@@ -253,10 +295,10 @@
                  color: #4c99a8;
               }
               .success {
                  color: #03C68F;
          color: #03c68f;
               }
               .error {
                  color: #E0312A;
          color: #e0312a;
               }
               text {
                  &:nth-child(1) {
@@ -274,11 +316,11 @@
               padding: 30rpx;
               width: 100%;
               box-sizing: border-box;
               background-color: #FFFFFF;
        background-color: #ffffff;
               .box_list_item_nr_x {
                  width: 100%;
                  height: 1rpx;
                  background-color: #E5E5E5;
          background-color: #e5e5e5;
               }
               .box_list_item_nr_text {
                  .time{
@@ -290,7 +332,7 @@
                     padding: 0 32rpx;
                     height: 60rpx;
                     line-height: 60rpx;
                     background: #279BAA;
            background: #279baa;
                     color: #fff;
                     font-size: 26rpx;
                     font-weight: 300;
@@ -362,7 +404,7 @@
                     padding: 0 26rpx;
                     height: 64rpx;
                     line-height: 64rpx;
                     background: #F7F7F7;
            background: #f7f7f7;
                     border-radius: 36rpx;
                     margin-right: 20rpx;
                     font-size: 26rpx;
@@ -376,9 +418,9 @@
               .search_list_item_val {
                  width: 100%;
                  height: 64rpx;
                  background: #F7F7F7;
          background: #f7f7f7;
                  border-radius: 36rpx;
                  border: 1rpx solid #E5E5E5;
          border: 1rpx solid #e5e5e5;
                  display: flex;
                  align-items: center;
                  .search_list_item_val_row {