补结算单，输入框是否可变价添加判断

(cherry picked from commit 7b8e2efbb4)

.gitignore

@@ -22,3 +22,4 @@ pnpm-debug.log*
 *.njsproj
 *.sln
 *.sw?
+/yarn.lock

package.json

@@ -23,7 +23,8 @@
     "vue-router": "^3.0.7",
     "vuex": "^3.6.2",
     "element-ui": "^2.15.9",
-    "dayjs": "^1.8.14"
+    "dayjs": "^1.8.14",
+    "decimal.js": "^10.4.3"
   },
   "devDependencies": {
     "@babel/core": "^7.12.16",

src/api/kpi.js

@@ -27,6 +27,14 @@ export function getDriverStatisticsKpi(data){
     data
   })
 }
+export function querySupplierDriverStatisticsScore(data){
+  return request({
+    url: '/supplier/supplierKPI/querySupplierDriverStatisticsScore',
+    method:'POST',
+    // contentType: 'application/json',
+    data
+  })
+}
 //   各种详情数据
 export function getKpiDetailsData(data){
   return request({

src/utils/http.js

@@ -15,7 +15,7 @@ let token = urlParams.get('token') ;
 localStorage.setItem('token', token);
 service.interceptors.request.use(
     config => {
-      // let reqUrl=config.url
+      let reqUrl=config.url
         // console.log("reqUrl",reqUrl)
       config.data = config.contentType ? config.data : qs.stringify(config.data)
       if (config.testFlag) {
@@ -25,9 +25,12 @@ service.interceptors.request.use(
       let token = localStorage.getItem('token');
       // let token='4099761587129c46b03c9316c9e866c9'
       // let token='eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiJzb25nIiwiYXVkIjpbInN1cHBsaWVyLWFwcCJdLCJuYmYiOjE3MTI0NTQ5NTMsInVzZXJfaW5mbyI6eyJ1c2VySWQiOjU0NjU0LCJwaG9uZSI6IjE3NjMwMDM1NjU4IiwibmFtZSI6InNvbmciLCJzdXBwbGllck5hbWUiOiJDLeS4iua1t-a1i-ivleacjeWKoeWVhiIsInN1cHBsaWVySWQiOjMzMDQxLCJzdXBwbGllclR5cGUiOjIsInVzZXJuYW1lIjoic29uZyIsInVzZXJUeXBlIjoicmVzY3VlQXBwIiwiZGV2aWNlSWQiOiIyMmI0OWNhMjBmOWI4MzMwZDk4NzIxNzNmMzllYTY4YmMiLCJhdXRob3JpdGllcyI6W119LCJzY29wZSI6WyJhbGwiXSwiaXNzIjoiaHR0cHM6Ly9zaW5vYXNzaXN0LmNvbSIsImV4cCI6MTcxMjU0MTM1MywiaWF0IjoxNzEyNDU0OTUzfQ.sPU9_OD_TOWcTwqmlawEGyo4mCPrEaRYw2R02gnvYJw'
-      config.headers['token'] = `${token}`;
+       if(!(reqUrl=='/supplier/supplierTraining/trainingTask' || reqUrl=='/supplier/supplierTraining/normalList' || reqUrl=='/supplier/supplierTraining/trainingList')){
            config.headers['Authorization'] = `${token}`;
-      /*if (reqUrl.includes("/driverApp")) {
+           config.headers['token'] = `${token}`;
+       }
+
+    /*  if (reqUrl.includes("/driverApp")) {
           //  console.log("司机app")
           config.headers['token'] = `${token}`;
       } else if(reqUrl.includes("/supplierApp") || reqUrl.includes("/supplierKPI") || reqUrl.includes('/supplier/select') || reqUrl.includes('/order') || reqUrl.includes('/order/taskInvoiceBatch') || reqUrl.includes('/supplier') ){

src/utils/myMixins.js

@@ -72,7 +72,6 @@ export const myMixins = {
           methods();
         }
         setTimeout(() => {
-          console.log("shengxiaoxi")
           that.noClick = true;
         }, 3000)
       } else {

src/views/documentView/diverTrainDocment.vue

@@ -101,6 +101,7 @@ export default {
     const urlParams = new URLSearchParams(window.location.search);
     this.driverId = urlParams.get('driverId');
     this.time=timeFormat(Date.now())
+    this.keyword=urlParams.get('keyWord') || ''
     this.getTrainingList();
     document.addEventListener('visibilitychange', async (  ) => {
       let state = document.visibilityState

src/views/documentView/docmentList.vue

@@ -103,6 +103,9 @@ export default {
     const urlParams = new URLSearchParams(window.location.search);
     this.supplierId = urlParams.get('supplierId');
     this.driverId = urlParams.get('driverId');
+    if(this.driverId){
+      this.keyword=urlParams.get('keyWord') || ''
+    }
     this.getNormalList()
   },
   methods:{

src/views/index/invoicingNotify.vue

@@ -86,6 +86,7 @@
 </template>
 
 <script>
+import { Decimal } from 'decimal.js';
 import {myMixins} from "@/utils/myMixins"
 import {notifyInvoiceList} from  "@/api/mine"
 export default {
@@ -110,12 +111,23 @@ export default {
     }
   },
   computed: {
-    totalCount () {
+   /* totalCount () {
       let total = 0;
       this.checkList.map(item => {
         total += item.invoiceMoney
       })
       return total
+    },*/
+    totalCount() {
+      // 使用 Decimal 来计算总金额
+      let total = new Decimal(0);
+
+      this.checkList.forEach(item => {
+        total = total.plus(new Decimal(item.invoiceMoney));
+      });
+
+      // 返回总金额，保留两位小数
+      return total.toNumber()
     },
   },
   mounted() {

src/views/index/supplySettlement.vue

@@ -6,15 +6,15 @@
       <div class="metersWrap">
         <div class="item"  v-show="supplierSettlementType != 1">
           <div class="leftKiloMeters">AB段公里数</div>
-          <div class="rightInput"><input type="number" v-model="form.reportMileageAb"/>公里</div>
+          <div class="rightInput"><input type="number" :disabled="!taskCostShow" v-model="form.reportMileageAb"/>公里</div>
         </div>
         <div class="item"  v-show="supplierSettlementType == 1 || supplierSettlementType == 2 || supplierSettlementType == 3 || supplierSettlementType == 4">
           <div class="leftKiloMeters">BC段公里数</div>
-          <div class="rightInput"><input type="number" v-model="form.reportMileageBc"/>公里</div>
+          <div class="rightInput"><input type="number" :disabled="!taskCostShow" v-model="form.reportMileageBc"/>公里</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 class="rightInput"><input type="number" :disabled="!taskCostShow" v-model="form.reportMileageCa"/>公里</div>
         </div>
       </div>
     </div>
@@ -24,15 +24,15 @@
       <div class="metersWrap">
         <div class="item"  v-show="supplierSettlementType != 1">
           <div class="leftKiloMeters">AB段路桥费</div>
-          <div class="rightInput"><input type="number" v-model="form.bridgeAmountAb"/>元</div>
+          <div class="rightInput"><input type="number" :disabled="!taskCostShow" v-model="form.bridgeAmountAb"/>元</div>
         </div>
         <div class="item"  v-show="supplierSettlementType == 1 || supplierSettlementType == 2 || supplierSettlementType == 3 || supplierSettlementType == 4">
           <div class="leftKiloMeters">BC段路桥费</div>
-          <div class="rightInput"><input type="number" v-model="form.bridgeAmountBc"/>元</div>
+          <div class="rightInput"><input type="number" :disabled="!taskCostShow" v-model="form.bridgeAmountBc"/>元</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 class="rightInput"><input type="number" :disabled="!taskCostShow" v-model="form.bridgeAmountCa"/>元</div>
         </div>
       </div>
     </div >
@@ -42,23 +42,23 @@
       <div class="metersWrap">
         <div class="item"  >
           <div class="leftKiloMeters">小轮个数</div>
-          <div class="rightInput"><input type="number" v-model="form.tyreNumber" @input="handleInput"/>个</div>
+          <div class="rightInput"><input type="number" :disabled="!taskCostShow" v-model="form.tyreNumber" @input="handleInput"/>个</div>
         </div>
         <div class="item">
           <div class="leftKiloMeters">等候费</div>
-          <div class="rightInput"><input type="number" v-model="form.waitAmount"/>元</div>
+          <div class="rightInput"><input type="number" :disabled="!taskCostShow" v-model="form.waitAmount"/>元</div>
         </div>
         <div class="item"  >
           <div class="leftKiloMeters">困境费</div>
-          <div class="rightInput"><input type="number" v-model="form.dilemmaFee"/>元</div>
+          <div class="rightInput"><input type="number" :disabled="!taskCostShow" 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 class="rightInput blueColor"><input class="blueColor" type="number" :disabled="!taskCostShow" v-model="form.customerAmount"/>元</div>
         </div>
       </div>
     </div>
-    <div class="btn">
+    <div class="btn" v-if="taskCostShow || finishLt7">
       <button @click="submit">提交</button>
     </div>
   </div>
@@ -86,7 +86,9 @@ export default {
         waitAmount:'',
         dilemmaFee:'',
         customerAmount:'',
-        taskFlowId:''
+        taskFlowId:'',
+        auditStatus:'',
+        finishTime:'',
       }
     }
   },
@@ -97,6 +99,14 @@ export default {
       this.orderCode = urlParams.get('orderCode')
       await this.getDetail()
   },
+  computed:{
+    taskCostShow() {
+      return this.form.auditStatus?.code && !([3, 4, 6].includes(this.form.auditStatus.code))
+    },
+    finishLt7(){
+      return  !this.form.finishTime || (this.form.finishTime && new Date().getTime() - new Date(this.form.finishTime).getTime() <= 7 * 24 * 60 * 60 * 1000)
+    },
+  },
   methods:{
     handleInput(event) {
       const newValue = parseInt(event.target.value, 10);
@@ -118,7 +128,6 @@ export default {
       })
       leftCopy(this.form,{...res.data});
       this.supplierSettlementType= res.data.supplierSettlementType?.code
-      // this.form.taskFlowId =1
     },
     async updatSettlement(){
       let result =await updateOrderSettlement({

src/views/index/uploadInvoice.vue

@@ -73,6 +73,7 @@
 </template>
 
 <script>
+  import { Decimal } from 'decimal.js';
   import { Dialog } from "vant";
   import { myMixins } from "@/utils/myMixins"
   import { uploadInvoice, getBillingInfo, deleteInvoice, createBatch } from "@/api/mine"
@@ -120,7 +121,7 @@
       invoiceTotal () {
         let total = 0;
         this.list?.map(item => {
-          total += item.invoiceMoney
+          total = new Decimal(total).plus(new Decimal(item.invoiceMoney)).toNumber()
         })
         return total
       }
@@ -278,6 +279,15 @@
               if(ocrName != billName && diffNumber > 2 && !res.data.ocrInvoiceRes.data.sellerName.startsWith("国家税务总局")){
                 errorStr = errorStr + "上传发票抬头与服务商配置不一致，设置抬头为：" + (this.billInfo.unitName || '未设置') + "，识别抬头为：" + res.data.ocrInvoiceRes.data.sellerName + ";如发票确认无误，请联系结算部：021-53682525";
               }
+              let conList = res.data.ocrInvoiceRes.data.invoiceDetails.filter(a => a.itemName.includes("*"))
+              if(!res.data.ocrInvoiceRes.data.sellerName.startsWith("国家税务总局") &&
+                conList.every(a => {
+                  let items = a.itemName.split("*")
+                  return (!items[1].includes("现代服务") && !items[1].includes("运输服务")) || (!items[2].includes("拖车") && !items[2].includes("救援") && !items[2].includes("施救") && !items[2].includes("清障") && !items[2].includes("道路救援"))
+                })
+              ){
+                errorStr = errorStr + "分类必须包含：现代服务/运输服务，服务名称必须包含：拖车/救援/施救/清障/道路救援 ;例如《*现代服务*拖车费》";
+              }
 
               if( !flag ) {
                 Dialog.alert({

src/views/index/vehicleAdd.vue

@@ -40,6 +40,20 @@
       accept="image "
     />
   </div>
+  <div class="itemContent">
+    <div class="titleType">
+      <img class="startImg" src="@/assets/start.png" />
+      <span>行驶证车辆照片页</span>
+    </div>
+    <van-uploader
+      v-model="vehicleLicenseCarPhotoList"
+      :after-read="vehicleLicenseCarHandler"
+      :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" />
@@ -60,9 +74,64 @@
       <img class="startImg" src="@/assets/start.png" />
       <span>车辆类型</span>
     </div>
-    <select id="mySelect"  class="mySelect"  v-model="selectedOption">
+<!--
-      <option v-for="(item,index) in typeList" :key="index" :value="index">{{item}}</option>
+    <select
+        id="mySelect"
+        class="mySelect"
+        v-model="selectedOption"
+        multiple
+    >
+      <option
+          v-for="item in typeList"
+          :key="item"
+          :value="item"
+          :disabled="isOptionDisabled(item)"
+      >
+        {{ item }}
+      </option>
     </select>
+-->
+    <el-select
+        multiple
+        :multiple-limit="isMultiple ? 2 : 1"
+        v-model="selectedOption"
+        value-key="name"
+        class="elSelect"
+        collapse-tags="collapse-tags"
+        placeholder="请选择"  style="width: 55%"
+    >
+      <el-option
+          v-for="item in vehicleTypes"
+          :key="item.name"
+          :label="item.name"
+          :value="item.value"
+          :disabled="!item.disabled ? false : true"
+      >
+      </el-option>
+    </el-select>
+
+  </div>
+  <div class="itemContent">
+    <div class="titleType">
+      <span>牌照</span>
+    </div>
+    <el-select
+      v-model="vehicleLicense"
+      disabled
+      value-key="name"
+      class="elSelect"
+      collapse-tags="collapse-tags"
+      placeholder="请选择"  style="width: 55%"
+    >
+      <el-option
+        v-for="item in vehicleLicenseOptions"
+        :key="item.name"
+        :label="item.name"
+        :value="item.value"
+      >
+      </el-option>
+    </el-select>
+
   </div>
   <div class="lineBot"></div>
   <div class="itemContent">
@@ -107,7 +176,7 @@
         <span class="line"></span>
       </div>
       <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-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>
@@ -138,35 +207,133 @@ export default {
       checked: true,
       carNum:"",//车牌号
       typeList:[],//车辆类型列表
-      selectedOption:'1',//车辆类型
+      selectedOption:[],//车辆类型
       id:'',//车辆Id
       serviceIds:[],//车辆服务种类,
       supplierServiceList:[],
+      oldSupplierServiceList:[],
       show:false,
       imageUrl: require('@/assets/arr_right.png'),
       vehicleLicenseFrontList: [],
       vehicleLicenseBackList: [],
+      vehicleLicenseCarPhotoList: [],
       vehicleFrontPhotoList: [],
       vehicleLicenseFront: '',  // 行驶证首页
       vehicleLicenseBack: '',   // 行驶证副页
+      vehicleLicenseCarPhoto: '',  // 行驶证车辆照片
       vehicleFrontPhoto: '',    // 车头照
       vehicleLicenseInfo: {},
       vehicleLicenseBackOcrFlag: false,   // 行驶证副页 修改时默认不需要 ocr识别
+      isMultiple: false,     // 是否支持多选
+      vehicleLicense:'',//牌照
+      vehicleFrontLicensePlate:'',//车头照车牌号码
+      vehicleTypes:[{
+        name: '小修车',
+        value: 1
+      },{
+        name: '一般平板车',
+        value: 2
+      },{
+        name: '落地平板车',
+        value: 3
+      },{
+        name: '地库车',
+        value: 4
+      },
+        {
+          name:'牵引车',
+          value: 5 },
+        {
+          name:'大力神',
+          value:6},
+        {
+          name:'充电车',
+          value: 7 },
+        {
+          name:'吊车',
+          value: 8 },
+        {
+          name:'公车',
+          value: 9 },
+        {
+          name:'箱式拖车',
+          value: 10 },
+
+      ],
+      vehicleLicenseOptions: [{
+        name: '蓝牌',
+        value: 1
+      }, {
+        name: '黄牌',
+        value: 2
+      }, {
+        name: '新能源',
+        value: 3
+      }, {
+        name: '临牌',
+        value: 4
+      }, {
+        name: '其他',
+        value: 5
+      }]
     }
   },
+  watch:{
+    selectedOption(newVal){
+      if(newVal == 4){
+        this.isMultiple = true
+        this.vehicleTypes[2].disabled=true
+        this.vehicleTypes[5].disabled=true
+        this.vehicleTypes[6].disabled=true
+        this.vehicleTypes[7].disabled=true
+        this.vehicleTypes[8].disabled=true
+        this.vehicleTypes[9].disabled=true
+      }else{
+        this.isMultiple = false
+        this.vehicleTypes[2].disabled=false
+        this.vehicleTypes[5].disabled=false
+        this.vehicleTypes[6].disabled=false
+        this.vehicleTypes[7].disabled=false
+        this.vehicleTypes[8].disabled=false
+        this.vehicleTypes[9].disabled=false
+      }
+      if (newVal == 1 || newVal == 7){
+        let arr = []
+        this.supplierServiceList.forEach((item)=>{
+          if(!(item.name == '拖车服务' || item.name == '大型车救援')){
+            arr.push(item)
+          }
+        })
+        this.supplierServiceList = arr
+      }else{
+        this.supplierServiceList = this.oldSupplierServiceList
+      }
+
+    },
+  },
+
   async mounted() {
     this.id=this.$route.params?.id
-    const selectElement = document.getElementById('mySelect');
+    await this.getSupplierServiceTree();
-    selectElement.addEventListener('change', function() {
-     this.selectedOption=selectElement.value;
-    });
     await this.getTypeList();
     if( this.id){
       await this.vehicleInfo()
     }
-    await this.getSupplierServiceTree();
   },
   methods:{
+    getVehicleLicense(color) {
+      if( color == '蓝' ) {
+        this.vehicleLicense = 1
+      } else if(color == '黄') {
+        this.vehicleLicense = 2
+      } else if(color == '临牌') {
+        this.vehicleLicense = 4
+      } else if(color.includes('绿')) {
+        this.vehicleLicense = 3
+      } else {
+        this.vehicleLicense = 5
+      }
+    },
     async vehicleLicenseFrontHandler(file) {    // 上传 行驶证首页
       const formData = new FormData();
       formData.append("file" , file.file);
@@ -182,11 +349,27 @@ export default {
       this.vehicleLicenseBack = res.data;
       await this.vehicleBackOcrHandler();
     },
+    async vehicleLicenseCarHandler(file) {     // 上传 行驶证车辆照片
+      const formData = new FormData();
+      formData.append("file" , file.file);
+      let res = await uploadImage(formData);
+      this.vehicleLicenseCarPhoto = res.data;
+    },
     async vehicleFrontPhotoHandler(file) {     // 上传 车头照
       const formData = new FormData();
       formData.append("file" , file.file);
       let res = await uploadImage(formData);
       this.vehicleFrontPhoto = res.data;
+      await this.ocrCarFrontHandler()
+    },
+    async ocrCarFrontHandler() {     // 车辆正面 orc 识别
+      let res = await ocrHandler({
+        ocrType: 10,
+        imageUrl: this.vehicleFrontPhoto,
+        cardSide: 'FRONT'
+      });
+      this.vehicleFrontLicensePlate=res.data?.number
+      this.getVehicleLicense(res.data.color)
     },
     async vehicleOcrHandler() {     // 行驶证首页 ocr 识别
       this.vehicleLicenseInfo.licensePlateNumber = '';
@@ -265,31 +448,53 @@ export default {
     },
     async getTypeList() {
         let result=await vehicleTypeList();
+        this.typeList=[]
         if(result.code === 200){
-          this.typeList=result.data
+          for (const key in result.data){
+            // console.log("keys",result.data[key])
+            this.typeList.push({name:result.data[key],disabled:false,value:(key+1)})
+            // this.typeList.push(result.data[key])
+
+          }
         }
     },
     async getSupplierServiceTree(){
       let res = await supplierServiceTree();
       this.supplierServiceList=res.data
+      this.oldSupplierServiceList=this.supplierServiceList
     },
     async vehicleInfo(){
       let res= await  getInfoById({
         vehicleId:this.id
       })
       let result=res.data;
+      console.log("result",result)
       this.id=result.vehicleId
       this.carNum=result.plateNumber
       this.isJoin=result.hasPolymerization.code
-      this.selectedOption=result.vehicleType;
+      this.selectedOption=result.vehicleType?.split(',').map((item)=>{
+        return Number(item);
+      });
       this.serviceIds=result.serviceIds
       this.vehicleLicenseFront = result.vehicleLicenseFront;
       this.vehicleLicenseBack = result.vehicleLicenseBack;
       this.vehicleFrontPhoto = result.vehicleFrontPhoto;
       this.vehicleLicenseInfo = result.vehicleLicenseInfo;
+      this.vehicleLicenseCarPhoto = result.vehicleLicenseCarPhoto;
+      this.vehicleLicense = result.vehicleLicense;
+      this.vehicleFrontLicensePlate = result.vehicleFrontLicensePlate;
+      if( this.vehicleLicenseFront ) {
         this.vehicleLicenseFrontList = [{ url : this.vehicleLicenseFront }];
+      }
+      if(this.vehicleLicenseBack) {
         this.vehicleLicenseBackList = [{ url : this.vehicleLicenseBack }];
+      }
+      if(this.vehicleFrontPhoto) {
         this.vehicleFrontPhotoList = [{ url : this.vehicleFrontPhoto }];
+      }
+      if(this.vehicleLicenseCarPhoto) {
+        this.vehicleLicenseCarPhotoList = [{ url : this.vehicleLicenseCarPhoto }];
+      }
     },
     isChange(e){
       this.isJoin=e
@@ -303,7 +508,11 @@ export default {
         this.$toast('行驶证副页照片不能为空')
         return
       }
-      if( !this.vehicleLicenseBack ) {
+      if( !this.vehicleLicenseCarPhoto ) {
+        this.$toast('行驶证车辆照片页不能为空')
+        return
+      }
+      if( !this.vehicleFrontPhoto ) {
         this.$toast('车头照片不能为空')
         return
       }
@@ -315,16 +524,27 @@ export default {
         this.$toast('行驶证副页识别失败')
         return
       }
+      if(!(this.selectedOption.length > 0)){
+        this.$toast('车辆类型不能为空')
+        return
+      }
+      if(this.selectedOption?.length==1 && this.selectedOption.includes(1)){//选择小修车时需清除原本的拖车服务类型
+        let data=this.oldSupplierServiceList.filter(item => item.name ==='拖车服务')
+        this.serviceIds = this.serviceIds.filter(item => !data[0].children.some(obj => obj.id === item));
+      }
       await saveVehicle({
           vehicleId:this.id ? this.id : '',
           plateNumber:this.carNum ? this.carNum :'',
-          vehicleType:this.selectedOption ? this.selectedOption : '',
+          vehicleType:this.selectedOption?.length>0 ? this.selectedOption.join(',') : '',
           hasPolymerization:this.isJoin,
           serviceIds:this.serviceIds ? this.serviceIds : [],
           vehicleLicenseFront: this.vehicleLicenseFront,
           vehicleLicenseBack: this.vehicleLicenseBack,
           vehicleFrontPhoto: this.vehicleFrontPhoto,
           vehicleLicenseInfo: this.vehicleLicenseInfo,
+          vehicleLicenseCarPhoto: this.vehicleLicenseCarPhoto,
+          vehicleLicense: this.vehicleLicense,
+          vehicleFrontLicensePlate:this.vehicleFrontLicensePlate,
         })
         if(this.id){
           this.$toast('修改成功')
@@ -443,4 +663,8 @@ export default {
     margin: 40px 0 30px 8px;
   }
 }
+.elSelect ::v-deep .el-input__inner{
+  border: none !important;
+  text-align: right !important;
+}
 </style>

src/views/kpi/components/noFit-table.vue

@@ -13,7 +13,7 @@
           <template slot-scope="scope">{{scope.row[item.prop]}}  </template>
         </el-table-column>
       </template>
-      <template v-else-if="active===3">
+      <template v-else-if="active===4">
         <el-table-column v-for="(column,index) in filteredLabelList" :key="column.prop" :prop="column.prop" :label="column.label"
                          :fixed="index===0" align="center"  min-width="100"
                          :width="(isMobile && (column.label=='案件编号' || column.label=='服务内容')) ? 70 : 'auto'">
@@ -46,7 +46,7 @@ export default {
   },
   computed: {
     filteredLabelList() {
-      if(this.active!==3){
+      if(this.active!==4){
         return
       }
       return this.labelList.filter(column => column.label !== '星级评分');

src/views/kpi/kpiIndex.vue

@@ -2,14 +2,21 @@
   <div class="wrap">
     <div v-if="isMobile" class="headWrap">
       <div class="title">KPI.数据看板</div>
-      <div class="titleName">{{ current }}月-{{supplierName}}</div>
+      <div class="titleName">{{ current }}-{{supplierName}}</div>
     </div>
     <div v-else class="webHeadWrap" :style="'justify-content:'+(isZd==1 ? 'space-between':'center')">
       <div class="empty" v-if="isZd==1"></div>
-      <div class="title">KPI.数据看板<span v-if="isZd==1">--中道救援</span><span v-if="isZd!=1">--{{ current }}月</span></div>
+      <div class="title">KPI.数据看板<span v-if="isZd==1">--中道救援</span><span v-if="isZd!=1">--{{ current }}</span></div>
       <!--  只有中道账号才显示搜索框  -->
       <div class="searchWrap" v-if="isZd==1">
-        <span class="month">{{ current }}月</span>
+        <el-date-picker
+            v-model="current"
+            type="month"
+            :clearable="false"
+            class="month custom-date-picker"
+            @change="monthChangeHandle"
+            placeholder="选择月">
+        </el-date-picker>
         <el-select
             v-model="supplierId"
             filterable
@@ -18,7 +25,7 @@
             clearable
             placeholder="请输入后选择"
             :remote-method="remoteMethod"
-            @change="selectSupplierNameHanldle"
+            @change="selectSupplierNameHandle"
             :loading="selectLoading">
           <el-option
               v-for="item in selectOption"
@@ -29,17 +36,18 @@
         </el-select>
       </div>
     </div>
-    <van-tabs v-model="active" sticky @click="onClick">
+    <van-tabs v-model="active" sticky @click="tabClickHandle">
       <van-tab v-for="(item,index) in tabArr" :key="index" :title="item.name"></van-tab>
       <div v-if="isMobile && !([0,1,2,3].includes(active))" class="tipArrow left">{{ leftArr }}</div>
-      <div v-if="isMobile && !([8,9].includes(active))" class="tipArrow right">>>></div>
+      <div v-if="isMobile && !([9,10].includes(active))" class="tipArrow right">>>></div>
     </van-tabs>
     <div v-loading="loadingData" :class="{'contentWrap':true,'webcontentWrap':!isMobile}" v-if="active===0">
       <div :class="{'reciceOrder':true,'webCom':!isMobile}">
         <div :class="{'title':true,'webTitle':!isMobile}">接单指标</div>
         <div class="reciceOrderIWrap">
           <div class="left common">
-            <div class="num">{{ indexData && indexData.receiveOrderCount }}</div>
+<!--            indexData && -->
+            <div class="num">{{ formatCurrency(indexData?.receiveOrderCount) }}</div>
             <div class="itemTitle">承接案件量</div>
           </div>
           <div class="center common" @click="clickJumpHandle(5)">
@@ -103,8 +111,8 @@
           <i class="el-icon-question" @click.prevent="showScoreChart = !showScoreChart"></i>
         </div>
         <div class="storeWrap" v-if="indexData">
-          <circle-char v-if="showScoreChart"  ref="Doughnut7" :data="indexData && indexData.score" :bg-color="'#00D273'" :is-store="true"></circle-char>
+          <circle-char v-show="showScoreChart"  ref="Doughnut7" :data="indexData && indexData.score" :bg-color="'#00D273'" :is-store="true"></circle-char>
-          <div v-else class="detailScore">
+          <div  v-show="!showScoreChart"  class="detailScore">
             <div class="left">
               <div>
                 <span class="defen">接单得分:</span>
@@ -194,8 +202,8 @@
         <noFit-table v-else :active='active'  :is-mobile='isMobile' :table-data="detailList" :label-list="labelList"></noFit-table>
      </div>
     </div>
-    <div v-loading="loadingData" class="contentWrap  monthTotal" v-if="[2,3,4].includes(active)">
+    <div v-loading="loadingData" class="contentWrap  monthTotal" v-if="[2,4,5].includes(active)">
-      <div class="searchDriverName" v-if="[3,4].includes(active)">
+      <div class="searchDriverName" v-if="[5,4].includes(active)">
         <el-select
             v-model="driverName"
             filterable
@@ -217,12 +225,12 @@
         </el-select>
       </div>
       <div :class="{'tabWrap':true,'webTabWrap':!isMobile,'mobileTab':isMobile}">
-        <div v-for="(item,index) in (active===3 ? driverList : list)" :class="activeIndex===index ? 'active' : ''"
+        <div v-for="(item,index) in (active===4 ? driverList : list)" :class="activeIndex===index ? 'active' : ''"
              :key="index"
              @click="changeTab(index)">{{ item.name }}
         </div>
       </div>
-      <div :class="{'comTab':true}">
+      <div :class="{'comTab':active !== 4,'comTabActive3':active === 4}">
         <noFit-table :active='active'  :is-mobile='isMobile' :table-data="detailList" :label-list="labelList"></noFit-table>
       </div>
       <el-pagination
@@ -237,22 +245,13 @@
           :total="total">
       </el-pagination>
     </div>
-    <div v-loading="loadingData" class="contentWrap  monthTotal" v-if="[5,6,7,8,9].includes(active)">
+    <div v-loading="loadingData" class="contentWrap  monthTotal" v-if="[3,6,7,8,9,10].includes(active)">
       <div :class="{'comTab':true,'detailTable':isMobile}">
         <noFit-table :active='active'  :is-mobile='isMobile' :table-data="detailList" :label-list="labelList"
                      ></noFit-table>
       </div>
-<!--      <el-pagination
-          small
-          :current-page.sync="pageNum"
-          :page-size.sync="pageSize"
-          @current-change="getKpiData"
-          @size-change="getKpiData"
-          layout="prev, pager, next"
-          :total="total">
-      </el-pagination>-->
       <el-pagination
-          v-if="active !== 9"
+          v-if="active !== 10"
           small
           :page-sizes="[20, 50, 100]"
           :current-page.sync="pageNum"
@@ -273,10 +272,9 @@ import {
   getKpiDetailsData,
   getStatisticsKpiByMonth,
   getStatisticsKpi,
-  getDriverStatisticsKpi,
   getSupplierId,
-  getDriverName,
+  getDriverName,getDriverStatisticsKpi,
-  getRecentSupplierKpi
+  getRecentSupplierKpi, querySupplierDriverStatisticsScore
 } from "@/api/kpi.js"
 import {myMixins} from "@/utils/myMixins"
 import CircleChar from "@/views/kpi/components/circleChar.vue";
@@ -291,8 +289,9 @@ export default {
     return {
       active:0,
       activeIndex: 0,
+      //
       tabArr: [
-        {name: '总览'}, {name: '月/总'}, {name: '日/总'}, {name: '月/师傅'}, {name: '日/师傅'}, {name: '拒单明细'},
+        {name: '总览'}, {name: '月/总'}, {name: '日/总'},{name: '师傅满意度'},{name: '月/师傅'}, {name: '日/师傅'},  {name: '拒单明细'},
         {name: '超时明细'}, {name: '投诉明细'}, {name: '不使用APP案件明细'}, {name: '车辆在线情况'}
       ],
       list: [{name: '接单指标'}, {name: '客户评价'}, {name: 'APP使用'}, {name: ' 时效 '}],
@@ -316,7 +315,8 @@ export default {
       xAxisArr: [],
       isMobile: false,
       isZd: '',
-      current: dayjs(new Date()).format('M'),
+      current:'',
+      // current: dayjs(new Date()).format('M'),
       supplierName:'',
       value: '1',
       options: [
@@ -350,15 +350,13 @@ export default {
   async mounted() {
     await this.checkMobile();
     await this.initDate();
-    await this.getData();
+    await this.selectSupplierNameHandle();
-    // await this.allDataChart()
   },
   methods: {
     applicateHandle() {
       if (window.parent) {
         const hasListener = window.parent.dispatchEvent(new Event('checkCloseDialog'));
         if (hasListener) {
-          console.log("this.supplierId",this.supplierId)
           const data = {
             action: 'closeDialog',
             message: this.supplierId,
@@ -371,9 +369,31 @@ export default {
         }
       }
     },
-    async selectSupplierNameHanldle(){
+    monthChangeHandle(value){
+      if (value) {
+        const year = value.getFullYear();
+        const month = value.getMonth() + 1; // 月份从 0 开始，需要加 1
+        const yearAndMonth = year + '-' + (month > 9 ? month : '0' + month);
+        this.current = dayjs(new Date(yearAndMonth)).format('YYYY-MM')
+        this.startTime = `${year}-${this.padZero(month)}-01 00:00:00`;
+        const lastDay = new Date(year, month, 0).getDate(); // 获取该月的最后一天
+        this.endTime = `${year}-${this.padZero(month)}-${this.padZero(lastDay)} 23:59:59`;
+        this.startMonthTime=this.getStartTimeFromEndTime(this.endTime)
+        console.log(" this.startMonthTime", this.startMonthTime)
+        this.selectSupplierNameHandle();
+        if(this.active===1){
+          this.tabClickHandle()
+        }
+      }
+    },
+    padZero(num) {
+      return num < 10 ? `0${num}` : num;
+    },
+    async selectSupplierNameHandle(){
       await this.getData()
-      setTimeout(()=>{
+      if(this.active !== 0){
+        return
+      }
       this.$refs.Doughnut1.initCircle()
       this.$refs.Doughnut2.initCircle()
       this.$refs.Doughnut3.initCircle()
@@ -381,7 +401,6 @@ export default {
       this.$refs.Doughnut5.initCircle()
       this.$refs.Doughnut6.initCircle()
       this.$refs.Doughnut7.initCircle()
-      },1500)
     },
     async remoteMethod(query) {
       if (query !== '') {
@@ -446,24 +465,41 @@ export default {
         this.loadingData = false
       }
     },
+    // 格式化承接案件量数据
+    formatCurrency(value) {
+      if (!value) return '';
+      let num = parseInt(value);
+      return num.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ',');
+    },
+    formatCurrency1(value) {
+      if (!value) return ''; // 如果值为空，返回空字符串
+      // 如果值已经包含逗号，直接返回原值
+      if (value.toString().includes(',')) {
+        return value;
+      }
+      // 否则，添加千分号
+      let num = parseInt(value);
+      if (isNaN(num)) return ''; // 如果转换失败，返回空字符串
+      return num.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ',');
+    },
     async clickJumpHandle(type) {
       this.loading = true
       this.active = type;
-      await this.onClick();
+      await this.tabClickHandle();
     },
-    onClick() {
+    tabClickHandle() {
       this.activeIndex = 0;
       this.detailList = [];
       this.labelList = [];
       this.driverName=''
-      this.getData();
+      this.selectSupplierNameHandle();
       if (this.active === 1) {
         setTimeout(() => {
           this.drawLine()
           if (!this.isMobile && this.activeIndex === 3) {
             this.drawLine1()
           }
-        }, 500)
+        }, 1000)
       }
     },
     drawLine() { // 基于准备好的dom，初始化echarts实例
@@ -473,13 +509,16 @@ export default {
       let series1 = [{
         name: '派遣案件量',
         type: 'bar',
-        data: this.v1,
+        data: this.v1?.map(item => Number(item?.toString()?.replace(/,/g, ''))),
         yAxisIndex: 0,
         smooth: true,
         barWidth: this.isMobile ? 35 : 60,
         label: {
           show: true, // 显示标签
           position: 'top', // 标签位置在柱形顶部
+          formatter: (params) => {
+            return params.value.toLocaleString();
+          }
         }
       },
         {
@@ -872,18 +911,23 @@ export default {
         driverId: this.driverId,
         driverName:this.driverName,
       });
-      console.log("res",res)
       this.continueMonthKpi=res.data;
-      let v1=[]
+      // 初始化 v1 ,v2数组，长度为 12，初始值为 0
-      let v2=[]
+      let v1 = new Array(12).fill(0);
+      let v2 = new Array(12).fill(0);
       if( this.continueMonthKpi.length>0){
         this.continueMonthKpi.forEach(item=>{
-          v1.push(item.dispatchOrderCount)
+          let month = parseInt(item.statisticsDate?.split('-')[1], 10) - 1; // 获取月份，并转换为数组索引
-          v2.push(item.orderScore)
+          v1[month] = item.dispatchOrderCount;
+          v2[month] = item.orderScore;
         })
       }
       let myChart = echarts.init(document.getElementById('allDataChart'))
       let option = {
+        grid: {
+          top: '15%',
+          bottom: '12%',
+        },
         tooltip: {
           trigger: 'axis',
           axisPointer: {
@@ -936,6 +980,14 @@ export default {
       };
       option && myChart.setOption(option, true);
     },
+    // 通用函数，用于处理百分比数据
+    processPercentage(value) {
+      value *= 100;
+      if (value % 1 !== 0) {
+        value = value.toFixed(2);
+      }
+      return value;
+    },
     async getKpiData() {
       try {
         this.loading = true
@@ -952,37 +1004,21 @@ export default {
           }
           this.indexData = res.data;
           this.supplierName=res.data?.supplierName
-          this.indexData.refuseOrderRate=this.indexData.refuseOrderRate*100
+          // 需要处理的属性名数组
-          if (this.indexData.refuseOrderRate % 1 !== 0) {
+          const propertiesToProcess = [
-            this.indexData.refuseOrderRate = this.indexData.refuseOrderRate.toFixed(2);
+            'refuseOrderRate',
+            'timeoutOrderRate',
+            'complainOrderRate',
+            'customerSatisfaction',
+            'threeMinutesContactRate',
+            'urgeRate',
+            'appRate',
+            'polymerizationSuccessRate'
+          ];
+          for (let key in this.indexData){
+            if (propertiesToProcess.includes(key)) {
+              this.indexData[key] = this.processPercentage(this.indexData[key]);
             }
-          this.indexData.timeoutOrderRate=this.indexData.timeoutOrderRate*100
-          if (this.indexData.timeoutOrderRate % 1 !== 0) {
-            this.indexData.timeoutOrderRate = this.indexData.timeoutOrderRate.toFixed(2);
-          }
-          this.indexData.complainOrderRate=this.indexData.complainOrderRate*100
-          if (this.indexData.complainOrderRate % 1 !== 0) {
-            this.indexData.complainOrderRate = this.indexData.complainOrderRate.toFixed(2);
-          }
-          this.indexData.customerSatisfaction=this.indexData.customerSatisfaction*100
-          if (this.indexData.customerSatisfaction % 1 !== 0) {
-            this.indexData.customerSatisfaction = this.indexData.customerSatisfaction.toFixed(2);
-          }
-          this.indexData.threeMinutesContactRate=this.indexData.threeMinutesContactRate*100
-          if (this.indexData.threeMinutesContactRate % 1 !== 0) {
-            this.indexData.threeMinutesContactRate = this.indexData.threeMinutesContactRate.toFixed(2);
-          }
-          this.indexData.urgeRate=this.indexData.urgeRate*100
-          if (this.indexData.urgeRate % 1 !== 0) {
-            this.indexData.urgeRate = this.indexData.urgeRate.toFixed(2);
-          }
-          this.indexData.appRate=this.indexData.appRate*100
-          if (this.indexData.appRate % 1 !== 0) {
-            this.indexData.appRate = this.indexData.appRate.toFixed(2);
-          }
-          this.indexData.polymerizationSuccessRate=this.indexData.polymerizationSuccessRate*100
-          if (this.indexData.polymerizationSuccessRate % 1 !== 0) {
-            this.indexData.polymerizationSuccessRate = this.indexData.polymerizationSuccessRate.toFixed(2);
           }
         } else if ([1, 2].includes(this.active)) {
           let res = await getStatisticsKpi({
@@ -1011,32 +1047,57 @@ export default {
             item.minorFortyMinutesArrivalRate=this.formatPercentage(item.minorFortyMinutesArrivalRate) ;
             let formatVal = dayjs(item.statisticsDate).format('DD');
             let formatVal1 = dayjs(item.statisticsDate).format('M');
-            return {...item, date: formatVal, month: (formatVal1 == this.current) ? '本月' : (formatVal1 + '月')};
+            // console.log("formatVal1",formatVal1)
+            // return {...item, date: formatVal, month: (formatVal1 == this.current) ? '本月' : (formatVal1 + '月')};
+            return {...item, date: formatVal, month: formatVal1 + '月'};
           });
           this.loading = false
           this.detailList?.map(item => {
             this.xAxisArr.push(item.month)
+            this.xAxisArr = [...new Set(this.xAxisArr)]; // 去重
           })
-          this.xAxisArr[this.xAxisArr.length - 1] = '本月'
+          console.log(" this.xAxisArr", this.xAxisArr)
+          // this.xAxisArr[this.xAxisArr.length - 1] = '本月'
           await this.twoTabHanldeData()
-        } else if ([3, 4].includes(this.active)) {
+        }else if (this.active === 3) {
-          let res = await getDriverStatisticsKpi({
+          let res = await querySupplierDriverStatisticsScore({
             startTime: this.startTime ,
             endTime: this.endTime,
-            statisticsType: this.active === 3 ? 1 : 2,
+            statisticsType: 1,
+            supplierId: this.supplierId,
+            driverId: this.driverId,
+            driverName:this.driverName,
+            pageNum: this.pageNum,
+            pageSize: this.pageSize
+          })
+          this.total = res.total
+          this.detailList = res.data?.map(item => {
+            let formatVal = dayjs(item.statisticsDate).format('DD');
+            return {...item, date: formatVal};
+          });
+          this.labelList = [
+            {label: '师傅姓名', prop: 'driverName'},
+            {label: '案件总量', prop: 'orderCount'},
+            {label: '满意度得分  ', prop: 'driverSatisfaction'},
+          ]
+          this.loading = false;
+        }
+        else if ([4,5].includes(this.active)) {
+          let res = await getDriverStatisticsKpi({
+            startTime: this.startTime ,
+            endTime: this.endTime,
+            statisticsType:this.active === 4 ? 1 : 2,
             supplierId: this.supplierId,
             driverId: this.driverId,
             driverName:this.driverName,
             pageNum: this.pageNum,
             pageSize: this.pageSize
           })
-          // this.detailList = res.data
           this.total = res.total
           this.detailList = res.data?.map(item => {
             item.refuseOrderRate=this.formatPercentage(item.refuseOrderRate) ;
             item.timeoutOrderRate=this.formatPercentage(item.timeoutOrderRate) ;
             item.cancelRate=this.formatPercentage(item.cancelRate) ;
-            // item.urgeRate=this.formatPercentage(item.urgeRate) ;
             item.complainOrderRate=this.formatPercentage(item.complainOrderRate) ;
             item.customerEvaluateRate=this.formatPercentage(item.customerEvaluateRate) ;
             item.appRate=this.formatPercentage(item.appRate) ;
@@ -1051,14 +1112,14 @@ export default {
             let formatVal = dayjs(item.statisticsDate).format('DD');
             return {...item, date: formatVal};
           });
-          console.log("this.detailList",this.detailList)
           this.loading = false;
-          if(this.active===4 && !this.driverName){
+          if(this.active===5 && !this.driverName){
             this.detailList=[]
             this.total=0
           }
           await this.twoTabHanldeData();
-        } else if ([5, 6, 7, 8, 9].includes(this.active)) {
+        }
+        else if ([ 6, 7, 8,9,10].includes(this.active)) {
           this.detailList = []
           this.labelList = []
           let result = await getKpiDetailsData({
@@ -1075,7 +1136,7 @@ export default {
             return {...item, date: formatVal};
           });
           this.loading = false
-          if (this.active === 5) {//拒单明细
+          if (this.active === 6) {//拒单明细
             this.labelList = [
               {label: '案件编号', prop: 'orderCode'},
               {label: '服务内容', prop: 'serviceName'},
@@ -1086,7 +1147,7 @@ export default {
               {label: '中道派单时间', prop: 'dispatchTime'},
               {label: '拒绝原因', prop: 'reason'},
             ]
-          } else if (this.active === 6) {//超时明细
+          } else if (this.active === 7) {//超时明细
             this.labelList = [
               {label: '案件编号', prop: 'orderCode'},
               {label: '服务内容', prop: 'serviceName'},
@@ -1096,7 +1157,7 @@ export default {
               {label: '上游接单来源', prop: 'workSource'},
               {label: '中道派单时间', prop: 'dispatchTime'},
             ]
-          } else if (this.active === 7) {//投诉明细
+          } else if (this.active === 8) {//投诉明细
             this.labelList = [
               {label: '案件编号', prop: 'orderCode'},
               {label: '服务内容', prop: 'serviceName'},
@@ -1105,7 +1166,7 @@ export default {
               {label: '投诉时间', prop: 'complainCreateTime'},
               {label: '投诉类型', prop: 'complainTypeString'},
             ]
-          } else if (this.active === 8) {//不使用App案件明细
+          } else if (this.active === 9) {//不使用App案件明细
             this.labelList = [
               {label: '案件编号', prop: 'orderCode'},
               {label: '服务内容', prop: 'serviceName'},
@@ -1113,7 +1174,7 @@ export default {
               {label: '工单创建时间', prop: 'orderCreateTime'},
               {label: '事发地', prop: 'vehiclePointAddress'},
             ]
-          } else if (this.active === 9) {//车辆在线情况
+          } else if (this.active === 10) {//车辆在线情况
             this.labelList = [
               {label: '日期', prop: 'date'},
               {label: '0点在线车辆数量', prop: 'zeroClockVehicleCount'},
@@ -1122,7 +1183,6 @@ export default {
               {label: '16点在线车辆数量', prop: 'sixteenClockVehicleCount'},
               {label: '20点在线车辆数量', prop: 'twentyClockVehicleCount'},
               {label: '22点在线车辆数量', prop: 'twentyTwoClockVehicleCount'},
-
             ]
           }
         }
@@ -1138,15 +1198,23 @@ export default {
         return result.toFixed(2) + '%';
       }
     },
-    checkMobile() {
-      const userAgent = navigator.userAgent || navigator.vendor || window.opera;
-      this.isMobile = /android|webos|iphone|ipad|ipod|blackberry|iemobile|opera mini/i.test(userAgent);
-    },
     // 初始化获取当月日期
     initDate() {
+      let year=''
+      let month=''
+      if( this.current ) {
+        year = new Date(this.current).getFullYear();
+        month = new Date(this.current).getMonth() + 1;
+      } else {
+        year = new Date().getFullYear();
+        month = new Date().getMonth() + 1;
+      }
+      let yearAndMonth = year + '-' + (month > 9 ? month : '0' + month);
+      this.current = dayjs(new Date(yearAndMonth)).format('YYYY-MM')
       this.startTime = dayjs(new Date()).format('YYYY-MM') + '-01 00:00:00'
       this.endTime = dayjs(new Date()).format('YYYY-MM') + '-' + this.getDayLen()+' 23:59:59'
       this.startMonthTime=this.getStartTimeFromEndTime(this.endTime)
+      console.log(" this.startMonthTime", this.startMonthTime,this.startTime)
     },
     // 获取当月天数
     getDayLen() {
@@ -1207,6 +1275,12 @@ export default {
             { 'month': '拒单量' },{ 'month': '拒单率(%)' },{ 'month': '超时接单量' },{ 'month': '超时率(%)' },{ 'month': '客户取消率(%)' }]
           let props = 'prop' //自定义字段名称
           this.detailList?.map((item,index) => {
+
+            item.dispatchOrderCount=this.formatCurrency1( item.dispatchOrderCount);
+            item.receiveOrderCount=this.formatCurrency1( item.receiveOrderCount);
+            item.finishOrderCount=this.formatCurrency1( item.finishOrderCount);
+            item.refuseOrderCount=this.formatCurrency1( item.refuseOrderCount);
+            item.timeoutOrderCount=this.formatCurrency1( item.timeoutOrderCount);
             this.v1.push(item.dispatchOrderCount)
             this.v2.push(item.refuseOrderRate.replace('%', ''))
             this.v3.push(item.timeoutOrderRate.replace('%', ''))
@@ -1384,9 +1458,12 @@ export default {
             {label: '聚合成功到达时效(分)', prop: 'polymerizationSuccessArriving'},
           ]
         }
-      } else if (this.active === 3) {
+      }
-        if (this.activeIndex === 0) {
+     /* else if(this.active === 3){
 
+      } */
+      else if (this.active === 4) {
+        if (this.activeIndex === 0) {
           this.labelList = [
             {label: '师傅姓名', prop: 'driverName'},
             {label: '总分', prop: 'score'},
@@ -1455,7 +1532,7 @@ export default {
             {label: '聚合成功到达时效(分)', prop: 'polymerizationSuccessArriving'},
           ]
         }
-      } else if (this.active === 4) {
+      } else if (this.active === 5) {
         if (this.activeIndex === 0) {//接单指标
           this.labelList = [
             {label: '日', prop: 'date'},
@@ -1504,17 +1581,21 @@ export default {
         }
       }
     },
+    checkMobile() {
+      const userAgent = navigator.userAgent || navigator.vendor || window.opera;
+      this.isMobile = /android|webos|iphone|ipad|ipod|blackberry|iemobile|opera mini/i.test(userAgent);
+    },
     setType(type) {
       switch (type) {
-        case 5:
-          return 1;
         case 6:
-          return 2;
+          return 1;
         case 7:
-          return 3;
+          return 2;
         case 8:
-          return 4;
+          return 3;
         case 9:
+          return 4;
+        case 10:
           return 5;
       }
     },
@@ -1581,19 +1662,6 @@ export default {
     display: flex;
     align-items: center;
     position: relative;
-
-    .month {
-      display: inline-block;
-      width: 45px;
-      height: 30px;
-      line-height: 30px;
-      text-align: center;
-      border-radius: 20px 0px 0px 20px;
-      border: 1px solid #4C81F5;
-      font-size: 14px;
-      color: #FFFFFF;
-    }
-
     .el-icon-search {
       font-size: 15px;
       color: #4C81F5;
@@ -1675,12 +1743,6 @@ export default {
         display: flex;
         justify-content:center;
       }
-
-     /* .defen{
-        display: inline-block;
-        //width: 92px;
-        //text-align: right;
-      }*/
       .left{
         text-align: right;
         padding-right: 5px;
@@ -1734,8 +1796,9 @@ export default {
     }
   }
   .allDataChartWrap{
-    width: 375px;
+  /*  width: 375px;
-    height: 220px;
+    height: 220px;*/
+    @include whBg(375px, 200px, #FFFFFF);
 
   }
   .allDataChart{
@@ -1743,8 +1806,10 @@ export default {
     height: 100%;
   }
   .webComAllData{
-    width: 400px;
+    width: 420px;
-    height: 255px;
+    height: 200px;
+    /*width: 375px;
+    height: 146px;*/
     float: left;
     margin: 10px;
   }
@@ -1862,7 +1927,6 @@ export default {
   width: 100%;
   height: 95%;
 }
-
 ::v-deep .el-table {
   height: 100%;
 }
@@ -1870,7 +1934,11 @@ export default {
 ::v-deep .el-table--scrollable-x .el-table__body-wrapper {
   height: 95% !important;
 }
-
+.comTabActive3 ::v-deep .el-table--scrollable-x .el-table__body-wrapper{
+  width: 100%;
+  //height: 90%;
+  //height: 84% !important;
+}
 .chartWrapWeb, .webTab {
   height: calc(100% - 200px);
   width: 100%;
@@ -1938,4 +2006,47 @@ export default {
 ::v-deep .el-switch__label * {
   font-size: 12px;
 }
+/* 自定义样式 */
+.custom-date-picker ::v-deep .el-input__prefix{
+  display: none;
+}
+.month {
+  display: inline-block;
+  width: 75px;
+  //height: 30px;
+  //line-height: 30px;
+  text-align: center;
+  border-radius: 20px 0px 0px 20px;
+  //border-radius: 0px 20px 20px 0px;
+  //border: 1px solid #4C81F5;
+  font-size: 14px;
+  color: #FFFFFF;
+  ::v-deep .el-input--suffix .el-input__inner{
+
+  }
+  ::v-deep .el-input__inner{
+    padding-left: 0 !important;
+    padding-right: 0 !important;
+    border-radius: 20px 0px 0px 20px !important;
+    text-align: center !important;
+    font-size: 14px  !important;
+    color: #FFFFFF !important;
+    border: 1px solid #4C81F5 !important;
+    background-color: transparent !important;
+  }
+  /* 自定义清除按钮样式 */
+  .custom-date-picker ::v-deep .el-input__suffix {
+    right: 0 !important;
+    padding-right: 10px !important;
+  }
+
+  .custom-date-picker ::v-deep .el-input__suffix-inner {
+    display: flex;
+    align-items: center;
+  }
+
+  .custom-date-picker ::v-deep .el-input__icon {
+    line-height: 1 !important;
+  }
+}
 </style>

src/views/workOrder/accounting.vue

@@ -73,51 +73,51 @@
         <div class="titleContent">
           <div class="flex-between" v-show="abState">
             <div> 到事发地距离:</div>
-            <div class="halfOpcity"><input @input="validateIntegerInput"   type="number" v-model="form.supplierSettleMileageAb"/>公里</div>
+            <div class="halfOpcity"><input @input="validateIntegerInput"  class="ipt"  type="number" v-model="form.supplierSettleMileageAb"/>公里</div>
           </div>
           <div class="flex-between" v-show="bcState">
             <div> 拖车里程:</div>
-            <div class="halfOpcity"><input    type="number" v-model="form.supplierSettleMileageBc"/>公里</div>
+            <div class="halfOpcity"><input class="ipt"    type="number" v-model="form.supplierSettleMileageBc"/>公里</div>
           </div>
           <div class="flex-between" v-show="caState">
             <div>返程里程:</div>
-            <div class="halfOpcity"><input    type="number" v-model="form.supplierSettleMileageCa"/>公里</div>
+            <div class="halfOpcity"><input  class="ipt"   type="number" v-model="form.supplierSettleMileageCa"/>公里</div>
           </div>
           <div class="flex-between" v-show="bridgeAbState">
             <div>ab路桥费:</div>
-            <div class="halfOpcity"><input @input="validateIntegerInput" :disabled="isUnsuccessfulSettle"  type="number" v-model="form.supplierBridgeAmountAb"/>元</div>
+            <div class="halfOpcity"><input class="ipt"  @input="validateIntegerInput" :disabled="isUnsuccessfulSettle"  type="number" v-model="form.supplierBridgeAmountAb"/>元</div>
           </div>
           <div class="flex-between" v-show="bridgeBcState">
             <div>bc路桥费:</div>
-            <div class="halfOpcity"><input @input="validateIntegerInput" :disabled="isUnsuccessfulSettle"  type="number" v-model="form.supplierBridgeAmountBc"/>元</div>
+            <div class="halfOpcity"><input class="ipt"  @input="validateIntegerInput" :disabled="isUnsuccessfulSettle"  type="number" v-model="form.supplierBridgeAmountBc"/>元</div>
           </div>
           <div class="flex-between" v-show="bridgeCaState">
             <div>ca路桥费:</div>
-            <div class="halfOpcity"><input  @input="validateIntegerInput" :disabled="isUnsuccessfulSettle" type="number" v-model="form.supplierBridgeAmountCa"/>元</div>
+            <div class="halfOpcity"><input class="ipt"  @input="validateIntegerInput" :disabled="isUnsuccessfulSettle" type="number" v-model="form.supplierBridgeAmountCa"/>元</div>
           </div>
           <div class="flex-between" v-show="waitAmountState">
             <div>等候费:</div>
-            <div class="halfOpcity inputContent"><input @input="validateIntegerInput"   type="number" v-model="form.supplierWaitAmount"/>元</div>
+            <div class="halfOpcity inputContent"><input class="ipt"  @input="validateIntegerInput"   type="number" v-model="form.supplierWaitAmount"/>元</div>
           </div>
           <div class="flex-between" v-show="tyreAmountState">
             <div>小轮个数:</div>
-            <div class="halfOpcity inputContent"><input @input="validateIntegerInput" :disabled="isUnsuccessfulSettle"   type="number" v-model="form.tyreNumber"/>个</div>
+            <div class="halfOpcity inputContent"><input class="ipt"  @input="validateIntegerInput" :disabled="isUnsuccessfulSettle"   type="number" v-model="form.tyreNumber"/>个</div>
           </div>
           <div class="flex-between" v-show="tyreAmountState">
             <div>小轮费:</div>
-            <div class="halfOpcity inputContent"><input @input="validateIntegerInput"  :disabled="isUnsuccessfulSettle"    type="number" v-model="form.supplierTyreAmount"/>元</div>
+            <div class="halfOpcity inputContent"><input @input="validateIntegerInput"  disabled  type="number" v-model="form.supplierTyreAmount"/>元</div>
           </div>
           <div class="flex-between" v-show="dilemmaAmountState && basePriceDisabled">
             <div>困境费:</div>
-            <div class="halfOpcity inputContent"><input @input="validateIntegerInput"   type="number" v-model="form.supplierDilemmaAmount"/>元</div>
+            <div class="halfOpcity inputContent"><input class="ipt"  @input="validateIntegerInput"   type="number" v-model="form.supplierDilemmaAmount"/>元</div>
           </div>
           <div class="flex-between" v-show="basementFeeState">
             <div>地库费:</div>
-            <div class="halfOpcity inputContent"><input @input="validateIntegerInput"   type="number" v-model="form.supplierBasementFee" :disabled="!isBasementSettle || isUnsuccessfulSettle" />元</div>
+            <div class="halfOpcity inputContent"><input @input="validateIntegerInput"  class="ipt"  type="number" v-model="form.supplierBasementFee" :disabled="!isBasementSettle || isUnsuccessfulSettle" />元</div>
           </div>
           <div class="flex-between">
             <div>收取客户金额:</div>
-            <div class="halfOpcity inputContent"><input type="number" v-model="form.supplierCustomerAmount"/>元</div>
+            <div class="halfOpcity inputContent"><input type="number" class="ipt"  v-model="form.supplierCustomerAmount"/>元</div>
           </div>
           <div class="flex-between bgDisable" :class=" { 'flex-between': true, 'bgDisable' : basePriceDisabled } ">
             <div>基本费用:</div>
@@ -897,11 +897,11 @@ export default {
 
   .leftTitle {
     opacity: .5;
-    @include wh(60px, 189px);
+    width: 60px;
   }
 
   .rightContent {
-    height: 189px;
+    /*height: 189px;*/
     width: calc(100% - 60px);
   }
 
@@ -973,10 +973,14 @@ img {
 
     .halfOpcity {
       opacity: .5;
+      .ipt{
+        border: 1px solid #cccccc !important;
+      }
     }
 
     .inputContent {
       text-align: right;
+      flex: 1;
     }
   }
 

src/views/workOrder/aduitCompleteDetail.vue

@@ -82,7 +82,7 @@
       <span class="content">{{orderInfo.bridgeAmountBc + ' 元' }}</span>
     </div>
     <div class="item" v-show="bridgeCaState">
-      <span class="titleLeft">va路桥费：</span>
+      <span class="titleLeft">ca路桥费：</span>
       <span class="content">{{orderInfo.bridgeAmountCa + ' 元' }}</span>
     </div>
     <div class="item"  v-show="tyreAmountState">