bug#4506, 重新记账模块是否扣除保险费int型转string展示

(cherry picked from commit 073814bd69)

.gitignore

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

public/index.html

@@ -29,5 +29,32 @@
         }
     </script>
     <script src="https://webapi.amap.com/maps?v=1.4.15&key=2560bbf04daef66c810c5e6a97e8c508&plugin=AMap.Polyline"></script>
+
+    <script>
+        // VConsole 默认会挂载到 `window.VConsole` 上
+        // let vConsole = new window.VConsole();
+        (function (doc, win) {
+            let docEl = doc.documentElement
+            let resizeEvt = 'orientationchange' in window ? 'orientationchange' : 'resize'
+            recalc = function () {
+                var clientWidth = docEl.clientWidth;
+                // console.log("clientWidth",clientWidth)
+                if (!clientWidth) return;
+                if (clientWidth < 400) {
+                    clientWidth = 400;
+                }
+                docEl.style.fontSize = 18 * (clientWidth / 650) + 'px';
+            };
+            if (!doc.addEventListener) return;
+            var isMobile = /Android|webOS|iPhone|iPad|iPod|BlackBerry|IEMobile|Opera Mini/i.test(navigator.userAgent);
+            if (isMobile) {// 是移动端不变
+
+            }else{
+                win.addEventListener(resizeEvt, recalc, false);
+                doc.addEventListener('DOMContentLoaded', recalc, false);
+            }
+            // console.log("isMobile",isMobile)
+        })(document, window);
+    </script>
   </body>
 </html>

src/api/kpi.js

@@ -4,7 +4,7 @@ export function getStatisticsKpiByMonth(data){
   return request({
     url: '/supplier/supplierKPI/querySupplierStatisticsKpiByMonth',
     method:'POST',
-    contentType: 'application/json',
+    // contentType: 'application/json',
     data
   })
 }
@@ -13,7 +13,7 @@ export function getStatisticsKpi(data){
   return request({
     url: '/supplier/supplierKPI/querySupplierStatisticsKpi',
     method:'POST',
-    contentType: 'application/json',
+    // contentType: 'application/json',
     data
   })
 }
@@ -23,7 +23,7 @@ export function getDriverStatisticsKpi(data){
   return request({
     url: '/supplier/supplierKPI/querySupplierDriverStatisticsKpi',
     method:'POST',
-    contentType: 'application/json',
+    // contentType: 'application/json',
     data
   })
 }
@@ -32,7 +32,24 @@ export function getKpiDetailsData(data){
   return request({
     url: '/supplier/supplierKPI/querySupplierKpiDetailsData',
     method:'POST',
-    contentType: 'application/json',
+    // contentType: 'application/json',
     data
   })
 }
+/*export function getSupplierId(data){
+  return request({
+    url: '/supplier/select/supplier',
+    method:'GET',
+    // contentType: 'application/json',
+    data
+  })
+}*/
+export function getSupplierId(key) {
+  return request({
+    url: '/supplier/select/supplier',
+    method: 'GET',
+    params: {
+      key: key ,
+    }
+  });
+}

src/views/index/reporting.vue

@@ -111,7 +111,7 @@ export default {
   padding: 13px 24px 0;
   width: 100%;
   height: 100%;
-  //overflow-y: auto;
+  overflow-y: auto;
 }
 
 .title {

src/views/kpi/components/circleChar.vue

@@ -1,6 +1,6 @@
 <template>
 <div class="wrap">
-  <div id="supplierScore" ref="supplierScore" style="width: 100%;height: 125px" @click="handle"></div>
+  <div  id="supplierScore" ref="supplierScore" class="chart" @click="handle"></div>
 </div>
 </template>
 
@@ -14,14 +14,25 @@ export default {
     }
   },
   mounted() {
+  /*  if(this.data){
       this.drawHandle();
+    }*/
+    setTimeout(()=>{
+      this.drawHandle();
+    },500)
+
   },
   methods:{
+    initCircle(){
+      // setTimeout(()=>{
+        this.drawHandle();
+      // },500)
+    },
     handle(){
       if(this.titleText == '投诉率'){
-        console.log(this.titleText)
+        this.$emit('clickComplain')
       }else if(this.titleText == '使用率'){
-        console.log(this.titleText)
+        this.$emit('clickUse')
       }
     },
     // 绘制 总分图表
@@ -95,4 +106,8 @@ export default {
 .img{
   @include whMarLe(12px,10px,4px);
 }
+.chart{
+  width: 100%;
+  height: 125px;
+}
 </style>

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

@@ -0,0 +1,46 @@
+<template>
+  <div class="wrap">
+    <el-table :data="tableData"
+              stripe
+              border
+              style="width: 100%"
+              height="100%"
+              v-loading="loading"
+              class="custom-table">
+      <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'">
+      </el-table-column>
+    </el-table>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "noFit-table",
+  props: ['tableData','labelList','loading','isMobile'],
+  data() {
+    return {}
+  },
+  mounted() {
+    // console.log("tableData",this.tableData)
+  },
+  methods: {}
+}
+</script>
+
+<style scoped lang="scss">
+@import "@/styles/mixin.scss";
+::v-deep .el-table{
+  font-size: 11px;
+}
+::v-deep .el-table thead{
+  color: #1D2129;
+  font-weight: bold;
+}
+::v-deep .el-table th.el-table__cell.is-leaf {
+  background-color: #E5E6EB;
+}
+::v-deep .el-table .el-table__cell{
+  padding: 4px 0 !important;
+}
+</style>

src/views/vehicle-maintenance/maintenance-application.vue

@@ -24,7 +24,7 @@
       <div ><span class="opa">车辆名称:</span><span>{{ detailInfo.vehicleName }}</span></div>
       <div><span class="opa">车牌号:</span><span>{{ detailInfo.plateNumber }}</span></div>
 <!--      审批中，通过，终止detailInfo.states ==1 || detailInfo.states ==2 ||detailInfo.states ==3-->
-      <div class="shopName" v-if="[1,2,3].includes(detailInfo.states)"><span class="opa" >门店信息:</span><span>{{detailInfo.repairPoint || ''}}</span></div>
+      <div class="shopName" v-if="[1,2,3].includes(detailInfo.states)"><span class="opa" >门店信息:</span><span class="textarea">{{detailInfo.repairPoint || ''}}</span></div>
       <div class="shopImgList" v-if="[1,2,3].includes(detailInfo.states)">
         <template v-if="detailInfo.storePhotoUrls && detailInfo.storePhotoUrls.indexOf(',') !== -1">
           <div v-for="(item,index) in (detailInfo.storePhotoUrls?.split(','))" :key="index">
@@ -40,7 +40,7 @@
       <div v-if="noPassStatus"><span class="opa">车辆里程:</span><span>{{ parseInt(detailInfo.mileage) || '' }}km</span></div>
       <div v-if="noPassStatus"><span class="opa">结算类型:</span><span>{{ detailInfo.paymentType?.label || '' }}</span></div>
       <div v-if="noPassStatus && detailInfo.paymentType?.code !=2"><span class="opa">维修金额:</span><span>{{ detailInfo.amount || ''}}元</span></div>
-      <div v-if="noPassStatus && detailInfo.paymentType?.code !=2" class="shopName"><span class="opa">维保项目:</span><span class="project">{{ detailInfo.information ||'' }}</span></div>
+      <div v-if="noPassStatus && detailInfo.paymentType?.code !=2" class="shopName"><span class="opa">维保项目:</span><span class="project textarea">{{ detailInfo.information ||'' }}</span></div>
     </div>
 <!--   不通过-->
     <div class="detailInfo"  v-if="noPassStatus  && detailInfo.paymentType?.code !=2">
@@ -335,13 +335,16 @@ export default {
     line-height: 27px;
   }
   .shopName{
-    //width: 100%;
+    width: 100%;
     display: flex;
     align-items: baseline;
+    .textarea{
+      width: calc(100% - 60px);
+    }
   }
   .project{
     color: #E8A524;
-    width: calc(100% -  60px);
+    //width: calc(100% -  60px);
   }
   .shopImgList{
     margin-top: 6px;

src/views/workOrder/accounting.vue

@@ -46,7 +46,7 @@
     </div>
     <div class="item">
       <span class="titleLeft">扣除责任险费：</span>
-      <span class="content">{{orderInfo.policyAmount}} {{orderInfo.cutInsuranceAmount}}</span>
+      <span class="content">{{orderInfo.policyAmount}} {{orderInfo.cutInsuranceAmount==1 ? '是' : (orderInfo.cutInsuranceAmount==0 ? '否' : ' ')}}</span>
     </div>
     <div class="item">
       <span class="leftTitle fontColor">工单照片:</span>