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

.gitignore

@@ -6,7 +6,8 @@ node_modules
 # local env files
 .env.local
 .env.*.local
-
+/http.js
+http.js
 # Log files
 npm-debug.log*
 yarn-debug.log*

jenkins/Jenkinsfile

@@ -48,14 +48,14 @@ node {
     }
 
     stage('scp') {
-         sh 'tar zcvf rescue-h5.zip ./dist/'
+         sh 'tar zcvf supplier-dispatch-h5.zip ./dist/'
 
           for (String ip : "${params.targetIps}".split(",")) {
                  echo "ssh deploy ${ip}"
-                 sh "ssh root@${ip} 'bash -s' < '${workspace}/jenkins/file_exist.sh' rescue-h5"
+                 sh "ssh root@${ip} 'bash -s' < '${workspace}/jenkins/file_exist.sh' supplier-dispatch-h5"
 
-                 sh "scp rescue-h5.zip root@${ip}:/zd/rescue-h5/"
+                 sh "scp supplier-dispatch-h5.zip root@${ip}:/zd/supplier-dispatch-h5/"
-                 sh "ssh root@${ip} 'sudo rm -rf /zd/rescue-h5/dist && sudo tar -zxvf /zd/rescue-h5/rescue-h5.zip  -C  /zd/rescue-h5/ '"
+                 sh "ssh root@${ip} 'sudo rm -rf /zd/supplier-dispatch-h5/dist && sudo tar -zxvf /zd/supplier-dispatch-h5/supplier-dispatch-h5.zip  -C  /zd/supplier-dispatch-h5/ '"
                  sh "ssh root@${ip} 'sudo bash -s' < '${workspace}/jenkins/docker-compose-restart.sh'"
           }
     }

jenkins/Jenkinsfile_prod

@@ -48,14 +48,14 @@ node {
     }
 
     stage('scp') {
-         sh 'tar zcvf rescue-h5.zip ./dist/'
+         sh 'tar zcvf supplier-dispatch-h5.zip ./dist/'
 
           for (String ip : "${params.targetIps}".split(",")) {
                  echo "ssh deploy ${ip}"
-                 sh "ssh sasys@${ip} 'bash -s' < '${workspace}/jenkins/file_exist.sh' rescue-h5"
+                 sh "ssh sasys@${ip} 'bash -s' < '${workspace}/jenkins/file_exist.sh' supplier-dispatch-h5"
 
-                 sh "scp rescue-h5.zip sasys@${ip}:/zd/rescue-h5/"
+                 sh "scp supplier-dispatch-h5.zip sasys@${ip}:/zd/supplier-dispatch-h5/"
-                 sh "ssh sasys@${ip} 'sudo rm -rf /zd/rescue-h5/dist && sudo tar -zxvf /zd/rescue-h5/rescue-h5.zip  -C  /zd/rescue-h5/ '"
+                 sh "ssh sasys@${ip} 'sudo rm -rf /zd/supplier-dispatch-h5/dist && sudo tar -zxvf /zd/supplier-dispatch-h5/supplier-dispatch-h5.zip  -C  /zd/supplier-dispatch-h5/ '"
                  sh "ssh sasys@${ip} 'sudo bash -s' < '${workspace}/jenkins/docker-compose-restart.sh'"
           }
     }

package.json

@@ -48,7 +48,10 @@
     "parserOptions": {
       "parser": "@babel/eslint-parser"
     },
-    "rules": {}
+    "rules": {},
+    "globals":{
+      "AMap": "true"
+    }
   },
   "browserslist": [
     "> 1%",

public/index.html

@@ -25,10 +25,9 @@
     <van-number-keyboard safe-area-inset-bottom />
     <script type="text/javascript">
         window._AMapSecurityConfig = {
-        // serviceHost:'https://api.sinoassist.com/_AMapService',
+            serviceHost: 'https://api.sinoassist.com/_AMapService',
-        securityJsCode:'91ab1ebc492d5479a68b11527bd73dc9',
         }
     </script>
-    <script type="text/javascript" src="https://webapi.amap.com/maps?v=2.0&key=2560bbf04daef66c810c5e6a97e8c508&plugin=AMap.AutoComplete,AMap.PlaceSearch,AMap.Geolocation,AMap.Geocoder,AMap.Marker,AMap.Driving"></script>
+    <script src="https://webapi.amap.com/maps?v=1.4.15&key=2560bbf04daef66c810c5e6a97e8c508&plugin=AMap.Polyline"></script>
   </body>
 </html>

src/api/mine.js

@@ -165,7 +165,34 @@ export function notifyInvoiceDetail(data){
 // /supplier/supplierTrainingMaterials/pageList 获取培训材料列表
 export function pageList(data){
     return request({
-        url:'/supplier/supplierTrainingMaterials/pageList',
+        url:'/supplierAppV2/dispatchApp/user/supplierTrainingMaterialsPageList',
+        method:'POST',
+        contentType:'application/json',
+        data
+    })
+}
+//用户操作权限
+export function userOperationPermissions(){
+    return request({
+        url:'/supplierAppV2/dispatchApp/user/userOperationPermissions',
+        method:'POST',
+    })
+}
+
+// 上传图片
+export function uploadImage(data){
+    return request({
+        url:'/order/uploadImage',
+        method:'POST',
+        contentType:'multipart/form-data',
+        data
+    })
+}
+
+// ocr 识别
+export function ocrHandler(data){
+    return request({
+        url:'/agg-api/tencent-ocr/unifiedOCR',
         method:'POST',
         contentType:'application/json',
         data

src/api/order.js

@@ -25,6 +25,15 @@ export function getOrderDetail(data){
     data
   })
 }
+// 工单司机位置
+export function showVehiclePositionInfo(data){
+  return request({
+    url:'/supplierAppV2/dispatchApp/order/showVehiclePositionInfo',
+    method:'POST',
+    contentType:'application/json',
+    data
+  })
+}
 // 工单报备
 export  function orderReporting(data){
   return request({
@@ -34,6 +43,15 @@ export  function orderReporting(data){
     data
   })
 }
+// 查看报备列表
+export  function  orderReportingList(data){
+  return request({
+    url:'/supplierAppV2/dispatchApp/order/orderReportingList',
+    method:'POST',
+    contentType:'application/json',
+    data
+  })
+}
 // 获取订单结算单信息
 export function getOrderSettlement(data){
   return request({

src/api/reimbursementBatch.js

@@ -0,0 +1,90 @@
+import request from '@/utils/http'
+//司机app待报销月份
+export function waitReimburseMonth(data) {
+    return request({
+        url: '/driverApp/reimburse/waitReimburseMonth',
+        method:'POST',
+        contentType: 'application/json',
+        data
+    })
+}
+//司机app待报销列表
+export function waitReimburseList(data) {
+    return request({
+        url: '/driverApp/reimburse/waitReimburseList',
+        method:'POST',
+        contentType: 'application/json',
+        data
+    })
+}
+// 司机app提交报销批次
+export function submitReimburseBatch(data) {
+    return request({
+        url: '/driverApp/reimburse/submitReimburseBatch',
+        method:'POST',
+        contentType: 'application/json',
+        data
+    })
+}
+// 司机app已报销/报销失败列表
+export function reimbursedList(data) {
+    return request({
+        url: '/driverApp/reimburse/reimbursedList',
+        method:'POST',
+        contentType: 'application/json',
+        data
+    })
+}
+//调度App-报销批次数量
+export function reimburseBatchCount() {
+    return request({
+        url: '/supplierAppV2/dispatchApp/reimburse/reimburseBatchCount',
+        method:'POST',
+        // contentType: 'application/x-www-form-urlencoded',
+    })
+}
+// 调度App-报销批次审核
+export function reimburseBatchList(data) {
+    return request({
+        url: '/supplierAppV2/dispatchApp/reimburse/reimburseBatchList',
+        method:'POST',
+        contentType: 'application/json',
+        data
+    })
+}
+//调度App-报销批次订单数量
+export function reimburseBatchOrderCount(data) {
+    return request({
+        url: '/supplierAppV2/dispatchApp/reimburse/reimburseBatchOrderCount',
+        method:'POST',
+        contentType: 'application/json',
+        data
+    })
+}
+//调度App-报销批次订单列表
+export function reimburseBatchOrderList(data) {
+    return request({
+        url: '/supplierAppV2/dispatchApp/reimburse/reimburseBatchOrderList',
+        method:'POST',
+        contentType: 'application/json',
+        data
+    })
+}
+//调度App-报销订单详情
+export function reimburseOrderDetail(data) {
+    return request({
+        url: '/supplierAppV2/dispatchApp/reimburse/reimburseOrderDetail',
+        method:'POST',
+        contentType: 'application/json',
+        data
+    })
+}
+//调度App-报销订单审核
+export function reimburseOrderAudit(data) {
+    return request({
+        url: '/supplierAppV2/dispatchApp/reimburse/reimburseOrderAudit ',
+        method:'POST',
+        contentType: 'application/json',
+        data
+    })
+}

src/components/cellGroup.vue

@@ -5,6 +5,7 @@
         :label="label"
         :placeholder="placeholder"
         required
+        :disabled="disabled"
         @input="$emit('input', $event)"
         @blur="$emit('blurIn')"
         input-align="right"
@@ -24,11 +25,15 @@ export default {
       type:String,
       default: ''
     },
-    value: [String, Number]
+    value: [String, Number],
+    disabled:{
+      type:Boolean,
+      default:false
+    }
   },
   data(){
     return{
-        name:''
+        name:'',
     }
   },
   mounted() {

src/components/twoBtnCommon.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="btn">
-    <button class="cancel" @click="noMultipleClicks(cancelClick)">{{ title1 }}</button>
+    <button :class=" { 'loading1': loading1, 'cancel' : title1 == '取消', 'submit' : title1 != '取消' } "  @click="noMultipleClicks( title1 == '提交' ? submitClick1 :cancelClick )">{{ title1 }}</button>
-    <button class="submit" @click="noMultipleClicks(submitClick)">{{ title2}}</button>
+    <button  class="submit" @click="noMultipleClicks(submitClick)" :class="{'loading': loading}">{{ title2}}</button>
   </div>
 </template>
 
@@ -12,7 +12,9 @@ export default {
   mixins:[myMixins],
   data(){
     return{
-      noClick:true
+      noClick:true,
+      loading: false,
+      loading1: false
     }
   },
   props:{
@@ -30,7 +32,32 @@ export default {
       this.$emit('cancelClick')
     },
     submitClick(){
+      // 设置 loading 状态
+      this.loading = true;
+
+      // 模拟异步请求
+      setTimeout(() => {
+        // 处理请求结果
+        // ...
         this.$emit('submitClick')
+        // 重置 loading 状态
+        this.loading = false;
+      }, 2000);
+
+    },
+    submitClick1(){
+      // 设置 loading1状态
+      this.loading1 = true;
+
+      // 模拟异步请求
+      setTimeout(() => {
+        // 处理请求结果
+        // ...
+        this.$emit('submitClick1')
+        // 重置 loading1 状态
+        this.loading1 = false;
+      }, 2000);
+
     }
   }
 }
@@ -39,6 +66,32 @@ export default {
 <style scoped lang="scss">
 @import "@/styles/mixin.scss";
 @import "@/styles/common.scss";
+.loading,.loading1 {
+  position: relative;
+}
+
+.loading::after,.loading1::after {
+  content: '';
+  position: absolute;
+  top: 50%;
+  left: 50%;
+  transform: translate(-50%, -50%);
+  width: 20px;
+  height: 20px;
+  border: 2px solid #000;
+  border-top-color: transparent;
+  border-radius: 50%;
+  animation: spin 1s linear infinite;
+}
+
+@keyframes spin {
+  0% {
+    transform: translate(-50%, -50%) rotate(0deg);
+  }
+  100% {
+    transform: translate(-50%, -50%) rotate(360deg);
+  }
+}
 .btn{
   @include flexColBet;
   button{
@@ -54,4 +107,5 @@ export default {
     background-color: #354D93;
   }
 }
+
 </style>

src/router/index.js

@@ -23,6 +23,14 @@ const routes = [
         title: '报备'
       }
     },
+    {
+        path: "/reportingList",
+        name: 'reportingList',
+        component: () => import('@/views/index/reportingList.vue'),
+        meta: {
+            title: '查看报备'
+        }
+    },
     {
       path: "/workOrderDetail",
       name: 'workOrderDetail',
@@ -62,7 +70,14 @@ const routes = [
         meta: {
             title: '审核完成-详情'
         }
-
+    },
+    {
+        path: "/settlementDetail",
+        name: 'settlementDetail',
+        component: () => import('@/views/workOrder/settlementDetail.vue'),
+        meta: {
+            title: '结算单详情'
+        }
     },
     {
       path: "/invoicingNotify",
@@ -127,6 +142,46 @@ const routes = [
         meta: {
             title:'文档资料'
         }
+    },
+    {
+        path: '/caseList',
+        name: 'caseList',
+        component:()=>import('@/views/caseList/caseList.vue'),
+        meta: {
+            title:'案件列表'
+        }
+    },
+    {
+        path: '/driverCaseList',
+        name: 'driverCaseList',
+        component:()=>import('@/views/driverCaseList/driverCaseList.vue'),
+        meta: {
+            title:'司机app案件列表'
+        }
+    },
+    {
+        path: '/caseAuditList',
+        name: 'caseAuditList',
+        component:()=>import('@/views/caseList/caseAuditList.vue'),
+        meta: {
+            title:'案件审核列表'
+        }
+    },
+    {
+        path: '/caseDetail',
+        name: 'caseDetail',
+        component:()=>import('@/views/caseList/caseDetail.vue'),
+        meta: {
+            title:'案件详情'
+        }
+    },
+    {
+        path: '/newTrainingList',
+        name: 'newTrainingList',
+        component:()=>import('@/views/newcomerTraining/newTrainingList.vue'),
+        meta: {
+            title:'新人培训'
+        }
     }
   ]
 

src/styles/common.scss

@@ -8,9 +8,6 @@ select{
   background-color: transparent; /* 设置透明背景色 */
   border: none;              /* 取消边框 */
   outline: none;
-    /* 右侧添加箭头的背景图  自行调整位置 */
-    //background: url('@/assets/copy.png') 20px center no-repeat #fff;
-
 }
 .van-toast--html, .van-toast--text {
   z-index: 100000000002 !important;

src/styles/docment.scss

@@ -0,0 +1,62 @@
+@import "@/styles/mixin.scss";
+.wrap{
+  @include wh(100%,100%);
+  background-color: #F4F5F7;
+  overflow-y: auto;
+}
+.navBar{
+  margin-bottom: 46px;
+}
+.rightWrap {
+  @include flexCenter;
+  .img2 {
+    @include wh(17px, 17px);
+  }
+}
+.contentWrap{
+  @include sizingPadding(0,8px);
+  width: 100%;
+  margin-top: 20px;
+  .itemWrap{
+    margin-bottom: 16px;
+    @include wh(100%, 300px);
+    background: #FFFFFF;
+    box-shadow: 0px 2px 10px 0px rgba(216, 216, 216, 0.5);
+    @include sizingPadRadius(6px ,0,3px);
+    @include flexAround;
+    @include fontWeightSize(400, 12px);
+    .flexBetween{
+      @include flexColBet;
+    }
+    .common{
+      margin: 0 15px ;
+    }
+    .imgWrap{
+      @include wh(100%,200px);
+      position: relative;
+      img{
+        @include wh(100%,200px);
+      }
+      .name{
+        position: absolute;
+        left: 30px;
+        bottom: 30px;
+        @include fontWeightSize(bold,14px);
+        color: #FFFFFF;
+      }
+    }
+    .left{
+      color: red;
+      @include fontWeightSize(bold,15px);
+    }
+  }
+
+}
+.empty{
+  @include flexTwoCenter;
+  height:calc(100% - 86px);
+  background-color: #FAFAFA;
+  img{
+    width: 100%;
+  }
+}

src/styles/mixin.scss

@@ -31,11 +31,48 @@
     @include flexColumn;
     justify-content: space-between;
 }
+@mixin flexAround(){
+    @include flexColumn;
+    justify-content: space-around;
+}
 @mixin flexColBet(){
     display: flex;
     justify-content: space-between;
 }
+@mixin flexColAround(){
+    display: flex;
+    justify-content: space-around;
+}
 @mixin flexCenter(){
     display: flex;
     align-items: center;
 }
+@mixin flexBetCen{
+    @include flexColBet;
+    align-items: center;
+}
+@mixin flexTwoCenter(){
+    @include flexCenter;
+    justify-content: center;
+}
+@mixin colorOpa($col,$alpha){
+    color: $col;
+    opacity: $alpha;
+}
+@mixin bgcolorOpa($col,$alpha){
+    background: $col;
+    opacity: $alpha;
+}
+@mixin radiusSizing($rad){
+    border-radius: $rad;
+    box-sizing: border-box;
+}
+@mixin sizingPadding($tb,$lr){
+    box-sizing: border-box;
+    padding: $tb $lr;
+}
+@mixin sizingPadRadius( $tb,$lr,$rad){
+    box-sizing: border-box;
+    padding: $tb $lr;
+    border-radius: $rad;
+}

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/utils/http.js

@@ -15,13 +15,20 @@ let token = urlParams.get('token') ;
 localStorage.setItem('token', token);
 service.interceptors.request.use(
     config => {
+      let reqUrl=config.url
       config.data = config.contentType ? config.data : qs.stringify(config.data)
       config.headers['Content-Type'] = config.contentType || 'application/x-www-form-urlencoded'
-        const token = localStorage.getItem('token');
+      let token = localStorage.getItem('token');
-      // const urlParams = new URLSearchParams(window.location.search);
+       // alert(token);
-      // const token = urlParams.get('token') ;
+      // let token='4099761587129c46b03c9316c9e866c9'
-      // let token='eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiJzemwiLCJhdWQiOlsic3VwcGxpZXItYXBwIl0sIm5iZiI6MTY5Mjc3MzMxMSwidXNlcl9pbmZvIjp7InVzZXJJZCI6NTQ1ODUsInBob25lIjoiMTc2MzAwMzU2NTgiLCJuYW1lIjoi5bCP5a6LIiwic3VwcGxpZXJOYW1lIjoi5LiK5rW35a6J55WFQSIsInN1cHBsaWVySWQiOjExMjgsInN1cHBsaWVyVHlwZSI6MSwidXNlcm5hbWUiOiJzemwiLCJ1c2VyVHlwZSI6IkFQUCIsImF1dGhvcml0aWVzIjpbXX0sInNjb3BlIjpbImFsbCJdLCJpc3MiOiJodHRwczovL3Npbm9hc3Npc3QuY29tIiwiZXhwIjoxNjkyODU5NzExLCJpYXQiOjE2OTI3NzMzMTF9.bFTJlX73vYl06ncE6Ge5_qtbEwRNFZwXhzNjMXzikkE'
+      // let token='eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiJzb25nIiwiYXVkIjpbInN1cHBsaWVyLWFwcCJdLCJuYmYiOjE3MTI0NTQ5NTMsInVzZXJfaW5mbyI6eyJ1c2VySWQiOjU0NjU0LCJwaG9uZSI6IjE3NjMwMDM1NjU4IiwibmFtZSI6InNvbmciLCJzdXBwbGllck5hbWUiOiJDLeS4iua1t-a1i-ivleacjeWKoeWVhiIsInN1cHBsaWVySWQiOjMzMDQxLCJzdXBwbGllclR5cGUiOjIsInVzZXJuYW1lIjoic29uZyIsInVzZXJUeXBlIjoicmVzY3VlQXBwIiwiZGV2aWNlSWQiOiIyMmI0OWNhMjBmOWI4MzMwZDk4NzIxNzNmMzllYTY4YmMiLCJhdXRob3JpdGllcyI6W119LCJzY29wZSI6WyJhbGwiXSwiaXNzIjoiaHR0cHM6Ly9zaW5vYXNzaXN0LmNvbSIsImV4cCI6MTcxMjU0MTM1MywiaWF0IjoxNzEyNDU0OTUzfQ.sPU9_OD_TOWcTwqmlawEGyo4mCPrEaRYw2R02gnvYJw'
+          // console.log("tokentokentoken",token)
+      if (reqUrl.includes("/driverApp")) {
+          config.headers['token'] = `${token}`;
+      } else {
+          console.log("调度app")
           config.headers['Authorization'] = `${token}`;
+      }
       return config
     },
     error => {

src/utils/myMixins.js

@@ -34,6 +34,21 @@ export const myMixins = {
         window.android.sendMessage("goBack");
       }
     },
+    goH5Detail(item){//h5传参到app文档资料，培训文档
+      let data = {
+        "action": "goTraining",
+        "params": {
+          "id": item.id,
+        }
+      };
+      let u = navigator.userAgent;
+      let isiOS = !!u.match(/\(i[^;]+;( U;)? CPU.+Mac OS X/);
+      if(isiOS){
+        window.webkit.messageHandlers.nativeObject.postMessage(data);
+      }else {
+        window.android.sendMessage("articleId=" + item.id);
+      }
+    },
     h5GoBack(){
       this.$router.back();
     },

src/views/caseList/caseAuditList.vue

@@ -0,0 +1,333 @@
+<template>
+  <div class="wrap">
+    <div class="navBar">
+      <van-nav-bar
+          title="案件审核列表"
+          :left-arrow="isShowBackBtn ? true : false"
+          left-arrow-color="#FFFFFF"
+          :border="false"
+          :fixed="true"
+          :safe-area-inset-top="true"
+          @click-left="goPrePage"
+      />
+    </div>
+    <div class="tab_wrap">
+      <div v-for="(item, index) in tabArr" :key="index"
+           @click="changeTab(index)">
+        <span :class="{'active' : activeIndex == index , 'alpha' :true}"> {{ item.name }}</span>
+        <span class="numTip" style="opacity: 1 !important;">{{item.num}}</span>
+      </div>
+    </div>
+    <van-pull-refresh class="refresh" v-model="isLoading" @refresh="onRefresh" v-show="!show">
+      <div class="listWrap">
+        <div class="listItem" v-for="(item,index) in pageList" :key="index" @click="noMultipleClicks(goPageDetail,item.id)">
+          <div class="line1">
+            <div><span>案件编号:</span><span>{{ item.userOrderCode }}</span></div>
+            <div class="right">
+              <img class="commonImg" :src="getStatus(item.state.code)">
+              <div :class="getStatusColor(item.state.code)">{{item.state.label}}</div>
+              <img class="rightArrImg"  src="@/assets/list_rightArrow.png">
+            </div>
+          </div>
+          <div><span>报销金额:</span><span>{{ item.reimburseAmount }}元</span></div>
+          <div v-show="activeIndex == 2"><span>审核备注:</span><span style="color: #FF5D2E">{{ item.auditRemark }}</span></div>
+        </div>
+      </div>
+
+    </van-pull-refresh>
+    <div class="bgEmptyImg" v-show="show" >
+      <img  src="@/assets/empty.png" />
+    </div>
+  </div>
+
+</template>
+
+<script>
+import {myMixins} from "@/utils/myMixins";
+import {reimburseBatchOrderCount,reimburseBatchOrderList } from "@/api/reimbursementBatch";
+export default {
+  name: "caseAuditList",
+  mixins: [myMixins],
+  data(){
+    return{
+      tabArr: [ {name: '审核通过', status: 2,num:0},{name: '审核不通过', status: 2,num:0},],
+      activeIndex: 0,
+      pageList:[],
+      pageNum:1,
+      pageSize:10,
+      id:'',//批次id
+      isLoading:"",
+      isShowBackBtn:true,
+      backBtn:false,
+      type:'',//用于判断是已审核还是待审核,已审核只有两个tab切
+      noClick:true,
+      getUrlId:'',
+    }
+  },
+  computed:{
+    show() {
+      return (this.pageList.length < 0 || this.pageList.length == 0); // 判断数组长度是否大于 0
+    },
+  },
+  created() {
+
+  },
+  async mounted() {
+    // 获取当前 URL
+    const urlParams = new URLSearchParams(window.location.search);
+    if(urlParams.get('id')){//后台进入此页面没有返回按钮
+      this.isShowBackBtn=false
+    }else{
+      this.isShowBackBtn=true
+    }
+    this.backBtn=this.$route.params.isShowBtn
+    if(this.backBtn){
+      this.isShowBackBtn=false
+    }
+    // console.log(" this.backBtn", this.backBtn)
+    this.getUrlId=urlParams.get('id')
+    this.id = urlParams.get('id') || this.$route.params.id  || this.$route.params.batchCode;
+    this.activeIndex=this.$route.params?.activeIndex || 0
+    this.type=this.$route.params?.type
+    // console.log("urlParams.get('status')",urlParams.get('status'))
+    if (urlParams.get('status')){
+      this.type=urlParams.get('status')
+    }
+    if (this.type==1 || (urlParams.get('status') && urlParams.get('status') == 1)) {
+      this.tabArr.unshift({name: '待审核', status: 1,num:0},);
+    }
+    await this.batchOrderCount();
+    await this.getList()
+  },
+  methods:{
+    goPrePage(){
+      this.$router.push({
+        name: 'caseList',
+        params: {
+          type: this.type
+        }
+      });
+    },
+    onRefresh() {
+      this.getList()
+      setTimeout(() => {
+        this.$toast('刷新成功');
+        this.isLoading = false;
+      }, 1000);
+    },
+    async changeTab(index) {
+      this.activeIndex = index
+      this.pageNum = 1
+      this.pageList = [];
+      await this.getList()
+    },
+    async getList(){
+      let res=await reimburseBatchOrderList ({
+        pageNum:this.pageNum,
+        pageSize:this.pageSize,
+        batchCode:this.id,
+        type:this.tabArr.length==3 ? this.activeIndex+1 : this.activeIndex+2
+      })
+      this.pageList=res.data
+    },
+    async batchOrderCount(){
+      let res  =await reimburseBatchOrderCount({
+        batchCode:this.id
+      })
+      this.tabArr.forEach(tab => {
+        if (tab.name === '待审核') {
+          tab.num = res.data.waitAuditCount;
+        } else if (tab.name === '审核通过') {
+          tab.num = res.data.auditSuccessCount;
+        }else{
+          tab.num = res.data.auditFailCount;
+        }
+      });
+    },
+    goPageDetail(id){
+      this.$router.push({
+        name: 'caseDetail',  // 目标路由的名称
+        params: {
+          id:id,
+          index:this.activeIndex,
+          batchCode:this.id,
+          getUrlId:this.getUrlId,
+          type:this.type,}
+      });
+
+    },
+    getStatus(i){
+      switch (i){
+        case 0://待提交
+        case 1://待审核
+          return require('@/assets/waitSubmit.png')
+        case 2://审核通过
+        case 7://已打款
+          return require('@/assets/dakuan.png')
+        case 3://审核不通过
+          return require('@/assets/unpass.png')
+        case 4://报销失败
+          return require('@/assets/unSubmit.png')
+        case 6://代打款
+          return require('@/assets/waitDakuan.png')
+        default:
+          return require('@/assets/waitSubmit.png')
+      }
+    },
+    getStatusColor(i){
+      switch (i){
+        case 0://待提交
+        case 1://待审核
+          return 'yelColor'
+        case 2://审核通过
+        case 6://代打款
+        case 7://已打款
+          return 'greColor'
+        case 3://审核不通过
+          return 'oraColor'
+        case 4://报销失败
+          return 'garyColor'
+        default:
+          return 'yelColor'
+      }
+    },
+  }
+}
+</script>
+
+<style scoped lang="scss">
+@import "@/styles/mixin.scss";
+@import "@/styles/common.scss";
+.refresh{
+  min-height: 100%;
+  background-color: #F4F5F7;
+}
+.wrap{
+  @include wh(100%,100%);
+  box-sizing: border-box;
+}
+.navBar{
+  margin-bottom: 46px;
+}
+/*::v-deep .van-nav-bar__content{
+  background-color: #354683 !important;
+}*/
+.tab_wrap {
+  @include fontWeightSize(500, 14px);
+  @include flexColAround();
+  padding: 2px 0 10px 0;
+  background: #2C395F;
+  div {
+    padding-top: 8px;
+    color: #FFFFFF;
+  }
+  .alpha{
+    opacity: 0.5;
+  }
+  .numTip{
+    display: inline-block;
+    @include wh(15px,15px);
+    @include bgcolorOpa(#F95B45,0.9);
+    border-radius: 4px;
+    text-align: center;
+    line-height: 15px;
+    margin-left: 5px;
+    opacity: 1; /* 保持透明度为1 */
+  }
+  .active {
+    position: relative;
+    opacity: 1;
+  }
+  .active:after {
+    content: '';
+    display: block;
+    @include wh(18px,2px);
+    opacity: .8;
+    background: #FFFFFF;
+    position: absolute;
+    border-radius: 2px;
+    margin-top: 3px;
+    left: 50%;
+    opacity: 1;
+    transform: translateX(-50%);
+  }
+}
+::v-deep .van-pull-refresh{
+  height: calc(100% - 86px) ;
+}
+.listWrap{
+  width: 100%;
+  //height: calc(100% - 86px);
+  height: 100%;
+  overflow-y: auto;
+
+  .listItem{
+    width: 100%;
+    box-sizing: border-box;
+    padding: 14px 25px 13px 29px;
+    background-color: #FFFFFF;
+    margin-bottom: 10px;
+    .line1{
+      @include flexColBet();
+      .viewBtn{
+        @include wh(48px,18px);
+        text-align: center;
+        line-height: 18px;
+        background: #354D93;
+        border-radius: 3px;
+        color: #FFFFFF;
+      }
+    }
+    div{
+      line-height: 27px;
+      span:first-child{
+        display: inline-block;
+        width: 60px;
+        opacity: 0.5;
+      }
+      .right{
+        @include flexCenter();
+      }
+    }
+  }
+}
+.bgEmptyImg{
+  @include flexTwoCenter;
+  height: 90% ;
+  background-color: #FAFAFA;
+  img{
+    width: 100%;
+  }
+}
+.greColor{
+  color:#38AD00 ;
+  font-weight: 500;
+}
+.redColor{
+  color:#FF5D2E ;
+  font-weight: 500;
+}
+.commonImg{
+  @include widHeiMar(13px,13px,4px);
+}
+.rightArrImg{
+  @include wh(6px,9px);
+  margin-left: 6px;
+}
+.yelColor{
+  color: #E69B0B;
+  font-weight: 600;
+}
+.greColor{
+  color: #56B628;
+  font-weight: 600;
+}
+.oraColor{
+  color: #FF5D2E;
+  font-weight: 600;
+}
+.garyColor{
+  color: #9C9C9C;
+  font-weight: 600;
+}
+</style>

src/views/caseList/caseDetail.vue

@@ -0,0 +1,624 @@
+<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="goPrePage"
+      />
+    </div>
+<!--    h5GoBack-->
+    <div class="listWrap">
+     <div class="mapWrap">
+       <div>{{ detailInfo.userOrderCode }}</div>
+       <div class="map">
+         <div class="title">
+           <div><span>司机姓名:</span><span>{{ detailInfo.driverName }}</span></div>
+           <div><span>车牌号:</span><span>{{ detailInfo.plateNumber }}</span></div>
+         </div>
+         <div class="mapContainer"    id="container"></div>
+       </div>
+       <div class="wiadgeWrap">
+          <div class="lineWrap">
+            <div class="left">
+              <img class="commonImg" :src="detailInfo.bridgeAbUrl">
+              <span class="free">AB(出发段)路桥费</span>
+              <span>{{detailInfo.settleMileageAb}}公里</span>
+            </div>
+            <div class="right">
+              <span>{{detailInfo.bridgeAmountAb}}</span>
+              <span>元</span>
+            </div>
+          </div>
+          <div class="line"></div>
+         <div class="lineWrap">
+           <div class="left">
+             <img class="commonImg" :src="detailInfo.bridgeBcUrl">
+             <span class="free">BC(出发段)路桥费</span>
+             <span>{{detailInfo.settleMileageBc}}公里</span>
+           </div>
+           <div class="right">
+             <span>{{detailInfo.bridgeAmountBc}}</span>
+             <span>元</span>
+           </div>
+         </div>
+         <div class="line"></div>
+         <div class="lineWrap">
+           <div class="left">
+             <img class="commonImg" :src="detailInfo.bridgeCaUrl">
+             <span class="free">CA(出发段)路桥费</span>
+             <span>{{detailInfo.settleMileageCa}}公里</span>
+           </div>
+           <div class="right">
+             <span>{{detailInfo.bridgeAmountCa}}</span>
+             <span>元</span>
+           </div>
+         </div>
+         <div class="line"></div>
+         <div class="totalFree">
+           <span>总金额</span>
+           <span>{{ detailInfo.bridgeAmountAb+detailInfo.bridgeAmountBc+detailInfo.bridgeAmountCa }}</span>
+           <span>元</span>
+         </div>
+       </div>
+     </div>
+      <template  v-if="detailInfo.state.code == 1">
+        <div class="aduit">
+          <div  :class="{itemWrap : true,aduitResult: detailInfo.secondAudit}">
+            <div>
+              <span class="star">*</span>
+              <span>{{detailInfo.secondAudit ? '二次审核结果' : '审核结果'}}</span>
+            </div>
+            <div class="isJoin">
+              <van-radio-group v-model="states" @change="isUse"  class="joinWrap">
+                <van-radio :name="2" style="margin-right: 26px" class="item">
+                  通过
+                  <img
+                      slot="icon"
+                      slot-scope="props"
+                      :src="props.checked ? activeIcon : inactiveIcon"
+                  >
+                </van-radio>
+                <template v-if="detailInfo.secondAudit">
+                  <van-radio  :name="4"  class="item">报销失败
+                    <img
+                        slot="icon"
+                        slot-scope="props"
+                        :src="props.checked ? activeIcon : inactiveIcon"
+                    >
+                  </van-radio>
+                </template>
+                <template v-else>
+                  <van-radio  :name="3"  class="item">
+                    不通过
+                    <img
+                        slot="icon"
+                        slot-scope="props"
+                        :src="props.checked ? activeIcon : inactiveIcon"
+                    >
+                  </van-radio>
+                </template>
+              </van-radio-group>
+            </div>
+          </div>
+          <div class="itemWrap"  v-if="states == 3 || states == 4">
+            <div>
+              <div>
+                <span class="star">*</span>
+                <span>不通过原因</span>
+              </div>
+            </div>
+            <van-dropdown-menu active-color="#354683" direction="up">
+                <van-dropdown-item v-model="other" :options="option"   @change="changeOption">
+                  <template #title>
+                    <span v-if="!other">请选择</span>
+                    <span v-else>{{ other }}</span>
+                  </template>
+                </van-dropdown-item>
+            </van-dropdown-menu>
+          </div>
+          <div v-show="other == '其他'">
+            <div>其他原因</div>
+            <textarea v-model="otherReason" class="multipleTxt" placeholder="描述"></textarea>
+          </div>
+        </div>
+      </template>
+      <template v-else>
+       <div class="aduit" style="line-height: 20px">
+         <div  class="itemWrap" >
+           <div> {{ result }}</div>
+           <div class="gary">{{detailInfo.state.label}}
+         </div>
+         </div>
+         <div class="itemWrap"  v-if="detailInfo.state.code == 3 || detailInfo.state.code == 4">
+           <div>不通过原因 </div>
+           <div class="gary">{{detailInfo.auditRemark.includes('/') ? detailInfo.auditRemark.substring(0,2) : detailInfo.auditRemark}}</div>
+         </div>
+         <div class="itemWrap" v-show="detailInfo.auditRemark.substring(0,2) == '其他'">
+           <div>其他原因</div>
+           <div class="gary" style="flex: 1;width: 75%;text-align: end">{{detailInfo.auditRemark}}</div>
+         </div>
+       </div>
+     </template>
+     <div  v-if="detailInfo.state.code == 1" class="submitBtn" @click="noMultipleClicks(submitHandle)">提交</div>
+   </div>
+  </div>
+
+</template>
+
+<script>
+import {myMixins} from "@/utils/myMixins";
+import {reimburseOrderDetail,reimburseOrderAudit} from  "@/api/reimbursementBatch"
+import minePosition from "@/assets/realApoint.png";
+import vehiclePosition from "@/assets/realBpoint.png";
+import desitationPosition from "@/assets/realCpoint.png";
+export default {
+  name: "caseDetail",
+  mixins: [myMixins],
+  data(){
+    return{
+      states:'',
+      activeIcon: require('@/assets/check.png'),
+      inactiveIcon: require('@/assets/uncheck.png'),
+      otherReason:'',
+      other:'',
+      firstSubmit:2,
+      id:'',
+      detailInfo:{},
+      noClick:true,
+      state:'',//审核状态
+      map: '',
+      abPath:[],
+      bcPath:[],
+      activeIndex:'',
+      batchCode:'',
+      isShowBtn:false,
+      type:'',
+      option: [
+        { text: '缺失凭证照片', value: '缺失凭证照片' },
+        { text: '申请金额与凭证不一致', value: '申请金额与凭证不一致' },
+        { text: '非正常产生路桥费', value: '非正常产生路桥费' },
+        { text: '其他', value: '其他' },
+
+      ],
+    }
+  },
+  created() {
+    this.id = this.$route.params.id;
+    // this.id=29
+    this.activeIndex=this.$route.params.index;
+    this.batchCode=this.$route.params.batchCode
+    this.isShowBtn=this.$route.params.getUrlId
+    this.type=this.$route.params?.type
+    console.log("created",this.type)
+    console.log(" this.isShowBackBtn",this.isShowBackBtn)
+  },
+  async mounted(){
+    await this.getOrderDetail()
+    this.$nextTick(() => {
+      this.initMap();
+    });
+  },
+  computed:{
+    result() {
+      if (this.detailInfo.secondAudit) {
+        if(this.detailInfo.state.code != 3){
+          return '二次审核结果';
+        }else{
+          return '审核结果';
+        }
+      } else {
+        return '审核结果';
+      }
+    },
+  },
+  methods:{
+    changeOption(){
+      console.log("99999",this.other)
+    },
+    goPrePage(){
+      this.$router.push({
+        name: 'caseAuditList',  // 目标路由的名称
+        params: {
+          activeIndex:this.activeIndex,
+          batchCode:this.batchCode,
+          isShowBtn:this.isShowBtn,
+          type:this.type
+        }
+      });
+    },
+    initMap() {
+      this.map = new AMap.Map('container',{
+        zoom:14,//级别(缩放比例 3-20 )
+        center: [this.detailInfo.apointLongtitude,this.detailInfo.apointLatitude],//中心点坐标
+        viewMode:'2D',//使用3D视图
+      })
+      this.map.on('complete', () => {
+        this.mapMarkers();
+      });
+    },
+    mapMarkers(){
+      let ABpolyline=''
+      let BCpolyline=''
+      if(this.abPath && this.abPath.length>0){
+        ABpolyline = new AMap.Polyline({
+          path: [...this.abPath],
+          strokeColor: '#005DC7', // 路径线颜色
+          strokeWeight: 5 ,// 路径线宽度
+          showDir: true // 显示箭头
+        });
+        this.map.add(ABpolyline);
+      }
+      if(this.bcPath && this.bcPath.length>0){
+        BCpolyline = new AMap.Polyline({
+          path: [...this.bcPath],
+          strokeColor: '#005DC7 ', // 路径线颜色
+          strokeWeight: 5 ,// 路径线宽度
+          showDir: true // 显示箭头
+        });
+        this.map.add(BCpolyline);
+      }
+      // 车辆位置，a点
+      let marker = new AMap.Marker({
+        position: [this.detailInfo?.apointLongtitude,this.detailInfo?.apointLatitude],
+        icon: new AMap.Icon({
+          image: minePosition, // 图片的相对路径
+          size: new AMap.Size(43, 43),  // 图标的尺寸
+          imageSize: new AMap.Size(43, 43)  // 图片的实际尺寸
+        }),
+      });
+      this.setLabel(marker,this.detailInfo.apointAddress)
+      this.map.add(marker);
+      // 事发地，b点
+      let marker1 = new AMap.Marker({
+        position: [this.detailInfo?.bpointLongtitude,this.detailInfo?.bpointLatitude],
+        icon: new AMap.Icon({
+          image: vehiclePosition, // 图片的相对路径
+          size: new AMap.Size(43, 43),  // 图标的尺寸
+          imageSize: new AMap.Size(43, 43)  // 图片的实际尺寸
+        })
+      });
+      this.setLabel(marker1,this.detailInfo.bpointAddress)
+      this.map.add(marker1);
+      let marker2=''
+      if(this.detailInfo.cpointLongtitude && this.detailInfo.cpointLatitude){
+          marker2 = new AMap.Marker({
+               position: [this.detailInfo?.cpointLongtitude,this.detailInfo?.cpointLatitude],
+               icon: new AMap.Icon({
+                 image: desitationPosition, // 图片的相对路径
+                 size: new AMap.Size(28, 28),  // 图标的尺寸
+                 imageSize: new AMap.Size(28, 28)  // 图片的实际尺寸
+               })
+             });
+        this.setLabel(marker2,this.detailInfo.cpointAddress)
+        this.map.add(marker2);
+      }
+      if(this.detailInfo.cpointLongtitude && this.detailInfo.cpointLatitude){
+        this.map.setFitView([marker,marker1,marker2])
+      }else{
+        this.map.setFitView([marker,marker1])
+      }
+    },
+    setLabel(markerPoint,address){
+      markerPoint.setLabel({
+        offset: new AMap.Pixel(0, 0),  //设置文本标注偏移量
+        content: address, //设置文本标注内容
+        direction: 'top'
+      });
+    },
+    async submitHandle(){
+      if(!this.states){
+          this.$toast('审核结果必选')
+          return
+      }
+      if(this.states != 2  && !this.other){
+        this.$toast('审核不通过原因必填')
+        return
+      }
+      if(this.other == '其他'  && !this.otherReason){
+        this.$toast('审核不通过原因为其他时审核原因必填')
+        return
+      }
+      let res=''
+      try {
+        res = await reimburseOrderAudit({
+          id: this.id,
+          state: this.state,
+          auditRemark: this.other == '其他' ? this.other + '/' + this.otherReason : this.other,
+        })
+      } catch (e) {
+        // this.$toast(e.error)
+      }
+      if(res.code == 200){
+        this.$toast("提交成功")
+        setTimeout(()=>{
+          this.goPrePage()
+        },1500)
+      }else{
+        this.$toast(res.msg)
+      }
+    },
+    isUse(e){
+      this.state=e
+    },
+    async getOrderDetail(){
+      let res=await reimburseOrderDetail({
+        id:this.id
+      })
+      this.detailInfo=res.data
+      if(this.detailInfo.gpsTrackQOsAB && this.detailInfo.gpsTrackQOsAB .length > 0){
+        this.detailInfo?.gpsTrackQOsAB.forEach((item)=>{
+          this.abPath.push([item.lon,item.lat])
+        })
+      }
+      if(this.detailInfo.gpsTrackQOsBC && this.detailInfo.gpsTrackQOsBC .length > 0){
+        this.detailInfo?.gpsTrackQOsBC.forEach((item)=>{
+          this.bcPath.push([item.lon,item.lat])
+        })
+      }
+    },
+  }
+}
+</script>
+
+<style scoped lang="scss">
+@import "@/styles/mixin.scss";
+@import "@/styles/common.scss";
+.wrap{
+  @include wh(100%,100%);
+  box-sizing: border-box;
+}
+::v-deep .van-dropdown-menu__bar {
+  background-color: #FFFFFF !important; /* 去掉边框 */
+  box-shadow: none !important; /* 去掉阴影（如果有的话）*/
+}
+/*.mySelect{
+  @include fontWeightSize(bold,13px);
+  color: #323643;
+  appearance: none;
+  padding-right: 16px;
+  background: url('@/assets/arrow_bot.png') no-repeat right center / 15px 14px;
+  text-align: right; !* 将下拉列表的文本右对齐 *!
+}
+.mySelect {
+  -webkit-appearance: none; !* 移除默认的样式 *!
+  -moz-appearance: none;
+  appearance: none;
+  position: relative;
+  z-index: 1;
+}
+
+.mySelect::after {
+  content: "";
+  position: absolute;
+  top: 50%;
+  right: 10px;
+  transform: translateY(-50%);
+  pointer-events: none;
+  border-style: solid;
+  border-width: 6px 6px 0 6px;
+  border-color: #000 transparent transparent transparent;
+}*/
+.navBar{
+  margin-bottom: 46px;
+}
+::v-deep .van-nav-bar__content{
+  background-color: #354683 !important;
+}
+.listWrap{
+  width: 100%;
+  height: calc(100% - 46px);
+  overflow-y: auto;
+  background-color: #F4F5F7;
+  box-sizing: border-box;
+  padding: 10px 8px;
+  position: relative;
+  .mapWrap{
+    @include wh(100%,407px);
+    background-color: #FFFFFF;
+    border-radius: 6px;
+    margin-bottom: 15px;
+    box-sizing: border-box;
+    padding: 9px 8px 0;
+    .map{
+      @include wh(100%,204px);
+      border-radius: 4px;
+      border: 1px solid #F0F0F0;
+      margin-top: 7px;
+      margin-bottom: 13px;
+      .title{
+        @include wh(100%,31px);
+        line-height: 31px;
+        background: #F9FCFF;
+        border-radius: 0px 0px 6px 6px;
+        display: flex;
+        div{
+          width: 50%;
+          margin-left: 17px;
+          font-size: 12px;
+          span:first-child{
+            display: inline-block;
+            color: #555A68;
+            margin-right: 3px;
+          }
+          span:last-child{
+            color: #3A3A3A;
+          }
+        }
+      }
+      .mapContainer{
+        @include wh(100%,173px)
+      }
+    }
+  }
+  .wiadgeWrap{
+    box-sizing: border-box;
+    padding: 0 6px;
+    .lineWrap{
+      @include flexBetCen();
+      line-height: 32px;
+      .left{
+        @include flexCenter();
+        img{
+          @include wh( 48px,31px);
+        }
+        .free{
+          margin: 0 11px;
+          @include fontWeightSize(bold,13px);
+          @include colorOpa(#000000,0.9);
+        }
+        span:last-child{
+          font-size: 12px;
+          color: #555A68;
+        }
+      }
+      .right{
+        span:first-child{
+          @include fontWeightSize(bold,18px);
+          @include colorOpa(#000000,0.75);
+        }
+        span:last-child{
+          @include fontWeightSize(bold,10px);
+          @include colorOpa(#000000,0.8);
+          margin-left: 4px;
+        }
+      }
+    }
+    .line{
+      width: 100%;
+      border-bottom: 1px solid #E9E9EA;
+      opacity: 0.6;
+      margin-top: 2px;
+    }
+    .totalFree{
+      width: 100%;
+      line-height: 42px;
+      @include flexCenter();
+      justify-content: flex-end;
+      span:first-child{
+        @include fontWeightSize(bold,13px);
+        @include colorOpa(#000000,0.9);
+      }
+      span:nth-child(2){
+        @include fontWeightSize(600,22px);
+        color: #FF5D2E;
+        margin: 0 3px 0 9px;
+      }
+      span:last-child{
+        @include fontWeightSize(bold,10px);
+        @include colorOpa(#000000,0.8);
+      }
+    }
+  }
+  .aduit{
+    width: 100%;
+    background-color: #FFFFFF;
+    //height: 201px;
+    line-height: 37px;
+    border-radius: 6px;
+    margin-bottom: 15px;
+    box-sizing: border-box;
+    padding: 17px 21px 19px 16px;
+    @include flexBetween();
+    .itemWrap{
+      display: flex;
+      justify-content: space-between;
+      .gary{
+        opacity: 0.5;
+      }
+    }
+    .star{
+      color:  #FF0808;
+      @include fontWeightSize(bold,13px);
+    }
+    .isJoin{
+      display: flex;
+      position: relative;
+      z-index: 10;
+      .joinWrap, .item{
+        @include flexCenter;
+      }
+      img{
+        @include widHeiMar(16px,16px,6px)
+      }
+    }
+    .multipleTxt{
+      @include wh(100%,87px);
+      background: #FAFAFA;
+      @include sizingPadRadius(8px,8px,3px);
+      border: 1px solid #E6E6E6;
+      backdrop-filter: blur(10px);
+      margin-top: 3px;
+    }
+    .aduitResult:after{
+      content: '该案件为二次提交，审核不通过后司机无法再次申请报销。';
+      color: red;
+      position: absolute;
+      z-index: 1;
+      line-height: 70px;
+      font-size: 10px;
+    }
+  }
+  .submitBtn{
+    //position: absolute;
+    //bottom: 30px;
+    margin:20px 0 10px 6%;
+    border-radius: 5px;
+    text-align: center;
+    @include bgFontColor(#FFFFFF,#354D93);
+    @include fontWeightSize(bold,15px);
+    @include whLin(88%,48px);
+  }
+}
+.greColor{
+  color:#38AD00 ;
+  font-weight: 500;
+}
+.redColor{
+  color:#FF5D2E ;
+  font-weight: 500;
+}
+.commonImg{
+  @include widHeiMar(13px,13px,4px);
+}
+.rightArrImg{
+  @include wh(6px,9px);
+  margin-left: 6px;
+}
+.yelColor{
+  color: #E69B0B;
+  font-weight: 600;
+}
+.greColor{
+  color: #56B628;
+  font-weight: 600;
+}
+.oraColor{
+  color: #FF5D2E;
+  font-weight: 600;
+}
+.garyColor{
+  color: #9C9C9C;
+  font-weight: 600;
+}
+::v-deep .amap-copyright{
+  display: none !important;
+}
+::v-deep .amap-logo{
+  display: none !important;
+}
+::v-deep .amap-marker-label{
+  border: none;
+  padding: 0 8px;
+  @include all-height(25px);
+  @include fontWeightSize(12px,400);
+  color: #3A3A3A;
+  @include bgcolorOpa(#FFFFFF,0.98);
+  box-shadow: 0px 1px 4px 0px rgba(164,162,162,0.69);
+  border-radius: 17px;
+}
+</style>

src/views/caseList/caseList.vue

@@ -0,0 +1,272 @@
+<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 style="height: 42px">
+      <div class="tab_wrap">
+        <div v-for="(item, index) in tabArr" :key="index"
+             @click="changeTab(index)">
+          <span :class="{'active' : activeIndex == index , 'alpha' :true}"> {{ item.name }}</span>
+          <span class="numTip" style="opacity: 1 !important;">{{item.num}}</span>
+        </div>
+      </div>
+    </div>
+
+    <van-pull-refresh class="refresh" v-model="isLoading" @refresh="onRefresh" v-show="!show">
+      <van-list
+          v-model="loading"
+          :finished="finished"
+          finished-text="没有更多了"
+          @load="onLoad"
+      >
+        <div class="listWrap">
+          <div class="listItem" v-for="(item,index) in pageList" :key="index" @click="noMultipleClicks(goPageDetail,item.batchCode)">
+            <div class="line1">
+              <div><span>审核批次:</span><span>{{item.batchCode}}</span></div>
+              <div class="viewBtn">查看</div>
+            </div>
+            <div><span>报销金额:</span><span class="redColor">{{item.totalAmount}}元</span><span class="greColor">/{{item.auditSuccessAmount}}元</span></div>
+            <div><span>案件数量:</span><span>{{item.orderCount}}</span><span class="greColor">/{{item.auditSuccessCount}}</span></div>
+            <div><span>提交人员:</span><span>{{ item.createUser }}</span></div>
+            <div><span>提交时间:</span><span>{{ item.createTime }}</span></div>
+          </div>
+        </div>
+
+      </van-list>
+    </van-pull-refresh>
+    <div class="bgEmptyImg" v-show="show" >
+      <img  src="@/assets/empty.png" />
+    </div>
+   </div>
+
+</template>
+
+<script>
+import {myMixins} from "@/utils/myMixins";
+import {reimburseBatchCount, reimburseBatchList} from "@/api/reimbursementBatch"
+export default {
+  name: "caseList",
+  mixins: [myMixins],
+  data(){
+    return{
+      tabArr: [ {name: '待审核', status: 1,num:0},{name: '已审核', status: 2,num:0},],
+      activeIndex: 0,
+      pageList:[],
+      pageNum:1,
+      pageSize:10,
+      total:'',
+      isLoading:"",
+      loading: false,
+      finished: false,
+      noClick:true
+    }
+  },
+   async mounted() {
+     this.activeIndex = (this.$route.params.type - 1) || this.activeIndex
+     await this.getCount();
+     await this.getList()
+  },
+  computed:{
+    show() {
+      return (this.pageList.length < 0 || this.pageList.length == 0); // 判断数组长度是否大于 0
+    },
+  },
+  methods:{
+    async onLoad(){
+      // console.log('00000000000000000000')
+      this.pageNum++;
+      await this.getList()
+      // 加载状态结束
+      this.loading = false;
+
+      // 数据全部加载完成
+      if (this.pageList.length >= this.total) {
+        this.finished = true;
+      }
+    },
+    async changeTab(index) {
+      this.activeIndex = index
+      this.pageNum = 1
+      this.pageList = [];
+      this.total=0
+      this.loading=false
+      this.finished=false
+      await this.getCount()
+      await this.getList()
+      // await this.onLoad()
+    },
+    onRefresh() {
+      this.pageNum=1
+      // this.getList()
+      setTimeout(() => {
+        this.$toast('刷新成功');
+        this.isLoading = false;
+      }, 1000);
+    },
+    async getList(){
+     let res=await reimburseBatchList({
+        pageNum:this.pageNum,
+        pageSize:this.pageSize,
+        type:this.activeIndex == 0 ? 1 : 2
+      })
+      this.total=res.total
+      if(this.pageNum == 1){// 第一页直接赋值
+        this.pageList=res.data
+      }else{// 第二页数据拼接
+        console.log("第二页数据拼接")
+        let preList = this.pageList;
+        console.log("preList",preList)
+        let arr = res.data;
+        console.log("arr",arr)
+        this.pageList = preList.concat(arr)
+        console.log("this.pageList",this.pageList)
+      }
+
+    },
+    async getCount(){
+      let res=await reimburseBatchCount()
+      this.tabArr.forEach(tab => {
+        if (tab.name === '待审核') {
+          tab.num = res.data.waitAuditCount;
+        } else if (tab.name === '已审核') {
+          tab.num = res.data.auditSuccessCount;
+        }
+      });
+    },
+    goPageDetail(id){
+      this.$router.push({
+        name: 'caseAuditList',  // 目标路由的名称
+        params: {
+          id: id,                  // 参数对象的属性
+          type: this.activeIndex+1,
+          page1Index:this.activeIndex
+        }
+      });
+    },
+  }
+}
+</script>
+
+<style scoped lang="scss">
+@import "@/styles/mixin.scss";
+@import "@/styles/common.scss";
+.wrap{
+  @include wh(100%,100%);
+  box-sizing: border-box;
+  overflow-y: auto;
+}
+.navBar{
+  margin-bottom: 46px;
+}
+.bgEmptyImg{
+  @include flexTwoCenter;
+  height: 90% ;
+  background-color: #FAFAFA;
+  img{
+    width: 100%;
+  }
+}
+::v-deep .van-list__finished-text{
+  background-color: #F4F5F7 !important;
+  padding-bottom: 10px;
+}
+::v-deep .van-pull-refresh{
+  height: calc(100% - 86px) ;
+  overflow-y: auto;
+  background-color: #F4F5F7;
+}
+.tab_wrap {
+  @include fontWeightSize(500, 14px);
+  @include flexColAround();
+  padding: 2px 0 10px 0;
+  background: #2C395F;
+  position: fixed;
+  z-index: 11;
+  width: 100%;
+  div {
+    padding-top: 8px;
+    color: #FFFFFF;
+  }
+  .alpha{
+    opacity: 0.5;
+  }
+  .numTip{
+    display: inline-block;
+    min-width: 15px;
+    @include all-height(15px);
+    @include bgcolorOpa(#F95B45,0.9);
+    border-radius: 4px;
+    text-align: center;
+    margin-left: 5px;
+    opacity: 1; /* 保持透明度为1 */
+  }
+  .active {
+    position: relative;
+    opacity: 1;
+  }
+  .active:after {
+    content: '';
+    display: block;
+    @include wh(18px,2px);
+    opacity: .8;
+    background: #FFFFFF;
+    position: absolute;
+    border-radius: 2px;
+    margin-top: 3px;
+    left: 50%;
+    opacity: 1;
+    transform: translateX(-50%);
+  }
+}
+.listWrap{
+  width: 100%;
+  height: calc(100% - 86px);
+  //height: 100%;
+  overflow-y: auto;
+  background-color: #F4F5F7;
+  .listItem{
+    width: 100%;
+    box-sizing: border-box;
+    padding: 14px 25px 13px 29px;
+    background-color: #FFFFFF;
+    margin-bottom: 10px;
+    .line1{
+      @include flexColBet();
+      .viewBtn{
+        @include wh(48px,18px);
+        text-align: center;
+        line-height: 18px;
+        background: #354D93;
+        border-radius: 3px;
+        color: #FFFFFF;
+      }
+    }
+    div{
+      line-height: 27px;
+      span:first-child{
+        display: inline-block;
+        width: 60px;
+        opacity: 0.5;
+      }
+    }
+  }
+}
+.greColor{
+  color:#38AD00 ;
+  font-weight: bold;
+}
+.redColor{
+
+  color:#FF5D2E ;
+  font-weight: bold;
+}
+</style>

src/views/documentView/docmentList.vue

@@ -2,7 +2,6 @@
 <div class="wrap">
   <div class="navBar">
     <van-nav-bar
-        title="文档资料"
         left-arrow
         left-arrow-color="#FFFFFF"
         :border="false"
@@ -10,43 +9,56 @@
         :safe-area-inset-top="true"
         @click-left="goBack"
     >
+      <template slot="title">
+        <div v-show="!show">文档资料</div>
+        <van-field v-model="keyword" placeholder="请输入关键词" v-show="show"   @input="getList"/>
+      </template>
       <template slot="right">
-        <div class="rightWrap">
+        <div class="rightWrap" @click="show = !show">
-          <img src="@/assets/serach.png" class="img2"/>
+          <img src="@/assets/serach.png" class="img2" v-show="!show"/>
+          <img src="@/assets/delKey.png" class="img2" v-show="show" @click="initShow"/>
         </div>
       </template>
     </van-nav-bar>
   </div>
+
  <div class="tab_wrap">
     <div v-for="(item, index) in tabArr" :key="index" :class="{'active' : activeIndex == index}"
          @click="changeTab(index)">
       {{ item.name }}
     </div>
   </div>
-  <div class="contentWrap">
+  <div class="contentWrap" v-show="!showEmpty">
-        <div class="itemWrap">
+    <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">会记回家和</div>
+          <div class="title">{{ item.pushUser }}</div>
-              <div class="time">2023-08-24 13:14:00</div>
+          <div class="time">{{ item.pushTime }}</div>
         </div>
         <div class="imgWrap">
-             <img src="@/assets/empty.png">
+          <img :src="item.themePicture">
+          <div class="name">{{item.name}}</div>
         </div>
-           <div class="num common">111</div>
+        <div class="num common">{{ item.synopsis }}</div>
         <div class="doc flexBetween common">
-              <div class="left">培训材料</div>
+          <div class="left">{{ item.docType?.label }}</div>
           <div class="right">
-                <span style="color: red;font-size: 14px;margin-right: 8px">未处理</span>
+            <span style="color: red;font-size: 14px;margin-right: 8px">{{ item.listShowButton==null ? '已处理' :  '未处理' }}</span>
-                <span style="opacity: .9;color: #ccc">阅读8</span>
+            <span style="opacity: .9;color: #ccc">阅读  {{item.readCount}}</span>
           </div>
         </div>
       </div>
+    </van-pull-refresh>
+ </div>
+  <div class="empty"  v-show="showEmpty">
+    <img src="@/assets/empty.png"  />
   </div>
 </div>
 </template>
 
 <script>
 import {myMixins} from "@/utils/myMixins"
+import {pageList} from "@/api/mine";
 export default {
   name: "trainDocment",
   mixins:[myMixins],
@@ -54,16 +66,56 @@ export default {
     return{
       tabArr: [{name: '中道制度', status: 1}, {name: '技术参数', status: 2},],
       activeIndex: 0,
-      orderList: [],
+      pageList:[],
+      pageNum:1,
+      pageSize:10,
+      keyword:'',
+      trainingType:1,
+      isLoading:false,
+      show:false,
+      showEmpty:false
     }
   },
-  methods:{
+  mounted() {
-   changeTab(index) {
+    this.getList()
-    this.activeIndex = index
-    // this.total = 0;
-    this.pageNum = 1
-    this.orderList = [];
   },
+  methods:{
+    onRefresh() {
+      this.getList()
+      setTimeout(() => {
+        this.$toast('刷新成功');
+        this.isLoading = false;
+      }, 1000);
+    },
+   async changeTab(index) {
+    this.activeIndex = index
+    this.pageNum = 1
+    this.pageList = [];
+    if(this.activeIndex === 0){
+      this.trainingType =1
+    }else{
+      this.trainingType=2
+    }
+    await this.getList()
+  },
+    async getList(){
+      let res= await pageList({
+        pageNum:this.pageNum,
+        pageSize:this.pageSize,
+        docType:2,
+        trainingType:this.trainingType,
+        keyword:this.keyword || ''
+      })
+      this.pageList=res.data;
+      if(res.data.length === 0){
+        this.showEmpty  = true
+      }else {
+        this.showEmpty = false
+      }    },
+    initShow(){
+      this.keyword= '',
+      this.getList()
+    }
 }
 }
 </script>
@@ -71,28 +123,13 @@ export default {
 <style scoped lang="scss">
 @import "@/styles/common.scss";
 @import "@/styles/mixin.scss";
-.wrap{
+@import "@/styles/docment.scss";
-  width: 100%;
-  height: 100%;
-  background-color: #F4F5F7;
-  overflow-y: auto;
-}
-.navBar{
-  margin-bottom: 46px;
-}
-.rightWrap {
-  @include flexCenter;
-  .img2 {
-    @include wh(17px, 17px)
-  }
-}
 .tab_wrap {
   @include fontWeightSize(bolder, 15px);
   display: flex;
   justify-content: space-around;
   padding: 5px 0 5px 0;
-  color: #737373;
+  @include colorOpa(#737373,0.7);
-  opacity: .7;
   div {
     padding-top: 8px;
   }
@@ -100,12 +137,10 @@ export default {
     color: #3678FF;
     position: relative;
   }
-
   .active:after {
     content: '';
     display: block;
-    width: 50px;
+    @include wh(50px,3px);
-    height: 3px;
     background: linear-gradient(270deg, #33A3FF 0%, #176AFE 100%);
     border-radius: 2px;
     position: absolute;
@@ -114,43 +149,4 @@ export default {
     transform: translateX(-50%);
   }
 }
-
-.contentWrap{
-  padding: 0 8px;
-  width: 100%;
-  box-sizing: border-box;
-  .itemWrap{
-    margin-top: 16px;
-    @include wh(100%, 300px);
-    background: #FFFFFF;
-    box-shadow: 0px 2px 10px 0px rgba(216, 216, 216, 0.5);
-    border-radius: 3px;
-    box-sizing: border-box;
-    @include flexColumn;
-    justify-content: space-around;
-    padding: 6px 0;
-    @include fontWeightSize(400, 12px);
-    .flexBetween{
-      @include flexColBet;
-    }
-    .common{
-      margin: 0 15px ;
-    }
-    .imgWrap{
-      width: 100%;
-      height: 200px;
-      //background-color: #6C81CD;
-      img{
-        width: 100%;
-        height: 200px;
-      }
-    }
-    .left{
-      color: red;
-      font-size: 15px;
-      font-weight: 500;
-    }
-  }
-
-}
 </style>

src/views/documentView/trainDocment.vue

@@ -2,7 +2,6 @@
 <div class="wrap">
   <div class="navBar">
     <van-nav-bar
-        title="培训文档 "
         left-arrow
         left-arrow-color="#FFFFFF"
         :border="false"
@@ -10,31 +9,43 @@
         :safe-area-inset-top="true"
         @click-left="goBack"
     >
+      <template slot="title">
+         <div v-show="!show">培训文档</div>
+         <van-field v-model="keyword" placeholder="请输入关键词" v-show="show"   @input="getList"/>
+      </template>
       <template slot="right">
-        <div class="rightWrap">
+        <div class="rightWrap" @click="show = !show">
-          <img src="@/assets/serach.png" class="img2"/>
+          <img src="@/assets/serach.png" class="img2" v-show="!show"/>
+          <img src="@/assets/delKey.png" class="img2" v-show="show" @click="initShow"/>
         </div>
       </template>
     </van-nav-bar>
   </div>
-  <div class="contentWrap">
+
-        <div class="itemWrap">
+  <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">会记回家和</div>
+          <div class="title">{{ item.pushUser }}</div>
-              <div class="time">2023-08-24 13:14:00</div>
+          <div class="time">{{ item.pushTime }}</div>
         </div>
         <div class="imgWrap">
-             <img src="@/assets/empty.png">
+          <img :src="item.themePicture">
+          <div class="name">{{item.name}}</div>
         </div>
-           <div class="num common">111</div>
+        <div class="num common">{{ item.synopsis }}</div>
         <div class="doc flexBetween common">
-              <div class="left">培训材料</div>
+          <div class="left">{{ item.docType?.label }}</div>
           <div class="right">
-                <span style="color: red;font-size: 14px;margin-right: 8px">未处理</span>
+            <span style="color: red;font-size: 14px;margin-right: 8px">{{ item.listShowButton==null ? '已处理' :  '未处理' }}</span>
-                <span style="opacity: .9;color: #ccc">阅读8</span>
+            <span style="opacity: .9;color: #ccc">阅读  {{item.readCount}}</span>
           </div>
         </div>
       </div>
+    </van-pull-refresh>
+</div>
+  <div class="empty" v-show="showEmpty">
+    <img src="@/assets/empty.png" />
   </div>
 </div>
 </template>
@@ -44,85 +55,54 @@ import {myMixins} from "@/utils/myMixins"
 import {pageList} from  "@/api/mine"
 export default {
   name: "trainDocment",
+  computed: {
+  },
   mixins:[myMixins],
   data(){
     return{
       pageNum:1,
-      pageSize:10
+      pageSize:10,
+      pageList:[],
+      keyword:'',
+      show:false,
+      showEmpty:false,
+      isLoading:false,
     }
   },
   mounted() {
-    this.getList()
+    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,
-        userId:54585,
+        docType:1,
-        docType:2
+        keyword:this.keyword || ''
       })
-      console.log(res)
+      this.pageList=res.data;
-
+      if(res.data.length === 0){
+        this.showEmpty  = true
+      }else {
+        this.showEmpty = false
+      }
+    },
+    initShow(){
+      this.keyword= '',
+      this.getList()
     }
   }
 }
 </script>
-
 <style scoped lang="scss">
 @import "@/styles/common.scss";
 @import "@/styles/mixin.scss";
-.wrap{
+@import "@/styles/docment.scss";
-  width: 100%;
-  height: 100%;
-  background-color: #F4F5F7;
-  overflow-y: auto;
-}
-.navBar{
-  margin-bottom: 46px;
-}
-.rightWrap {
-  @include flexCenter;
-  .img2 {
-    @include wh(17px, 17px)
-  }
-}
-.contentWrap{
-  padding: 0 8px;
-  width: 100%;
-  box-sizing: border-box;
-  .itemWrap{
-    margin-top: 56px;
-    @include wh(100%, 300px);
-    background: #FFFFFF;
-    box-shadow: 0px 2px 10px 0px rgba(216, 216, 216, 0.5);
-    border-radius: 3px;
-    box-sizing: border-box;
-    @include flexColumn;
-    justify-content: space-around;
-    padding: 6px 0;
-    @include fontWeightSize(400, 12px);
-    .flexBetween{
-      @include flexColBet;
-    }
-    .common{
-      margin: 0 15px ;
-    }
-    .imgWrap{
-      width: 100%;
-      height: 200px;
-      //background-color: #6C81CD;
-      img{
-        width: 100%;
-        height: 200px;
-      }
-    }
-    .left{
-      color: red;
-      font-size: 15px;
-      font-weight: 500;
-    }
-  }
-
-}
 </style>

src/views/driverCaseList/driverCaseList.vue

@@ -0,0 +1,429 @@
+<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 :style="{ 'height': activeIndex == 0 ? '83px' : '42px' }">
+      <div class="tab_wrap">
+        <div v-for="(item, index) in tabArr" :key="index" :class="{'active' : activeIndex == index}"
+             @click="changeTab(index)">
+          {{ item.name }}
+        </div>
+      </div>
+
+    </div>
+    <div class="monthSearch" v-show="activeIndex == 0">
+      <span v-for="(item,index) in monthList" :class="monthIndex === index ? 'active' : ''" :key="index" @click="clickHandle(index)">{{item}}</span>
+    </div>
+    <van-pull-refresh v-model="isLoading" @refresh="onRefresh" v-show="!show" :class="activeIndex==0 ? 'firstpullRefresh' : 'secondpullRefresh'">
+      <van-list
+          v-model="loading"
+          :finished="finished"
+          finished-text="没有更多了"
+          @load="onLoad"
+      >
+        <div class="listWrap" :style="{ 'padding-top': activeIndex == 0 ? '0px' : '10px' }">
+          <div class="itemWrap" v-for="(item,index) in pageList" :key="index" :style="{ 'padding-left': activeIndex == 0 ? '34px' : '11px' }">
+            <div class="contentWrap" @click="noMultipleClicks(goDetail,item.taskOrderId)">
+              <div class="line1">
+                <div><span>订单编号:</span><span>{{item.userOrderCode}}</span></div>
+                <div class="right">
+                  <img class="commonImg" :src="getStatus(item.state)">
+                  <div :class="getStatusColor(item.state)">{{item.stateStr}}</div>
+                  <img class="rightArrImg"  src="@/assets/list_rightArrow.png">
+                </div>
+              </div>
+              <div><span>报销金额:</span><span>{{item.reimburseAmount}}元</span></div>
+              <div v-show="activeIndex == 2 || item.state == 3"><span>审核备注:</span><span style="color: #FF5D2E">{{item.auditRemark}}</span></div>
+              <div v-show="(activeIndex != 0 && item.state != 1) || (activeIndex == 0 && item.state == 3)"><span>审核人员:</span><span>{{item.auditUser}}</span></div>
+              <div v-show="(activeIndex != 0 && item.state != 1) || (activeIndex == 0 && item.state == 3)"><span>审核时间:</span><span>{{item.auditTime}}</span></div>
+            </div>
+            <img v-show="activeIndex == 0" class="checkImg" @click="toggleSelection(item)" :src="item.isSelected ? require('@/assets/baoxiao_check.png') : require('@/assets/baoxiao_uncheck.png')">
+          </div>
+        </div>
+
+      </van-list>
+    </van-pull-refresh>
+    <div v-show="activeIndex == 0" class="submitBtnWrap">
+      <div   class="submitBtn" @click="noMultipleClicks(submitHandle)">提交</div>
+    </div>
+
+    <div class="bgEmptyImg" v-show="show" >
+      <img  src="@/assets/empty.png" />
+    </div>
+  </div>
+
+</template>
+
+<script>
+import {myMixins} from "@/utils/myMixins";
+import { waitReimburseList ,reimbursedList,waitReimburseMonth,submitReimburseBatch} from '@/api/reimbursementBatch'
+//
+export default {
+  name: "driverCaseList",
+  mixins: [myMixins],
+
+  data(){
+    return{
+      tabArr: [{name: '待报销', status: 1}, {name: '已报销', status: 2},{name: '报销失败', status: 3},],
+      activeIndex: 0,
+      pageList:[],
+      pageNum:1,
+      pageSize:10,
+      total: 0,
+      isCheck:false,
+      driverId: '',//
+      submitData:[],
+      noClick:true,
+      loading:false,
+      isLoading: false,
+      finished: false,
+      monthList:[],
+      monthIndex:0,
+    }
+  },
+  computed:{
+    show() {
+      return (this.pageList.length < 0 || this.pageList.length == 0); // 判断数组长度是否大于 0
+    },
+  },
+  async mounted() {
+    const urlParams = new URLSearchParams(window.location.search);
+    this.driverId = urlParams.get('driverId');
+    // this.driverId = 78948;
+    await this.getMonth();
+    await this.getList()
+  },
+  methods:{
+    async onLoad(){
+      console.log('onLoadonLoadonLoadonLoadonLoad')
+      if (this.pageList.length >= this.total) {
+        this.finished = true;
+        return
+      }
+      this.pageNum++;
+      await this.getList()
+      this.loading = false;
+
+    },
+    async clickHandle(index){
+      // console.log("index",index)
+      this.monthIndex=index
+      this.pageNum=1
+      this.total=0
+      this.pageList=[]
+      this.monthIndex=index
+      // console.log("this.monthIndex",this.monthIndex)
+      await this.getList()
+      this.submitData=[]
+    },
+    onRefresh() {
+      this.pageNum=1;
+      setTimeout(() => {
+        this.$toast('刷新成功');
+        this.isLoading = false;
+      }, 1000);
+    },
+    toggleSelection(item) {
+      item.isSelected = !item.isSelected; // 切换 isSelected 属性的值
+    },
+    async submitHandle(){
+      this.pageList.forEach((item)=>{
+        if(item.isSelected){
+          this.submitData.push({...item})
+        }
+      })
+      // console.log("this.submitData",this.submitData)
+      if(this.submitData && this.submitData.length>0){
+        const uniqueArr = this.submitData.filter(
+            (item, index, self) =>
+                index === self.findIndex((t) => t.userOrderCode === item.userOrderCode)
+        );
+        // console.log("uniqueArr",uniqueArr)
+        let res = await submitReimburseBatch({
+          driverId: this.driverId,
+          orderList: [...uniqueArr]
+        })
+        if(res.code === 200){
+          this.$toast(res.msg)
+        }
+      }else{
+        this.$toast("请勾选要报销的订单")
+      }
+      await this.getList()
+    },
+    async changeTab(index) {
+      this.activeIndex = index
+      this.pageNum = 1
+      this.pageList = [];
+      this.total=0
+      this.loading=false
+      this.finished=false
+      await this.getList()
+    },
+    goDetail(id){
+      window.android.sendMessage("taskId=" + id);
+    },
+    async getList(){
+      let res=[]
+      if(this.activeIndex==0){
+        res=await waitReimburseList({
+          pageNum:this.pageNum,
+          pageSize:this.pageSize,
+          driverId:this.driverId,
+          type: this.activeIndex+1,
+          periodMonth:this.monthList[this.monthIndex]
+        })
+      }else{
+        res=await reimbursedList({
+          pageNum:this.pageNum,
+          pageSize:this.pageSize,
+          driverId:this.driverId,
+          type: this.activeIndex+1
+        })
+      }
+      // this.pageList=res.data
+      this.total=res.total
+      if(this.pageNum == 1){// 第一页直接赋值
+        this.pageList=res.data
+      }else{// 第二页数据拼接
+        let preList = this.pageList;
+        let arr = res.data;
+        this.pageList = preList.concat(arr)
+      }
+      if(this.activeIndex==0){
+        this.pageList.forEach(item => {
+          this.$set(item,'isSelected',false)
+        });
+      }
+    },
+   async getMonth(){
+      let res = await waitReimburseMonth({
+        driverId:this.driverId,
+      })
+      this.monthList=res.data
+    },
+    getStatus(i){
+      switch (i){
+        case 0://待提交
+        case 1://待审核
+          return require('@/assets/waitSubmit.png')
+        case 2://审核通过
+        case 7://已打款
+          return require('@/assets/dakuan.png')
+        case 3://审核不通过
+          return require('@/assets/unpass.png')
+        case 4://报销失败
+          return require('@/assets/unSubmit.png')
+        case 6://代打款
+          return require('@/assets/waitDakuan.png')
+        default:
+          return require('@/assets/waitSubmit.png')
+      }
+    },
+    getStatusColor(i){
+      switch (i){
+        case 0://待提交
+        case 1://待审核
+          return 'yelColor'
+        case 2://审核通过
+        case 6://代打款
+        case 7://已打款
+          return 'greColor'
+        case 3://审核不通过
+          return 'oraColor'
+        case 4://报销失败
+          return 'garyColor'
+        default:
+          return 'yelColor'
+      }
+    },
+  }
+}
+</script>
+
+<style scoped lang="scss">
+@import "@/styles/mixin.scss";
+@import "@/styles/common.scss";
+.wrap{
+  @include wh(100%,100%);
+  box-sizing: border-box;
+  overflow-y: auto;
+}
+.navBar{
+  margin-bottom: 46px;
+}
+::v-deep .van-nav-bar__content{
+  background-color: #000000 !important;
+}
+.tab_wrap {
+  @include fontWeightSize(500, 15px);
+  @include flexColAround();
+  padding: 2px 0 10px 0;
+  @include bgFontColor(#FFFFFF,#101011);
+  position: fixed;
+  width: 100%;
+  z-index: 111;
+  div {
+    padding-top: 8px;
+    @include colorOpa(#FFFFFF,0.5);
+  }
+  .active {
+    position: relative;
+    opacity: 1;
+  }
+  .active:after {
+    content: '';
+    display: block;
+    @include wh(18px,2px);
+    background: #FFFFFF;
+    position: absolute;
+    border-radius: 2px;
+    margin-top: 3px;
+    left: 50%;
+    transform: translateX(-50%);
+  }
+}
+.monthSearch{
+  @include wh(100%,45px);
+  background: #F4F5F7 ;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  position: fixed;
+  width: 100%;
+  z-index: 111;
+  top: 84px;
+  span{
+    display: inline-block;
+    @include wh(102px,25px);
+    box-shadow: 0px 1px 2px 0px rgba(236,236,236,0.5);
+    border-radius: 14px;
+    margin-right: 8px;
+    line-height: 25px;
+    text-align: center;
+    @include fontWeightSize(600,14px);
+    background: #FFFFFF;
+  }
+  .active{
+    background: #3687FF;
+    color: #FFFFFF;
+  }
+}
+::v-deep .van-pull-refresh{
+  //height: calc(100% - 140px);
+  overflow-y: auto;
+  background-color: #F4F5F7;
+}
+.firstpullRefresh{
+  height: calc(100% - 140px) ;
+}
+.secondpullRefresh{
+  height: calc(100% - 91px) ;
+}
+::v-deep .van-list__finished-text{
+  padding-bottom: 70px;
+  background-color: #F4F5F7;
+}
+.listWrap{
+  //@include wh(100%,100%);
+  width: 100%;
+  height: calc(100% - 50px);
+  box-sizing: border-box;
+  padding: 0px 7px 10px 8px;
+  overflow-y: auto;
+  position: relative;
+  background-color:#F4F5F7 ;
+  .itemWrap{
+    position: relative;
+    width: 100%;
+    @include flexColBet();
+    box-sizing: border-box;
+    padding: 14px 12px 11px 0;
+    box-shadow: 0px 0px 8px 0px rgba(98,107,128,0.07);
+    border-radius: 10px;
+    border: 1px solid #4C81F5;
+    margin-bottom: 10px;
+    background-color: #FFFFFF;
+    .contentWrap{
+      width: 100%;
+      @include fontWeightSize(400,12px);
+      line-height: 27px;
+      .line1{
+        @include flexColBet();
+      }
+      span:first-child{
+          display:inline-block;
+          width: 60px;
+          opacity: .5;
+        }
+      .right{
+        @include flexCenter();
+      }
+    }
+    .checkImg{
+      position: absolute;
+      top: -1px;
+      left: -1px;
+      @include wh(25px,27px)
+    }
+  }
+}
+.submitBtnWrap{
+  background-color: #F4F5F7;
+  height: 50px;
+  width: 100%;
+  position: fixed;
+  bottom: 10px;
+  @include flexTwoCenter;
+}
+.submitBtn{
+  //position: absolute;
+  //position:;
+  //bottom: 15px;
+  //margin:20px 0 10px 6%;
+  border-radius: 4px;
+  text-align: center;
+  @include bgFontColor(#FFFFFF,#333333);
+  @include fontWeightSize(bold,15px);
+  @include whLin(88%,48px);
+}
+.commonImg{
+  @include widHeiMar(13px,13px,4px);
+}
+.rightArrImg{
+  @include wh(6px,9px);
+  margin-left: 6px;
+}
+.yelColor{
+  color: #E69B0B;
+}
+.greColor{
+  color: #56B628;
+}
+.oraColor{
+  color: #FF5D2E;
+}
+.garyColor{
+  color: #9C9C9C;
+}
+.bgEmptyImg{
+  @include flexTwoCenter;
+  height: 90% ;
+  background-color: #FAFAFA;
+  img{
+    width: 100%;
+  }
+}
+//::v-deep .van-pull-refresh__track{
+//  position: static !important;
+//}
+</style>

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 ? '修改司机信息' : '添加司机'"
@@ -11,16 +11,87 @@
         @click-left="h5GoBack"
     />
   </div>
-  <cell-group label="司机姓名" placeholder="请输入司机姓名"  v-model="driverName"/>
+  <div class="itemContent">
-  <cell-group label="手机号码"  v-model="driverPhone"   placeholder="请输入手机号" />
+    <div class="titleType">
-  <p v-if="phoneNumberError" class="error-message">{{ phoneNumberErrorMessage }}</p>
+      <img class="startImg" src="@/assets/start.png" />
-  <cell-group label="身份证号" v-model="identityCardNumber"   placeholder="请输入身份证号"   />
+      <span>身份证正面</span>
+    </div>
+    <van-uploader
+      v-model="identityCardFrontList"
+      :after-read="identityCardFrontHandler"
+      :max-size="5 * 1024 * 1024"
+      max-count="1"
+      :preview-size="54"
+      accept="image "
+    />
+  </div>
+  <div class="lineBot"></div>
+  <div class="itemContent">
+    <div class="titleType">
+      <img class="startImg" src="@/assets/start.png" />
+      <span>身份证反面</span>
+    </div>
+    <van-uploader
+      v-model="identityCardContraryList"
+      :after-read="identityCardBackHandler"
+      max-count="1"
+      :preview-size="54"
+      accept="image "
+    />
+  </div>
+  <div class="lineBot"></div>
+  <div class="itemContent">
+    <div class="titleType">
+      <img class="startImg" src="@/assets/start.png" />
+      <span>驾驶证主页</span>
+    </div>
+    <van-uploader
+      v-model="drivingLicenceFrontList"
+      :after-read="drivingLicenceFrontHandler"
+      max-count="1"
+      :max-size="5 * 1024 * 1024"
+      :preview-size="54"
+      accept="image "
+    />
+  </div>
+  <div class="lineBot"></div>
+  <div class="itemContent">
+    <div class="titleType">
+      <img class="startImg" src="@/assets/start.png" />
+      <span>驾驶证副页</span>
+    </div>
+    <van-uploader
+      v-model="drivingLicenceContraryList"
+      :after-read="drivingLicenceContraryHandler"
+      max-count="1"
+      :preview-size="54"
+      accept="image "
+    />
+  </div>
+  <div class="lineBot"></div>
+  <div class="itemContent">
+    <div class="titleType">
+      <span>头像</span>
+    </div>
+    <van-uploader
+      v-model="iconList"
+      :after-read="iconListHandler"
+      max-count="1"
+      :preview-size="54"
+      accept="image "
+    />
+  </div>
+  <div class="lineBot"></div>
+<!--  :disabled="supplierType ==1 ? true:false"-->
+  <cell-group label="司机姓名" placeholder="司机姓名"  v-model="driverName" disabled />
+  <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" v-model="drivingModel"  class="chosen-select" style="width: 44px">
+    <select id="mySelect" class="mySelect" v-model="drivingModel" disabled >
       <option value="A1">A1</option>
       <option value="A2">A2</option>
       <option value="A3">A3</option>
@@ -58,16 +129,16 @@
     </div>
   </div>
   <div class="lineBot"></div>
-  <two-common-btn class="btn" @cancelClick="cancelBtn" @submitClick="submitBtn" />
+  <two-common-btn class="btn" @cancelClick="h5GoBack" @submitClick="submitBtn" />
 </div>
 </template>
 
 <script>
 import {myMixins} from  "@/utils/myMixins"
-import {timeFormat} from "@/utils/common"
+import {saveDriver, uploadImage, ocrHandler} from "@/api/mine"
-import {saveDriver} 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],
@@ -81,8 +152,23 @@ export default {
       states:'',
       activeIcon: require('@/assets/check.png'),
       inactiveIcon: require('@/assets/uncheck.png'),
-      phoneNumberError: false,
+      supplierType:'',
-      phoneNumberErrorMessage: ''
+      createTime:'',
+      identityCardFront: '',           // 身份证正面
+      identityCardFrontList: [],       // 身份证正面 列表
+      identityCardContrary: '',        // 身份证反面
+      identityCardContraryList: [],    // 身份证反面 列表
+      drivingLicenceFront: '',         // 驾驶证正面
+      drivingLicenceFrontList: [],     // 驾驶证正面 列表
+      drivingLicenceContrary: '',      // 驾驶证反面
+      drivingLicenceContraryList: [],  // 驾驶证反面 列表
+      icon: '',
+      iconList: [],
+      driverInfo: {},
+      drivingLicenceName: '',
+      idCardAuthority:'',
+      idCardValidStartTime:'',
+      idCardValidEndTime:'',
     }
   },
   mounted() {
@@ -92,7 +178,32 @@ export default {
     this.drivingModel = this.$route.params?.drivingModel;
     this.identityCardNumber = this.$route.params?.identityCardNumber;
     this.states = this.$route.params?.states;
-    console.log(this.driverName,this.driverPhone,this.drivingModel,this.identityCardNumber,this.states)
+    this.supplierType=this.$route.params?.supplierType;
+    this.createTime=this.$route.params?.createTime;
+    this.driverInfo.drivingBeginDate = this.$route.params?.drivingBeginDate;
+    this.drivingLicenceContrary = this.$route.params?.drivingLicenceContrary;
+    this.drivingLicenceFront = this.$route.params?.drivingLicenceFront;
+    this.driverInfo.drivingLicenceValidityDate = this.$route.params?.drivingLicenceValidityDate;
+    this.icon = this.$route.params?.icon;
+    this.identityCardContrary = this.$route.params?.identityCardContrary;
+    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;
@@ -104,10 +215,145 @@ export default {
     isUse(e){
       this.states=e
     },
+    async identityCardFrontHandler(file) {    // 上传身份证正面照片
+      const formData = new FormData();
+      formData.append("file" , file.file);
+      let res = await uploadImage(formData)
+      this.identityCardFront = res.data;
+      await this.idCardOcrHandler();
+    },
+    async identityCardBackHandler(file) {  // 上传身份证反面照片
+      const formData = new FormData();
+      formData.append("file" , file.file);
+      let res = await uploadImage(formData)
+      this.identityCardContrary = res.data;
+      await this.idCardBackOcrHandler();
+    },
+    async drivingLicenceFrontHandler(file) {   // 上传驾驶证主页
+      const formData = new FormData();
+      formData.append("file" , file.file);
+      let res = await uploadImage(formData)
+      this.drivingLicenceFront = res.data;
+      await this.drivingLicenceOcrHandler();
+    },
+    async drivingLicenceContraryHandler(file) {   // 上传驾驶证副页
+      const formData = new FormData();
+      formData.append("file" , file.file);
+      let res = await uploadImage(formData)
+      this.drivingLicenceContrary = res.data;
+    },
+    async iconListHandler(file) {           // 上传头像
+      const formData = new FormData();
+      formData.append("file" , file.file);
+      let res = await uploadImage(formData)
+      this.icon = res.data;
+    },
+    async idCardOcrHandler() {    // 身份证正面 ocr识别
+      this.driverName = '';
+      this.identityCardNumber = '';
+      let res = await ocrHandler({
+        ocrType: 1,
+        imageUrl: this.identityCardFront,
+        cardSide: 'FRONT'
+      })
+      this.driverName = res?.data?.name;
+      this.identityCardNumber = res?.data?.idNum;
+      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.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
+        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('身份证信息与驾驶证信息不匹配')
+        }
+      }
+    },
     async submitBtn(){
-      // if (this.driverName || this.driverPhone || this.identityCardNumber || this.drivingModel || this.states){
+      if(!this.identityCardFront) {
-      //   this.$toast('必填字段未填写')
+        this.$toast('身份证正面照未上传')
-      // }else{
+        return
+      }
+      if(!this.identityCardContrary) {
+        this.$toast('身份证反面照未上传')
+        return
+      }
+      if(!this.drivingLicenceFront) {
+        this.$toast('驾驶证首页未上传')
+        return
+      }
+      if(!this.drivingLicenceContrary) {
+        this.$toast('驾驶证副页未上传')
+        return
+      }
+      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(this.driverInfo.drivingLicenceValidityDate && new Date(this.driverInfo.drivingLicenceValidityDate).getTime() < new Date().getTime() ) {
+          this.$toast('驾驶证已过期')
+          return
+        }
+      } else {
+        this.$toast('驾驶证信息识别错误，请重新上传')
+        return
+      }
        await saveDriver({
          driverId:this.id ? this.id : '',
          driverName:this.driverName ,
@@ -115,33 +361,27 @@ export default {
          identityCardNumber:this.identityCardNumber,
          drivingModel:this.drivingModel,
          states:Number(this.states),
-          createTime:timeFormat(new Date())
+         createTime:this.createTime || '',
+         identityCardFront: this.identityCardFront,
+         identityCardContrary: this.identityCardContrary,
+         drivingLicenceFront: this.drivingLicenceFront,
+         drivingLicenceContrary: this.drivingLicenceContrary,
+         icon: this.icon,
+         drivingLicenceName: this.drivingLicenceName,
+         idCardAuthority:this.idCardAuthority,
+         idCardValidStartTime:this.idCardValidStartTime,
+         idCardValidEndTime:this.idCardValidEndTime,
+         ...this.driverInfo
       })
       if(this.id){
         this.$toast('修改成功')
-
       }else{
         this.$toast('添加成功')
       }
         setTimeout(()=>{
           this.$router.back();
         },2000)
-      // }
       },
-    cancelBtn(){//取消
-     this.$router.back()
-    },
-    // @blurIn="validatePhoneNumber"
-    // validatePhoneNumber() {
-    //   const phoneNumberRegex = /^1[0-9]{10}$/;
-    //   if (!phoneNumberRegex.test(this.driverPhone)) {
-    //     this.phoneNumberError = true;
-    //     this.phoneNumberErrorMessage = '电话号码格式不正确，请输入有效的11位手机号码。';
-    //   } else {
-    //     this.phoneNumberError = false;
-    //     this.phoneNumberErrorMessage = '';
-    //   }
-    // }
   },
   components:{
     TwoCommonBtn,
@@ -149,20 +389,31 @@ 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";
-.error-message {
-  color: red;
-}
 .wrap{
   @include wh(100%,100%);
   box-sizing: border-box;
   padding-left: 16px;
+  padding-bottom: 100px;
+  overflow-y: auto;
+}
+.mySelect{
+  @include fontWeightSize(bold,13px);
+  width: 44px;
+  color: #323643;
+  appearance: none;
+  padding-right: 16px;
+  background: url('@/assets/arrow_bot.png') no-repeat right center / 15px 14px;
 }
 .navBar{
-  //height: 46px;
   margin-bottom: 46px;
 }
 .itemContent{

src/views/index/driverManage.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="wrap"  @scroll="handleScroll">
+  <div class="wrap" >
     <div class="navBar">
       <van-nav-bar
           title="司机管理"
@@ -10,7 +10,7 @@
           :safe-area-inset-top="true"
           @click-left="goBack"
       >
-        <template slot="right">
+        <template slot="right" v-if="permissonList.includes('driverAddBtn')">
           <div class="rightWrap" @click="addDriver" >
             <img src="@/assets/addImg.png" />
             <span class="addTxt">添加</span>
@@ -19,12 +19,18 @@
       </van-nav-bar>
     </div>
     <van-pull-refresh v-model="isLoading" @refresh="onRefresh">
+      <van-list
+          v-model="loading"
+          :finished="finished"
+          finished-text="没有更多了"
+          @load="onLoad"
+      >
         <div class="itemWrap" v-for="(item,index) in driverList" :key="index">
           <div class="name-status">
             <div class="namephone">{{ item.driverName }} / {{ item.driverPhone }}</div>
             <div class="twoBtn">
-            <button class="del" @click="handleStatus(item)">{{ item.states?.label == '启用'  ? '停用' : '启用' }}</button>
+              <button v-if="permissonList.includes('driverModifyBtn')" class="del" @click="handleStatus(item)">{{ item.states?.label == '启用'  ? '停用' : '启用' }}</button>
-            <button class="revise" @click="updateDriver(item)">修改</button>
+              <button v-if="permissonList.includes('driverModifyBtn')" class="revise" @click="updateDriver(item)">修改</button>
             </div>
           </div>
           <div class="" style="display: flex">
@@ -46,6 +52,8 @@
             <span :class="item.states?.code == 1 ? 'statusYes' : 'statusNo'">{{ item.states?.label }}</span>
           </div>
         </div>
+
+      </van-list>
   </van-pull-refresh>
 
   </div>
@@ -54,7 +62,7 @@
 <script>
 
 import {myMixins} from "@/utils/myMixins"
-import {driverList,enableAction} from  "@/api/mine"
+import {driverList,enableAction,userOperationPermissions} from  "@/api/mine"
 export default {
   name: "driverManage",
   mixins:[myMixins],
@@ -68,16 +76,31 @@ export default {
       supplierType:'',
       count: 0,
       isLoading: false,
+      loading: false,
+      finished: false,
+      permissonList:[],
     }
   },
   mounted() {
     const urlParams = new URLSearchParams(window.location.search);
     this.supplierType = urlParams.get('supplierType');
-    this.getDriverList()
+    this.getPermissions();
+    // this.getDriverList()
   },
   methods:{
+    async onLoad(){
+      await this.getDriverList()
+      this.pageNum++;
+      // 加载状态结束
+      this.loading = false;
+      // 数据全部加载完成
+      if (this.driverList.length >= this.total) {
+        this.finished = true;
+      }
+    },
     onRefresh() {
-      this.getDriverList()
+      this.pageNum=1;
+      // this.getDriverList()
       setTimeout(() => {
         this.$toast('刷新成功');
         this.isLoading = false;
@@ -108,22 +131,24 @@ export default {
           }
         }
      },
+    async getPermissions(){
+      let res = await userOperationPermissions();
+      this.permissonList = res.data
+      // console.log("司机管理",this.permissonList.includes('driverAddBtn'))
+
+    },
     async handleStatus(item){
         if(item.states.code === 0){
             this.states = 1
         }else{
           this.states = 0
         }
-       let res = await enableAction({
+       await enableAction({
          driverId:item.driverId,
          states:this.states
        })
-
+      this.pageNum = 1;
       await this.getDriverList();
-        // setTimeout(()=>{
-        //   this.$toast('操作成功')
-        // },2000)
-        console.log("item",res)
     },
     updateDriver(item){
       // 在当前组件中进行路由跳转并传递参数对象
@@ -135,20 +160,21 @@ export default {
           phone:item.driverPhone,
           drivingModel:item.drivingModel,
           identityCardNumber:item.identityCardNumber,
-          states:item.states.code
+          states:item.states.code,
+          createTime:item.createTime,
+          supplierType:this.supplierType,
+          drivingBeginDate: item.drivingBeginDate,
+          drivingLicenceContrary: item.drivingLicenceContrary,
+          drivingLicenceFront: item.drivingLicenceFront,
+          drivingLicenceValidityDate: item.drivingLicenceValidityDate,
+          icon: item.icon,
+          identityCardContrary: item.identityCardContrary,
+          identityCardFront: item.identityCardFront,
+          lssueDate: item.lssueDate,
+          drivingLicenceName: item.drivingLicenceName
         }
       });
     },
-    async handleScroll(){
-      let num =  Math.ceil( this.total / 10)
-      if(num <= this.pageNum){
-        // console.log("不在加载数据")
-      }else{
-        this.pageNum++;
-        await this.getDriverList()
-      }
-    },
-
   }
 }
 </script>
@@ -159,67 +185,54 @@ export default {
 
 .wrap {
   background: #F4F5F7;
-  box-sizing: border-box;
+  @include sizingPadding(13px,13px);
-  padding: 13px;
   @include wh(100%, 100%);
   overflow-y: auto;
 }
 .navBar{
-  //height: 46px;
   margin-bottom: 46px;
   .rightWrap{
-    width: 50px;
+    @include wh(50px,20px);
-    height: 20px;
     border-radius: 10px;
     opacity: 0.7;
     border: 1px solid #FFFFFF;
-    @include flexCenter;
+    @include flexTwoCenter;
-    justify-content: center;
     img{
       @include widHeiMar(9px,8px,4px);
     }
     .addTxt{
       @include fontWeightSize(bolder,11px);
-      opacity: .7;
+      @include colorOpa( #FFFFFF,0.7);
-      color: #FFFFFF;
     }
   }
-
 }
 
 .itemWrap {
   @include wh(100%, 104px);
-  background: #FFFFFF;
+  @include radiusSizing(6px);
-  box-shadow: 0px 2px 10px 0px rgba(216, 216, 216, 0.5);
-  border-radius: 6px;
-  margin-bottom: 10px;
-  box-sizing: border-box;
-  padding: 11px 13px 9px 15px;
   @include fontWeightSize(400, 12px);
   @include flexBetween;
-
+  background: #FFFFFF;
+  box-shadow: 0px 2px 10px 0px rgba(216, 216, 216, 0.5);
+  margin-bottom: 10px;
+  padding: 11px 13px 9px 15px;
   .halfOpci {
     opacity: .5;
     margin-right: 5px;
   }
-
   .allOpci {
     opacity: 1;
   }
-
   .statusNo {
     color: #FF0000;
   }
-
   .statusYes {
     color: #09B820
   }
 }
 
 .name-status {
-  display: flex;
+  @include flexColBet;
-  justify-content: space-between;
-
   .namephone {
     @include fontWeightSize(bold, 14px)
   }
@@ -228,26 +241,19 @@ export default {
     display: flex;
     button {
       border: none;
-      //width: 48px;
-      //padding: 2px;
-      //@include all-height(20px);
       padding: 4px  8px;
-      display: flex;
-      justify-content: center;
-      align-items: center;
       border-radius: 3px;
+      @include flexTwoCenter;
       @include fontWeightSize(bold, 12px)
     }
-
     .del {
       border: 1px solid #DDDDDD;
       background-color: #FFFFFF;
     }
 
     .revise {
-      color: #FFFFFF;
+      @include bgFontColor( #FFFFFF,#354D93);
       margin-left: 15px;
-      background: #354D93;
     }
   }
 

src/views/index/invoicingDetail.vue

@@ -56,10 +56,7 @@ export default {
           pageSize:this.pageSize,
          ...this.form,
         })
-        // if(res.code=== 200){
         this.detailList=res.data
-        // }
-        // console.log("resssss",res)
       }
   }
 }
@@ -75,22 +72,19 @@ export default {
   height: 46px;
 }
 .contentWrap{
-  width: 100%;
+  @include wh(100%,400px);
-  height: 400px;
   margin-left: 27px;
   .item{
     width: 100%;
     @include all-height(47px);
     .itemContent{
       margin-left: 5px;
-      @include fontWeightSize(400,13px);
       color: #323643;
+      @include fontWeightSize(400,13px);
     }
     .line{
-      width: 100%;
+      @include wh(100%,1px);
-      height: 1px;
+      @include bgcolorOpa(#E9E9EA,0.6);
-      background: #E9E9EA;
-      opacity: 0.6;
     }
   }
 }

src/views/index/invoicingNotify.vue

@@ -11,6 +11,7 @@
         @click-left="goBack"
     />
   </div>
+  <van-pull-refresh v-model="isLoading" @refresh="onRefresh">
     <div class="itemWrap" v-for="(item,index) in notifyList" :key="index" >
       <div class="item line1">
         <div class="itemTime">
@@ -44,6 +45,7 @@
         <span class="content">{{ item.invoiceMoney+ '元' }}</span>
       </div>
     </div>
+  </van-pull-refresh>
   <div v-show="show" class="bgShow">
     <img src="@/assets/empty.png">
   </div>
@@ -61,13 +63,22 @@ export default {
       notifyList:[],
       pageNum:1,
       pageSize:10,
-      show:false
+      show:false,
+      isLoading: false,
     }
   },
   mounted() {
       this.getNotifyList()
   },
   methods:{
+    onRefresh() {
+      this.pageNum=1
+      this.getNotifyList()
+      setTimeout(() => {
+        this.$toast('刷新成功');
+        this.isLoading = false;
+      }, 1000);
+    },
     async getNotifyList(){
       let res =  await notifyInvoiceList({
           pageNum:this.pageNum,
@@ -94,10 +105,10 @@ export default {
   @include wh(100%,100%);
   background-color: #F4F5F7;
   overflow-y: auto;
+  box-sizing: border-box;
+  padding-bottom: 30px;
 }
 .navBar{
-
-  //height: 46px;
   margin-bottom: 46px;
 }
 .itemWrap{
@@ -114,27 +125,26 @@ export default {
     }
     .title{
       opacity: .5;
-      //width:55px;
     }
-    .content{}
   }
   .line1{
     width: 100%;
-    display: flex;
+    @include flexColBet;
-    justify-content: space-between;
     .checkBtn{
-      background: #354D93;
+      @include bgFontColor(#FFFFFF,#354D93);
-      border-radius: 3px;
       @include wh(48px,18px);
+      border-radius: 3px;
       line-height: 18px;
       text-align: center;
-      color: #FFFFFF;
     }
   }
 }
 .bgShow{
-  @include wh(100%,80%);
+  @include flexTwoCenter;
-  @include flexCenter;
+  height:calc(100% - 46px);
-  justify-content: center;
+  background-color: #FAFAFA;
+  img{
+    width: 100%;
+  }
 }
 </style>

src/views/index/reporting.vue

@@ -3,32 +3,8 @@
     <div class="title">报备事项:</div>
     <div class="line"></div>
     <van-radio-group v-model="radio" @change="change">
-      <van-radio name="特殊情况绕路" class="item">
+      <van-radio v-for="(item,index) in reportingRadioList" :key="index" :name="item" class="item">
-        特殊情况绕路
+        {{ item }}
-        <img
-            slot="icon"
-            slot-scope="props"
-            :src="props.checked ? activeIcon : inactiveIcon"
-        >
-      </van-radio>
-      <van-radio name="事发地变更" class="item">
-        事发地变更
-        <img
-            slot="icon"
-            slot-scope="props"
-            :src="props.checked ? activeIcon : inactiveIcon"
-        >
-      </van-radio>
-      <van-radio name="目的地变更" class="item">
-        目的地变更
-        <img
-            slot="icon"
-            slot-scope="props"
-            :src="props.checked ? activeIcon : inactiveIcon"
-        >
-      </van-radio>
-      <van-radio name="其他报备" class="item">
-        其他报备
         <img
             slot="icon"
             slot-scope="props"
@@ -36,7 +12,8 @@
         >
       </van-radio>
     </van-radio-group>
-    <textarea class="multiple" id="text-input" rows="4" cols="50" placeholder="报备描述" v-model="decscripTxt"></textarea><br>
+    <textarea v-if="radio == '其他报备'" class="multiple" id="text-input" rows="4" cols="50" placeholder="报备描述"
+              v-model.trim="decscripTxt"></textarea><br>
     <common-btn @submitClick="submit"/>
   </div>
 </template>
@@ -45,6 +22,7 @@
 import {orderReporting} from "@/api/order"
 import {myMixins} from "@/utils/myMixins"
 import CommonBtn from "@/components/commonBtn.vue"
+
 export default {
   name: "reportingView",
   mixins: [myMixins],
@@ -57,6 +35,9 @@ export default {
       queryType: '',
       userOrderId: '',
       orderCode: '',
+      reportingList: [],
+      reportingRadioList: ['目的地变更', '服务项目更改', '拖车实际在地库', '目的地没有门头照片', '联系不到客户', '车牌、车架号不符',
+        '第三方路段无法救援', '客户酒后代驾叫拖车', '车上有货物无法卸货', '客户无钥匙打不开车门', '事故车走故障救援', '电瓶检测仪显示优良客户要搭电', '客户车辆位于非正常路面', '其他报备']
     }
   },
   mounted() {
@@ -82,33 +63,38 @@ export default {
       this.radio = e
     },
     async goReporting() {
-      if(this.isRadio && this.isTxt){
+      if (!this.isRadio) {
+        this.$toast('报备事项必选')
+        return
+      }
+      if (this.radio == '其他报备') {
+        if (!this.decscripTxt) {
+          this.$toast('报备描述必填')
+          return
+        }
+      }
       let result = await orderReporting({
         queryType: Number(this.queryType),
         userOrderId: this.userOrderId,
         orderCode: this.orderCode,
+        reportingConfirm: 1,
         reportingItem: this.radio ? this.radio : "",
         reportingDesc: this.decscripTxt ? this.decscripTxt : ""
       })
-        // if(result.code === 200){
+      // reportingConfirm: this.radio == '其他报备' ? 0 : 1,
       this.$toast(result.msg)
       setTimeout(() => {
         let data = {"action": "goBack", "params": ""}
         var u = navigator.userAgent;
         var isiOS = !!u.match(/\(i[^;]+;( U;)? CPU.+Mac OS X/);
-            // var isAndroid = u.indexOf('Android') > -1 || u.indexOf('Adr') > -1; //android终端
         if (isiOS) {
           window.webkit.messageHandlers.nativeObject.postMessage(data);
         } else {
           window.android.sendMessage("goBack");
         }
-
       }, 2000)
-        // }
+
-      }else{
+    },
-        this.$toast("报备事项和报备描述必选")
-      }
-    }
   },
   components: {
     CommonBtn
@@ -119,11 +105,13 @@ export default {
 <style scoped lang="scss">
 @import "@/styles/mixin.scss";
 @import "@/styles/common.scss";
+
 .wrap {
   box-sizing: border-box;
   padding: 13px 24px 0;
   width: 100%;
   height: 100%;
+  //overflow-y: auto;
 }
 
 .title {
@@ -131,11 +119,13 @@ export default {
   color: #323643;
 
 }
+
 .item {
   font-size: 14px;
   margin-bottom: 8px;
   @include flexCenter;
 }
+
 .line {
   @include wh(100%, 2px);
   opacity: 0.16;
@@ -144,10 +134,12 @@ export default {
   margin-top: 10px;
   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;
 }
+
 img {
   @include widHeiMar(16px, 16px, 10px);
 }
 
+
 .multiple {
   width: 100%;
   height: 125px;
@@ -157,8 +149,17 @@ img{
   backdrop-filter: blur(10px);
   padding: 10px;
   box-sizing: border-box;
-  margin-top: 20px;
+  //margin-top: 20px;
+  margin-bottom: 10px;
 }
 
+.btn {
+  box-sizing: border-box;
+  padding: 13px 24px 0;
+}
+
+.scrollWrap {
+
+}
 
 </style>

src/views/index/reportingList.vue

@@ -0,0 +1,83 @@
+<template>
+  <div class="wrap">
+    <div class="title">已报备列表:</div>
+    <div class="line"></div>
+    <div v-if="reportList">
+      <div style="margin: 7px 0" v-for="(item,index) in reportList" :key="index">{{item.createTime+','}}{{item.remark}}</div>
+    </div>
+  </div>
+</template>
+
+<script>
+import {orderReportingList} from "@/api/order"
+import {myMixins} from "@/utils/myMixins"
+
+export default {
+  name: "reportingList",
+  mixins: [myMixins],
+  data() {
+    return {
+      queryType: '',
+      userOrderId: '',
+      orderCode: '',
+      taskOrderId:'',
+      reportList:[]
+    }
+  },
+  async mounted() {
+    const urlParams = new URLSearchParams(window.location.search);
+    this.queryType = urlParams.get('queryType');
+    this.userOrderId = urlParams.get('userOrderId');
+    this.orderCode = urlParams.get('orderCode')
+    this.taskOrderId=urlParams.get('taskOrderId')
+    await this.getReportingList()
+  },
+  methods: {
+    async getReportingList(){
+      let res = await orderReportingList({
+        queryType:Number(this.queryType),
+        userOrderId:this.userOrderId,
+        orderCode: this.orderCode,
+        taskOrderId:this.taskOrderId
+      })
+      this.reportList=res.data
+    }
+  },
+}
+</script>
+
+<style scoped lang="scss">
+@import "@/styles/mixin.scss";
+@import "@/styles/common.scss";
+
+.wrap {
+  box-sizing: border-box;
+  padding: 13px 24px 0;
+  width: 100%;
+  height: 100%;
+}
+
+.title {
+  @include fontWeightSize(bold, 14px);
+  color: #323643;
+
+}
+
+.item {
+  font-size: 14px;
+  margin-bottom: 8px;
+  @include flexCenter;
+}
+
+.line {
+  @include wh(100%, 2px);
+  opacity: 0.16;
+  border-top: 1px solid;
+  margin-bottom: 8px;
+  margin-top: 8px;
+  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;
+}
+
+
+
+</style>

src/views/index/supplySettlement.vue

@@ -4,15 +4,17 @@
       <div class="title">公里数:</div>
       <div class="line"></div>
       <div class="metersWrap">
-        <div class="leftKiloMeters">
+        <div class="item"  v-show="supplierSettlementType != 1">
-          <div>AB段公里数</div>
+          <div class="leftKiloMeters">AB段公里数</div>
-          <div>BC段公里数</div>
+          <div class="rightInput"><input type="number" v-model="form.reportMileageAb"/>公里</div>
-          <div>CA段公里数</div>
         </div>
-        <div class="rightInputMeters">
+        <div class="item"  v-show="supplierSettlementType == 1 || supplierSettlementType == 2 || supplierSettlementType == 3 || supplierSettlementType == 4">
-          <div><input type="number" v-model="form.reportMileageAb"/>公里</div>
+          <div class="leftKiloMeters">BC段公里数</div>
-          <div><input type="number" v-model="form.reportMileageBc"/>公里</div>
+          <div class="rightInput"><input type="number" v-model="form.reportMileageBc"/>公里</div>
-          <div><input type="number" v-model="form.reportMileageCa"/>公里</div>
+        </div>
+        <div class="item"  v-show=" supplierSettlementType == 3 || supplierSettlementType == 4">
+          <div class="leftKiloMeters">CA段公里数</div>
+          <div class="rightInput"><input type="number" v-model="form.reportMileageCa"/>公里</div>
         </div>
       </div>
     </div>
@@ -20,15 +22,17 @@
       <div class="title">路桥费:</div>
       <div class="line"></div>
       <div class="metersWrap">
-        <div class="leftKiloMeters">
+        <div class="item"  v-show="supplierSettlementType != 1">
-          <div>AB段路桥费</div>
+          <div class="leftKiloMeters">AB段路桥费</div>
-          <div>BC段路桥费</div>
+          <div class="rightInput"><input type="number" v-model="form.bridgeAmountAb"/>元</div>
-          <div>CA段路桥费</div>
         </div>
-        <div class="rightInputMeters">
+        <div class="item"  v-show="supplierSettlementType == 1 || supplierSettlementType == 2 || supplierSettlementType == 3 || supplierSettlementType == 4">
-          <div><input type="number" v-model="form.bridgeAmountAb"/>元</div>
+          <div class="leftKiloMeters">BC段路桥费</div>
-          <div><input type="number" v-model="form.bridgeAmountBc"/>元</div>
+          <div class="rightInput"><input type="number" v-model="form.bridgeAmountBc"/>元</div>
-          <div><input type="number" v-model="form.bridgeAmountCa"/>元</div>
+        </div>
+        <div class="item"  v-show=" supplierSettlementType == 3 || supplierSettlementType == 4">
+          <div class="leftKiloMeters">CA段路桥费</div>
+          <div class="rightInput"><input type="number" v-model="form.bridgeAmountCa"/>元</div>
         </div>
       </div>
     </div >
@@ -36,31 +40,31 @@
       <div class="title">其他费用:</div>
       <div class="line"></div>
       <div class="metersWrap">
-        <div class="leftKiloMeters">
+        <div class="item"  >
-          <div>小轮个数</div>
+          <div class="leftKiloMeters">小轮个数</div>
-          <div>等候费</div>
+          <div class="rightInput"><input type="number" v-model="form.tyreNumber"/>个</div>
-          <div>困境费</div>
-          <div class="blueColor" style="font-weight: 500;font-size: 14px">已收取客户金额</div>
         </div>
-        <div class="rightInputMeters" style="opacity: 1">
+        <div class="item">
-          <div class="alignRight"><input type="number" v-model="form.tyreNumber"/>个</div>
+          <div class="leftKiloMeters">等候费</div>
-          <div  class="alignRight"><input type="number" v-model="form.waitAmount"/>元</div>
+          <div class="rightInput"><input type="number" v-model="form.waitAmount"/>元</div>
-          <div class="alignRight"><input type="number" v-model="form.dilemmaFee"/>元</div>
+        </div>
-          <div class="blueColor" style="font-weight: 500;font-size: 14px ;"><input  class="blueColor" type="number" v-model="form.customerAmount"/>元</div>
+        <div class="item"  >
+          <div class="leftKiloMeters">困境费</div>
+          <div class="rightInput"><input type="number" v-model="form.dilemmaFee"/>元</div>
+        </div>
+        <div class="item blueColor" >
+          <div class="leftKiloMeters">收取客户金额</div>
+          <div class="rightInput blueColor"><input class="blueColor" type="number" v-model="form.customerAmount"/>元</div>
         </div>
       </div>
     </div>
     <div class="btn">
-      <button>提交</button>
+      <button @click="submit">提交</button>
     </div>
-<!--    <div class="fixed-bottom">-->
-<!--      <common-btn class="btn" @submitClick="submit" />-->
-<!--    </div>-->
   </div>
 </template>
 
 <script>
-// import CommonBtn  from "@/components/commonBtn.vue"
 import {leftCopy} from  "@/utils/common"
 import {getOrderSettlement, updateOrderSettlement} from "@/api/order"
 export default {
@@ -70,6 +74,7 @@ export default {
       taskOrderId:'',
       userOrderId:'',
       orderCode:'',
+      supplierSettlementType:'',
       form:{
         reportMileageAb:'',
         reportMileageBc:'',
@@ -81,6 +86,7 @@ export default {
         waitAmount:'',
         dilemmaFee:'',
         customerAmount:'',
+        taskFlowId:''
       }
     }
   },
@@ -90,7 +96,6 @@ export default {
       this.userOrderId = urlParams.get('userOrderId');
       this.orderCode = urlParams.get('orderCode')
       await this.getDetail()
-
   },
   methods:{
     submit() {
@@ -102,7 +107,9 @@ export default {
         orderCode:  this.orderCode,
         taskOrderId: this.taskOrderId
       })
-      leftCopy(this.form,{...res.data})
+      leftCopy(this.form,{...res.data});
+      this.supplierSettlementType= res.data.supplierSettlementType?.code
+      // this.form.taskFlowId =1
     },
     async updatSettlement(){
       let result =await updateOrderSettlement({
@@ -129,9 +136,6 @@ export default {
       }
     }
   },
-  components:{
-    // CommonBtn
-  }
 }
 </script>
 
@@ -143,7 +147,7 @@ export default {
   overflow-y: scroll;
 }
 .common {
-  @include wh(100%, 161px);
+  width: 100%;
   background: #FFFFFF;
   backdrop-filter: blur(5.602678571428572px);
   box-sizing: border-box;
@@ -152,7 +156,6 @@ export default {
 }
 .otherFee {
   @include wh(100%, 198px);
-  //margin-bottom: 20px;
 }
 .title {
   @include fontWeightSize(bold, 14px);
@@ -168,24 +171,23 @@ export default {
   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;
 }
 .metersWrap {
-  display: flex;
+  @include flexBetween;
-  justify-content: space-between;
   line-height: 37px;
   .blueColor{
     color: #4682FE;
   }
-  .alignRight{
+  .item{
-    text-align: right;
+    width: 100%;
-    opacity: .5;
+    @include flexBetCen;
-  }
+    .rightInput{
-  .leftTitle {
-    @include fontWeightSize(400, 14px);
-  }
-  .rightInputMeters {
-    margin-right: 13px;
       @include fontWeightSize(bold, 13px);
       color: #323643;
       opacity: .5;
+    }
+    .blueColor{
+      color: #4682FE;
+      opacity:  1 !important;
+    }
     input {
       height: 30px;
       border: none;
@@ -194,14 +196,21 @@ export default {
       opacity: .8;
     }
   }
+  .leftTitle {
+    @include fontWeightSize(400, 14px);
+  }
 }
 .btn {
-margin-top: 20px;
+  //position:absolute;
+  position: absolute;
+  bottom: 20px;
+  width: 100%;
   display: flex;
   align-items: center;
   justify-content: center;
-  margin-top: 20px;
+  margin-top: 40px;
   margin-bottom: 20px;
+  //bottom: 20px;
   button {
     border: none;
     border-radius: 5px;

src/views/index/toDoList.vue

@@ -1,7 +1,6 @@
 <template>
-  <div v-if="show"
+  <div class="empty" v-if="show">
-       style="width:100%;height:100%;background: #F1F5F9;;display: flex;align-items: center;justify-content: center">
+    <img src="@/assets/empty.png" >
-    <img src="@/assets/empty.png" style="width:65%;">
   </div>
   <div class="wrap" v-else>
     <ul id="dataList" class="dataList">
@@ -13,7 +12,7 @@
           <div class="addressName">{{ item.address }}</div>
           <div class="time">{{ item.toDoTime }} &nbsp;&nbsp;{{ item.userName }}</div>
         </div>
-        <div class="right">
+        <div class="right" v-if="permissonList.includes('approve')">
           <button class="nopass" @click="todoAudit(item ,2)">不通过</button>
           <button class="pass" @click="todoAudit(item ,1)">通过</button>
         </div>
@@ -24,16 +23,18 @@
 
 <script>
 import {getToDoList, toDoAudit} from "@/api/order"
-
+import {userOperationPermissions} from "@/api/mine"
 export default {
   name: "toDoList",
   data() {
     return {
       todolist: [],
-      show: false
+      show: false,
+      permissonList:[]
     }
   },
   mounted() {
+    this.getPermissions()
     this.getList()
   },
   methods: {
@@ -46,6 +47,11 @@ export default {
         this.show = false
       }
     },
+    async getPermissions(){
+      let res = await userOperationPermissions();
+      this.permissonList = res.data
+      // console.log("代办事项",this.permissonList.includes('approve'))
+    },
     async todoAudit(item,type) {
        await toDoAudit({
         toDoId: item.toDoId,
@@ -62,7 +68,14 @@ export default {
 <style scoped lang="scss">
 @import "@/styles/mixin.scss";
 @import "@/styles/common.scss";
-
+.empty{
+  @include wh(100%,100%);
+  background-color: #FAFAFA;
+  @include flexTwoCenter;
+  img{
+    width: 100%;
+  }
+}
 .wrap {
   @include wh(100%, 100%);
   box-sizing: border-box;

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 ? '修改车辆信息' : '添加车辆'"
@@ -12,13 +12,55 @@
     />
   </div>
 <div class="addContentWrap">
-  <cell-group label="车牌号" placeholder="请输入车牌号"   v-model="carNum" />
+  <div class="itemContent">
+    <div class="titleType">
+      <img class="startImg" src="@/assets/start.png" />
+      <span>行驶证首页</span>
+    </div>
+    <van-uploader
+      v-model="vehicleLicenseFrontList"
+      :after-read="vehicleLicenseFrontHandler"
+      :max-size="5 * 1024 * 1024"
+      max-count="1"
+      :preview-size="54"
+      accept="image "
+    />
+  </div>
+  <div class="itemContent">
+    <div class="titleType">
+      <img class="startImg" src="@/assets/start.png" />
+      <span>行驶证副页</span>
+    </div>
+    <van-uploader
+      v-model="vehicleLicenseBackList"
+      :after-read="vehicleLicenseBackHandler"
+      :max-size="5 * 1024 * 1024"
+      max-count="1"
+      :preview-size="54"
+      accept="image "
+    />
+  </div>
+  <div class="itemContent">
+    <div class="titleType">
+      <img class="startImg" src="@/assets/start.png" />
+      <span>车头照</span>
+    </div>
+    <van-uploader
+      v-model="vehicleFrontPhotoList"
+      :after-read="vehicleFrontPhotoHandler"
+      max-count="1"
+      :preview-size="54"
+      accept="image "
+    />
+  </div>
+
+  <cell-group label="车牌号" placeholder="车牌号" disabled v-model="carNum" />
   <div class="itemContent">
     <div class="titleType">
       <img class="startImg" src="@/assets/start.png" />
       <span>车辆类型</span>
     </div>
-    <select id="mySelect" style="width: 70px"  v-model="selectedOption">
+    <select id="mySelect"  class="mySelect"  v-model="selectedOption">
       <option v-for="(item,index) in typeList" :key="index" :value="index">{{item}}</option>
     </select>
   </div>
@@ -57,24 +99,30 @@
     </div>
   </div>
   <div class="serviceType">
+
     <div class="trailerService" v-for="(item,index) in supplierServiceList" :key="index">
-      <div class="serviceline">
+      <div class="serviceline"  @click="loadAll(index)">
+        <img  :ref="'serviceline' + index" :src="imageUrl" style="width: 20px;height: 15px" >
         <span  class="service">{{ item.name }}:</span>
         <span class="line"></span>
       </div>
-      <van-checkbox-group v-model="serviceIds" v-for="(item2,index2) in item.children" :key="index2" class="radioWrap" @change="change">
+      <div :ref="'checkboxGroup' + index"  class="checkbox-group">
+        <van-checkbox-group  v-model="serviceIds" v-for="(item2,index2) in item.children" :key="index2" class="radioWrap" >
           <van-checkbox class="item" :name="item2.id">{{item2.name }}</van-checkbox>
         </van-checkbox-group>
       </div>
+
     </div>
-  <two-common-btn class="btn" @cancelClick="cancelBtn" @submitClick="submitBtn" />
+  </div>
+  <two-common-btn class="btn" @cancelClick="h5GoBack" @submitClick="submitBtn" />
 </div>
 </div>
 </template>
 
 <script>
+  // uploadImage
 import {myMixins} from "@/utils/myMixins"
-import {vehicleTypeList,saveVehicle,getInfoById,supplierServiceTree} from "@/api/mine"
+import {vehicleTypeList,saveVehicle,getInfoById,supplierServiceTree, uploadImage, ocrHandler} from "@/api/mine"
 import TwoCommonBtn from "@/components/twoBtnCommon.vue"
 import CellGroup from "@/components/cellGroup.vue";
 export default {
@@ -83,7 +131,6 @@ export default {
   data(){
     return{
       trailerService: '',//拖车服务
-      smallRepairService: '',//小修服务
       isJoin:'',//是否参与
       activeIcon: require('@/assets/check.png'),
       inactiveIcon: require('@/assets/uncheck.png'),
@@ -94,7 +141,17 @@ export default {
       selectedOption:'1',//车辆类型
       id:'',//车辆Id
       serviceIds:[],//车辆服务种类,
-      supplierServiceList:[]
+      supplierServiceList:[],
+      show:false,
+      imageUrl: require('@/assets/arr_right.png'),
+      vehicleLicenseFrontList: [],
+      vehicleLicenseBackList: [],
+      vehicleFrontPhotoList: [],
+      vehicleLicenseFront: '',  // 行驶证首页
+      vehicleLicenseBack: '',   // 行驶证副页
+      vehicleFrontPhoto: '',    // 车头照
+      vehicleLicenseInfo: {},
+      vehicleLicenseBackOcrFlag: false,   // 行驶证副页 修改时默认不需要 ocr识别
     }
   },
   async mounted() {
@@ -110,6 +167,102 @@ export default {
     await this.getSupplierServiceTree();
   },
   methods:{
+    async vehicleLicenseFrontHandler(file) {    // 上传 行驶证首页
+      const formData = new FormData();
+      formData.append("file" , file.file);
+      let res = await uploadImage(formData)
+      this.vehicleLicenseFront = res.data;
+      await this.vehicleOcrHandler();
+    },
+    async vehicleLicenseBackHandler(file) {     // 上传 行驶证副页
+      this.vehicleLicenseBackOcrFlag = true;
+      const formData = new FormData();
+      formData.append("file" , file.file);
+      let res = await uploadImage(formData);
+      this.vehicleLicenseBack = res.data;
+      await this.vehicleBackOcrHandler();
+    },
+    async vehicleFrontPhotoHandler(file) {     // 上传 车头照
+      const formData = new FormData();
+      formData.append("file" , file.file);
+      let res = await uploadImage(formData);
+      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,
+        cardSide: 'FRONT'
+      })
+      if ( res?.data?.frontInfo ) {
+        let frontInfo = res?.data?.frontInfo;
+        this.carNum = frontInfo?.plateNo;
+        this.vehicleLicenseInfo.licensePlateNumber = frontInfo?.plateNo;
+        this.vehicleLicenseInfo.vehicleType = frontInfo?.vehicleType;
+        this.vehicleLicenseInfo.owner = frontInfo?.owner;
+        this.vehicleLicenseInfo.address = frontInfo?.address;
+        this.vehicleLicenseInfo.useNature = frontInfo?.useCharacter;
+        this.vehicleLicenseInfo.model = frontInfo?.model;
+        this.vehicleLicenseInfo.vinCode = frontInfo?.vin;
+        this.vehicleLicenseInfo.engineNumber = frontInfo?.engineNo;
+        this.vehicleLicenseInfo.registrationDate = frontInfo?.registerDate;
+        this.vehicleLicenseInfo.issueDate = frontInfo?.issueDate;
+        this.vehicleLicenseInfo.issueAuthority = frontInfo?.seal;
+      }
+    },
+    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,
+        cardSide: 'BACK'
+      })
+      if(res?.data?.backInfo) {
+        let backInfo = res?.data?.backInfo;
+        this.vehicleLicenseInfo.recordNumber = backInfo?.fileNo;
+        this.vehicleLicenseInfo.passengerCapacity = backInfo?.allowNum;
+        this.vehicleLicenseInfo.totalWeight = backInfo?.totalMass;
+        this.vehicleLicenseInfo.curbWeight = backInfo?.curbWeight;
+        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)
+    },
+    loadAll(i){
+      // console.log(i)
+      this.show = !this.show
+      const refName='checkboxGroup' + i;
+      const element1 = this.$refs[refName]; // 通过动态属性名访问引用this.$refs.checkboxGroup.style.display = 'block';
+      const refName1='serviceline' + i;
+      const element = this.$refs[refName1];
+      if(this.show){
+        element1[0].style.display = 'block'
+        element[0].src= require('@/assets/arr_bot.png')
+      }else {
+        element1[0].style.display = 'none'
+        element[0].src= require('@/assets/arr_right.png')
+      }
+    },
     async getTypeList() {
         let result=await vehicleTypeList();
         if(result.code === 200){
@@ -130,30 +283,48 @@ export default {
       this.isJoin=result.hasPolymerization.code
       this.selectedOption=result.vehicleType;
       this.serviceIds=result.serviceIds
-    },
+      this.vehicleLicenseFront = result.vehicleLicenseFront;
-    change(e) {
+      this.vehicleLicenseBack = result.vehicleLicenseBack;
-      // this.trailerService=e
+      this.vehicleFrontPhoto = result.vehicleFrontPhoto;
-      console.log(" this.trailerService",e, this.result)
+      this.vehicleLicenseInfo = result.vehicleLicenseInfo;
-    },
+      this.vehicleLicenseFrontList = [{ url : this.vehicleLicenseFront }];
-    change2(e) {
+      this.vehicleLicenseBackList = [{ url : this.vehicleLicenseBack }];
-      this.smallRepairService=e
+      this.vehicleFrontPhotoList = [{ url : this.vehicleFrontPhoto }];
     },
     isChange(e){
       this.isJoin=e
     },
-    cancelBtn(){//取消车辆
-      this.$router.back()
-    },
     async submitBtn(){
-      // if(this.carNum || this.selectedOption || this.isJoin){
+        if( !this.vehicleLicenseFront ) {
-      //   this.$toast('必填字段未填写')
+          this.$toast('行驶证主页照片不能为空')
-      // }else{
+          return
+        }
+      if( !this.vehicleLicenseBack ) {
+        this.$toast('行驶证副页照片不能为空')
+        return
+      }
+      if( !this.vehicleLicenseBack ) {
+        this.$toast('车头照片不能为空')
+        return
+      }
+      if( !this.vehicleLicenseInfo.licensePlateNumber ) {
+        this.$toast('行驶证主页识别失败')
+        return
+      }
+      if(this.vehicleLicenseBackOcrFlag && !this.vehicleLicenseInfo.backPlateNo ) {
+        this.$toast('行驶证副页识别失败')
+        return
+      }
         await saveVehicle({
           vehicleId:this.id ? this.id : '',
           plateNumber:this.carNum ? this.carNum :'',
           vehicleType:this.selectedOption ? this.selectedOption : '',
-          hasPolymerization:this.isJoin ? this.isJoin : '',
+          hasPolymerization:this.isJoin,
-          serviceIds:this.serviceIds ? this.serviceIds : []
+          serviceIds:this.serviceIds ? this.serviceIds : [],
+          vehicleLicenseFront: this.vehicleLicenseFront,
+          vehicleLicenseBack: this.vehicleLicenseBack,
+          vehicleFrontPhoto: this.vehicleFrontPhoto,
+          vehicleLicenseInfo: this.vehicleLicenseInfo,
         })
         if(this.id){
           this.$toast('修改成功')
@@ -164,7 +335,6 @@ export default {
           this.$router.back();
         },2000)
       }
-    // },
   },
   components:{
     CellGroup,
@@ -173,9 +343,25 @@ 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";
+.mySelect{
+  @include fontWeightSize(bold,13px);
+  color: #323643;
+  appearance: none;
+  padding-right: 16px;
+  background: url('@/assets/arrow_bot.png') no-repeat right center / 15px 14px;
+}
+.checkbox-group {
+  display: none;
+}
 .navBar{
   margin-bottom: 46px;
 }
@@ -186,8 +372,7 @@ export default {
 .addContentWrap{
   margin-left: 16px;
   .itemContent{
-    display: flex;
+    @include flexColBet;
-    justify-content: space-between;
     line-height: 56px;
     box-sizing: border-box;
     padding-right: 25px;
@@ -238,13 +423,13 @@ export default {
       margin-left: 10px;
     }
     .service{
-      opacity: .7;
+      @include colorOpa(#323643,0.7);
-      color: #323643;
       line-height: 18px;
+      white-space: nowrap;
     }
     .line{
       display: inline-block;
-      @include wh(246px,2px);
+      @include wh(240px,2px);
       opacity: 0.16;
       border-bottom: 1px solid;
       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;
@@ -254,11 +439,8 @@ export default {
     }
   }
   .btn{
-    //margin-left: 8px;
     width: 90%;
     margin: 40px 0 30px 8px;
-    //position: fixed;
-    //bottom: 30px;
   }
 }
 </style>

src/views/index/vehicleManage.vue

@@ -1,5 +1,5 @@
 <template>
-<div class="wrap"  @scroll="handleScroll">
+<div class="wrap"  >
   <div class="navBar">
     <van-nav-bar
         title="车辆管理"
@@ -10,7 +10,7 @@
         :safe-area-inset-top="true"
         @click-left="goBack"
     >
-      <template slot="right">
+      <template slot="right" v-if="permissonList.includes('vehicleAddBtn')">
         <div class="rightWrap" @click="goPage('vehicleAdd')">
               <img src="@/assets/addImg.png" />
               <span class="addTxt">添加</span>
@@ -19,12 +19,18 @@
     </van-nav-bar>
   </div>
   <van-pull-refresh v-model="isLoading" @refresh="onRefresh">
+    <van-list
+        v-model="loading"
+        :finished="finished"
+        finished-text="没有更多了"
+        @load="onLoad"
+    >
       <div class="carItem" v-for="(item,index) in vehicleList" :key="index">
         <div class="carCode">
           <div class="codeLeft">{{item.plateNumber}} / {{item.vehicleTypeString}}</div>
           <div class="twoBtn">
-          <button class="del" @click="deleteItem(item.vehicleId)">删除</button>
+            <button v-if="permissonList.includes('vehicleAddBtn')" class="del" @click="deleteItem(item.vehicleId)">删除</button>
-          <button class="revise" @click="updateVehicle(item)">修改</button>
+            <button v-if="permissonList.includes('vehicleModifyBtn')" class="revise" @click="updateVehicle(item)">修改</button>
           </div>
         </div>
         <div class="carType">{{ item.serviceName }}</div>
@@ -33,16 +39,17 @@
           <span :class="item.hasPolymerization.code == 0  ? 'isYes' :'isNo'">{{item.hasPolymerization.label}}</span>
         </div>
       </div>
+
+    </van-list>
  </van-pull-refresh>
   <van-dialog v-model="show" title="确定删除吗" show-cancel-button @confirm="handleConfirm"></van-dialog>
-  <div v-if="loading">加载中...</div>
 </div>
 
 </template>
 
 <script>
 import { myMixins} from "@/utils/myMixins";
-import {supplierVehicleList,deleteVehicle} from "@/api/mine"
+import {supplierVehicleList,deleteVehicle,userOperationPermissions} from "@/api/mine"
 export default {
   name: "vehicleManage",
   mixins:[myMixins],
@@ -54,16 +61,30 @@ export default {
       pageNum:1,
       pageSize:10,
       total:'',
-      loading:false,
       isLoading: false,
+      loading: false,
+      finished: false,
+      permissonList:[],
     }
   },
   mounted() {
-    this.getVehicleList();
+    // this.getVehicleList();
+    this.getPermissions();
   },
   methods:{
+    async onLoad(){
+      await this.getVehicleList()
+      this.pageNum++;
+      // 加载状态结束
+      this.loading = false;
+      // 数据全部加载完成
+      if (this.vehicleList.length >= this.total) {
+        this.finished = true;
+      }
+    },
     onRefresh() {
-      this.getVehicleList()
+      this.pageNum=1
+      // this.getVehicleList()
       setTimeout(() => {
         this.$toast('刷新成功');
         this.isLoading = false;
@@ -74,7 +95,6 @@ export default {
           pageNum:this.pageNum,
           pageSize:this.pageSize
         })
-        // if(result.code === 200){
           this.total=result.total
           if(this.pageNum == 1){// 第一页直接赋值
             this.vehicleList=result.data;
@@ -83,7 +103,11 @@ export default {
             let arr = result.data;
             this.vehicleList = preList.concat(arr)
           }
-        // }
+      },
+    async getPermissions(){
+      let res = await userOperationPermissions();
+      this.permissonList = res.data
+      // console.log("车辆管理",this.permissonList.includes('vehicleAddBtn','vehicleModifyBtn'))
     },
     deleteItem(id){//删除车辆
         this.show=true
@@ -93,11 +117,9 @@ export default {
       await deleteVehicle({
         vehicleId:this.id
       })
-     // if(result.code === 200){
        this.$toast('删除成功');
-       // this.vehicleList=[]
+      this.pageNum=1
       await this.getVehicleList();
-     // }
     },
     updateVehicle(item){//修改
       this.$router.push({
@@ -107,15 +129,6 @@ export default {
         }
       })
     },
-    async handleScroll(){
-      let num =  Math.ceil( this.total / 10)
-      if(num <= this.pageNum){
-        // console.log("不在加载数据")
-      }else{
-        this.pageNum++;
-        await this.getVehicleList()
-      }
-    },
 
   }
 }
@@ -125,47 +138,38 @@ export default {
 @import "@/styles/mixin.scss";
 @import "@/styles/common.scss";
 .wrap{
+  background: #F4F5F7;
+  @include sizingPadding(13px,13px);
+  @include wh(100%, 100%);
   overflow-y: auto;
-  @include wh(100%,calc(100% - 46px));
-  box-sizing: border-box;
-  padding: 13px 13px 0;
 }
 .navBar{
   margin-bottom: 46px;
-  //height: 46px;
   .rightWrap{
-    width: 50px;
+    @include wh(50px,20px);
-    height: 20px;
     border-radius: 10px;
     opacity: 0.7;
     border: 1px solid #FFFFFF;
-    @include flexCenter;
+    @include flexTwoCenter;
-    justify-content: center;
     img{
       @include widHeiMar(9px,8px,4px);
     }
     .addTxt{
       @include fontWeightSize(bolder,11px);
-      opacity: .7;
+      @include colorOpa(#FFFFFF,0.7);
-      color: #FFFFFF;
     }
   }
-
 }
 .carItem{
-//position: relative;
-//  z-index: 11;
   @include wh(100%,86px);
   background: #FFFFFF;
   box-shadow: 0px 2px 10px 0px rgba(216,216,216,0.5);
-  border-radius: 6px;
+  @include radiusSizing(6px);
-  box-sizing: border-box;
   padding: 11px 13px 11px 15px;
   margin-bottom: 10px;
   @include flexBetween;
   .carCode{
-    display: flex;
+    @include flexColBet;
-    justify-content: space-between;
     .codeLeft{
       @include fontWeightSize(bold,14px)
     }
@@ -173,13 +177,9 @@ export default {
       display: flex;
       button{
         border: none;
-        //width: 48px;
-        //@include all-height(20px);
         padding: 4px  8px;
-        display: flex;
-        justify-content: center;
-        align-items: center;
         border-radius: 3px;
+        @include flexTwoCenter;
         @include fontWeightSize(bold,12px)
       }
       .del{
@@ -187,9 +187,8 @@ export default {
         background-color: #FFFFFF;
       }
       .revise{
-        color: #FFFFFF;
+        @include bgFontColor( #FFFFFF,#354D93);
         margin-left: 15px;
-        background: #354D93;
       }
     }
   }

src/views/index/workOrderDetail.vue

@@ -15,18 +15,17 @@
         </div>
         <div class="rightContent">
           <div class="rightItem" style="display: flex;align-items: center;">
-            <span id="copyText">{{orderCode}}</span>
+            <span id="copyText">{{orderDetailInfo.orderCode}}</span>
             <img @click="copyText" src="@/assets/copy.png" style="width: 35px;height: 15px;margin-left: 10px"/>
           </div>
           <div class="rightItem">{{ orderDetailInfo.contractName }}</div>
-          <div class="rightItem">{{ orderDetailInfo.contractSettleType.label }}</div>
+          <div class="rightItem">{{ orderDetailInfo.contractSettleType?.label }}</div>
           <div class="rightItem">{{ orderDetailInfo.userName }}</div>
           <div class="rightItem">{{ orderDetailInfo.userPhone }}</div>
           <div class="rightItem">{{ orderDetailInfo.plateNumber }}</div>
-          <div class="rightItem"  style="line-height: 17px;width: 220px;align-items: baseline">
+<!--          <div class="rightItem" >理想智动LXA6500SHEVM理想智动LXA6500SHEVM</div>-->
-            <span >{{orderDetailInfo.model}}  </span>
+          <div class="rightItem" >{{orderDetailInfo.model}}{{ orderDetailInfo.brand }}</div>
-            <span>{{ orderDetailInfo.brand }}</span>
+
-             </div>
         </div>
       </div>
     </div>
@@ -38,7 +37,7 @@
           <span class="leftTitle fontColor">服务类型:</span><span class="rightContent">{{ orderDetailInfo.taskServiceName }}</span>
         </div>
         <div class="item">
-          <span class="leftTitle fontColor">车辆位于:</span><span class="rightContent">{{ orderDetailInfo.positionEnvironment.label }}</span>
+          <span class="leftTitle fontColor">车辆位于:</span><span class="rightContent">{{ orderDetailInfo.positionEnvironment?.label }}</span>
         </div>
         <div class="item"  style="align-items: baseline">
           <span class="leftTitle fontColor">事发地:</span><span class="rightContent" style="flex: 1">{{ orderDetailInfo.vehiclePointAddress }}</span>
@@ -47,10 +46,10 @@
           <span class="leftTitle fontColor">事发地补充:</span><span class="rightContent vehicleRemark" >{{orderDetailInfo.vehiclePointRemark}}
       </span>
         </div>
-        <div class="item"  style="align-items: baseline">
+        <div v-show="orderDetailInfo.taskFlowId === 2" class="item"  style="align-items: baseline" >
           <span class="leftTitle fontColor">目的地:</span><span class="rightContent" style="flex: 1">{{ orderDetailInfo.destinationAddress }}</span>
         </div>
-        <div class="item"  style="align-items: baseline">
+        <div v-show="orderDetailInfo.taskFlowId === 2" class="item"  style="align-items: baseline">
           <span class="leftTitle fontColor">目的地补充:</span><span class="rightContent vehicleRemark">{{orderDetailInfo.destinationRemark}}</span>
         </div>
         <div class="item">
@@ -60,16 +59,28 @@
           <span class="leftTitle fontColor">服务车辆:</span><span class="rightContent">{{ orderDetailInfo.taskVehicleName }}</span>
         </div>
         <div class="item">
-          <span class="leftTitle fontColor">服务师傅:</span><span class="rightContent">{{ orderDetailInfo.driverName }} {{orderDetailInfo.drivePhone ? '/' : ''}} {{orderDetailInfo.drivePhone }}</span>
+          <span class="leftTitle fontColor">服务师傅:</span><span class="rightContent">{{ orderDetailInfo.driverName }} {{orderDetailInfo.drivePhone ? '/' : ''}} {{orderDetailInfo.drivePhone }}
+           <span v-if="queryType == 5" class="driverPoiBtn" @click="noMultipleClicks(showMap)">查看司机位置</span>
+          </span>
+        </div>
+        <div class="item" v-if="queryType == 9 || queryType ==11  || queryType ==12">
+          <span class="leftTitle fontColor">工单照片:</span><span class="rightContent">
+           <span  class="driverPoiBtn" @click="checkPhoto">查看照片</span>
+          </span>
         </div>
       </div>
     </div>
+    <div class="map" v-show="showPopup"   id="container">
+      <img @click="showPopup = false"  src="@/assets/delKey.png" class="mapImg">
+    </div>
   </div>
 </template>
-
 <script>
 import {myMixins} from '@/utils/myMixins'
-import {getOrderDetail} from "@/api/order"
+import {getOrderDetail,showVehiclePositionInfo} from "@/api/order"
+import minePosition from '@/assets/minePosition.png';
+import vehiclePosition from '@/assets/vehiclePosition.png';
+import  desitationPosition from '@/assets/desitationPosition.png'
 export default {
   name: "workOrderDetail",
   mixins:[myMixins],
@@ -79,7 +90,11 @@ export default {
       queryType:'',
       orderCode:'',
       taskOrderId:'',
-      orderDetailInfo:{}
+      orderDetailInfo:{},
+      showPopup: false,
+      map: '',
+      driverPoiInfo:{},
+      noClick:true,
     }
   },
   async mounted() {
@@ -91,6 +106,13 @@ export default {
     this.orderCode=urlParams.get('orderCode');
     this.taskOrderId=urlParams.get('taskOrderId') ? urlParams.get('taskOrderId') : '';
     await this.getDetail();
+    if(this.queryType == 5){
+      await this.getDriverPoi();
+    }
+    this.$nextTick(() => {
+      this.initMap();
+    });
+
   },
   methods:{
     async getDetail(){
@@ -101,8 +123,83 @@ export default {
         taskOrderId:this.taskOrderId ? this.taskOrderId : ''
       })
       // if(result.code === 200){
-        this.orderDetailInfo=result;
+        this.orderDetailInfo=result.data;
       // }
+    },
+    showMap() {
+      this.showPopup = true;
+      this.mapMarkers();
+    },
+    checkPhoto(){
+      let isAllowImage = this.queryType == 9 ? 0 : 1
+      let data = {
+        "action": "orderPhoto",
+        "params": {
+          "userOrderId": this.userOrderId,
+          "orderCode": this.orderCode,
+          "taskOrderId": this.taskOrderId,
+          "isAllowImage":isAllowImage,
+        }
+      }
+      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("orderPhoto,"+this.userOrderId+","+this.orderCode+","+this.taskOrderId+","+isAllowImage);
+      }
+    },
+    initMap() {
+      this.map = new AMap.Map('container',{
+        zoom:14,//级别(缩放比例 3-20 )
+        center: [this.driverPoiInfo.vehiclePositionLongtitude,this.driverPoiInfo.vehiclePositionLatitude],//中心点坐标
+        viewMode:'2D',//使用3D视图
+      })
+      this.map.on('complete', () => {
+        console.log("地图加载完成")
+        this.mapMarkers();
+      });
+    },
+    mapMarkers(){
+      // 车辆位置，a点
+      let marker = new AMap.Marker({
+        position: [this.driverPoiInfo?.vehiclePositionLongtitude,this.driverPoiInfo?.vehiclePositionLatitude],
+        icon: new AMap.Icon({
+          image: minePosition, // 图片的相对路径
+          size: new AMap.Size(22, 32),  // 图标的尺寸
+          imageSize: new AMap.Size(22, 32)  // 图片的实际尺寸
+        }),
+      });
+      this.map.add(marker);
+      // 事发地，b点
+      let marker1 = new AMap.Marker({
+        position: [this.driverPoiInfo?.vehiclePointLongitude,this.driverPoiInfo?.vehiclePointLatitude],
+        icon: new AMap.Icon({
+          image: vehiclePosition, // 图片的相对路径
+          size: new AMap.Size(26, 28),  // 图标的尺寸
+          imageSize: new AMap.Size(26, 28)  // 图片的实际尺寸
+        })
+      });
+      this.map.add(marker1);
+      let marker2 = new AMap.Marker({
+        position: [this.driverPoiInfo?.destinationLongitude,this.driverPoiInfo?.destinationLatitude],
+        icon: new AMap.Icon({
+          image: desitationPosition, // 图片的相对路径
+          size: new AMap.Size(28, 28),  // 图标的尺寸
+          imageSize: new AMap.Size(28, 28)  // 图片的实际尺寸
+        })
+      });
+      this.map.add(marker2);
+      this.map.setFitView([marker,marker1,marker2])
+    },
+    async getDriverPoi(){
+      let res=await showVehiclePositionInfo({
+        userOrderId:this.userOrderId,
+        taskOrderId:this.taskOrderId
+      })
+      // 2704382，24145
+      this.driverPoiInfo = res.data
+      console.log("driverPoiInfo",this.driverPoiInfo)
     }
   }
 }
@@ -111,23 +208,46 @@ export default {
 <style scoped lang="scss">
 @import "@/styles/mixin.scss";
 .wrap{
-  width: 100%;
+  @include wh(100%,100%);
-  height: 100%;
   background-color: #F4F5F7;
+  overflow-y: auto;
 }
+::v-deep .amap-copyright{
+  display: none !important;
+}
+::v-deep .amap-logo{
+  display: none !important;
+}
+.map{
+  position: absolute;
+  top: 0;
+  bottom: 0;
+  left: 0;
+  right: 0;
+  margin: auto;
+  @include wh(95%,350px);
+  .mapImg{
+    background-color: #FFFFFF;
+    position: absolute;
+    right: 0;
+    top: 0;
+    @include wh(25px,25px);
+    z-index: 1111111;
+  }
+}
+
 .common{
   background: #FFFFFF;
-  border-radius: 6px;
+  @include radiusSizing(6px);
-  box-sizing: border-box;
   padding: 11px 17px 15px 24px;
 }
 .fontColor{
   @include fontWeightSize(400,12px);
   color: #000000;
-  line-height: 27px;
+  line-height: 24px;
 }
 .baseInfo{
-  @include wh(100%,250px);
+  @include wh(100%,260px);
   margin-bottom: 12px;
   .infoWrap{
     display: flex;
@@ -138,16 +258,17 @@ export default {
       opacity: .5;
     }
     .rightContent{
-      @include wh(90px,189px);
+      height: 189px;
+      width: calc(100% - 60px);
     }
   }
 }
 .serviceInfo{
-  @include wh(100%,356px);
+  //@include wh(100%,356px);
+  width: 100%;
+  margin-bottom: 30px;
   .item{
-    display: flex;
+    @include flexCenter;
-    align-items: center;
-    line-height: 27px;
   }
   .infoContent{
     .leftTitle{
@@ -158,12 +279,21 @@ export default {
     .rightContent{
       width: calc(100% - 90px);
       @include fontWeightSize(bold,12px);
+      .driverPoiBtn{
+        display: inline-block;
+        padding: 3px 8px;
+        @include bgFontColor(#FFFFFF,#354D93);
+        opacity: .7;
+        border-radius: 3px;
+        text-align: center;
+        margin-left: 6px;
+        cursor: pointer;
+      }
     }
 
     .vehicleRemark{
       @include fontWeightSize(400,11px);
-      opacity: 0.55;
+      @include colorOpa(#121212,0.55);
-      color: #121212;
       line-height: 14px;
       flex: 1;
     }
@@ -174,9 +304,8 @@ export default {
 }
 .title{
   @include fontWeightSize(bold,14px);
-  color: #323643;
+  @include colorOpa(#323643,0.6);
   line-height: 20px;
-  opacity: .6;
 }
 .line{
   @include wh(100%,2px);

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,17 +41,19 @@
     </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="driverPoiBtn" @click="checkPhoto">查看照片</span>
+      </span>
+    </div>
   </div>
   <div class="supplierData common" v-show="!auditFormShow">
     <div class="title">供应商数据:</div>
@@ -102,27 +104,32 @@
             <div>收取客户金额:</div>
             <div class="halfOpcity inputContent"><input type="number" v-model="form.supplierCustomerAmount"/>元</div>
         </div>
-        <div  class="flex-between" >
+        <div  class="flex-between bgDisable" :class=" { 'flex-between': true, 'bgDisable' : basePriceDisabled } " >
           <div>基本费用:</div>
-          <div class="halfOpcity inputContent"  ><input  type="number" :disabled="basePriceDisabled" v-model="form.supplierBasePrice"/>元</div>
+          <div class="halfOpcity inputContent "  ><input  class="disable" type="number" :readonly="basePriceDisabled" v-model="form.supplierBasePrice"/><span >元</span></div>
         </div>
-        <div  class="flex-between" >
+        <div  class="flex-between bgDisable" >
           <div>额外费用总计:</div>
-          <div class="halfOpcity inputContent" ><input type="number"  :disabled="true" v-model="form.supplierExtraPrice"/>元</div>
+          <div class="halfOpcity inputContent " ><input class="disable" type="number"  :readonly="true" v-model="form.supplierExtraPrice"/><span>元</span></div>
         </div>
-        <div  class="flex-between">
+        <div  class="flex-between bgDisable ">
             <div>费用总计: </div>
-          <div class="halfOpcity inputContent" ><input type="number" :disabled="true" v-model="form.supplierSettleAmount"/>元</div>
+          <div class="halfOpcity inputContent " ><input class="disable" type="number" :readonly="true" v-model="form.supplierSettleAmount"/><span >元</span></div>
         </div>
         <div  class="flex-between">
-          <div> </div>
+          <div> &nbsp;</div>
           <div class="btnComputed" @click="compute">计算</div>
         </div>
         <div>备注说明:</div>
       </div>
     </div>
     <textarea v-model="form.supplierRemark" class="multipleTxt" placeholder="报备描述"></textarea>
-    <two-common-btn class="btn" @cancelClick="cancelBtn" @submitClick="save" />
+<!--    <two-common-btn class="btn" @cancelClick="cancelBtn" @submitClick="save" />-->
+    <div class="btn">
+      <button class="cancel"  @click="noMultipleClicks(cancelBtn )">取消</button>
+      <button v-if="orderInfo.checkCount < 3" :class="{'submit' : true,'loading' : loading}" @click="noMultipleClicks(save)" >提交</button>
+    </div>
+
   </div>
   <div class="dataType" v-show="auditFormShow">
     <table>
@@ -172,11 +179,11 @@
       </tr>
       <tr>
         <td class="col1">基本费用:{{orderInfo.basePrice +'元'}}</td>
-        <td  class="col2 halfOpc" ><input  :disabled="basePriceDisabled" v-model="form.supplierBasePrice"/></td>
+        <td  class="col2 halfOpc"  :style="{ opacity: basePriceDisabled ? '1' : '0.5' }"><input   :class="basePriceDisabled ? 'supplierdisable' : ''" :readonly="basePriceDisabled" v-model="form.supplierBasePrice"/></td>
       </tr>
       <tr>
         <td class="col1">额外费用总计:{{orderInfo.extraPrice +'元'}}</td>
-        <td  class="col2 halfOpc" ><input  :disabled="true" v-model="form.supplierExtraPrice"/></td>
+        <td  class="col2 halfOpc" style="opacity: 1;"><input  class="supplierdisable"  :readonly="true" v-model="form.supplierExtraPrice"/></td>
       </tr>
       <tr>
         <td class="col1">收取客户:{{orderInfo.customerAmount +'元'}}</td>
@@ -185,7 +192,7 @@
       <tr>
         <td class="col1">费用总计:{{orderInfo.settleAmount +'元'}}</td>
         <td  class="col2" style="width: 100%;display: flex;justify-content: center;box-sizing: border-box">
-          <input   :disabled="true" v-model="form.supplierSettleAmount"/>
+          <input   class="supplierdisable"  :readonly="true" v-model="form.supplierSettleAmount"/>
           <button class="btnCom" @click="compute">计算</button>
         </td>
       </tr>
@@ -193,15 +200,16 @@
         <td class="col1 alignLeft" style="border-bottom-left-radius: 3px">
           <div class="title col1" style="white-space: nowrap;">审核失败原因</div>
           <div class="reason">{{orderInfo.auditRemark}}</div>
-          <div  v-show="orderInfo.auditPhoto">
+          <div  v-show="orderInfo.auditPhoto"  style="display: flex;flex-wrap: wrap">
-            <img v-for="(item,index) in auditPhotoList" :key="index" class="camerImg" :src="item.url" >
+            <van-image class="camerImg" v-for="(item,index) in auditPhotoList" :key="index" :src="item.url" @click="previewPhoto(index)" />
           </div>
         </td>
         <td  class="col2 alignLeft"  style="border-bottom-right-radius: 3px">
           <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
@@ -209,7 +217,6 @@
                 :after-read="handleFileRead"
                  multiple
                 :preview-size="54"
-                capture="camera"
                 accept="image "
             />
           </div>
@@ -217,7 +224,11 @@
       </tr>
     </table>
   </div>
-  <two-common-btn v-show="auditFormShow" class="btn" :title2="accountStatus ==2 ? '再次审核' : '再次提交' " @cancelClick="cancelBtn" @submitClick="save" />
+  <van-dialog v-model="show" title="确定删除此照片吗" show-cancel-button @confirm="handleConfirm"></van-dialog>
+  <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>
+  </div>
 </div>
 </template>
 
@@ -229,7 +240,8 @@ import {
   updateAccountRecordInfo,
   selectRecordPictureList, deleteImage
 } from "@/api/mine"
-import TwoCommonBtn from "@/components/twoBtnCommon.vue"
+import { ImagePreview } from "vant";
+import {orderReportingList} from "@/api/order";
 export default {
   name: "accountingView",
   mixins:[myMixins],
@@ -262,12 +274,14 @@ export default {
       auditBasePrice:'0',
       auditExtraPrice:'0',
       extraPrice:'0',
-      commitLoading: false,
       auditFormShow:false,
       auditPhotoList:[],
       supplierPhotoList:[],
       index:'',//记录工单对账属于哪个状态
+      queryTime:'',//记录工单对账选择的时间
       uploadedImage: null,
+      show:false,//是否显示弹框
+      imgId:'',//删除供应商图片的Id
       form:{
         id:'',
         taskOrderCostHisId:'',
@@ -338,18 +352,25 @@ export default {
         auditSuccessRemark:'',
         accountStatus: ''
       },
+      noClick:true,
+      loading: false,
+      loading1: false,
+      settleDetail:[],
     }
   },
   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.$nextTick(async ()=>{
       await this.getDetail()
+      await this.getSettlementDetail()
     })
   },
   computed:{
     basePriceDisabled(){
+      // return false
       return !(this.serviceType == '困境救援' || this.serviceType == '困境-吊车' || this.serviceType == '困境救援-事故' || this.serviceType == '困境救援-故障'
           || (this.fixedPrice && parseFloat(this.fixedPrice) > 0 && this.fixedPriceType) || this.supplierId == 500921)
     },
@@ -362,27 +383,72 @@ export default {
     },
   },
   methods:{
-    // openFileSelector() {
+    viewSettlementDoc(){//查看结算单
-    //   this.$refs.fileInput.click();
+      this.$router.push({
-    // },
+        name:"settlementDetail",
-    // handleFileUpload(event) {
+        params:{
-    //   const file = event.target.files[0];
+          id: this.id,                  // 参数对象的属性
-    //   if (file) {
+          postfix:this.postfix,
-    //     const reader = new FileReader();
+          index:this.activeIndex,
-    //     reader.onload = (e) => {
+          queryTime: this.time || this.queryTime,
-    //       this.uploadedImage = e.target.result;
+          settleDetailList:this.settleDetail
-    //     };
+        }
-    //     reader.readAsDataURL(file);
+      })
-    //   }
+    },
-    // },
+    checkPhoto(){
+      let isAllowImage = 1
+      let data = {
+        "action": "orderPhoto",
+        "params": {
+          "userOrderId":String( this.orderInfo.userOrderId),
+          "orderCode": this.orderInfo.orderCode,
+          "taskOrderId": String(this.orderInfo.taskOrderId),
+          "isAllowImage":isAllowImage,
+        }
+      }
+      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("orderPhoto,"+this.orderInfo.userOrderId+","+this.orderInfo.orderCode+","+this.orderInfo.taskOrderId+","+isAllowImage);
+      }
+    },
+    previewPhoto(index) {
+      let url=[]
+      this.auditPhotoList.forEach((item)=>{
+        url.push(item.url)
+      })
+      ImagePreview({
+        images: url,
+        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(){
       this.$router.push({
         name:"workOrderReconciliation",
         params:{
-           activeIndex:this.index
+          activeIndex:this.index,
+          queryTime:this.queryTime,
         }
       })
     },
@@ -405,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,
@@ -414,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(){
@@ -453,6 +516,7 @@ export default {
       })
       if(res.code === 200){
         this.orderInfo=res.data
+        console.log("this.orderInfo",this.orderInfo)
         this.serviceType=this.orderInfo.serviceName
         this.taskFlowId=this.orderInfo.taskFlowId
         this.settleType=this.orderInfo.settleType?.label
@@ -504,22 +568,20 @@ export default {
       }
     },
     cancelBtn(){
-      this.$router.back();
+      this.goback()
     },
     async save() {
-      this.commitLoading = true;
       if(this.form.supplierOtherAmount > 0){
         if(this.form.supplierOtherAmountRemark == ''){
           this.$alert('请填写其他费用说明');
-          this.commitLoading = false;
           return;
         }
       }
       if(this.accountStatus >= 4){
         this.$alert('已进入后续流程，不允许操作');
-        this.commitLoading = false;
         return;
       }
+      this.loading = true;
       let accountStatus = 0
       if(this.accountStatus == 0) accountStatus = 1
       if(this.accountStatus == 1) accountStatus = 1
@@ -555,22 +617,89 @@ export default {
       if(res.code === 200){
         this.$toast('操作成功')
         setTimeout(()=>{
-          this.$router.back()
+          // this.$router.back()
+          this.$router.push({
+            name:"workOrderReconciliation",
+            params:{
+              activeIndex:this.index,
+              queryTime:this.queryTime,
+            }
+          })
         },2000)
       }
-      this.commitLoading = false;
+      this.loading = false;
     },
+    async confirmAudit(){
+      if(this.accountStatus >= 4){
+        this.$alert('已进入后续流程，不允许操作');
+        return;
+      }
+      this.loading1 = true;
+      this.form.supplierExtraPrice = this.form.extraPrice || 0
+      this.form.supplierBasePrice = this.form.basePrice || 0
+      this.form.supplierBridgeAmountAb = this.form.bridgeAmountAb || 0
+      this.form.supplierBridgeAmountBc = this.form.bridgeAmountBc || 0
+      this.form.supplierBridgeAmountCa = this.form.bridgeAmountCa || 0
+      this.form.supplierBridgeAmount = this.form.supplierBridgeAmountAb + this.form.supplierBridgeAmountBc + this.form.supplierBridgeAmountCa
+      this.form.supplierCustomerAmount = this.form.customerAmount || 0
+      this.form.supplierDilemmaAmount = this.form.dilemmaAmount || 0
+      this.form.supplierOtherAmount = this.form.otherAmount || 0
+      this.form.supplierSettleAmount = this.form.settleAmount || 0
+      this.form.supplierTyreAmount = this.form.tyreAmount || 0
+      this.form.supplierSettleMileageAb = this.form.settleMileageAb || 0
+      this.form.supplierSettleMileageBc = this.form.settleMileageBc || 0
+      this.form.supplierSettleMileageCa = this.form.settleMileageCa || 0
+      this.form.supplierWaitAmount = this.form.waitAmount || 0
+      this.form.supplierBasementFee = this.form.basementFee || 0
+      let accountStatus = 11
+      if(this.form.financePrice >= this.form.settleAmount){//服务商确认中道价格，且等于财务金额，则直接到审核完成
+        accountStatus = 4
+      }
+      this.form.accountStatus = accountStatus;
+      const formData = new FormData();
+      let obj = this.form;
+      Object.keys(obj).forEach((key) => {
+        formData.append(key, obj[key]);
+      });
+      this.files.forEach((file) => {
+        formData.append('file', file.file);
+      });
+      // formData.append('accountStatus', accountStatus);
+      formData.append('state', 0);
+      formData.append('postfix', this.postfix);
+      formData.append('supplierBridgeAmount', parseInt(this.form.supplierBridgeAmountAb || 0) + parseInt(this.form.supplierBridgeAmountBc || 0) + parseInt(this.form.supplierBridgeAmountCa || 0));
+      let res = await updateAccountRecordInfo( formData);
+      if(res.code === 200){
+        this.$toast('操作成功')
+        setTimeout(()=>{
+          // this.$router.back()
+          this.$router.push({
+            name:"workOrderReconciliation",
+            params:{
+              activeIndex:this.index,
+              queryTime:this.queryTime
+            }
+          })
+        },2000)
+      }
+      this.loading1 = false;
+    },
+
+
     async delSupplierPhoto(item){
-      let res = await deleteImage({
+      this.show = true
-        recordPictureId:item.id,
+      this.imgId=item.id
+    },
+    async handleConfirm(){//删除供应商图片
+       await deleteImage({
+          recordPictureId:this.imgId,
           postfix:this.postfix
         })
-      this.$toast(res.msg)
         await this.pictureList()
-    }
+    },
   },
   components:{
-    TwoCommonBtn
+    // TwoCommonBtn
   }
 }
 </script>
@@ -578,19 +707,71 @@ export default {
 <style scoped lang="scss">
 @import "@/styles/mixin.scss";
 @import "@/styles/common.scss";
+.loading,.loading1 {
+  position: relative;
+}
+
+.loading::after,.loading1::after {
+  content: '';
+  position: absolute;
+  top: 50%;
+  left: 50%;
+  transform: translate(-50%, -50%);
+  width: 20px;
+  height: 20px;
+  border: 2px solid #000;
+  border-top-color: transparent;
+  border-radius: 50%;
+  animation: spin 1s linear infinite;
+}
+
+@keyframes spin {
+  0% {
+    transform: translate(-50%, -50%) rotate(0deg);
+  }
+  100% {
+    transform: translate(-50%, -50%) rotate(360deg);
+  }
+}
+.btn{
+  @include flexColBet;
+  button{
+    @include whLin(152px,39px);
+    border-radius: 5px;
+    color: #FFFFFF;
+    @include fontWeightSize(bold,14px)
+  }
+  .cancel{
+    background: #9EA7C0;
+  }
+  .submit{
+    background-color: #354D93;
+  }
+}
 .wrap{
-  width: 100%;
+  @include wh(100%,100%);
-  height: 100%;
   background-color: #F4F5F7;
   overflow-y: auto;
 }
+.disable{
+  background-color: transparent;
+  border: none;
+  opacity: 1 !important;
+}
+.supplierdisable{
+  color:  #999999;;
+  border: none;
+  opacity: 1 !important;
+}
+.bgDisable{
+  background: rgba(204, 204, 204, .3);
+}
 .navBar{
   margin-bottom: 46px;
 }
 .title{
   @include fontWeightSize(bold,14px);
-  color: #323643;
+  @include colorOpa(#323643,0.66);
-  opacity: 0.66;
 }
 .line{
   @include wh(100%,2px);
@@ -600,15 +781,41 @@ export default {
   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{
-  display: flex;
+  @include flexCenter;
-  align-items: center;
   font-size: 12px !important;
   font-weight: 400 !important;
-  //@include fontWeightSize(400,12px) !important;
   .titleLeft{
     opacity: .5;
     line-height: 27px;
   }
+  .leftTitle{
+    opacity: .5;
+    @include wh(60px,189px);
+  }
+  .rightContent{
+    height: 189px;
+    width: calc(100% - 60px);
+  }
+  .fontColor{
+    @include fontWeightSize(400,12px);
+    color: #000000;
+    line-height: 24px;
+  }
+  .rightContent{
+    width: calc(100% - 90px);
+    @include fontWeightSize(bold,12px);
+
+  }
+  .driverPoiBtn{
+    display: inline-block;
+    padding: 3px 8px;
+    @include bgFontColor(#FFFFFF,#354D93);
+    opacity: .7;
+    border-radius: 3px;
+    text-align: center;
+    //margin-left: 6px;
+    cursor: pointer;
+  }
 }
 img{
   @include wh(35px,15px);
@@ -621,37 +828,34 @@ img{
   margin-bottom: 10px;
 }
 .baseInfo{
-  @include wh(100%,276px);
+  @include wh(100%,286px);
 
 }
 .supplierData{
   width: 100%;
   margin-bottom: 0;
-
-  //@include wh(100%,438px);
   .inpInfo{
-    //display: flex;
-    //justify-content: space-between;
     margin: 0 5px;
     color: #323643;
     line-height: 32px;
     input{
       border: none;
       text-align: right;
+      padding-right: 3px;
+      margin-right: 0;
     }
     .titleContent{
       @include fontWeightSize(bold,13px);
-
     }
     .flex-between{
-        @include flexColBet
+      width: 100%;
+        @include flexBetCen
     }
     .halfOpcity{
       opacity: .5;
     }
     .inputContent{
       text-align: right;
-
     }
   }
   .btnComputed{
@@ -664,11 +868,9 @@ img{
   .multipleTxt{
     @include wh(100%,87px);
     background: #FAFAFA;
-    border-radius: 3px;
+    @include sizingPadRadius(8px,8px,3px);
     border: 1px solid #E6E6E6;
     backdrop-filter: blur(10px);
-    padding: 8px;
-    box-sizing: border-box;
   }
   .btn{
     margin-top: 28px;
@@ -691,8 +893,9 @@ img{
     opacity: 1 !important;
     .reason{
       @include fontWeightSize(400,11px);
-      color: #FF8F37;
+      @include colorOpa(#FF8F37,1);
-      opacity: 1 !important;
+      //color: #FF8F37;
+      //opacity: 1 !important;
     }
     .camerImg{
       @include widHeiMar(54px,42px,5px);
@@ -732,12 +935,11 @@ img{
   }
   .btnCom{
     border: none;
-    //width: 48px;
-    //@include all-height(18px);
     padding: 4px 7px;
-    display: flex;
+    @include flexTwoCenter;
-    justify-content: center;
+    //display: flex;
-    align-items: center;
+    //justify-content: center;
+    //align-items: center;
     background: #354D93;
     border-radius: 3px;
     color: #FFFFFF;
@@ -757,19 +959,28 @@ img{
     opacity: .5;
   }
 }
+.twoBtn{
+  margin-top: 28px;
+  margin-bottom: 30px;
+  @include flexColBet;
+  @include sizingPadding(0 ,15px);
+  button{
+    @include whLin(152px,39px);
+    @include fontWeightSize(bold,14px);
+    @include bgFontColor(#FFFFFF,#354D93);
+    border-radius: 5px;
+  }
+}
 .btn{
   margin-top: 31px;
-  margin-bottom: 20px;
+  margin-bottom: 31px;
-  display: flex;
+  @include flexColAround;
-  justify-content: space-around;
   box-sizing: border-box;
-  //padding: 0 8px;
   button{
-    @include wh(105px,39px);
     line-height: 39px;
-    background: #9EA7C0;
     border-radius: 5px;
-    color: #FFFFFF;
+    @include wh(105px,39px);
+    @include bgFontColor(#FFFFFF,#9EA7C0);
     @include fontWeightSize(bold,14px);
     border: none;
   }

src/views/workOrder/aduitCompleteDetail.vue

@@ -43,8 +43,6 @@
       <span class="titleLeft">结算方式：</span>
       <div class="content" style="width: calc(100% - 84px);display: flex;justify-content: space-between;line-height: 27px" >
         <span>{{orderInfo.taskSettleType?.label}}</span>
-        <!--        <span>包含公里数:15</span>-->
-        <!--        <span>超出单价:6</span>-->
       </div>
     </div>
     <div class="item">
@@ -56,30 +54,54 @@
   <div class="baseInfo common">
     <div class="title">审核数据:</div>
     <div class="line"></div>
-    <div class="item">
+    <div class="item" v-show="abState">
+      <span class="titleLeft">到事发地距离：</span>
+      <span class="content">{{ orderInfo.settleMileageAb + ' km' }}</span>
+    </div>
+    <div class="item" v-show="bcState">
       <span class="titleLeft">拖车里程：</span>
-      <span class="content">{{ orderInfo.bridgeAmountBc + ' km' }}</span>
+      <span class="content">{{ orderInfo.settleMileageBc + ' km' }}</span>
     </div>
-    <div class="item">
+    <div class="item" v-show="caState">
-      <span class="titleLeft">路桥费：</span>
+      <span class="titleLeft">返程里程：</span>
-      <span class="content">{{orderInfo.bridgeAmount + ' 元' }}</span>
+      <span class="content">{{ orderInfo.settleMileageCa + ' km' }}</span>
     </div>
-    <div class="item">
+    <div class="item" v-show="bridgeAbState">
+      <span class="titleLeft">ab路桥费：</span>
+      <span class="content">{{orderInfo.bridgeAmountAb + ' 元' }}</span>
+    </div>
+    <div class="item" v-show="bridgeBcState">
+      <span class="titleLeft">bc路桥费：</span>
+      <span class="content">{{orderInfo.bridgeAmountBc + ' 元' }}</span>
+    </div>
+    <div class="item" v-show="bridgeCaState">
+      <span class="titleLeft">va路桥费：</span>
+      <span class="content">{{orderInfo.bridgeAmountCa + ' 元' }}</span>
+    </div>
+    <div class="item"  v-show="tyreAmountState">
       <span class="titleLeft">小轮费：</span>
       <span class="content" >{{ orderInfo.tyreAmount  + ' 元'}}</span>
     </div>
-    <div class="item">
+    <div class="item" v-show="dilemmaAmountState && basePriceDisabled">
       <span class="titleLeft">困境费：</span>
       <span class="content" >{{ orderInfo.dilemmaAmount  + ' 元'}}</span>
     </div>
-    <div class="item">
+    <div class="item" v-show="waitAmountState">
       <span class="titleLeft">等候费：</span>
       <span class="content" >{{ orderInfo.waitAmount  + ' 元'}}</span>
     </div>
-    <div class="item">
+    <div class="item" v-show="basementFeeState">
       <span class="titleLeft">地库费：</span>
       <span class="content" >{{ orderInfo.basementFee  + ' 元'}}</span>
     </div>
+    <div class="item">
+      <span class="titleLeft">基本费用：</span>
+      <span class="content" >{{ orderInfo.basePrice   + '元'}}</span>
+    </div>
+    <div class="item">
+      <span class="titleLeft">额外费用总计：</span>
+      <span class="content" >{{ orderInfo.extraPrice   + '元'}}</span>
+    </div>
     <div class="item">
       <span class="titleLeft">收取客户金额：</span>
       <span class="content" >{{ orderInfo.customerAmount   + '元'}}</span>
@@ -105,12 +127,42 @@ export default {
       postfix:'',
       orderInfo:{},
       index:"",
+      queryTime:'',//记录工单对账选择的时间
+      serviceType:'',
+      settleType:'',
+      taskFlowId: '',
+      appCode:'',
+      abState:false,
+      bcState:false,
+      caState:false,
+      bridgeAbState:false,
+      bridgeBcState:false,
+      bridgeCaState:false,
+      waitAmountState:false,
+      dilemmaAmountState:false,
+      tyreAmountState:false,
+      basementFeeState:false,
+      accountStatus:'',
     }
   },
+  computed:{
+    basePriceDisabled(){
+      return !(this.serviceType == '困境救援' || this.serviceType == '困境-吊车' || this.serviceType == '困境救援-事故' || this.serviceType == '困境救援-故障'
+          || (this.fixedPrice && parseFloat(this.fixedPrice) > 0 && this.fixedPriceType) || this.supplierId == 500921)
+    },
+    //保险实拖案件，剔除人保和太平事故
+    isCPICDrag(){
+      return this.settleType == '实拖' &&  !['PICC10101','PICCSHANGQI','PICC101099','SAIPCC2021',''].includes(this.appCode)
+    },
+    isBasement(){
+      return this.serviceType == '困境救援' || this.serviceType == '困境-吊车' || this.serviceType == '困境救援-事故' || this.serviceType == '困境救援-故障'
+    },
+  },
   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
     await this.getDetail()
   },
   methods: {
@@ -119,16 +171,60 @@ export default {
         name:"workOrderReconciliation",
         params:{
           activeIndex:this.index,
+          queryTime:this.queryTime
         }
       })
     },
     async getDetail(){
+      this.abState = false
+      this.bcState = false
+      this.caState = false
+      this.bridgeAbState = false
+      this.bridgeBcState = false
+      this.bridgeCaState = false
+      this.waitAmountState = false
+      this.dilemmaAmountState = false
+      this.tyreAmountState = false
+      this.basementFeeState = false
+      this.accountStatus = ''
       let res= await getAccountRecordDetail({
         id:this.id,
         postfix:this.postfix
       })
       if(res.code === 200){
         this.orderInfo=res.data
+        this.serviceType=this.orderInfo.serviceName
+        this.taskFlowId=this.orderInfo.taskFlowId
+        this.settleType=this.orderInfo.settleType?.label
+        this.accountStatus = this.orderInfo.accountStatus?.code
+        this.appCode=this.orderInfo.appCode
+      }
+      if(this.settleType == '实拖'  && this.basePriceDisabled){
+        this.bcState = true
+
+      }else if(this.settleType == '单程' && this.basePriceDisabled){
+        this.abState = true
+        this.bcState = true
+        if(this.taskFlowId == '1'  && this.basePriceDisabled ){
+          this.bcState = false
+        }
+      }else if(this.settleType == '全程'  && this.basePriceDisabled){
+        this.abState = true
+        this.bcState = true
+        this.caState = true
+      }else if(this.settleType == '全程减半'  && this.basePriceDisabled){
+        this.abState = true
+        this.bcState = true
+        this.caState = true
+      }
+      if(this.orderInfo.refBridgeAmountAB > 0 && !this.isCPICDrag && !this.isBasement) this.bridgeAbState = true
+      if(this.orderInfo.refBridgeAmountBC > 0 && !this.isCPICDrag && !this.isBasement) this.bridgeBcState = true
+      if(this.orderInfo.refBridgeAmountCA > 0 && !this.isCPICDrag && !this.isBasement) this.bridgeCaState = true
+      if(this.orderInfo.refWaitFee > 0) this.waitAmountState = true
+      if(this.orderInfo.refDilemmaFee > 0) this.dilemmaAmountState = true
+      if(this.orderInfo.refTyreNumber > 0 && this.taskFlowId != '1') this.tyreAmountState = true
+      if(this.orderInfo.refBasementFee > 0 && this.taskFlowId != '1' ){
+        this.basementFeeState = true
       }
     },
   }
@@ -139,8 +235,7 @@ export default {
 @import "@/styles/mixin.scss";
 @import "@/styles/common.scss";
 .wrap{
-  width: 100%;
+  @include wh(100%,100%);
-  height: 100%;
   background-color: #F4F5F7;
   overflow-y: auto;
 }
@@ -149,8 +244,7 @@ export default {
 }
 .title{
   @include fontWeightSize(bold,14px);
-  color: #323643;
+  @include colorOpa(#323643,0.66);
-  opacity: 0.66;
 }
 .line{
   @include wh(100%,2px);
@@ -160,11 +254,9 @@ export default {
   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{
-  display: flex;
+  @include flexCenter;
-  align-items: center;
   font-size: 12px !important;
   font-weight: 400 !important;
-  //@include fontWeightSize(400,12px) !important;
   .titleLeft{
     opacity: .5;
     line-height: 27px;
@@ -188,8 +280,7 @@ img{
   @include wh(100%, 438px);
 
   .inpInfo {
-    display: flex;
+    @include flexColBet;
-    justify-content: space-between;
     margin: 0 5px;
     color: #323643;
     line-height: 32px;
@@ -211,16 +302,12 @@ img{
 
     .inputContent {
       text-align: right;
-      //opacity: .5;e
       .btnComputed {
         width: 48px;
-        @include all-height(18px);
         text-align: center;
-        color: #FFFFFF;
-        background: #354D93;
         border-radius: 3px;
-        //position: absolute;
+        @include all-height(18px);
-        //right: 24px;
+        @include bgFontColor(#FFFFFF,#354D93);
       }
     }
   }

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>

src/views/workOrder/workOrderReconciliation.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="wrap">
+  <div class="wrap" :style="`backgroundColor: ${show ? '#FAFAFA' : '#F4F5F7'};`">
     <div class="navBar">
       <van-nav-bar
           title="工单对账"
@@ -12,7 +12,7 @@
       >
         <template slot="right">
           <div class="rightWrap"  @click="showDatetime = !showDatetime">
-            <span class="dateTitle">{{ ymTime }}</span>
+            <span class="dateTitle">{{ time ? time?.slice(0,7) : ymTime  }}</span>
             <img src="@/assets/line.png" class="img1"/>
             <img src="@/assets/arrow_bottom.png" class="img2"/>
           </div>
@@ -34,7 +34,7 @@
       </div>
     </div>
 
-    <van-pull-refresh v-model="isLoading" @refresh="onRefresh">
+    <van-pull-refresh v-model="isLoading" @refresh="onRefresh"  v-show="!show" >
      <div >
         <div  class="content_wrap" v-for="(item,index) in orderList" :key="index">
           <div class="codeTxt common">
@@ -57,22 +57,24 @@
               <span class="allTxt">{{ item.accountStatus?.label }}</span>
             </div>
             <div class="rightBtn">
-              <button class="btn"  v-if="queryType == 1"  @click="handleAccounting(item)">记账</button>
+              <button class="btn"  v-if="queryType == 1 && permissonList.includes('supplierRecordOperation')"  @click="handleAccounting(item)">记账</button>
-              <button class="btn" v-if="queryType == 3"  @click="handleAccounting(item)">{{item.accountStatus.code == 3 ? '重新记账'  : '记账'}}</button>
+              <button class="btn" v-if="queryType == 3 && permissonList.includes('supplierRecordOperation')"  @click="handleAccounting(item)">{{item.accountStatus.code == 3 ? '重新记账'  : '记账'}}</button>
-              <button class="btn"  v-if="queryType == 5"  @click="handleAccounting(item)">重新记账</button>
+              <button class="btn"  v-if="queryType == 5 && permissonList.includes('supplierRecordOperation')"  @click="handleAccounting(item)">重新记账</button>
               <button class="btn"  v-if="queryType == 7" @click="goPageDetail(item)">查看详情</button>
             </div>
           </div>
         </div>
       </div>
     </van-pull-refresh>
-
+    <div class="bgEmptyImg" v-show="show">
+      <img  src="@/assets/empty.png" />
+    </div>
   </div>
 </template>
 
 <script>
 import {myMixins} from "@/utils/myMixins"
-import {accountRecordList} from "@/api/mine"
+import {accountRecordList,userOperationPermissions} from "@/api/mine"
 import {timeFormat} from "@/utils/common"
 export default {
   name: "workOrderReconciliation",
@@ -85,20 +87,30 @@ export default {
       pageNum: 1,
       pageSize: 10,
       total: 0,
-      queryType:1,
+      queryType:1,//默认显示待记账
-      queryTime:'',
+      queryTime:'',//默认查询时间为当年当月
-      showDatetime: false,
+      showDatetime: false,//时间选择器
       currentDate: new Date(),
-      ymTime: '',
+      ymTime: '',//默认显示时间为当年当月
       isLoading:"",
+      permissonList:[],
+      time:'',//当页面已经跳转到其他页面时就用原本的时间，如果没有就用当前时间
     }
   },
-  mounted() {
+  async mounted() {
+    console.log("params",this.$route.params?.queryTime)
     this.activeIndex=this.$route.params?.activeIndex || 0
     this.queryType=this.$route.params?.queryType || this.queryType
-    this.initIndex()
+    this.time = this.$route.params?.queryTime
-    this.initSelectTime();
+    await this.initIndex()
-    this.getList();
+    await this.initSelectTime();
+    await this.getPermissions();
+    await this.getList();
+  },
+  computed:{
+    show() {
+      return (this.orderList.length < 0 || this.orderList.length == 0); // 判断数组长度是否大于 0
+    },
   },
   methods: {
     onRefresh() {
@@ -108,17 +120,6 @@ export default {
         this.isLoading = false;
       }, 1000);
     },
-    initIndex(){
-      if(this.activeIndex === 0){
-        this.queryType = 1
-      }else if(this.activeIndex === 1){
-        this.queryType = 3
-      }else if(this.activeIndex === 2){
-        this.queryType = 5
-      }else if(this.activeIndex === 3){
-        this.queryType = 7
-      }
-    },
     async changeTab(index) {
       this.activeIndex = index
       this.initIndex()
@@ -132,33 +133,54 @@ export default {
         pageNum:this.pageNum,
         pageSize:this.pageSize,
         queryType:this.queryType,
-        queryTime:this.queryTime
+        queryTime:this.time || this.queryTime,//当页面已经跳转到其他页面时就用原本的时间，如果没有就用当前时间
       })
       if(res.code === 200){
         this.orderList = res.data;
       }
     },
+    async getPermissions(){
+      let res = await userOperationPermissions();
+      this.permissonList = res.data
+      // console.log("1122",this.permissonList)
+      // console.log('工单对账',this.permissonList.includes('supplierRecordOperation'))
+    },
     handleAccounting(item){
+      console.log("item")
       this.$router.push({
         name: 'accountingView',  // 目标路由的名称
         params: {
           id: item.id,                  // 参数对象的属性
           postfix:item.postfix,
-          index:this.activeIndex
+          index:this.activeIndex,
+          queryTime:this.queryTime
         }
       });
     },
+    initIndex(){
+      if(this.activeIndex === 0){
+        this.queryType = 1
+      }else if(this.activeIndex === 1){
+        this.queryType = 3
+      }else if(this.activeIndex === 2){
+        this.queryType = 5
+      }else if(this.activeIndex === 3){
+        this.queryType = 7
+      }
+    },
     goPageDetail(item){
       this.$router.push({
         name: 'aduitCompleteDetail',  // 目标路由的名称
         params: {
           id: item.id,                  // 参数对象的属性
           postfix:item.postfix,
-          index:this.activeIndex
+          index:this.activeIndex,
+          queryTime: this.time || this.queryTime
         }
       });
     },
     async onConfirm(value) {
+      this.time = '';
       this.showDatetime = false
       const date = new Date(value);
       const year = date.getFullYear(); // 获取年份，结果为 2023
@@ -169,11 +191,18 @@ export default {
       await this.getList();
     },
     initSelectTime() {//初始化查询时间
+      if(this.time){
+        const date = new Date(this.time);
+        const year = date.getFullYear(); // 获取年份，结果为 2023
+        const month = (date.getMonth() + 1).toString().padStart(2, '0');  // 获取月份，需要注意月份从 0 开始，所以要加 1，结果为 9
+        this.ymTime = year + '-' + month
+        return
+      }
       const year = this.currentDate.getFullYear(); // 获取年份，结果为 2023
       const month = (this.currentDate.getMonth() + 1).toString().padStart(2, '0');  // 获取月份，需要注意月份从 0 开始，所以要加 1，结果为 9
       this.ymTime = year + '-' + month;
       this.queryTime=timeFormat(new Date());
-      // console.log(this.queryTime)
+
     },
   }
 }
@@ -185,9 +214,7 @@ export default {
 
 .wrap {
   @include wh(100%, 100%);
-  background: #F4F5F7;
+  @include sizingPadding(0,12px);
-  box-sizing: border-box;
-  padding: 0 12px;
   overflow-y: auto;
 }
 
@@ -203,8 +230,8 @@ export default {
   margin-bottom: 46px;
 
   .rightWrap {
-    @include flexCenter;
+    @include flexColAround;
-    justify-content: space-around;
+    align-items: center;
     @include wh(106px, 26px);
     background: linear-gradient(180deg, #A3B8E9 0%, #6C81CD 100%);
     border-radius: 4px;
@@ -214,41 +241,33 @@ export default {
     .img1 {
       @include wh(1px, 18px)
     }
-
     .img2 {
       @include wh(7px, 5px)
     }
 
     .dateTitle {
       @include fontWeightSize(bolder, 12px);
-      color: #FFFFFF;
+      @include colorOpa(#FFFFFF,0.9);
-      opacity: .9;
     }
   }
 }
 
 .tab_wrap {
   @include fontWeightSize(bolder, 15px);
-  display: flex;
+  @include flexColAround;
-  justify-content: space-around;
+  @include colorOpa(#737373,0.7);
   padding: 10px 0 15px 0;
-  color: #737373;
-  opacity: .7;
-
   div {
     padding-top: 8px;
   }
-
   .active {
     color: #3678FF;
     position: relative;
   }
-
   .active:after {
     content: '';
     display: block;
-    width: 18px;
+    @include wh(18px,3px);
-    height: 3px;
     background: linear-gradient(270deg, #33A3FF 0%, #176AFE 100%);
     border-radius: 2px;
     position: absolute;
@@ -262,51 +281,41 @@ export default {
   @include wh(100%, 96px);
   background: #FFFFFF;
   box-shadow: 0px 1px 4px 0px rgba(39, 52, 125, 0.05);
-  border-radius: 6px;
   border: 1px solid #E6E6E6;
   backdrop-filter: blur(5.602678571428572px);
   @include flexBetween;
-  box-sizing: border-box;
+  @include sizingPadRadius(10px,0,6px);
-  padding: 10px 0;
   margin-bottom: 10px;
   .common {
     @include flexColBet();
     margin-left: 18px;
     margin-right: 14px;
-
   }
-
   .line {
     @include wh(100%, 1px);
     background: #E9E9EA;
     opacity: 0.6;
   }
-
   .supplier {
     margin-left: 18px;
     margin-right: 14px;
   }
-
   .btn {
-    //@include wh(48px, 18px);
-    @include all-height(20px);
     text-align: center;
-    @include bgFontColor(#FFFFFF, #354D93);
     border-radius: 3px;
     border: none;
+    @include bgFontColor(#FFFFFF, #354D93);
+    @include all-height(20px);
   }
-
   .halfTxt {
     display: inline-block;
     width: 55px;
     @include fontWeightSize(400, 12px);
     opacity: .5;
   }
-
   .allTxt {
     @include fontWeightSize(400, 12px)
   }
-
   .orderCode {
     @include fontWeightSize(bold, 13px)
   }
@@ -320,4 +329,12 @@ export default {
     color: #09B820;
   }
 }
+.bgEmptyImg{
+  @include flexTwoCenter;
+  height: 85% ;
+  background-color: #FAFAFA;
+  img{
+    width: 100%;
+  }
+}
 </style>