task#，司机培训文档和文档材料添加关键词接收

(cherry picked from commit f3a15b829f)

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

@@ -36,6 +36,24 @@ export function getKpiDetailsData(data){
     data
   })
 }
+// 获取近12个月的服务商数据
+export function getRecentSupplierKpi(data){
+  return request({
+    url: '/supplier/supplierKPI/queryRecentSupplierStatisticsKpi',
+    method:'POST',
+    // contentType: 'application/json',
+    data
+  })
+}
+// 司机分数详情
+export function driverScoreDetail(data){
+  return request({
+    url: '/supplier/supplierKPI/querySupplierDriverStatisticsScore',
+    method:'POST',
+    // contentType: 'application/json',
+    data
+  })
+}
 // 关键词搜索服务商名称
 export function getSupplierId(key) {
   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}`;
-      config.headers['Authorization'] = `${token}`;
-      /*if (reqUrl.includes("/driverApp")) {
+       if(!(reqUrl=='/supplier/supplierTraining/trainingTask' || reqUrl=='/supplier/supplierTraining/normalList' || reqUrl=='/supplier/supplierTraining/trainingList')){
+           config.headers['Authorization'] = `${token}`;
+           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/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/kpi/components/noFit-table.vue

@@ -13,6 +13,19 @@
           <template slot-scope="scope">{{scope.row[item.prop]}}  </template>
         </el-table-column>
       </template>
+      <template v-else-if="active===3">
+        <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'">
+          <template slot-scope="scope">
+            <span v-if="column.label === '师傅姓名'">
+              {{ scope.row[column.prop] }}
+              <span style=" color: #FFBA00;" v-if="scope.row.starRank"><i class="el-icon-star-on star"></i>{{scope.row.starRank}}</span>
+            </span>
+            <span v-else>{{ scope.row[column.prop] }}</span>
+          </template>
+        </el-table-column>
+      </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'">
@@ -31,6 +44,14 @@ export default {
   },
   mounted() {
   },
+  computed: {
+    filteredLabelList() {
+      if(this.active!==3){
+        return
+      }
+      return this.labelList.filter(column => column.label !== '星级评分');
+    }
+  },
   methods: {
     setTableCellStyle({ row, column,columnIndex }) {
       // 月总表格被转置，原始方法失效，重新定义对比

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"
@@ -27,10 +34,9 @@
               :value="item.id">
           </el-option>
         </el-select>
-<!--        <i class="el-icon-search" @click="searchHandle"></i>-->
       </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>
@@ -97,12 +103,15 @@
       </div>
       <div :class="{'reciceOrder':true,'webCom':!isMobile,'store':isMobile}">
         <div class="scoreTitle">
-          <span class="title">综合打分</span>
+          <div>
+            <span class="title" style="margin-right: 15px">综合打分</span>
+            <el-button v-if="!isMobile && isBtn && supplierId" size="mini" type="primary" @click="applicateHandle">信息变更申请</el-button>
+          </div>
           <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>
-          <div v-else class="detailScore">
+          <circle-char v-show="showScoreChart"  ref="Doughnut7" :data="indexData && indexData.score" :bg-color="'#00D273'" :is-store="true"></circle-char>
+          <div  v-show="!showScoreChart"  class="detailScore">
             <div class="left">
               <div>
                 <span class="defen">接单得分:</span>
@@ -111,7 +120,7 @@
                 <span class="defen">接单时效得分:</span>
               </div>
               <div>
-                <span class="defen">到达时效得分:</span>
+                <span class="defen">接单时效得分:</span>
               </div>
               <div><span class="defen">聚合成功率得分:</span>
               </div>
@@ -135,13 +144,13 @@
               <div> <span>{{ indexData.polymerizationSuccessScore }}</span></div>
               <div> <span>{{ indexData.appUseScore }}</span></div>
               <div> <span>{{ indexData.urgeScore }}</span></div>
-              <div><span>{{ indexData.complainScore }}</span></div>
+              <div><span>{{ indexData.urgeScore }}</span></div>
             </div>
           </div>
         </div>
       </div>
-      <div>
-
+      <div :class="{'allDataChartWrap':true,'webComAllData':!isMobile,'store':isMobile}">
+        <div  class="allDataChart" id="allDataChart" ></div>
       </div>
       <div v-if="isMobile" style="padding: 20px"></div>
     </div>
@@ -240,15 +249,6 @@
         <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"
           small
@@ -273,7 +273,8 @@ import {
   getStatisticsKpi,
   getDriverStatisticsKpi,
   getSupplierId,
-  getDriverName
+  getDriverName,
+  getRecentSupplierKpi
 } from "@/api/kpi.js"
 import {myMixins} from "@/utils/myMixins"
 import CircleChar from "@/views/kpi/components/circleChar.vue";
@@ -293,7 +294,7 @@ export default {
         {name: '超时明细'}, {name: '投诉明细'}, {name: '不使用APP案件明细'}, {name: '车辆在线情况'}
       ],
       list: [{name: '接单指标'}, {name: '客户评价'}, {name: 'APP使用'}, {name: ' 时效 '}],
-      driverList: [{name: '接单情况'}, {name: '服务评价'}, {name: 'APP使用情况'}, {name: '时效 '}],
+      driverList: [{name: '得分总览'},{name: '接单情况'}, {name: '服务评价'}, {name: 'APP使用情况'}, {name: '时效 '}],
       startMonthTime: '',
       startTime: '',
       endTime: '',
@@ -313,7 +314,8 @@ export default {
       xAxisArr: [],
       isMobile: false,
       isZd: '',
-      current: dayjs(new Date()).format('M'),
+      current:'',
+      // current: dayjs(new Date()).format('M'),
       supplierName:'',
       value: '1',
       options: [
@@ -332,36 +334,72 @@ export default {
       driverselectLoading: false,
       driverselectOption: [],
       leftArr:'<<<',
-      showScoreChart:true
+      showScoreChart:true,
+      continueMonthKpi:[],
+      isBtn:false,//是否有信息变更申请按钮权限
     }
   },
-  async mounted() {
-    await this.checkMobile();
-    await this.initDate();
-    await this.getData();
-  },
   created() {
     this.checkMobile();
     const urlParams = new URLSearchParams(window.location.search);
     this.isZd = urlParams?.get('isZd') || ''
-   /* if(!this.isMobile && this.isZd && this.isZd==1){
-      this.supplierId='1127'
-    }*/
+    this.supplierId = urlParams?.get('supplierId') || ''
+    this.isBtn= Number(urlParams?.get('isBtn'))
   },
-  async activated() {
+  async mounted() {
+    await this.checkMobile();
+    await this.initDate();
+    await this.selectSupplierNameHandle();
   },
   methods: {
-    async selectSupplierNameHanldle(){
+    applicateHandle() {
+      if (window.parent) {
+        const hasListener = window.parent.dispatchEvent(new Event('checkCloseDialog'));
+        if (hasListener) {
+          const data = {
+            action: 'closeDialog',
+            message: this.supplierId,
+            // 其他需要传递的参数
+          };
+          window.parent.postMessage(data, '*');
+          // window.parent.postMessage('closeDialog', '*');
+        } else {
+          window.history.back();
+        }
+      }
+    },
+    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(()=>{
-        this.$refs.Doughnut1.initCircle()
-        this.$refs.Doughnut2.initCircle()
-        this.$refs.Doughnut3.initCircle()
-        this.$refs.Doughnut4.initCircle()
-        this.$refs.Doughnut5.initCircle()
-        this.$refs.Doughnut6.initCircle()
-        this.$refs.Doughnut7.initCircle()
-      },1500)
+      if(this.active !== 0){
+        return
+      }
+      this.$refs.Doughnut1.initCircle()
+      this.$refs.Doughnut2.initCircle()
+      this.$refs.Doughnut3.initCircle()
+      this.$refs.Doughnut4.initCircle()
+      this.$refs.Doughnut5.initCircle()
+      this.$refs.Doughnut6.initCircle()
+      this.$refs.Doughnut7.initCircle()
     },
     async remoteMethod(query) {
       if (query !== '') {
@@ -394,9 +432,6 @@ export default {
         this.driverselectOption = [];
       }
     },
-    async searchHandle() {//web端服务商搜索操作
-      console.log("搜索按钮")
-    },
     async changeHandle() {
       this.v1=[]
       this.v2=[]
@@ -422,6 +457,7 @@ export default {
         this.xAxisArr = []
         this.etlDetailList=[]
         this.etlLabelList=[]
+        this.continueMonthKpi=[]
         await this.getKpiData()
         this.loadingData = false
       } finally {
@@ -431,21 +467,21 @@ export default {
     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实例
@@ -845,49 +881,119 @@ export default {
       };
       option && myChart.setOption(option, true);
     },
+    async allDataChart(){
+      let res = await getRecentSupplierKpi({
+        startTime: this.startTime,
+        endTime: this.endTime,
+        statisticsType: 1,
+        supplierId: this.supplierId,
+        driverId: this.driverId,
+        driverName:this.driverName,
+      });
+      this.continueMonthKpi=res.data;
+      // 初始化 v1 ,v2数组，长度为 12，初始值为 0
+      let v1 = new Array(12).fill(0);
+      let v2 = new Array(12).fill(0);
+      if( this.continueMonthKpi.length>0){
+        this.continueMonthKpi.forEach(item=>{
+          let month = parseInt(item.statisticsDate?.split('-')[1], 10) - 1; // 获取月份，并转换为数组索引
+          v1[month] = item.dispatchOrderCount;
+          v2[month] = item.orderScore;
+        })
+      }
+      let myChart = echarts.init(document.getElementById('allDataChart'))
+      let option = {
+        tooltip: {
+          trigger: 'axis',
+          axisPointer: {
+            type: 'cross',
+            crossStyle: {
+              color: '#999'
+            }
+          }
+        },
+        legend: {  },
+        xAxis: [
+          {
+            type: 'category',
+            data: ['1月', '2月', '3月', '4月', '5月', '6月', '7月', '8月', '9月', '10月', '11月', '12月'],
+            axisPointer: {
+              type: 'shadow'
+            }
+          }
+        ],
+        yAxis: [
+          {
+            type: 'value',
+            axisLabel: {
+              formatter: '{value}',
+              rotate: 45,
+              margin: 2
+            }
+          },
+          {
+            type: 'value',
+            axisLabel: {
+              formatter: '{value}',
+            }
+          }
+        ],
+        series: [
+          {
+            name: '案件量',
+            type: 'bar',
+            yAxisIndex: 0,
+            data:v1
+          },
+          {
+            name: '总分',
+            type: 'line',
+            yAxisIndex: 1,
+            data: v2
+          }
+        ]
+      };
+      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
         if (this.active === 0) {
+          await this.allDataChart()
           let res = await getStatisticsKpiByMonth({
             startTime: this.startTime,
             endTime: this.endTime,
             statisticsType: 1,
             supplierId: this.supplierId,
           });
+          if(!res.data){
+            return
+          }
           this.indexData = res.data;
           this.supplierName=res.data?.supplierName
-          this.indexData.refuseOrderRate=this.indexData.refuseOrderRate*100
-          if (this.indexData.refuseOrderRate % 1 !== 0) {
-            this.indexData.refuseOrderRate = this.indexData.refuseOrderRate.toFixed(2);
-          }
-          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);
+          // 需要处理的属性名数组
+          const propertiesToProcess = [
+            '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]);
+            }
           }
         } else if ([1, 2].includes(this.active)) {
           let res = await getStatisticsKpi({
@@ -916,13 +1022,16 @@ 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[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)) {
           let res = await getDriverStatisticsKpi({
@@ -935,13 +1044,11 @@ export default {
             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) ;
@@ -1010,7 +1117,6 @@ export default {
               {label: '投诉类型', prop: 'complainTypeString'},
             ]
           } else if (this.active === 8) {//不使用App案件明细
-            // console.log("不使用App案件明细")
             this.labelList = [
               {label: '案件编号', prop: 'orderCode'},
               {label: '服务内容', prop: 'serviceName'},
@@ -1043,16 +1149,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.startTime,this.endTime,this.startMonthTime)
+      console.log(" this.startMonthTime", this.startMonthTime,this.startTime)
     },
     // 获取当月天数
     getDayLen() {
@@ -1200,13 +1313,11 @@ export default {
                 this.v2.push(item.threeMinutesReceivingRate.replace('%', ''))
               })
             } else {
-              console.log(" this.detailList师傅接单时效", this.detailList)
               this.detailList?.map(item => {
                 this.v1.push(item.arriving)
                 this.v2.push(item.polymerizationSuccessArriving)
                 this.v3.push(item.fortyMinutesArrivalRate.replace('%', ''))
               })
-              console.log("this.v1",this.v1,this.v2,this.v3)
             }
             this.detailList?.map((item,index) => {
               const columnObj = {}
@@ -1294,6 +1405,34 @@ export default {
         }
       } else if (this.active === 3) {
         if (this.activeIndex === 0) {
+          this.labelList = [
+            {label: '师傅姓名', prop: 'driverName'},
+            {label: '总分', prop: 'score'},
+            {label: '案件总量', prop: 'orderCount'},
+            {label: '累计得分', prop: 'cumulativeScore'},
+            {label: '两分钟内接单得分', prop: 'twoMinutesAcceptScore'},
+            {label: '1分钟内联系客户得分', prop: 'oneMinutesContactCustomerScore'},
+            {label: '联系成功得分', prop: 'contactSuccessScore'},
+            {label: '准时到达B点得分', prop: 'arriveBScore'},
+            {label: '准时到达C点得分', prop: 'arriveCScore'},
+            {label: '服务成功得分', prop: 'serviceSuccessScore'},
+            {label: '必传照片上传得分', prop: 'uploadPhotoScore'},
+            {label: '审核一次通过得分', prop: 'auditScore'},
+            {label: '平安案件无评价扣分', prop: 'pinganNoCommentDeduct'},
+            {label: '案件差评扣分', prop: 'orderNegativeDeduct'},
+            {label: '催促扣分', prop: 'urgeDeduct'},
+            {label: '有责车损扣分', prop: 'responsibleDeduct'},
+            {label: '有责投诉（非态度类）扣分', prop: 'complaintNoAttitudeDeduct'},
+            {label: '有责投诉（态度类）扣分', prop: 'complaintAttitudeDeduct'},
+            {label: '拒单扣分', prop: 'rejectDeduct'},
+            {label: '超时扣分', prop: 'timeoutDeduct'},
+            {label: '聚合成功得分', prop: 'polymerizationSuccessScore'},
+            {label: '聚合失败扣分', prop: 'polymerizationFailDeduct'},
+            {label: '每月培训得分', prop: 'trainingScore'},
+            {label: '新手入列得分', prop: 'listedScore'},
+            {label: '星级评分', prop: 'starRank'},
+          ]
+        }if (this.activeIndex === 1) {
           this.labelList = [
             {label: '师傅姓名', prop: 'driverName'},
             {label: '承接案件量', prop: 'receiveOrderCount'},
@@ -1302,7 +1441,7 @@ export default {
             {label: '超时接单量', prop: 'timeoutOrderCount'},
             {label: '超时率(%)', prop: 'timeoutOrderRate'},
           ]
-        } else if (this.activeIndex === 1) {
+        } else if (this.activeIndex === 2) {
           this.labelList = [
             {label: '师傅姓名', prop: 'driverName'},
             {label: '承接案件量', prop: 'receiveOrderCount'},
@@ -1312,7 +1451,7 @@ export default {
             {label: '客户评价率(%)', prop: 'customerEvaluateRate'},
             {label: '催促率(%)', prop: 'urgeRate'},
           ]
-        } else if (this.activeIndex === 2) {
+        } else if (this.activeIndex === 3) {
           this.labelList = [
             {label: '师傅姓名', prop: 'driverName'},
             {label: '承接案件量', prop: 'receiveOrderCount'},
@@ -1324,7 +1463,7 @@ export default {
             {label: '总聚合成功率(%)', prop: 'polymerizationSuccessRate'},
             {label: '日均在线时长(h)', prop: 'onlineDuration'},
           ]
-        } else if (this.activeIndex === 3) {
+        } else if (this.activeIndex === 4) {
           this.labelList = [
             {label: '师傅姓名', prop: 'driverName'},
             {label: '接单时效(分)', prop: 'receiving'},
@@ -1383,6 +1522,10 @@ 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:
@@ -1461,7 +1604,7 @@ export default {
     align-items: center;
     position: relative;
 
-    .month {
+/*    .month {
       display: inline-block;
       width: 45px;
       height: 30px;
@@ -1471,7 +1614,7 @@ export default {
       border: 1px solid #4C81F5;
       font-size: 14px;
       color: #FFFFFF;
-    }
+    }*/
 
     .el-icon-search {
       font-size: 15px;
@@ -1612,7 +1755,21 @@ export default {
       margin-bottom: 0 !important;
     }
   }
+  .allDataChartWrap{
+    width: 375px;
+    height: 220px;
 
+  }
+  .allDataChart{
+    width: 100%;
+    height: 100%;
+  }
+  .webComAllData{
+    width: 400px;
+    height: 255px;
+    float: left;
+    margin: 10px;
+  }
   .webCom {
     @include whBg(420px, 200px, #FFFFFF);
     float: left;
@@ -1803,4 +1960,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,47 +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"   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"   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"  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 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"   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" />元</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>
@@ -381,6 +385,8 @@ export default {
         replaceBatteryAmount: '',
         supplierSettleRatio:{},
         contractSettleTypeString:'',
+        tyreNumber:'',
+        taskStatus:{},
       },
       noClick: true,
       loading: false,
@@ -412,7 +418,11 @@ export default {
       return this.settleType == '实拖' && this.orderInfo?.contractType == 1 && !['PICC10101', 'PICCSHANGQI', 'PICC101099', 'SAIPCC2021', ''].includes(this.appCode) && !(this.appCode.indexOf("TAIPING") != -1 && this.orderInfo?.malfunctionReason == 2)
     },
     isBasement() {
-      return this.serviceType == '困境救援' || this.serviceType == '困境-吊车' || this.serviceType == '困境救援-事故' || this.serviceType == '困境救援-故障'
+      return this.serviceType == '困境救援' ||this.serviceType == '困境拖车'|| this.serviceType == '困境-吊车' || this.serviceType == '困境救援-事故' || this.serviceType == '困境救援-故障'||this.serviceType =='困境救援（非事故）'||this.serviceType =='困境-吊车（非事故）'
+ },
+    //取消案件和结算比例为按服务不成功结算的案件都不能在后台记账模块填写路桥费、小轮费和地库费；
+    isUnsuccessfulSettle(){
+      return (this.form?.supplierSettleRatio && this.form?.supplierSettleRatio?.code==3 )|| this.form?.taskStatus?.code==19002
     },
   },
   methods: {
@@ -499,7 +509,7 @@ export default {
       }else {
         if (this.form.supplierOtherAmount > 0) {
           if (this.form.supplierOtherAmountRemark == '') {
-            this.$alert('请填写其他费用说明');
+            this.$toast('请填写其他费用说明');
             return;
           }
         }
@@ -512,11 +522,16 @@ export default {
         } else {
           let data = await accountRecordCompute({
             ...this.form,
-            settleType: this.orderInfo.settleType?.code
+            settleType: this.orderInfo.settleType?.code,
+            taskOrderCostHisId:this.orderInfo.taskOrderCostHisId,
+            orderCode: this.orderInfo.orderCode,
           });
           this.form.supplierBasePrice = data.data.basePrice
           this.form.supplierExtraPrice = data.data.extraPrice
           this.form.supplierSettleAmount = data.data.totalPrice
+          if (data.data?.supplierTyreAmount){
+            this.form.supplierTyreAmount=data.data.supplierTyreAmount
+          }
         }
         // }
         /*if(this.form.cutInsuranceAmount == 1 && this.form.policyState === 0){
@@ -633,7 +648,9 @@ export default {
         this.form.supplierBasementFee = this.orderInfo.refBasementFee
       }
       if (this.form.supplierSettleRatio?.code != 5 && (this.serviceType == '困境救援' || this.serviceType == '困境-吊车' || this.serviceType == '困境救援-事故' || this.serviceType == '困境救援-故障')){
-        await this.$alert("该案件为困境案件，需确认填写基本费用")
+        // await this.$alert("该案件为困境案件，需确认填写基本费用")
+        await  this.$toast("该案件为困境案件，需确认填写基本费用")
+        return
       }
     },
     cancelBtn() {
@@ -642,12 +659,16 @@ export default {
     async save() {
       if (this.form.supplierOtherAmount > 0) {
         if (this.form.supplierOtherAmountRemark == '') {
-          this.$alert('请填写其他费用说明');
+          this.$toast('请填写其他费用说明');
           return;
         }
       }
+      if (this.isBasement && ((this.form.supplierSettleRatio && this.form?.supplierSettleRatio?.code==3)|| this.form?.taskStatus?.code==19002) && !(this.basePriceDisabled || this.isBasementSettle) && (this.form.supplierBasePrice>this.form.startPrice)){
+        this.$toast('取消或服务不成功结算的困境案件,基本费用的填写不能超过起步价');
+        return;
+      }
       if (this.accountStatus >= 4) {
-        this.$alert('已进入后续流程，不允许操作');
+        this.$toast('已进入后续流程，不允许操作');
         return;
       }
       this.loading = true;
@@ -701,7 +722,7 @@ export default {
     },
     async confirmAudit() {
       if (this.accountStatus >= 4) {
-        this.$alert('已进入后续流程，不允许操作');
+        this.$toast('已进入后续流程，不允许操作');
         return;
       }
       this.loading1 = true;
@@ -952,6 +973,9 @@ img {
 
     .halfOpcity {
       opacity: .5;
+      .ipt{
+        border: 1px solid #cccccc !important;
+      }
     }
 
     .inputContent {

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">