Merge remote-tracking branch 'origin/master'

jiangping

2024-08-27 3a992a2be8c1cc815719ac76cd7242dd7a2f7c2d

 h5/pages/staff/task/index.vue

@@ -76,6 +76,23 @@
          <view class="info loading">{{ 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>
@@ -342,7 +359,11 @@
        uni.navigateTo({
          url: `/pages/staff/task/vDangetAppr?id=${objId}&objType=${objType}`
        })
      } else {
      } else if (objType === 6 || objType === 5) {
        uni.navigateTo({
          url: `/pages/staff/task/driver?id=${objId}&objType=${objType}`
        })
      }else {
        uni.navigateTo({
          url: `/pages/staff/task/visitorApprove?id=${objId}&objType=${objType}`
        })