Merge remote-tracking branch 'origin/master'

jiangping

2024-08-27 3a992a2be8c1cc815719ac76cd7242dd7a2f7c2d

 h5/pages/driver/reservedDetail.vue

@@ -1,96 +1,103 @@
<template>
  <view class="main_app">
    <view class="status_wrap">
      <view class="name">丁恩凯的访客申请</view>
      <view class="desc">等待我处理</view>
      <view class="status">审批中</view>
      <view class="name">{{info.driverName}}的入园预约</view>
      <view class="desc">{{info.carCodeFront}}</view>
      <view class="status">{{ statusMap[info.status] }}</view>
    </view>
    <!--  -->
    <view class="emyty"></view>
    <view class="module_list">
      <view class="item">
        <view class="label">拜访人</view>
        <view class="value">廖成瑶</view>
        <view class="label">入园原因</view>
        <view class="value">{{info.inReason}}</view>
      </view>
      <view class="item">
        <view class="label">预计入/离园时间</view>
        <view class="value">05/01 8:00 - 05/01 18:00</view>
        <view class="label">合同编号</view>
        <view class="value">{{info.contractNum}}</view>
      </view>
         <view class="item">
           <view class="label">到场时间</view>
           <view class="value" v-if="info.arriveDate">{{info.arriveDate.slice(0,16)}}</view>
         </view>
         <view class="item">
           <view class="label">准运证照片</view>
           <view class="value">
               <image
                  v-if="info.transportImg"
                 class="avatar_wrap"
                 :src="info.prefixUrl + info.transportImg"
               ></image>
            </view>
         </view>
         <view class="item">
           <view class="label">入库类型</view>
           <view class="value">{{info.inType == 0 ? '整托盘' : '件烟'}}</view>
         </view>
         <view class="item">
           <view class="label">总运数量</view>
           <view class="value">{{info.totalNum}}万支</view>
      </view>
      <view class="emyty"></view>
      <view class="item">
        <view class="label">访客信息</view>
        <view class="value">
          <image
            class="avatar"
            src="@/static/logo@2x.png"
            mode="widthFix"
          ></image>
          <view class="info">
            <text class="name">孙志 18177665678</text>
            <text>身份证号：3309****2910</text>
            <text>入园车辆：皖A88789</text>
          </view>
        <view class="label">司机姓名</view>
        <view class="value">{{info.driverName}}
        </view>
      </view>
      <view class="item">
        <view class="label">公司名称</view>
        <view class="value">中国移动</view>
        <view class="label">手机号</view>
        <view class="value">{{info.driverPhone}}</view>
      </view>
      <view class="item">
        <view class="label">施工人员</view>
        <view class="value">否</view>
      </view>
      <view class="item">
        <view class="label">来访事由</view>
        <view class="value">业务洽谈</view>
           <view class="label">车牌照</view>
           <view class="value">前 {{info.carCodeFront}}，后 {{info.carCodeBack}}</view>
      </view>
    </view>
    <!-- 流程 -->
    <view class="flow_wrap">
      <view class="flow_title">流程</view>
      <view class="list">
        <view class="item">
          <view class="avatar">
            <image class="img" src="@/static/logo@2x.png" mode="widthFix" />
      <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="avatar_wrap">
            <image
              class="img"
              :src="
                item.faceImg
                  ? item.faceImg
                  : require('@/static/meeting/common/default_user@2x.png')
              "
            />
            <image
                   v-if="item.status == 2"
              class="status"
              src="@/static/staff/liucheng_success@2x.png"
              mode="widthFix"
            />
            <view class="separate"></view>
          </view>
          <view class="content">
            <view class="head">
              <view class="event">某某提交的拜访申请</view>
              <view class="time">time</view>
            </view>
            <view class="name_wrap">
              <text>李东(<text class="status">处理中</text>)</text>
            </view>
            <view class="remark">同意放行</view>
          </view>
        </view>
        <view class="item">
          <view class="avatar">
            <image class="img" src="@/static/logo@2x.png" mode="widthFix" />
            <image
                   v-if="item.status == 3"
              class="status"
              src="@/static/staff/liucheng_success@2x.png"
                  src="@/static/staff/liucheng_fail@2x.png"
              mode="widthFix"
            />
          </view>
          <view class="content">
            <view class="head">
              <view class="event">某某提交的拜访申请</view>
              <view class="time">time</view>
              <view class="event">{{ item.title }}</view>
              <view class="time">{{item.createDate}}</view>
            </view>
            <view class="name_wrap">
              <text>李东(<text class="status">处理中</text>)</text>
              <text>{{item.memberName}}<text v-if="item.statusInfo" class="status">({{item.statusInfo}})</text></text>
            </view>
            <view class="carbon">
              <view class="carbon_item" v-for="i in 12">
                <image src="@/static/logo@2x.png" mode="widthFix"></image>
                <view class="text">name</view>
                <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>
            </view>
          </view>
@@ -99,44 +106,66 @@
    </view>
    <view class="emyty"></view>
    <view class="main_footer">
      <view class="btn" @click="handleSub('0')">拒绝</view>
      <view class="btn agree" @click="handleSub('1')">同意</view>
      <view v-if="info.status == 0 || info.status == 1" class="btn" @click="handleCancel">撤回申请</view>
       <view v-if="info.status == 0 || info.status == 1" class="btn agree" @click="handleEdit">修改</view>
       <view v-if="info.status == 3" class="btn agree aga" @click="handleAga">再次申请</view>
    </view>

    <!--  -->
    <u-popup
      :show="showApprModal"
      :round="10"
      :safeAreaInsetBottom="true"
      mode="bottom"
      @close="showApprModal = false"
    >
      <view class="appr_modal">
        <view class="title">同意</view>
        <textarea
          placeholder="同意说明，非必填"
          placeholder-class="placeholder9"
        />
        <view class="main_footer">
          <view class="btn" @click="showApprModal = false">取消</view>
          <view class="btn agree">提交</view>
        </view>
      </view>
    </u-popup>
  </view>
</template>

<script>
   import { driverApplyDetail, driverCarRevoke } from '@/api'
export default {
  data() {
    return {
      showApprModal: false,
      param: {}
      info: {},
         statusMap: {
            0: '待审批',
            1: '审批中',
            2: '审批通过',
            3: '审批不通过',
            4: '已取消',
         },
    }
  },
   onLoad(option) {
      this.getDetail(option.id)
   },
  methods: {
      handleCancel(){
         uni.showModal({
            title: '提示',
            content: '这是一个模态弹窗',
            success: function (res) {
               if (res.confirm) {
                  console.log('用户点击确定');
               } else if (res.cancel) {
                  console.log('用户点击取消');
               }
            }
         });
         // driverCarRevoke
      },
      handleEdit(){},
      handleAga(){},
      getDetail(id) {
         driverApplyDetail({id}).then(res => {
            this.info = res.data
            if(this.info.approveDateVO && this.info.approveDateVO.approveList.length > 0 ){
               this.info.approveDateVO.approveList.forEach(item => {
                  if(item.approveList && item.approveList.length == 1 && item.type !== 1){
                     item.title = item.approveList[0].title
                     item.faceImg = item.approveList[0].faceImg
                     item.memberName = item.approveList[0].memberName
                     item.statusInfo = item.approveList[0].statusInfo
                     item.approveList = []
                  }
               })
            }
         })
      },
    handleSub(flag) {
      // this.param.flag = 
      if (flag === '1') {

      } else {
@@ -172,7 +201,7 @@
        display: flex;
        margin-bottom: 48rpx;

        .avatar {
        .avatar_wrap {
          width: 80rpx;
          height: 80rpx;
          position: relative;
@@ -281,7 +310,7 @@
        display: flex;
        align-items: center;

        .avatar {
        .avatar_wrap {
          margin-right: 20rpx;
          width: 120rpx;
          height: 120rpx;
@@ -319,7 +348,7 @@

    .desc {
      font-size: 26rpx;
      color: #ed4545;
      color: #999999;
    }

    .status {
@@ -357,6 +386,9 @@
      color: #fff;
      border: 1rpx solid $uni-color-primary;
    }
      .aga{
         width: 100%;
      }
  }

  .appr_modal {