task#16101，工单记账，小轮个数和费用优化

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

@@ -27,7 +27,6 @@
               :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">
@@ -97,7 +96,10 @@
       </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">
@@ -111,7 +113,7 @@
                 <span class="defen">接单时效得分:</span>
               </div>
               <div>
-                <span class="defen">到达时效得分:</span>
+                <span class="defen">接单时效得分:</span>
               </div>
               <div><span class="defen">聚合成功率得分:</span>
               </div>
@@ -135,13 +137,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>
@@ -273,7 +275,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 +296,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: '',
@@ -332,25 +335,42 @@ 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.getData();
+    // 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,
+            // 其他需要传递的参数
+          };
+          window.parent.postMessage(data, '*');
+          // window.parent.postMessage('closeDialog', '*');
+        } else {
+          window.history.back();
+        }
+      }
+    },
     async selectSupplierNameHanldle(){
       await this.getData()
       setTimeout(()=>{
@@ -394,9 +414,6 @@ export default {
         this.driverselectOption = [];
       }
     },
-    async searchHandle() {//web端服务商搜索操作
-      console.log("搜索按钮")
-    },
     async changeHandle() {
       this.v1=[]
       this.v2=[]
@@ -422,6 +439,7 @@ export default {
         this.xAxisArr = []
         this.etlDetailList=[]
         this.etlLabelList=[]
+        this.continueMonthKpi=[]
         await this.getKpiData()
         this.loadingData = false
       } finally {
@@ -845,16 +863,93 @@ 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,
+      });
+      console.log("res",res)
+      this.continueMonthKpi=res.data;
+      let v1=[]
+      let v2=[]
+      if( this.continueMonthKpi.length>0){
+        this.continueMonthKpi.forEach(item=>{
+          v1.push(item.dispatchOrderCount)
+          v2.push(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);
+    },
     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
@@ -956,6 +1051,7 @@ 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){
             this.detailList=[]
@@ -1010,7 +1106,6 @@ export default {
               {label: '投诉类型', prop: 'complainTypeString'},
             ]
           } else if (this.active === 8) {//不使用App案件明细
-            // console.log("不使用App案件明细")
             this.labelList = [
               {label: '案件编号', prop: 'orderCode'},
               {label: '服务内容', prop: 'serviceName'},
@@ -1052,7 +1147,6 @@ export default {
       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)
     },
     // 获取当月天数
     getDayLen() {
@@ -1200,13 +1294,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 +1386,35 @@ 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 +1423,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 +1433,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 +1445,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'},
@@ -1612,7 +1733,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;

src/views/workOrder/accounting.vue

@@ -85,23 +85,27 @@
           </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 @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 @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  @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>
+          <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>
           <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="isUnsuccessfulSettle"    type="number" v-model="form.supplierTyreAmount"/>元</div>
           </div>
           <div class="flex-between" v-show="dilemmaAmountState && basePriceDisabled">
             <div>困境费:</div>
@@ -109,7 +113,7 @@
           </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"   type="number" v-model="form.supplierBasementFee" :disabled="!isBasementSettle || isUnsuccessfulSettle" />元</div>
           </div>
           <div class="flex-between">
             <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;