Merge remote-tracking branch 'origin/master'

jiangping

2024-09-24 6a2689a44840490a64cf66b37eb09e45eb1da244

 h5/pages/staff/task/driver.vue

@@ -3,6 +3,9 @@
    <view class="status_wrap">
      <view class="name">{{info.driverName}}的入园预约</view>
      <view class="desc">{{info.carCodeFront}}</view>
         <view class="desc" :class="{
             gray: info.businessStatus == '2' || info.businessStatus == '3' || info.businessStatus == '4',
           }">{{ infoStatus }}</view>
      <view class="status" v-if="info.status != 2 && info.status != 3">{{ statusMap[info.status] }}</view>
         <image v-if="info.status == 2" class="icon" src="@/static/ic_passed@2x.png" mode=""></image>
         <image v-if="info.status == 3" class="icon" src="@/static/ic_refused@2x.png" mode=""></image>
@@ -58,54 +61,39 @@
    <!-- 流程 -->
    <view class="flow_wrap">
      <view class="flow_title">流程</view>
      <view class="list" v-if="info.approveDateVO != null && info.approveDateVO.approveList != null">
        <view class="item" v-for="item,index in info.approveDateVO.approveList">
               <view v-if="index != info.approveDateVO.approveList.length - 1" class="separate"></view>
      <view class="list" v-if="
          info.approveDateVO != null && info.approveDateVO.approveList != null
        ">
         <view class="item" v-for="(item, index) in info.approveDateVO.approveList" :key="item.id">
            <view class="separate"></view>
          <view class="avatar">
            <image
               v-if="item.type == 1"
              class="img"
              src="@/static/staff/ic_chaosong@2x.png"
            />
            <image
               v-else-if="item.approveType == 1 || item.approveType == 0"
              class="img"
              src="@/static/staff/ic_shenpiren@2x.png"
            />
               <image v-if="item.type == 1" class="img" src="@/static/staff/ic_chaosong@2x.png" />
               <image v-else-if="item.approveType == 1 || item.approveType == 0" class="img"
                  src="@/static/staff/ic_shenpiren@2x.png" />
            <span v-else class="img_name">{{item.memberName && item.memberName.slice(0,1)}}</span>
            <image
                     v-if="item.status == 2"
              class="status"
              src="@/static/staff/liucheng_success@2x.png"
              mode="widthFix"
            />
                  <image
                     v-if="item.status == 3"
                    class="status"
                    src="@/static/staff/liucheng_fail@2x.png"
                    mode="widthFix"
                  />
               <image v-if="item.status == 2" class="status" src="@/static/staff/liucheng_success@2x.png"
                  mode="widthFix" />
               <image v-if="item.status == 3" class="status" src="@/static/staff/liucheng_fail@2x.png" mode="widthFix" />
          </view>
          <view class="content">
            <view class="head">
              <view class="event">{{ item.title }}</view>
              <view class="time">{{item.createDate}}</view>
                  <view class="time">{{ item.checkDate }}</view>
            </view>
            <view class="name_wrap">
              <text>{{item.memberName}}<text v-if="item.statusInfo" class="status">({{item.statusInfo}})</text></text>
                  <text>{{ item.memberName
                }}<text :class="{ status: item.statusInfo == '处理中' || item.status == '1'  }"
                        v-if="item.statusInfo">({{ item.statusInfo }})</text></text>
            </view>
                  <div v-if="item.checkInfo" class="remark">
                      {{ item.checkInfo }}
                  </div>
                  <view v-if="item.approveType == 1" class="carbon">
                    <view class="carbon_item" v-for="child in item.approveList"
                :key="child.id">
                      <image :src="
                    child.faceImg
                      ? child.faceImg
                      : require('@/static/meeting/common/default_user@2x.png')
                  "></image>
                      <view class="text">{{ child.memberName }}</view>
               <view v-if="item.checkInfo" class="remark">{{
              item.checkInfo
            }}</view>
               <!-- 抄送人 -->
               <view v-if="item.approveType == 0 || item.type == 1 || item.approveType == 1" class="children">
                  <view class="child" v-for="child in item.approveList" :key="child.id">
                     <image v-if="child.faceImg" class="child_img" :src="child.faceImg" />
                     <view v-else class="child_name">{{ child.memberName && child.memberName.slice(0,1) }}</view>
                     <view>{{ child.memberName }}</view>
                    </view>
                  </view>
          </view>
@@ -149,6 +137,7 @@
    return {
      showApprModal: false,
         checkInfo: '',
         infoStatus: '',
         flag: '1',
      info: {},
         type: 0,
@@ -163,6 +152,7 @@
  },
   onLoad(option) {
      this.type = option.objType
      this.infoStatus = option.info
      this.getDetail(option.id)
   },
  methods: {
@@ -236,6 +226,7 @@
        display: flex;
        margin-bottom: 48rpx;
        position: relative;
  
        .separate {
          position: absolute;
          width: 4rpx;
@@ -245,6 +236,7 @@
          transform: translate(-50%, 0);
          top: 80rpx;
        }
  
        .avatar {
          width: 80rpx;
          height: 80rpx;
@@ -253,15 +245,18 @@
              display: flex;
              align-items: center;
              justify-content: center;
  
          .img {
            width: 80rpx;
            height: 80rpx;
            border-radius: 50%;
          }
  
              .img_name{
                 font-size: 32rpx;
                 color: #FFFFFF;
              }
  
          .status {
            width: 28rpx;
            height: 28rpx;
@@ -298,10 +293,12 @@
              color: $uni-color-primary;
            }
          }
  
          .children {
            display: flex;
            flex-wrap: wrap;
            margin-top: 12rpx;
  
            .child {
              display: flex;
              flex-direction: column;
@@ -310,12 +307,14 @@
              margin-right: 12rpx;
                    font-size: 26rpx;
                    color: #777777;
  
              .child_img {
                width: 48rpx;
                height: 48rpx;
                border-radius: 50%;
                       margin-bottom: 2rpx;
              }
  
                    .child_name{
                       margin-bottom: 2rpx;
                       width: 48rpx;
@@ -341,26 +340,31 @@
            line-height: 36rpx;
          }
        }
  
        .carbon {
          display: flex;
          width: 590rpx;
          overflow-x: auto;
          margin-top: 12rpx;
  
          .carbon_item {
            text-align: center;
            flex-shrink: 0;
            width: 100rpx;
  
            image {
              width: 60rpx;
              height: 60rpx;
              margin: 0 auto;
            }
  
            view {
              font-size: 26rpx;
              color: #777777;
            }
          }
        }
  
        &:nth-last-child(1) {
          .separate {
            height: 0;
@@ -425,6 +429,10 @@
    .desc {
      font-size: 26rpx;
      color: #999999;
         margin-bottom: 12rpx;
    }
      .gray {
         color: #999999;
    }

    .status {