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

(cherry picked from commit 7b8e2efbb4)

.gitignore

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

README.md

@@ -29,7 +29,3 @@ See [Configuration Reference](https://cli.vuejs.org/config/).
 ```
 code = 104, 接口不提示报错
 ```
-### 开发分支
-```
-dev_2025
-```

src/utils/myMixins.js

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

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

@@ -74,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">
@@ -121,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>
@@ -152,10 +207,11 @@ export default {
       checked: true,
       carNum:"",//车牌号
       typeList:[],//车辆类型列表
-      selectedOption:'1',//车辆类型
+      selectedOption:[],//车辆类型
       id:'',//车辆Id
       serviceIds:[],//车辆服务种类,
       supplierServiceList:[],
+      oldSupplierServiceList:[],
       show:false,
       imageUrl: require('@/assets/arr_right.png'),
       vehicleLicenseFrontList: [],
@@ -168,21 +224,116 @@ export default {
       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');
-    selectElement.addEventListener('change', function() {
-     this.selectedOption=selectElement.value;
-    });
+    await this.getSupplierServiceTree();
     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);
@@ -209,6 +360,16 @@ export default {
       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 = '';
@@ -287,29 +448,41 @@ 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 }];
       }
@@ -339,7 +512,7 @@ export default {
         this.$toast('行驶证车辆照片页不能为空')
         return
       }
-      if( !this.vehicleLicenseBack ) {
+      if( !this.vehicleFrontPhoto ) {
         this.$toast('车头照片不能为空')
         return
       }
@@ -351,10 +524,18 @@ export default {
         this.$toast('行驶证副页识别失败')
         return
       }
-        await saveVehicle({
+      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,
@@ -362,6 +543,8 @@ export default {
           vehicleFrontPhoto: this.vehicleFrontPhoto,
           vehicleLicenseInfo: this.vehicleLicenseInfo,
           vehicleLicenseCarPhoto: this.vehicleLicenseCarPhoto,
+          vehicleLicense: this.vehicleLicense,
+          vehicleFrontLicensePlate:this.vehicleFrontLicensePlate,
         })
         if(this.id){
           this.$toast('修改成功')
@@ -480,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===4">
+      <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'">
@@ -25,7 +25,7 @@
             <span v-else>{{ scope.row[column.prop] }}</span>
           </template>
         </el-table-column>
-      </template>-->
+      </template>
       <template v-else>
         <el-table-column v-for="column in labelList" :key="column.prop" :prop="column.prop" :label="column.label"
                          align="center"  min-width="100" :width="(isMobile && (column.label=='案件编号' || column.label=='服务内容')) ? 70 : 'auto'">
@@ -45,12 +45,12 @@ export default {
   mounted() {
   },
   computed: {
-   /* filteredLabelList() {
+    filteredLabelList() {
       if(this.active!==4){
         return
       }
       return this.labelList.filter(column => column.label !== '星级评分');
-    }*/
+    }
   },
   methods: {
     setTableCellStyle({ row, column,columnIndex }) {

src/views/kpi/kpiIndex.vue

@@ -39,7 +39,7 @@
     <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 && !([7,8].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}">
@@ -202,7 +202,7 @@
         <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].includes(active)">
+    <div v-loading="loadingData" class="contentWrap  monthTotal" v-if="[2,4,5].includes(active)">
       <div class="searchDriverName" v-if="[5,4].includes(active)">
         <el-select
             v-model="driverName"
@@ -245,7 +245,7 @@
           :total="total">
       </el-pagination>
     </div>
-    <div v-loading="loadingData" class="contentWrap  monthTotal" v-if="[3,4,5,6,7,8].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>
@@ -273,7 +273,7 @@ import {
   getStatisticsKpiByMonth,
   getStatisticsKpi,
   getSupplierId,
-  getDriverName,
+  getDriverName,getDriverStatisticsKpi,
   getRecentSupplierKpi, querySupplierDriverStatisticsScore
 } from "@/api/kpi.js"
 import {myMixins} from "@/utils/myMixins"
@@ -289,9 +289,9 @@ export default {
     return {
       active:0,
       activeIndex: 0,
-      // {name: '月/师傅'}, {name: '日/师傅'},
+      //
       tabArr: [
-        {name: '总览'}, {name: '月/总'}, {name: '日/总'},{name: '师傅满意度'},  {name: '拒单明细'},
+        {name: '总览'}, {name: '月/总'}, {name: '日/总'},{name: '师傅满意度'},{name: '月/师傅'}, {name: '日/师傅'},  {name: '拒单明细'},
         {name: '超时明细'}, {name: '投诉明细'}, {name: '不使用APP案件明细'}, {name: '车辆在线情况'}
       ],
       list: [{name: '接单指标'}, {name: '客户评价'}, {name: 'APP使用'}, {name: ' 时效 '}],
@@ -1077,13 +1077,12 @@ export default {
           });
           this.labelList = [
             {label: '师傅姓名', prop: 'driverName'},
-            {label: '服务商名称', prop: 'supplierName'},
             {label: '案件总量', prop: 'orderCount'},
             {label: '满意度得分  ', prop: 'driverSatisfaction'},
           ]
           this.loading = false;
         }
-       /* else if ([4,5].includes(this.active)) {
+        else if ([4,5].includes(this.active)) {
           let res = await getDriverStatisticsKpi({
             startTime: this.startTime ,
             endTime: this.endTime,
@@ -1119,9 +1118,8 @@ export default {
             this.total=0
           }
           await this.twoTabHanldeData();
-        }*/
-        else if ([ 4,5,6, 7, 8].includes(this.active)) {
-
+        }
+        else if ([ 6, 7, 8,9,10].includes(this.active)) {
           this.detailList = []
           this.labelList = []
           let result = await getKpiDetailsData({
@@ -1138,7 +1136,7 @@ export default {
             return {...item, date: formatVal};
           });
           this.loading = false
-          if (this.active === 4) {//拒单明细
+          if (this.active === 6) {//拒单明细
             this.labelList = [
               {label: '案件编号', prop: 'orderCode'},
               {label: '服务内容', prop: 'serviceName'},
@@ -1149,7 +1147,7 @@ export default {
               {label: '中道派单时间', prop: 'dispatchTime'},
               {label: '拒绝原因', prop: 'reason'},
             ]
-          } else if (this.active === 5) {//超时明细
+          } else if (this.active === 7) {//超时明细
             this.labelList = [
               {label: '案件编号', prop: 'orderCode'},
               {label: '服务内容', prop: 'serviceName'},
@@ -1159,7 +1157,7 @@ export default {
               {label: '上游接单来源', prop: 'workSource'},
               {label: '中道派单时间', prop: 'dispatchTime'},
             ]
-          } else if (this.active === 6) {//投诉明细
+          } else if (this.active === 8) {//投诉明细
             this.labelList = [
               {label: '案件编号', prop: 'orderCode'},
               {label: '服务内容', prop: 'serviceName'},
@@ -1168,7 +1166,7 @@ export default {
               {label: '投诉时间', prop: 'complainCreateTime'},
               {label: '投诉类型', prop: 'complainTypeString'},
             ]
-          } else if (this.active === 7) {//不使用App案件明细
+          } else if (this.active === 9) {//不使用App案件明细
             this.labelList = [
               {label: '案件编号', prop: 'orderCode'},
               {label: '服务内容', prop: 'serviceName'},
@@ -1176,7 +1174,7 @@ export default {
               {label: '工单创建时间', prop: 'orderCreateTime'},
               {label: '事发地', prop: 'vehiclePointAddress'},
             ]
-          } else if (this.active === 8) {//车辆在线情况
+          } else if (this.active === 10) {//车辆在线情况
             this.labelList = [
               {label: '日期', prop: 'date'},
               {label: '0点在线车辆数量', prop: 'zeroClockVehicleCount'},
@@ -1208,18 +1206,13 @@ export default {
         year = new Date(this.current).getFullYear();
         month = new Date(this.current).getMonth() + 1;
       } else {
-        /*year = new Date().getFullYear();
-        month = new Date().getMonth() + 1;*/
-        year = 2024
-        month = 12
+        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')
-      console.log("this.current",this.current)
-      /*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.startTime = '2024-12-01 00:00:00'
-      this.endTime = '2024-12-31 23:59:59'
+      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)
     },
@@ -1594,15 +1587,15 @@ export default {
     },
     setType(type) {
       switch (type) {
-        case 4:
-          return 1;
-        case 5:
-          return 2;
         case 6:
-          return 3;
+          return 1;
         case 7:
-          return 4;
+          return 2;
         case 8:
+          return 3;
+        case 9:
+          return 4;
+        case 10:
           return 5;
       }
     },

src/views/workOrder/accounting.vue

@@ -897,11 +897,11 @@ export default {
 
   .leftTitle {
     opacity: .5;
-    @include wh(60px, 189px);
+    width: 60px;
   }
 
   .rightContent {
-    height: 189px;
+    /*height: 189px;*/
     width: calc(100% - 60px);
   }
 
@@ -980,6 +980,7 @@ img {
 
     .inputContent {
       text-align: right;
+      flex: 1;
     }
   }