Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit

liukangdong

2024-09-24 a1647a5152e3d368ec2fb738ca7cc858e220d06c

 h5/pages/driver/taskDetail.vue

@@ -11,10 +11,7 @@
      <view class="name" v-if="param.status == 5">月台作业中</view>
      <view class="name" v-if="param.status == 6">作业已完成</view>
      <view class="id_card">{{ param.carCodeFront }}</view>
      <view class="status" v-if="param.status == 1">等待签到</view>
      <view class="status" v-if="param.status == 2">等待叫号</view>
      <view class="status" v-if="param.status == 5">作业中</view>
      <view class="status" v-if="param.status == 6">作业完成</view>
      <view class="status">{{statusMap[param.status]}}</view>
    </view>
    <!--  -->
    <view class="main_content">
@@ -26,7 +23,7 @@
        <view class="label">手机号</view>
        <view class="value">{{param.drivierPhone}}</view>
      </view>
         <template v-if="param.type == 4">
         <template v-if="param.type != 4">
            <view class="line">
              <view class="label">运输单号</view>
              <view class="value" @click="showDetail = true">
@@ -68,11 +65,19 @@
          </view>
        </view>
      </view>
         <view class="line" v-if="param.status == 2">
         <view class="line" v-if="param.signDate">
           <view class="label">签到时间</view>
           <view class="value">{{param.signDate}}</view>
         </view>
      <view class="warnning">
         <view class="line" v-if="param.startDate">
           <view class="label">开始作业</view>
           <view class="value">{{param.startDate}}</view>
         </view>
         <view class="line" v-if="param.doneDate">
           <view class="label">作业完成</view>
           <view class="value">{{param.doneDate}}</view>
         </view>
      <view v-if="param.status == 1" class="warnning">
        <u-icon name="info-circle" color="#ED4545" class="mr12"></u-icon>
        如无法获取定位，请用微信扫描园区大屏二维
      </view>
@@ -173,16 +178,20 @@

<script>
   import { driverTaskJobDetail, driverSignInTask } from '@/api';
   import { statusMap } from '@/utils/config.js';
   import dayjs from 'dayjs';
export default {
  data() {
    return {
         statusMap,
      param: {
        status: '0'
      },
         jobId: '',
         lat: '',
         lnt: '',
         // lat: '',
         // lnt: '',
         lat: '31.783205',
         lnt: '117.262635',
         nowTime: '',
         signDistance: uni.getStorageSync('driverGuide').signDistance,
      showDetail: false,
@@ -190,17 +199,12 @@
  },
   onLoad(option) {
      this.jobId = option.id
      if(option.status && option.status == '1'){
         this.getLocation()
      }else{
         this.getDetail()
      }
		
      // this.getDetail({
      //    jobId: option.id,
      //    lat: 31.769137,
      //    lnt: 117.232241,
      // })
      // if(option.status && option.status == '1'){
      //    this.getLocation()
      // }else{
      //    this.getDetail()
      // }
      this.getDetail()
      setInterval(() => {
         this.nowTime = dayjs().format('HH:mm:ss')
      })
@@ -236,7 +240,7 @@
               this.getDetail()
        },
            fail:(err) => {
               console.log('err', err);
               this.showToast('获取定位失败')
            }
      })
    },