修改时 行驶证副页 不重新上传无法通过校验

src/router/index.js

@@ -70,7 +70,14 @@ const routes = [
         meta: {
             title: '审核完成-详情'
         }
-
+    },
+    {
+        path: "/settlementDetail",
+        name: 'settlementDetail',
+        component: () => import('@/views/workOrder/settlementDetail.vue'),
+        meta: {
+            title: '结算单详情'
+        }
     },
     {
       path: "/invoicingNotify",
@@ -167,6 +174,14 @@ const routes = [
         meta: {
             title:'案件详情'
         }
+    },
+    {
+        path: '/newTrainingList',
+        name: 'newTrainingList',
+        component:()=>import('@/views/newcomerTraining/newTrainingList.vue'),
+        meta: {
+            title:'新人培训'
+        }
     }
   ]
 

src/utils/common.js

@@ -5,7 +5,14 @@ const formatDate = date => {
   const day = tempDate.getDate()
   return `${[year, month, day].map(formatNumber).join('-')}`
 }
-
+const formatDate1 = date => {
+  let value=date.replace(/\./g, '/')
+  let tempDate = new Date(value)
+  const year = tempDate.getFullYear()
+  const month = tempDate.getMonth() + 1
+  const day = tempDate.getDate()
+  return `${[year, month, day].map(formatNumber).join('/')}`
+}
 const formatNumber = n => {
   n = n.toString()
   return n[1] ? n : `0${n}`
@@ -40,5 +47,6 @@ module.exports = {
   formatNumber,
   formatDate,
   leftCopy,
-  timeFormat
+  timeFormat,
+  formatDate1
 }

src/views/index/driverAdd.vue

@@ -1,5 +1,5 @@
 <template>
-<div class="wrap">
+<div class="wrap driverAdd">
   <div class="navBar">
     <van-nav-bar
         :title="id ? '修改司机信息' : '添加司机'"
@@ -19,6 +19,7 @@
     <van-uploader
       v-model="identityCardFrontList"
       :after-read="identityCardFrontHandler"
+      :max-size="5 * 1024 * 1024"
       max-count="1"
       :preview-size="54"
       accept="image "
@@ -48,6 +49,7 @@
       v-model="drivingLicenceFrontList"
       :after-read="drivingLicenceFrontHandler"
       max-count="1"
+      :max-size="5 * 1024 * 1024"
       :preview-size="54"
       accept="image "
     />
@@ -80,15 +82,16 @@
     />
   </div>
   <div class="lineBot"></div>
-  <cell-group label="司机姓名" placeholder="请输入司机姓名"  v-model="driverName" aria-readonly="true"   :disabled="supplierType ==1 ? true:false"/>
+<!--  :disabled="supplierType ==1 ? true:false"-->
-  <cell-group label="手机号码"  v-model="driverPhone"   placeholder="请输入手机号" />
+  <cell-group label="司机姓名" placeholder="司机姓名"  v-model="driverName" disabled />
-  <cell-group label="身份证号" v-model="identityCardNumber"   placeholder="请输入身份证号"   />
+  <cell-group label="手机号码"  v-model="driverPhone"   placeholder="手机号码" />
+  <cell-group label="身份证号" v-model="identityCardNumber"   placeholder="身份证号" disabled  />
   <div class="itemContent">
     <div class="titleType">
       <img class="startImg" src="@/assets/start.png" />
       <span>准驾车型</span>
     </div>
-    <select id="mySelect" class="mySelect" v-model="drivingModel"  >
+    <select id="mySelect" class="mySelect" v-model="drivingModel" disabled >
       <option value="A1">A1</option>
       <option value="A2">A2</option>
       <option value="A3">A3</option>
@@ -135,6 +138,7 @@ import {myMixins} from  "@/utils/myMixins"
 import {saveDriver, uploadImage, ocrHandler} from "@/api/mine"
 import TwoCommonBtn from "@/components/twoBtnCommon.vue"
 import CellGroup  from "@/components/cellGroup.vue"
+import {formatDate1} from "@/utils/common"
 export default {
   name: "driverAdd",
   mixins:[myMixins],
@@ -162,6 +166,9 @@ export default {
       iconList: [],
       driverInfo: {},
       drivingLicenceName: '',
+      idCardAuthority:'',
+      idCardValidStartTime:'',
+      idCardValidEndTime:'',
     }
   },
   mounted() {
@@ -182,11 +189,21 @@ export default {
     this.identityCardFront = this.$route.params?.identityCardFront;
     this.driverInfo.lssueDate = this.$route.params?.lssueDate;
     this.drivingLicenceName =  this.$route.params?.drivingLicenceName;
+    if( this.identityCardFront ) {
       this.identityCardFrontList = [{ url : this.identityCardFront }];
+    }
+    if( this.identityCardContrary ) {
       this.identityCardContraryList = [{ url : this.identityCardContrary }];
+    }
+    if( this.drivingLicenceFront ) {
       this.drivingLicenceFrontList = [{ url : this.drivingLicenceFront }];
+    }
+    if( this.drivingLicenceContrary ) {
       this.drivingLicenceContraryList = [{ url : this.drivingLicenceContrary }];
+    }
+    if( this.icon ) {
       this.iconList = [{ url : this.icon }];
+    }
     const selectElement = document.getElementById('mySelect');
     selectElement.addEventListener('change', function() {
       const selectedValue = selectElement.value;
@@ -210,6 +227,7 @@ export default {
       formData.append("file" , file.file);
       let res = await uploadImage(formData)
       this.identityCardContrary = res.data;
+      await this.idCardBackOcrHandler();
     },
     async drivingLicenceFrontHandler(file) {   // 上传驾驶证主页
       const formData = new FormData();
@@ -231,6 +249,8 @@ export default {
       this.icon = res.data;
     },
     async idCardOcrHandler() {    // 身份证正面 ocr识别
+      this.driverName = '';
+      this.identityCardNumber = '';
       let res = await ocrHandler({
         ocrType: 1,
         imageUrl: this.identityCardFront,
@@ -238,23 +258,65 @@ export default {
       })
       this.driverName = res?.data?.name;
       this.identityCardNumber = res?.data?.idNum;
-      if( this.drivingLicenceName && this.driverName != this.drivingLicenceName ) {
+      let aaa=''
+      if(this.drivingLicenceName){
+        aaa = this.drivingLicenceName.replace(/[^\u4e00-\u9fff]+/g, '');
+      }
+      let bbb=this.driverName.replace(/[^\u4e00-\u9fff]+/g, '');
+      if( this.drivingLicenceName && aaa != bbb ) {
         this.$toast('身份证信息与驾驶证信息不匹配')
       }
     },
+    async idCardBackOcrHandler() {    // 身份证反面 ocr识别
+      let res = await ocrHandler({
+        ocrType: 1,
+        imageUrl: this.identityCardContrary,
+        cardSide: 'BACK'
+      });
+      this.idCardAuthority=res.data.authority
+      if(!res.data.validDate){
+        return
+      }
+      let date=res.data.validDate.split('-')
+      if(date[0]){
+        this.idCardValidStartTime=formatDate1(date[0]) +' '+ '00:00:00';
+      }
+      if(date[1]){
+        if(date[1] == '长期'){
+          this.idCardValidEndTime='2099/12/12' +' '+ '00:00:00';
+        }else{
+          this.idCardValidEndTime=formatDate1(date[1]) +' '+ '00:00:00';
+        }
+      }
+    },
     async drivingLicenceOcrHandler() {      // 驾驶证正面 ocr识别
+      this.driverInfo.drivingLicenceValidityDate = '';
+      this.driverInfo.drivingBeginDate = '';
+      this.driverInfo.lssueDate = '';
+      this.drivingModel = '';
+      this.drivingLicenceName = '';
       let res = await ocrHandler({
         ocrType: 2,
         imageUrl: this.drivingLicenceFront,
         cardSide: 'FRONT'
       });
       if( res?.data ) {
-        this.driverInfo.drivingBeginDate = res?.data?.dateOfFirstIssue;
+        this.driverInfo.drivingBeginDate = res?.data?.dateOfFirstIssue || '';
         this.driverInfo.lssueDate = res?.data?.dateOfFirstIssue ? (res?.data?.dateOfFirstIssue + ' 00:00:00') : '';
+        if( res?.data?.endDate.indexOf('长期') != -1 ) {
+          this.driverInfo.drivingLicenceValidityDate = '2099-01-01';
+        } else {
           this.driverInfo.drivingLicenceValidityDate = res?.data?.endDate;
+        }
+
         this.drivingModel = res.data?.class_;
         this.drivingLicenceName = res.data?.name
-        if( this.driverName && this.drivingLicenceName != this.driverName ) {
+        let aaa=''
+        if(this.driverName){
+           aaa = this.driverName.replace(/[^\u4e00-\u9fff]+/g, '');
+        }
+        let bbb = this.drivingLicenceName.replace(/[^\u4e00-\u9fff]+/g, '');
+        if( this.driverName && bbb != aaa ) {
           this.$toast('身份证信息与驾驶证信息不匹配')
         }
       }
@@ -276,12 +338,15 @@ export default {
         this.$toast('驾驶证副页未上传')
         return
       }
-      if( this.drivingLicenceName != this.driverName ) {
+      let drivingLicenceName=this.drivingLicenceName.replace(/[^\u4e00-\u9fff]+/g, '');
+      let driverName=this.driverName.replace(/[^\u4e00-\u9fff]+/g, '');
+
+      if( drivingLicenceName != driverName ) {
         this.$toast('身份证信息与驾驶证信息不匹配')
         return
       }
       if( this.driverInfo.drivingLicenceValidityDate ) {
-        if( new Date(this.driverInfo.drivingLicenceValidityDate).getTime() < new Date().getTime() ) {
+        if(this.driverInfo.drivingLicenceValidityDate && new Date(this.driverInfo.drivingLicenceValidityDate).getTime() < new Date().getTime() ) {
           this.$toast('驾驶证已过期')
           return
         }
@@ -303,6 +368,9 @@ export default {
          drivingLicenceContrary: this.drivingLicenceContrary,
          icon: this.icon,
          drivingLicenceName: this.drivingLicenceName,
+         idCardAuthority:this.idCardAuthority,
+         idCardValidStartTime:this.idCardValidStartTime,
+         idCardValidEndTime:this.idCardValidEndTime,
          ...this.driverInfo
       })
       if(this.id){
@@ -321,7 +389,12 @@ export default {
   }
 }
 </script>
-
+<style>
+  .driverAdd .van-field__control:disabled {
+    color: #323643 !important;
+    -webkit-text-fill-color: #323643 !important;
+  }
+</style>
 <style scoped lang="scss">
 @import "@/styles/mixin.scss";
 @import "@/styles/common.scss";

src/views/index/vehicleAdd.vue

@@ -1,5 +1,5 @@
 <template>
-<div class="wrap">
+<div class="wrap vehicleAdd">
   <div class="navBar">
     <van-nav-bar
         :title="id ? '修改车辆信息' : '添加车辆'"
@@ -20,6 +20,7 @@
     <van-uploader
       v-model="vehicleLicenseFrontList"
       :after-read="vehicleLicenseFrontHandler"
+      :max-size="5 * 1024 * 1024"
       max-count="1"
       :preview-size="54"
       accept="image "
@@ -33,6 +34,7 @@
     <van-uploader
       v-model="vehicleLicenseBackList"
       :after-read="vehicleLicenseBackHandler"
+      :max-size="5 * 1024 * 1024"
       max-count="1"
       :preview-size="54"
       accept="image "
@@ -52,7 +54,7 @@
     />
   </div>
 
-  <cell-group label="车牌号" placeholder="请输入车牌号"   v-model="carNum" />
+  <cell-group label="车牌号" placeholder="车牌号" disabled v-model="carNum" />
   <div class="itemContent">
     <div class="titleType">
       <img class="startImg" src="@/assets/start.png" />
@@ -149,6 +151,7 @@ export default {
       vehicleLicenseBack: '',   // 行驶证副页
       vehicleFrontPhoto: '',    // 车头照
       vehicleLicenseInfo: {},
+      vehicleLicenseBackOcrFlag: false,   // 行驶证副页 修改时默认不需要 ocr识别
     }
   },
   async mounted() {
@@ -172,6 +175,7 @@ export default {
       await this.vehicleOcrHandler();
     },
     async vehicleLicenseBackHandler(file) {     // 上传 行驶证副页
+      this.vehicleLicenseBackOcrFlag = true;
       const formData = new FormData();
       formData.append("file" , file.file);
       let res = await uploadImage(formData);
@@ -185,6 +189,17 @@ export default {
       this.vehicleFrontPhoto = res.data;
     },
     async vehicleOcrHandler() {     // 行驶证首页 ocr 识别
+      this.vehicleLicenseInfo.licensePlateNumber = '';
+      this.vehicleLicenseInfo.vehicleType = '';
+      this.vehicleLicenseInfo.owner = '';
+      this.vehicleLicenseInfo.address = '';
+      this.vehicleLicenseInfo.useNature = '';
+      this.vehicleLicenseInfo.model = '';
+      this.vehicleLicenseInfo.vinCode = '';
+      this.vehicleLicenseInfo.engineNumber = '';
+      this.vehicleLicenseInfo.registrationDate = '';
+      this.vehicleLicenseInfo.issueDate = '';
+      this.vehicleLicenseInfo.issueAuthority = '';
       let res = await ocrHandler({
         ocrType: 3,
         imageUrl: this.vehicleLicenseFront,
@@ -207,6 +222,14 @@ export default {
       }
     },
     async vehicleBackOcrHandler() {     // 行驶证副页 ocr 识别
+      this.vehicleLicenseInfo.recordNumber = '';
+      this.vehicleLicenseInfo.passengerCapacity = '';
+      this.vehicleLicenseInfo.totalWeight = '';
+      this.vehicleLicenseInfo.curbWeight = '';
+      this.vehicleLicenseInfo.permittedWeight = '';
+      this.vehicleLicenseInfo.overallDimension = '';
+      this.vehicleLicenseInfo.tractionWeight = '';
+      this.vehicleLicenseInfo.backPlateNo = '';     // 行驶证副页 车牌号，仅用来判断 ocr 识别是否成功
       let res = await ocrHandler({
         ocrType: 3,
         imageUrl: this.vehicleLicenseBack,
@@ -221,6 +244,7 @@ export default {
         this.vehicleLicenseInfo.permittedWeight = backInfo?.loadQuality;
         this.vehicleLicenseInfo.overallDimension = backInfo?.externalSize;
         this.vehicleLicenseInfo.tractionWeight = backInfo?.TotalQuasiMass;
+        this.vehicleLicenseInfo.backPlateNo = backInfo?.plateNo;
       }
       console.log('this.vehicle', this.vehicleLicenseInfo)
     },
@@ -287,7 +311,7 @@ export default {
         this.$toast('行驶证主页识别失败')
         return
       }
-      if( !this.vehicleLicenseInfo.recordNumber ) {
+      if(this.vehicleLicenseBackOcrFlag && !this.vehicleLicenseInfo.backPlateNo ) {
         this.$toast('行驶证副页识别失败')
         return
       }
@@ -319,6 +343,12 @@ export default {
 }
 </script>
 
+<style>
+  .vehicleAdd .van-field__control:disabled {
+    color: #323643 !important;
+    -webkit-text-fill-color: #323643 !important;
+  }
+</style>
 <style scoped lang="scss">
 @import "@/styles/mixin.scss";
 @import "@/styles/common.scss";

src/views/newcomerTraining/newTrainingList.vue

@@ -0,0 +1,340 @@
+<template>
+  <div class="wrap" :style="{ 'overflow-y': showPoup ? 'hidden' : 'auto' }">
+    <div class="navBar">
+      <van-nav-bar title="新人培训"  :border="false" :fixed="true" :safe-area-inset-top="true">
+        <template slot="left" v-if="isFinished">
+         <van-icon  name="checked" color="#37ec37" size="20"/>
+        </template>
+      </van-nav-bar>
+    </div>
+    <div class="contentWrap" v-show="!showEmpty">
+      <van-pull-refresh v-model="isLoading" @refresh="onRefresh"  style="min-height:85vh">
+        <div class="itemWrap" v-for="(item,index) in  pageList" :key="index" @click="goH5Detail(item)">
+          <div class="info flexBetween common">
+            <div class="title">{{ item.pushUser }}</div>
+            <div class="time">{{ item.pushTime }}</div>
+          </div>
+          <div class="imgWrap"><img :src="item.themePicture"></div>
+          <div class="num common">{{ item.synopsis }}</div>
+          <template v-if="item.listShowButton == null">
+            <div class="status"  style="color: #cccccc">已处理</div>
+          </template>
+          <template v-else>
+            <div class="status" >未处理</div>
+          </template>
+        </div>
+      </van-pull-refresh>
+    </div>
+    <div class="empty" v-show="showEmpty">
+      <img src="@/assets/empty.png" />
+    </div>
+    <div  class="poupCommon" v-if="showPoup">
+      <div class="container showPoupContainer">
+        <div class="con">
+          <div class="title">培训提醒</div>
+          <div class="content">欢迎使用中道供应商APP。请您先完成培训，阅读文章，并问答相应问题。完成后即可正常使用APP。祝您使用愉快!</div>
+          <div class="line"></div>
+          <div class="btnWrap">
+            <div class="nextBtn" @click="showPoup = false">确定</div>
+          </div>
+        </div>
+
+      </div>
+    </div>
+    <div  class="poupCommon" v-if="isFinished">
+      <div class="container finishContainer">
+        <div class="con">
+          <div class="title">提示</div>
+          <div class="content">恭喜您，您已经全部完成培训！现在您可以正常使用我们的app，请前往体验。</div>
+          <div class="line"></div>
+          <div class="btnWrap">
+            <div class="nextBtn" @click="goApp">前往</div>
+          </div>
+        </div>
+
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+// import { Dialog  } from 'vant';
+import {myMixins} from "@/utils/myMixins"
+import {pageList} from  "@/api/mine"
+
+export default {
+  name: "newTrainingList",
+  computed: {
+  },
+  mixins:[myMixins],
+  data(){
+    return{
+      pageNum:1,
+      pageSize:10,
+      pageList:[],
+      keyword:'',
+      show:false,
+      showEmpty:false,
+      isLoading:false,
+      showPoup:true,//进入弹框
+      isFinished:false,
+      // showPoup:false,//进入弹框
+      // isFinished:true,
+    }
+  },
+  mounted() {
+    // this.onRefresh();
+    this.getList();
+
+  },
+  created() {
+    // this.getList();
+    // 每次回答完问题之后返回需重新加结果
+
+  },
+  async activated() {
+    await this.getList()
+  },
+  methods:{
+    onRefresh() {
+      this.getList()
+      setTimeout(() => {
+        this.$toast('刷新成功');
+        this.isLoading = false;
+      }, 1000);
+    },
+
+    async getList(){
+      let res= await pageList({
+        pageNum:this.pageNum,
+        pageSize:this.pageSize,
+        docType:1,
+        trainingType:4,
+      })
+      this.pageList=res.data;
+      let aaa=this.pageList.every(item=>item.listShowButton != 1)
+      if(aaa){
+        this.showPoup=false
+        this.isFinished=true
+        // await this.allProcessed()
+      }
+      if(res.data.length === 0){
+        this.showEmpty  = true
+
+      }else {
+        this.showEmpty = false
+      }
+    },
+    initShow(){
+      this.keyword= '',
+      this.getList()
+    },
+    goApp(){
+      let data = {"action":"goBack","params":""}
+      var u = navigator.userAgent;
+      var isiOS = !!u.match(/\(i[^;]+;( U;)? CPU.+Mac OS X/);
+      if(isiOS){
+        window.webkit.messageHandlers.nativeObject.postMessage(data);
+      }else {
+        window.android.sendMessage("goBack");
+      }
+    },
+    /*allProcessed(){
+      Dialog.confirm({
+        title: '提示',
+        message: '恭喜您，您已经全部完成培训！现在您可以正常使用我们的app，请前往体验。',
+        confirmButtonText: '前往',
+        cancelButtonText: '稍后'
+      })
+          .then(() => {
+            let data = {"action":"goBack","params":""}
+            var u = navigator.userAgent;
+            var isiOS = !!u.match(/\(i[^;]+;( U;)? CPU.+Mac OS X/);
+            if(isiOS){
+              window.webkit.messageHandlers.nativeObject.postMessage(data);
+            }else {
+              window.android.sendMessage("goBack");
+            }
+          })
+          .catch(() => {
+            // on cancel
+          });
+      console.log("全部处理")
+    },*/
+  }
+}
+</script>
+<style scoped lang="scss">
+@import "@/styles/common.scss";
+@import "@/styles/mixin.scss";
+@import "@/styles/docment.scss";
+.status{
+  color: red;
+  font-size: 14px;
+  margin-right: 8px;
+  text-align: right
+}
+.wrap{
+  position: relative;
+  overflow-y: hidden;
+}
+.poupCommon{
+    width: 100%;
+    height: 100%;
+    background-color: rgba(0,0,0,.7);
+    position: absolute;
+    top: 0;
+    left: 0;
+    .showPoupContainer{
+      height: 310px;
+      background-size: 320px 310px;
+      .content{
+        margin-bottom: 20px;
+      }
+      .btnWrap{
+        margin-top: 6px;
+      }
+    }
+    .finishContainer{
+      height: 260px;
+      background-size: 320px 260px;
+      .con{
+        top: 80px !important;
+      }
+    }
+    .container{
+      width: 320px;
+      background-image: url("@/assets/trainBg.png");
+      background-repeat: no-repeat;
+      position: absolute;
+      top: 0;
+      bottom: 0;
+      left: 0;
+      right: 0;
+      margin: auto;
+      .con{
+        position: absolute;
+        top: 100px;
+        left: 20px;
+      }
+
+    }
+    .title{
+      font-weight: bold;
+      font-size: 19px;
+      color: #3364B7;
+      line-height: 26px;
+      width: 70%;
+      margin-left: 35px;
+      text-align: center;
+    }
+    .content{
+      width: 70%;
+      height: 92px;
+      font-size: 14px;
+      color: #4C5361;
+      line-height: 23px;
+      text-align: justify;
+      margin-top: 8px;
+      margin-left: 35px;
+    }
+    .line{
+      width: 285px;
+      height: 1px;
+      border-bottom: 1px solid #F1F2F5;
+    }
+    .btnWrap{
+      width: 92%;
+      font-weight: bold;
+      font-size: 13px;
+      display: flex;
+      justify-content: space-around;
+      height: 40px;
+      line-height: 40px;
+      .closeBtn{
+        color: #999B9F;
+      }
+      .line{
+        width: 1px;
+        height: 48px;
+        border-right: 1px solid #F1F2F5;
+      }
+      .nextBtn{
+        color: #3364B7;
+      }
+    }
+}
+//.poupWrap{
+//  width: 100%;
+//  height: 100%;
+//  background-color: rgba(0,0,0,.7);
+//  position: absolute;
+//  top: 0;
+//  left: 0;
+//  .container{
+//    width: 320px;
+//    height: 310px;
+//    background-image: url("@/assets/trainBg.png");
+//    background-size: 320px 310px;
+//    background-repeat: no-repeat;
+//    position: absolute;
+//    top: 0;
+//    bottom: 0;
+//    left: 0;
+//    right: 0;
+//    margin: auto;
+//    .con{
+//      position: absolute;
+//      top: 100px;
+//      left: 20px;
+//    }
+//
+//  }
+//  .title{
+//    font-weight: bold;
+//    font-size: 19px;
+//    color: #3364B7;
+//    line-height: 26px;
+//    width: 70%;
+//    margin-left: 35px;
+//    text-align: center;
+//  }
+//  .content{
+//    width: 70%;
+//    height: 92px;
+//    font-size: 14px;
+//    color: #4C5361;
+//    line-height: 23px;
+//    text-align: justify;
+//    margin-top: 8px;
+//    margin-bottom: 20px;
+//    margin-left: 35px;
+//  }
+//  .line{
+//    width: 285px;
+//    height: 1px;
+//    border-bottom: 1px solid #F1F2F5;
+//  }
+//  .btnWrap{
+//    width: 92%;
+//    font-weight: bold;
+//    font-size: 13px;
+//    display: flex;
+//    justify-content: space-around;
+//    margin-top: 6px;
+//    height: 40px;
+//    line-height: 40px;
+//    .closeBtn{
+//      color: #999B9F;
+//    }
+//    .line{
+//      width: 1px;
+//      height: 48px;
+//      border-right: 1px solid #F1F2F5;
+//    }
+//    .nextBtn{
+//      color: #3364B7;
+//    }
+//  }
+//}
+</style>

src/views/workOrder/accounting.vue

@@ -41,18 +41,16 @@
     </div>
     <div class="item">
       <span class="titleLeft">结算方式：</span>
-      <div class="content" style="width: calc(100% - 84px);display: flex;justify-content: space-between;line-height: 27px" >
+      <span class="content" >{{orderInfo.taskSettleType?.label }}</span>
-        <span>{{orderInfo.taskSettleType?.label}}</span>
+      <span  class="driverPoiBtn" v-if="settleDetail.length>0" style="margin-left: 8px" @click="viewSettlementDoc">查看结算单</span>
-<!--        <span>包含公里数:15</span>-->
-<!--        <span>超出单价:6</span>-->
-         </div>
     </div>
     <div class="item">
       <span class="titleLeft">扣除责任险费：</span>
       <span class="content">{{orderInfo.policyAmount}} {{orderInfo.cutInsuranceAmount}}</span>
     </div>
     <div class="item">
-      <span class="leftTitle fontColor">工单照片:</span><span class="rightContent">
+      <span class="leftTitle fontColor">工单照片:</span>
+      <span class="rightContent">
            <span  class="driverPoiBtn" @click="checkPhoto">查看照片</span>
       </span>
     </div>
@@ -210,7 +208,8 @@
           <div class="title" style="margin-bottom: 8px"> 备注:{{orderInfo.supplierRemark}}</div>
           <div class="title" style="margin-bottom: 8px"> 本次补充说明:</div>
           <div  style="display: flex;margin-bottom: 5px">
-            <img v-for="(item,index) in supplierPhotoList"  :key="index" class="supplierImg" :src="item.url" @click="delSupplierPhoto(item)">
+            <!--          @click="delSupplierPhoto(item)  -->
+            <img v-for="(item,index) in supplierPhotoList"  :key="index" class="supplierImg" :src="item.url" @click="viewHandle(item)">
           </div>
           <div  style="display: flex"  >
             <van-uploader
@@ -226,7 +225,6 @@
     </table>
   </div>
   <van-dialog v-model="show" title="确定删除此照片吗" show-cancel-button @confirm="handleConfirm"></van-dialog>
-<!--  <two-common-btn v-show="auditFormShow"  class="btn" title1="提交" title2="确定审核" @submitClick1="save" @submitClick="save" />-->
   <div class="btn" v-show="auditFormShow">
     <button v-if="orderInfo.checkCount < 3" :class="{'submit' : true,'loading' : loading}"  @click="noMultipleClicks(save)">提交</button>
     <button v-if="accountStatus == 2 || accountStatus == 3" :class="{'submit' : true,'loading1' : loading1}" @click="noMultipleClicks(confirmAudit)" >确定审核</button>
@@ -243,7 +241,7 @@ import {
   selectRecordPictureList, deleteImage
 } from "@/api/mine"
 import { ImagePreview } from "vant";
-// import TwoCommonBtn from "@/components/twoBtnCommon.vue"
+import {orderReportingList} from "@/api/order";
 export default {
   name: "accountingView",
   mixins:[myMixins],
@@ -356,7 +354,8 @@ export default {
       },
       noClick:true,
       loading: false,
-      loading1: false
+      loading1: false,
+      settleDetail:[],
     }
   },
   async mounted() {
@@ -366,6 +365,7 @@ export default {
     this.queryTime = this.$route.params?.queryTime
     this.$nextTick(async ()=>{
       await this.getDetail()
+      await this.getSettlementDetail()
     })
   },
   computed:{
@@ -383,12 +383,20 @@ export default {
     },
   },
   methods:{
+    viewSettlementDoc(){//查看结算单
+      this.$router.push({
+        name:"settlementDetail",
+        params:{
+          id: this.id,                  // 参数对象的属性
+          postfix:this.postfix,
+          index:this.activeIndex,
+          queryTime: this.time || this.queryTime,
+          settleDetailList:this.settleDetail
+        }
+      })
+    },
     checkPhoto(){
       let isAllowImage = 1
-      console.log("this.orderInfo.userOrderId",this.orderInfo.userOrderId)
-      console.log("this.orderInfo.orderCode",this.orderInfo.orderCode)
-      console.log("this.orderInfo.taskOrderId",this.orderInfo.taskOrderId)
-      console.log("isAllowImage",isAllowImage)
       let data = {
         "action": "orderPhoto",
         "params": {
@@ -416,12 +424,26 @@ export default {
         startPosition: index,
         closeable: true,
       });
+
+    },
+    async getSettlementDetail(){
+      let res = await orderReportingList({
+        queryType:7,
+        userOrderId:this.orderInfo.userOrderId,
+        orderCode: this.orderInfo.orderCode,
+        taskOrderId:this.orderInfo.taskOrderId,
+        searchCostRemark:1
+      })
+      this.settleDetail=res.data
+      console.log("工单列表接口res",this.settleDetail)
     },
      handleFileRead(file) {
       console.log("file",file)
      },
+    viewHandle(i){
+      console.log("ii",i)
+    },
     goback(){
-      // console.log("aaaaa",this.queryTime)
       this.$router.push({
         name:"workOrderReconciliation",
         params:{
@@ -449,7 +471,6 @@ export default {
           this.form.supplierBasePrice = dilemmaBasePrice
           this.form.supplierExtraPrice = 0
           this.form.supplierSettleAmount = dilemmaBasePrice - (parseFloat(this.form.supplierCustomerAmount) || 0)
-          // console.log("困境案件费用总计",this.form.supplierSettleAmount)
          }else{
           let data = await accountRecordCompute( {
             ...this.form,
@@ -458,12 +479,10 @@ export default {
           this.form.supplierBasePrice = data.data.basePrice
           this.form.supplierExtraPrice = data.data.extraPrice
           this.form.supplierSettleAmount = data.data.totalPrice
-          // console.log("计算",this.form.supplierSettleAmount)
         }
       // }
       if(this.form.cutInsuranceAmount == 1 && this.form.policyState === 0){
         this.form.supplierSettleAmount = parseFloat(parseFloat(this.form.supplierSettleAmount) - parseFloat(this.form.policyAmount || 0)).toFixed(2)
-        // console.log("有责任险",this.form.supplierSettleAmount)
       }
     },
     async pictureList(){
@@ -785,6 +804,8 @@ export default {
   .rightContent{
     width: calc(100% - 90px);
     @include fontWeightSize(bold,12px);
+
+  }
   .driverPoiBtn{
     display: inline-block;
     padding: 3px 8px;
@@ -796,7 +817,6 @@ export default {
     cursor: pointer;
   }
 }
-}
 img{
   @include wh(35px,15px);
   margin-left: 21px;

src/views/workOrder/aduitCompleteDetail.vue

@@ -163,7 +163,6 @@ export default {
     this.postfix=this.$route.params?.postfix;
     this.index=this.$route.params?.index;
     this.queryTime = this.$route.params?.queryTime
-    console.log("111111111111",this.$route.params?.queryTime)
     await this.getDetail()
   },
   methods: {

src/views/workOrder/settlementDetail.vue

@@ -0,0 +1,113 @@
+<template>
+<div class="wrap">
+  <div class="navBar">
+    <van-nav-bar
+        title="结算单详情"
+        left-arrow
+        left-arrow-color="#FFFFFF"
+        :border="false"
+        :fixed="true"
+        :safe-area-inset-top="true"
+        @click-left="goback"
+    />
+  </div>
+  <div class="baseInfo">
+    <div class="itemWrap"  v-for="(item,index) in settleDetailList" :key="index">{{item.remark}}</div>
+  </div>
+
+</div>
+</template>
+
+<script>
+import {myMixins} from "@/utils/myMixins"
+
+export default {
+  name: "settlementDetail",
+  mixins:[myMixins],
+  data(){
+    return{
+      id:'',
+      postfix:'',
+      orderInfo:{},
+      index:"",
+      queryTime:'',//记录工单对账选择的时间
+      settleDetailList:[]
+    }
+  },
+  async mounted() {
+    this.id=this.$route.params?.id;
+    this.postfix=this.$route.params?.postfix;
+    this.index=this.$route.params?.index;
+    this.queryTime = this.$route.params?.queryTime
+    this.settleDetailList=this.$route.params?.settleDetailList
+    console.log(" this.settleDetailList", this.settleDetailList)
+  },
+  methods: {
+    goback(){
+      this.$router.push({
+        name:"accountingView",
+        params:{
+          id: this.id,                  // 参数对象的属性
+          postfix:this.postfix,
+          activeIndex:this.index,
+          queryTime:this.queryTime
+        }
+      })
+    },
+  }
+}
+</script>
+
+<style scoped lang="scss">
+@import "@/styles/mixin.scss";
+@import "@/styles/common.scss";
+.wrap{
+  @include wh(100%,100%);
+  background-color: #F4F5F7;
+  overflow-y: auto;
+}
+.navBar{
+  margin-bottom: 46px;
+}
+.title{
+  @include fontWeightSize(bold,14px);
+  @include colorOpa(#323643,0.66);
+}
+.line{
+  @include wh(100%,2px);
+  opacity: 0.16;
+  border-top: 1px solid;
+  margin-top: 7px;
+  border-image: linear-gradient(270deg, rgba(217, 217, 217, 0.6), rgba(178, 178, 178, 1), rgba(178, 178, 178, 1), rgba(217, 217, 217, 0.6)) 1 1;
+}
+.item{
+  @include flexCenter;
+  font-size: 12px !important;
+  font-weight: 400 !important;
+  .titleLeft{
+    opacity: .5;
+    line-height: 27px;
+  }
+}
+.itemWrap{
+  background-color: #FFFFFF;
+  margin-bottom: 10px;
+  box-sizing: border-box;
+  padding: 15px;
+}
+
+img{
+  @include wh(35px,15px);
+  margin-left: 21px;
+}
+/*.common{
+  background-color: #FFFFFF;
+  padding: 11px 24px 14px;
+  box-sizing: border-box;
+  margin-bottom: 10px;
+}*/
+.baseInfo{
+  @include wh(100%,100%);
+
+}
+</style>