Merge remote-tracking branch 'origin/master'

jiangping

2025-02-26 4e2e52b766d87fc528d02bdebc1757c3dda8c596

 h5/pages/staff/task/index.vue

@@ -70,12 +70,29 @@
      >
        <view class="box_list_item_head">
          <view class="df_ac">
            <text v-if="item.readed == 0" class="readed"></text>
            <text v-if="item.readed == 0 && search.queryType === 3" class="readed"></text>
            <text class="tt">{{ item.title }}</text>
          </view>
          <view class="info loading">{{ item.info }}</view>
          <view class="info" :class="{ loading: search.queryType === 0 }">{{ item.info }}</view>
        </view>
        <view class="box_list_item_nr">
               <view v-if="item.param1.arriveDate" class="box_list_item_nr_item">
                 <text></text>
                 <text>{{ item.param1.arriveDate }}</text>
               </view>
               <view v-if="item.param1.inType" class="box_list_item_nr_item">
                 <text></text>
                 <text>{{ item.param1.inType }}</text>
               </view>
               <view v-if="item.param1.totalNum" class="box_list_item_nr_item">
                 <text></text>
                 <text>{{ item.param1.totalNum }}</text>
               </view>
               <view v-if="item.param1.carNum" class="box_list_item_nr_item">
                 <text></text>
                 <text>{{ item.param1.carNum }}</text>
               </view>
					
          <view v-if="item.param1.name" class="box_list_item_nr_item">
            <text></text>
            <text>{{ item.param1.name }}</text>
@@ -115,7 +132,7 @@
          <view class="box_list_item_nr_x"></view>
          <view class="box_list_item_nr_text">
            <text class="time">{{ item.createDate }}提交</text>
            <text v-if="item.param2 == '0'" class="btn">去处理</text>
            <text v-if="search.queryType === 0" class="btn">去处理</text>
          </view>
        </view>
      </view>
@@ -189,6 +206,7 @@
      :show="tiemShow"
      v-model="startDate"
      mode="date"
         :formatter="formatter"
      @confirm="confirmLeft"
      @cancel="tiemShow = false"
    ></u-datetime-picker>
@@ -199,6 +217,7 @@
      "
      v-model="startDate"
      mode="date"
         :formatter="formatter"
      @confirm="confirmRight"
      @cancel="tiemShow1 = false"
    ></u-datetime-picker>
@@ -225,12 +244,14 @@
      },
      headData: {},
      dataList: [],
         total: 0,
      cateList: [
        { name: '访客申请', id: 0 },
        { name: '访客报备', id: 1 },
        { name: '用车申请', id: 2 },
        { name: '隐患随手拍', id: 3 },
        { name: '物流车申请', id: 4 },
        { name: '物流车申请', id: 6 },
        { name: '考勤代办', id: 7 },
      ],
      startDate: dayjs().format('YYYY-MM-DD'),
    }
@@ -241,9 +262,12 @@
  //   this.getList()
  // },
  onReachBottom() {
    // this.pagination.page = 0
    // this.dataList = []
    this.getList()
      const { total,  dataList} = this
    if(dataList.length < total){
         this.getList()
      } else {
         this.showToast('暂无更多数据')
      }
  },
  onBackPress(options) {
    setTimeout(()=>{
@@ -254,10 +278,27 @@
  onShow() {
    this.pagination.page = 0
    this.dataList = []
    this.getHeadList()
    this.getList()
      this.getHeadList()
  },
  methods: {
      formatter(type, value) {
         if (type === 'year') {
            return `${value}年`
         }
         if (type === 'month') {
            return `${value}月`
         }
         if (type === 'day') {
            return `${value}日`
         }
         if (type === 'hour') {
            return `${value}时`
         }
         if (type === 'minute') {
            return `${value}分`
         }
         return value
      },
    statusClick(val) {
      this.pagination.page = 0
      this.dataList = []
@@ -272,6 +313,9 @@
    },
    modalReset() {
      this.modelParam = {}
      this.search = {
            queryType: 0
         }
      this.pagination.page = 0
      this.dataList = []
      this.showFilter = false
@@ -298,12 +342,16 @@
          ...search
        }
      }).then(res => {
            if(res.data && res.data.records){
               res.data.records.forEach(i => {
                 if (i.param1) {
                   i.param1 = JSON.parse(i.param1)
                 }
               })
            }
        this.dataList = [...this.dataList, ...res.data.records]
        this.dataList.forEach(i => {
          if (i.param1) {
            i.param1 = JSON.parse(i.param1)
          }
        })
            this.total = res.data.total
        
      })
    },
    getHeadList() {
@@ -311,6 +359,7 @@
        isDetail: '1'
      }).then(res => {
        this.headData = res.data
            this.getList()
      })
    },
    handleReady() {
@@ -321,8 +370,8 @@
      })
    },
    handleAppr(item) {
      const { objType, objId } = item
      if (this.search.queryType === 3) {
      const { objType, objId, info, readed } = item
      if (readed === 0) {
        signReadTask({
          noticesId: item.id,
          signType: 0
@@ -330,21 +379,29 @@
          this.getHeadList()
        })
      }
         if (item.type == 7) {
           window.open('https://atwl.ahzyssl.com/dps/web/wxAuth/loginV2?oaId=atwl&redirectId=index')
            return 
         } 
      if (objType === 2) {
        uni.navigateTo({
          url: `/pages/staff/vehicle/sendACarDetail?id=${objId}&appr=1`
          url: `/pages/staff/vehicle/sendACarDetail?id=${objId}&info=${info}`
        })
      } else if (objType === 1) {
        uni.navigateTo({
          url: `/pages/staff/task/visitorReport?id=${objId}&objType=${objType}`
          url: `/pages/staff/task/visitorReport?id=${objId}&objType=${objType}&info=${info}`
        })
      } else if (objType === 3) {
        uni.navigateTo({
          url: `/pages/staff/task/vDangetAppr?id=${objId}&objType=${objType}`
          url: `/pages/staff/task/vDangetAppr?id=${objId}&objType=${objType}&info=${info}`
        })
      } else {
      }else if (objType === 6 || objType === 5) {
        uni.navigateTo({
          url: `/pages/staff/task/visitorApprove?id=${objId}&objType=${objType}`
          url: `/pages/staff/task/driver?id=${objId}&objType=${objType}&info=${info}`
        })
      }else {
        uni.navigateTo({
          url: `/pages/staff/task/visitorApprove?id=${objId}&objType=${objType}&info=${info}`
        })
      }
    },
@@ -499,13 +556,21 @@
        align-items: center;
        justify-content: space-between;
        .readed {
          width: 12rpx;
          height: 12rpx;
          width: 16rpx;
          height: 16rpx;
          border-radius: 50%;
          background-color: #e0312a;
               margin-right: 16rpx;
        }
            .info {
              font-size: 26rpx;
              font-weight: 400;
               color: #999999;
               width: 120rpx;
               text-align: right;
            }
        .loading {
          color: #4c99a8;
          color: $uni-color-primary;
        }
        .success {
          color: #03c68f;
@@ -517,10 +582,6 @@
          font-size: 32rpx;
          font-weight: 600;
          color: #222222;
        }
        .info {
          font-size: 26rpx;
          font-weight: 400;
        }
      }
      .box_list_item_nr {