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*

package-lock.json

@@ -2195,9 +2195,9 @@
       }
     },
     "@vue/vue-loader-v15": {
-      "version": "npm:vue-loader@15.10.1",
-      "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-15.10.1.tgz",
-      "integrity": "sha512-SaPHK1A01VrNthlix6h1hq4uJu7S/z0kdLUb6klubo738NeQoLbS6V9/d8Pv19tU0XdQKju3D1HSKuI8wJ5wMA==",
+      "version": "npm:vue-loader@15.11.1",
+      "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-15.11.1.tgz",
+      "integrity": "sha512-0iw4VchYLePqJfJu9s62ACWUXeSqM30SQqlIftbYWM3C+jpPcEHKSPUZBLjSF9au4HTHQ/naF6OGnO3Q/qGR3Q==",
       "dev": true,
       "requires": {
         "@vue/component-compiler-utils": "^3.1.0",
@@ -2581,6 +2581,14 @@
         "lodash": "^4.17.14"
       }
     },
+    "async-validator": {
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/async-validator/-/async-validator-1.8.5.tgz",
+      "integrity": "sha512-tXBM+1m056MAX0E8TL2iCjg8WvSyXu0Zc8LNtYqrVeyoL3+esHRZ4SieE9fKQyyU09uONjnMEjrNBMqT0mbvmA==",
+      "requires": {
+        "babel-runtime": "6.x"
+      }
+    },
     "asynckit": {
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
@@ -2616,6 +2624,11 @@
         "proxy-from-env": "^1.1.0"
       }
     },
+    "babel-helper-vue-jsx-merge-props": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/babel-helper-vue-jsx-merge-props/-/babel-helper-vue-jsx-merge-props-2.0.3.tgz",
+      "integrity": "sha512-gsLiKK7Qrb7zYJNgiXKpXblxbV5ffSwR0f5whkPAaBAR4fhi6bwRZxX9wBlIc5M/v8CCkXUbXZL4N/nSE97cqg=="
+    },
     "babel-loader": {
       "version": "8.3.0",
       "resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-8.3.0.tgz",
@@ -2667,6 +2680,27 @@
         "@babel/helper-define-polyfill-provider": "^0.4.2"
       }
     },
+    "babel-runtime": {
+      "version": "6.26.0",
+      "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz",
+      "integrity": "sha512-ITKNuq2wKlW1fJg9sSW52eepoYgZBggvOAHC0u/CYu/qxQ9EVzThCgR69BnSXLHjy2f7SY5zaQ4yt7H9ZVxY2g==",
+      "requires": {
+        "core-js": "^2.4.0",
+        "regenerator-runtime": "^0.11.0"
+      },
+      "dependencies": {
+        "core-js": {
+          "version": "2.6.12",
+          "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.12.tgz",
+          "integrity": "sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ=="
+        },
+        "regenerator-runtime": {
+          "version": "0.11.1",
+          "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz",
+          "integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg=="
+        }
+      }
+    },
     "balanced-match": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
@@ -3511,8 +3545,7 @@
     "de-indent": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/de-indent/-/de-indent-1.0.2.tgz",
-      "integrity": "sha512-e/1zu3xH5MQryN2zdVaF0OrdNLUbvWxzMbi+iNA6Bky7l1RoP8a2fIbRocyHclXt/arDrrR6lL3TqFD9pMQTsg==",
-      "dev": true
+      "integrity": "sha512-e/1zu3xH5MQryN2zdVaF0OrdNLUbvWxzMbi+iNA6Bky7l1RoP8a2fIbRocyHclXt/arDrrR6lL3TqFD9pMQTsg=="
     },
     "debug": {
       "version": "4.3.4",
@@ -3540,8 +3573,7 @@
     "deepmerge": {
       "version": "1.5.2",
       "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-1.5.2.tgz",
-      "integrity": "sha512-95k0GDqvBjZavkuvzx/YqVLv/6YYa17fz6ILMSf7neqQITCPbnfEnQvEgMPNjH4kgobe7+WIL0yJEHku+H3qtQ==",
-      "dev": true
+      "integrity": "sha512-95k0GDqvBjZavkuvzx/YqVLv/6YYa17fz6ILMSf7neqQITCPbnfEnQvEgMPNjH4kgobe7+WIL0yJEHku+H3qtQ=="
     },
     "default-gateway": {
       "version": "6.0.3",
@@ -3794,6 +3826,22 @@
       "integrity": "sha512-wK2sCs4feiiJeFXn3zvY0p41mdU5VUgbgs1rNsc/y5ngFUijdWd+iIN8eoyuZHKB8xN6BL4PdWmzqFmxNg6V2w==",
       "dev": true
     },
+    "echarts": {
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/echarts/-/echarts-5.5.0.tgz",
+      "integrity": "sha512-rNYnNCzqDAPCr4m/fqyUFv7fD9qIsd50S6GDFgO1DxZhncCsNsG7IfUlAlvZe5oSEQxtsjnHiUuppzccry93Xw==",
+      "requires": {
+        "tslib": "2.3.0",
+        "zrender": "5.5.0"
+      },
+      "dependencies": {
+        "tslib": {
+          "version": "2.3.0",
+          "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.0.tgz",
+          "integrity": "sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg=="
+        }
+      }
+    },
     "ee-first": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
@@ -3806,6 +3854,19 @@
       "integrity": "sha512-6s7NVJz+sATdYnIwhdshx/N/9O6rvMxmhVoDSDFdj6iA45gHR8EQje70+RYsF4GeB+k0IeNSBnP7yG9ZXJFr7A==",
       "dev": true
     },
+    "element-ui": {
+      "version": "2.15.14",
+      "resolved": "https://registry.npmjs.org/element-ui/-/element-ui-2.15.14.tgz",
+      "integrity": "sha512-2v9fHL0ZGINotOlRIAJD5YuVB8V7WKxrE9Qy7dXhRipa035+kF7WuU/z+tEmLVPBcJ0zt8mOu1DKpWcVzBK8IA==",
+      "requires": {
+        "async-validator": "~1.8.1",
+        "babel-helper-vue-jsx-merge-props": "^2.0.0",
+        "deepmerge": "^1.2.0",
+        "normalize-wheel": "^1.0.1",
+        "resize-observer-polyfill": "^1.5.0",
+        "throttle-debounce": "^1.0.1"
+      }
+    },
     "emoji-regex": {
       "version": "8.0.0",
       "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
@@ -4819,8 +4880,7 @@
     "he": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz",
-      "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==",
-      "dev": true
+      "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw=="
     },
     "highlight.js": {
       "version": "10.7.3",
@@ -5448,8 +5508,7 @@
     "lodash": {
       "version": "4.17.21",
       "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
-      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
-      "dev": true
+      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
     },
     "lodash.debounce": {
       "version": "4.0.8",
@@ -6025,6 +6084,11 @@
       "integrity": "sha512-DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A==",
       "dev": true
     },
+    "normalize-wheel": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/normalize-wheel/-/normalize-wheel-1.0.1.tgz",
+      "integrity": "sha512-1OnlAPZ3zgrk8B91HyRj+eVv+kS5u+Z0SCsak6Xil/kmgEia50ga7zfkumayonZrImffAxPU/5WcyGhzetHNPA=="
+    },
     "npm-run-path": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz",
@@ -7067,6 +7131,11 @@
       "integrity": "sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==",
       "dev": true
     },
+    "resize-observer-polyfill": {
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/resize-observer-polyfill/-/resize-observer-polyfill-1.5.1.tgz",
+      "integrity": "sha512-LwZrotdHOo12nQuZlHEmtuXdqGoOD0OhaxopaNFxWzInpEgaLWoVuAMbTzixuosCx2nEG58ngzW3vxdWoxIgdg=="
+    },
     "resolve": {
       "version": "1.22.4",
       "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.4.tgz",
@@ -7783,6 +7852,11 @@
         }
       }
     },
+    "throttle-debounce": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/throttle-debounce/-/throttle-debounce-1.1.0.tgz",
+      "integrity": "sha512-XH8UiPCQcWNuk2LYePibW/4qL97+ZQ1AN3FNXwZRBNPPowo/NRU5fAlDCSNBJIYCKbioZfuYtMhG4quqoJhVzg=="
+    },
     "thunky": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/thunky/-/thunky-1.1.0.tgz",
@@ -8171,7 +8245,6 @@
       "version": "2.7.14",
       "resolved": "https://registry.npmjs.org/vue-template-compiler/-/vue-template-compiler-2.7.14.tgz",
       "integrity": "sha512-zyA5Y3ArvVG0NacJDkkzJuPQDF8RFeRlzV2vLeSnhSpieO6LK2OVbdLPi5MPPs09Ii+gMO8nY4S3iKQxBxDmWQ==",
-      "dev": true,
       "requires": {
         "de-indent": "^1.0.2",
         "he": "^1.2.0"
@@ -8716,6 +8789,21 @@
           "dev": true
         }
       }
+    },
+    "zrender": {
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/zrender/-/zrender-5.5.0.tgz",
+      "integrity": "sha512-O3MilSi/9mwoovx77m6ROZM7sXShR/O/JIanvzTwjN3FORfLSr81PsUGd7jlaYOeds9d8tw82oP44+3YucVo+w==",
+      "requires": {
+        "tslib": "2.3.0"
+      },
+      "dependencies": {
+        "tslib": {
+          "version": "2.3.0",
+          "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.0.tgz",
+          "integrity": "sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg=="
+        }
+      }
     }
   }
 }

package.json

@@ -12,6 +12,7 @@
     "amfe-flexible": "^2.2.1",
     "axios": "^1.4.0",
     "core-js": "^3.8.3",
+    "echarts": "^5.2.2",
     "less": "^4.1.3",
     "less-loader": "^11.1.3",
     "qs": "^6.11.2",
@@ -20,7 +21,9 @@
     "vant": "^2.12.54",
     "vue": "^2.6.14",
     "vue-router": "^3.0.7",
-    "vuex": "^3.6.2"
+    "vuex": "^3.6.2",
+    "element-ui": "^2.15.9",
+    "dayjs": "^1.8.14"
   },
   "devDependencies": {
     "@babel/core": "^7.12.16",
@@ -49,7 +52,7 @@
       "parser": "@babel/eslint-parser"
     },
     "rules": {},
-    "globals":{
+    "globals": {
       "AMap": "true"
     }
   },

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

@@ -0,0 +1,55 @@
+import request from '@/utils/http'
+// 首页服务商接口
+export function getStatisticsKpiByMonth(data){
+  return request({
+    url: '/supplier/supplierKPI/querySupplierStatisticsKpiByMonth',
+    method:'POST',
+    // contentType: 'application/json',
+    data
+  })
+}
+//服务商kpi
+export function getStatisticsKpi(data){
+  return request({
+    url: '/supplier/supplierKPI/querySupplierStatisticsKpi',
+    method:'POST',
+    // contentType: 'application/json',
+    data
+  })
+}
+
+//  司机Kpi
+export function getDriverStatisticsKpi(data){
+  return request({
+    url: '/supplier/supplierKPI/querySupplierDriverStatisticsKpi',
+    method:'POST',
+    // contentType: 'application/json',
+    data
+  })
+}
+//   各种详情数据
+export function getKpiDetailsData(data){
+  return request({
+    url: '/supplier/supplierKPI/querySupplierKpiDetailsData',
+    method:'POST',
+    // 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/api/maintenance.js

@@ -0,0 +1,46 @@
+import request from '@/utils/http'
+
+// 调度APP-维保数量
+export function vehicleMaintenanceCount() {
+    return request({
+        url: '/supplierAppV2/dispatchApp/maintenance/vehicleMaintenanceCount',
+        method:'POST',
+    })
+}
+
+//维保列表
+export function vehicleMaintenanceList(data) {
+    return request({
+        url: '/supplierAppV2/dispatchApp/maintenance/vehicleMaintenanceList',
+        method:'POST',
+        contentType: 'application/json',
+        data
+    })
+}
+// 获取维保记录详情
+export function getVehicleMaintenanceDetail(data) {
+    return request({
+        url: '/supplierAppV2/dispatchApp/maintenance/getVehicleMaintenanceDetail',
+        method:'POST',
+        contentType: 'application/json',
+        data
+    })
+}
+// 维保终止
+export function vehicleMaintenanceStop(data) {
+    return request({
+        url: '/supplierAppV2/dispatchApp/maintenance/vehicleMaintenanceStop',
+        method:'POST',
+        contentType: 'application/json',
+        data
+    })
+}
+// 维保审批
+export function vehicleMaintenanceApproval(data) {
+    return request({
+        url: '/supplierAppV2/dispatchApp/maintenance/vehicleMaintenanceApproval',
+        method:'POST',
+        contentType: 'application/json',
+        data
+    })
+}

src/api/order.js

@@ -7,6 +7,13 @@ export function getToDoList() {
     method:'POST',
   })
 }
+// 调度APP待办事项列表New
+export function toDoListNew() {
+  return request({
+    url: '/supplierAppV2/dispatchApp/toDoMessage/toDoListNew',
+    method:'POST',
+  })
+}
 // 代办事项审核
 export function toDoAudit(data){
   return request({

src/main.js

@@ -2,12 +2,17 @@ import Vue from 'vue'
 import App from './App.vue'
 import router from './router'
 import Vant from 'vant';
+import ElementUI from 'element-ui';
+import 'element-ui/lib/theme-chalk/index.css';
 import 'vant/lib/index.css';
 import "lib-flexible/flexible";
 import "@/utils/rem.js"
 import store from './store'
+
 Vue.config.productionTip = false
+
 Vue.use(Vant);
+Vue.use(ElementUI);
 new Vue({
   store,
   router,

src/router/index.js

@@ -1,7 +1,7 @@
 import Vue from "vue";
 import VueRouter from "vue-router";
 Vue.use(VueRouter);
-
+import kpiRouter from './kpi-router'
 const routes = [
     {
       path: '/',
@@ -182,7 +182,24 @@ const routes = [
         meta: {
             title:'新人培训'
         }
-    }
+    },
+    {
+        path: '/maintenanceList',
+        name: 'vehicleMaintenanceList',
+        component:()=>import('@/views/vehicle-maintenance/vehicle-maintenance-list.vue'),
+        meta: {
+            title:'车辆维保'
+        }
+    },
+    {
+        path: '/maintenanceApplication',
+        name: 'maintenanceApplication',
+        component:()=>import('@/views/vehicle-maintenance/maintenance-application.vue'),
+        meta: {
+            title:'维保申请'
+        }
+    },
+    ...kpiRouter,
   ]
 
 const router = new VueRouter({

src/router/kpi-router.js

@@ -0,0 +1,11 @@
+const kpiRouter = [
+    {
+        path: '/kpiIndex',
+        name: 'kpiIndex',
+        component: () => import('@/views/kpi/kpiIndex'),
+        meta:{
+            title: 'kpi首页',
+        }
+    },
+]
+export default kpiRouter

src/styles/approval.scss

@@ -0,0 +1,116 @@
+@import "@/styles/mixin.scss";
+.refresh{
+  min-height: 100%;
+  //background-color: #F4F5F7;
+}
+.wrap{
+  @include wh(100%,100%);
+  box-sizing: border-box;
+  background-color: #F4F5F7;
+}
+.tab_wrap {
+  @include fontWeightSize(500, 14px);
+  @include flexColAround();
+  padding: 2px 0 10px 0;
+  background: #2C395F;
+  div {
+    padding-top: 8px;
+    color: #FFFFFF;
+  }
+  .alpha{
+    opacity: 0.5;
+  }
+  .numTip{
+    display: inline-block;
+    @include wh(15px,15px);
+    @include bgcolorOpa(#F95B45,0.9);
+    border-radius: 4px;
+    text-align: center;
+    line-height: 15px;
+    margin-left: 5px;
+    opacity: 1; /* 保持透明度为1 */
+  }
+  .active {
+    position: relative;
+    opacity: 1;
+  }
+  .active:after {
+    content: '';
+    display: block;
+    @include wh(18px,2px);
+    opacity: .8;
+    background: #FFFFFF;
+    position: absolute;
+    border-radius: 2px;
+    margin-top: 3px;
+    left: 50%;
+    opacity: 1;
+    transform: translateX(-50%);
+  }
+}
+::v-deep .van-pull-refresh{
+  height: calc(100% - 86px) ;
+}
+.listWrap{
+  width: 100%;
+  height: 100%;
+  overflow-y: auto;
+  .listItem{
+    width: 100%;
+    box-sizing: border-box;
+    padding: 14px 25px 13px 29px;
+    background-color: #FFFFFF;
+    margin-bottom: 10px;
+    .line1{
+      @include flexColBet();
+      .viewBtn{
+        @include wh(48px,18px);
+        text-align: center;
+        line-height: 18px;
+        background: #354D93;
+        border-radius: 3px;
+        color: #FFFFFF;
+      }
+    }
+
+  }
+}
+.bgEmptyImg{
+  @include flexTwoCenter;
+  height: 90% ;
+  background-color: #FAFAFA;
+  img{
+    width: 100%;
+  }
+}
+.greColor{
+  color:#38AD00 ;
+  font-weight: 500;
+}
+.redColor{
+  color:#FF5D2E ;
+  font-weight: 500;
+}
+.commonImg{
+  @include widHeiMar(13px,13px,4px);
+}
+.rightArrImg{
+  @include wh(6px,9px);
+  margin-left: 6px;
+}
+.yelColor{
+  color: #E69B0B;
+  font-weight: 600;
+}
+.greColor{
+  color: #56B628;
+  font-weight: 600;
+}
+.oraColor{
+  color: #FF5D2E;
+  font-weight: 600;
+}
+.garyColor{
+  color: #9C9C9C;
+  font-weight: 600;
+}

src/styles/mixin.scss

@@ -2,6 +2,11 @@
     font-size: $size;
     font-weight: $weight;
 }
+@mixin sizeWeightCol($size,$weight,$col){
+    font-size: $size;
+    font-weight: $weight;
+    color: $col;
+}
 @mixin bgFontColor($color,$bgcolor){
     color:$color;
     background: $bgcolor;
@@ -23,6 +28,14 @@
     width: $w;
     height: $h;
 }
+@mixin whMarLe($w,$h,$l){
+    @include wh($w,$h);
+    margin-left: $l;
+}
+@mixin whBg($w,$h,$bg){
+    @include wh($w,$h);
+    background: $bg;
+}
 @mixin flexColumn{
     display: flex;
     flex-direction: column;
@@ -35,6 +48,10 @@
     @include flexColumn;
     justify-content: space-around;
 }
+@mixin flexColCen(){
+    @include flexColumn;
+    align-items: center;
+}
 @mixin flexColBet(){
     display: flex;
     justify-content: space-between;
@@ -75,4 +92,16 @@
     box-sizing: border-box;
     padding: $tb $lr;
     border-radius: $rad;
+}
+@mixin sizing4Padding($t,$r,$b,$l){
+    box-sizing: border-box;
+    padding: $t $r $b $l;
+}
+@mixin sizing4Radius($t,$r,$b,$l,$radius){
+    @include sizing4Padding($t,$r,$b,$l);
+    border-radius: $radius;
+}
+@mixin colHeight($col,$hei){
+    color: $col;
+    line-height: $hei;
 }

src/utils/approval.js

@@ -0,0 +1,42 @@
+
+const getStatus=(i)=>{
+  switch (i){
+    case 0://待提交
+    case 1://待审核
+      return require('@/assets/waitSubmit.png')
+    case 2://审核通过
+    case 7://已打款
+      return require('@/assets/dakuan.png')
+    case 3://审核不通过
+      return require('@/assets/unpass.png')
+    case 4://报销失败
+      return require('@/assets/unSubmit.png')
+    case 6://代打款
+      return require('@/assets/waitDakuan.png')
+    default:
+      return require('@/assets/waitSubmit.png')
+  }
+}
+const getStatusColor=(i)=>{
+  switch (i){
+    case 0://待提交
+    case 1://待审核
+      return 'yelColor'
+    case 2://审核通过
+    case 6://代打款
+    case 7://已打款
+      return 'greColor'
+    case 3://审核不通过
+      return 'oraColor'
+    case 4://报销失败
+      return 'garyColor'
+    default:
+      return 'yelColor'
+  }
+}
+
+module.exports = {
+  getStatus,
+  getStatusColor
+}
+

src/utils/common.js

@@ -49,4 +49,4 @@ module.exports = {
   leftCopy,
   timeFormat,
   formatDate1
-}
+}

src/views/caseList/caseAuditList.vue

@@ -198,7 +198,25 @@ export default {
 <style scoped lang="scss">
 @import "@/styles/mixin.scss";
 @import "@/styles/common.scss";
-.refresh{
+@import "@/styles/approval.scss";
+.navBar{
+  margin-bottom: 46px;
+}
+.listItem{
+  padding: 14px 25px 13px 29px;
+  div{
+    line-height: 27px;
+    span:first-child{
+      display: inline-block;
+      width: 60px;
+      opacity: 0.5;
+    }
+    .right{
+      @include flexCenter();
+    }
+  }
+}
+/*.refresh{
   min-height: 100%;
   background-color: #F4F5F7;
 }
@@ -209,9 +227,9 @@ export default {
 .navBar{
   margin-bottom: 46px;
 }
-/*::v-deep .van-nav-bar__content{
+!*::v-deep .van-nav-bar__content{
   background-color: #354683 !important;
-}*/
+}*!
 .tab_wrap {
   @include fontWeightSize(500, 14px);
   @include flexColAround();
@@ -232,7 +250,7 @@ export default {
     text-align: center;
     line-height: 15px;
     margin-left: 5px;
-    opacity: 1; /* 保持透明度为1 */
+    opacity: 1; !* 保持透明度为1 *!
   }
   .active {
     position: relative;
@@ -329,5 +347,5 @@ export default {
 .garyColor{
   color: #9C9C9C;
   font-weight: 600;
-}
+}*/
 </style>

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/index/toDoList.vue

@@ -1,8 +1,31 @@
 <template>
-  <div class="empty" v-if="show">
-    <img src="@/assets/empty.png" >
+  <div class="wrapCotainer">
+    <div class="navBar">
+      <van-nav-bar
+          title="待办列表"
+          left-arrow
+          left-arrow-color="#FFFFFF"
+          :border="false"
+          :fixed="true"
+          :safe-area-inset-top="true"
+          @click-left="goBack"
+      />
+    </div>
+    <div class="empty" v-if="show">
+      <img src="@/assets/empty.png" >
+    </div>
+    <div class="wrap"  v-else>
+      <div class="itemWrap" @click="goApprovalList" v-for="(item,index) in todolist" :key="index">
+        <div class="left">
+          <div class="title">{{ item.toDoName }}<span class="num" v-if="item.toDoCount">{{item.toDoCount}}</span></div>
+          <img class="ritBtn" src="@/assets/todoRight.png">
+        </div>
+        <div class="time">{{ item.toDoTime }}</div>
+      </div>
+    </div>
   </div>
-  <div class="wrap" v-else>
+
+<!--  <div class="wrap" v-else>
     <ul id="dataList" class="dataList">
       <li class="item" v-for="(item,i) in todolist" :key="i">
         <div class="left">
@@ -18,14 +41,18 @@
         </div>
       </li>
     </ul>
-  </div>
+  </div>-->
 </template>
 
 <script>
-import {getToDoList, toDoAudit} from "@/api/order"
+//getToDoList,toDoAudit
+import {toDoListNew} from "@/api/order"
 import {userOperationPermissions} from "@/api/mine"
+import {myMixins} from  "@/utils/myMixins"
+
 export default {
   name: "toDoList",
+  mixins:[myMixins],
   data() {
     return {
       todolist: [],
@@ -38,9 +65,14 @@ export default {
     this.getList()
   },
   methods: {
+    goApprovalList(){
+      this.$router.push({ name: 'vehicleMaintenanceList',})
+    },
     async getList() {
-      let result = await getToDoList();
+      // let result = await getToDoList();
+      let result=await toDoListNew();
       this.todolist = result.data;
+      console.log("this.todolist",this.todolist)
       if (this.todolist?.length === 0) {
         this.show = true
       } else {
@@ -50,9 +82,8 @@ export default {
     async getPermissions(){
       let res = await userOperationPermissions();
       this.permissonList = res.data
-      // console.log("代办事项",this.permissonList.includes('approve'))
     },
-    async todoAudit(item,type) {
+/*    async todoAudit(item,type) {
        await toDoAudit({
         toDoId: item.toDoId,
         toDoType: item.toDoType.code,
@@ -60,7 +91,7 @@ export default {
       })
       this.todolist=[]
       await this.getList();
-    },
+    },*/
   }
 }
 </script>
@@ -68,6 +99,13 @@ export default {
 <style scoped lang="scss">
 @import "@/styles/mixin.scss";
 @import "@/styles/common.scss";
+.wrapCotainer{
+  @include wh(100%,100%);
+  background-color: #F4F5F7;
+}
+.navBar{
+  height: 46px;
+}
 .empty{
   @include wh(100%,100%);
   background-color: #FAFAFA;
@@ -78,9 +116,36 @@ export default {
 }
 .wrap {
   @include wh(100%, 100%);
-  box-sizing: border-box;
-  padding: 13px 13px 0 13px;
-  background-color: #F4F5F7;
+  @include sizing4Padding(13px,13px,0,13px);
+  .itemWrap{
+    @include wh(349px, 68px);
+    background: #FFFFFF;
+    box-shadow: 0px 2px 10px 0px rgba(216,216,216,0.5);
+    @include sizing4Radius(11px,12px,16px,15px, 6px);
+    @include flexBetween;
+    margin-bottom: 10px;
+    .left{
+      @include flexColBet;
+    }
+    .ritBtn{
+      @include wh(6px, 9px);
+    }
+    .time{
+      opacity: .6;
+    }
+    .title{
+      @include flexCenter;
+    }
+    .num{
+      display: inline-block;
+      @include whLin(14px, 14px);
+      @include fontWeightSize(10px,bold);
+      @include bgFontColor(#FFFFFF,#F93D3D);
+      border-radius: 2px;
+      text-align: center;
+      margin-left: 8px;
+    }
+  }
 }
 
 .dataList {

src/views/kpi/components/circleChar.vue

@@ -0,0 +1,113 @@
+<template>
+<div class="wrap">
+  <div  id="supplierScore" ref="supplierScore" class="chart" @click="handle"></div>
+</div>
+</template>
+
+<script>
+import * as echarts from 'echarts';
+export default {
+  name: "circleChar",
+  props:['data','bgColor','titleText','isStore'],
+  data(){
+    return{
+    }
+  },
+  mounted() {
+  /*  if(this.data){
+      this.drawHandle();
+    }*/
+    setTimeout(()=>{
+      this.drawHandle();
+    },500)
+
+  },
+  methods:{
+    initCircle(){
+      // setTimeout(()=>{
+        this.drawHandle();
+      // },500)
+    },
+    handle(){
+      if(this.titleText == '投诉率'){
+        this.$emit('clickComplain')
+      }else if(this.titleText == '使用率'){
+        this.$emit('clickUse')
+      }
+    },
+    // 绘制 总分图表
+    drawHandle() {
+      let supplierScoreChart = echarts.init(this.$refs.supplierScore)
+      let option;
+      let arrow=(this.titleText == '投诉率' || this.titleText == '使用率') ? '>' : ''
+      const gaugeData = [
+        {
+          value: this.data,
+          name: this.isStore ? '' : this.titleText+arrow,
+          title: {
+            offsetCenter: ['0%', '20%']
+          },
+          detail: {
+            valueAnimation: true,
+            offsetCenter: ['0%', this.isStore ? '10%' : '-25%']
+
+          }
+        }
+      ];
+      option = {
+        series: [
+          {
+            type: 'gauge',
+            startAngle: 90,
+            endAngle: -270,
+            pointer: {
+              show: false
+            },
+            progress: {
+              show: true,
+              // width:6,
+              itemStyle:{
+                color:this.bgColor
+              }
+            },
+           /* axisLine: {
+              lineStyle: {
+                width:12,
+              }
+            },*/
+            splitLine: { show: false},
+            axisTick: { show: false},
+            axisLabel: {show: false},
+            data: gaugeData,
+            title: {
+              fontSize: 11,
+              color:'rgba(4, 4, 21,0.45)'
+            },
+            detail: {
+              color:this.isStore ? this.bgColor : '#040415',
+              fontSize: this.isStore ? 43 :19,
+              formatter: this.isStore ? '{value}' : '{value}%'
+            }
+          }
+        ]
+      };
+      // 绘制图表
+      option && supplierScoreChart.setOption(option, true);
+    },
+  }
+}
+</script>
+
+<style scoped lang="scss">
+@import "@/styles/mixin.scss";
+.wrap{
+  @include flexCenter;
+}
+.img{
+  @include whMarLe(12px,10px,4px);
+}
+.chart{
+  width: 100%;
+  height: 125px;
+}
+</style>

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

@@ -0,0 +1,45 @@
+<template>
+  <div class="wrap">
+    <el-table :data="tableData"
+              stripe
+              border
+              style="width: 100%"
+              class="custom-table">
+      <el-table-column
+          v-for="(column,i) in tableData"
+          :key="i"
+          :prop="column.prop"
+          :label="column.label"
+          :fixed="i===0"
+          :width="i===0 ? '40' :'80'"
+          align="center"
+      >
+      </el-table-column>
+    </el-table>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "commonTable",
+  props: ['tableData'],
+  data() {
+    return {}
+  },
+  mounted() {
+  },
+  methods: {}
+}
+</script>
+
+<style scoped lang="scss">
+@import "@/styles/mixin.scss";
+::v-deep .el-table thead{
+  font-size: 11px;
+  color: #1D2129;
+  font-weight: bold;
+}
+::v-deep .el-table th.el-table__cell.is-leaf {
+  background-color: #E5E6EB;
+}
+</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

@@ -0,0 +1,429 @@
+<template>
+<div class="wrap">
+  <div class="navBar">
+    <van-nav-bar
+        title="车辆维保"
+        left-arrow
+        left-arrow-color="#FFFFFF"
+        :border="false"
+        :fixed="true"
+        :safe-area-inset-top="true"
+        @click-left="goPrePage"
+    />
+  </div>
+  <div class="flowWrap">
+    <div class="detailInfo">
+      <div class="line1">
+        <div class="leftTitle commonTitle">{{ rowInfo.stage }}:</div>
+        <div class="right">
+          <img class="commonImg" :src="getStatus(detailInfo.states)">
+          <div :class="getStatusColor(detailInfo.states)" >{{detailInfo.statesStr}}</div>
+        </div>
+      </div>
+      <div class="line"></div>
+      <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 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">
+            <img  :src="item" @click="previewPhoto(item)">
+          </div>
+        </template>
+        <template v-else>
+          <div v-if="!detailInfo.storePhotoUrls"></div>
+          <img v-else  :src="detailInfo.storePhotoUrls" @click="previewPhoto(detailInfo.storePhotoUrls)">
+        </template>
+      </div>
+<!--      不通过-->
+      <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 textarea">{{ detailInfo.information ||'' }}</span></div>
+    </div>
+<!--   不通过-->
+    <div class="detailInfo"  v-if="noPassStatus  && detailInfo.paymentType?.code !=2">
+      <div class="line1">
+        <div class="leftTitle commonTitle">维保项目照片:</div>
+      </div>
+      <div class="shopImgList">
+        <template v-if="detailInfo.maintenancePhotoUrls && detailInfo.maintenancePhotoUrls.indexOf(',') !== -1">
+          <div v-for="(item,index) in (detailInfo.maintenancePhotoUrls?.split(','))" :key="index">
+            <img  :src="item" @click="previewPhoto(item)">
+          </div>
+        </template>
+        <template v-else>
+          <div v-if="!detailInfo.maintenancePhotoUrls"></div>
+          <img v-else :src="detailInfo.maintenancePhotoUrls" @click="previewPhoto(detailInfo.maintenancePhotoUrls)">
+        </template>
+      </div>
+    </div>
+    <div class="detailInfo"  v-if="noPassStatus && detailInfo.paymentType?.code !=2">
+      <div class="line1">
+        <div class="leftTitle commonTitle">维保清单/凭证照片:</div>
+      </div>
+      <div class="shopImgList">
+        <template v-if="detailInfo.voucherPhotoUrls && detailInfo.voucherPhotoUrls.indexOf(',') !== -1">
+          <div v-for="(item,index) in (detailInfo.voucherPhotoUrls?.split(','))" :key="index">
+            <img  :src="item" @click="previewPhoto(item)">
+          </div>
+        </template>
+        <template v-else>
+          <div v-if="!detailInfo.voucherPhotoUrls"></div>
+          <img v-else :src="detailInfo.voucherPhotoUrls" @click="previewPhoto(detailInfo.voucherPhotoUrls)">
+        </template>
+      </div>
+    </div>
+    <!--  维保申请审批中，维保完成审批中,  -->
+    <div class="approvalContent" v-if="[1,4].includes(detailInfo.states)">
+      <div class="title commonTitle">审批意见：</div>
+      <textarea class="multiple" placeholder="输入意见" v-model="auditRemark"></textarea>
+    </div>
+<!--审批意见显示：   只要不是审批中状态-->
+    <div class="resultWrap" v-if="!(detailInfo.states == 1 || detailInfo.states == 4)">
+      <div class="result">
+        <div class="title commonTitle">审批意见：</div>
+        <div class="right">
+          <img class="commonImg" :src="getStatus(detailInfo.states)">
+          <div :class="getStatusColor(detailInfo.states)" >{{detailInfo.statesStr}}</div>
+        </div>
+      </div>
+      <div :class="getStatusColor(detailInfo.states)" class="time">{{ detailInfo.createTime }}  {{detailInfo.statesStr}}</div>
+<!--      完成不通过-->
+      <div class="line" v-if="detailInfo.auditRemark"></div>
+      <div class="reason" v-if="detailInfo.auditRemark">{{detailInfo.auditRemark}}</div>
+    </div>
+  </div>
+<!--  维保申请审批中，维保完成审批中-->
+  <div class="btnWrap"  v-if="detailInfo.states==1 || detailInfo.states==4">
+    <div class="noPass" @click="approvalHandle(0)">不通过</div>
+    <div class="pass" @click="approvalHandle(1)">通过</div>
+  </div>
+<!-- 维保申请通过 -->
+  <div class="btnWrap" v-if="detailInfo.states == 3">
+    <div  class="stoping pass" @click="show=true">维保终止</div>
+  </div>
+  <div class="dialogWrap" v-if="show">
+    <div class="title">维保终止 </div>
+    <div class="textWrap">
+      <textarea class="ipt" placeholder="请输入终止原因" v-model="reason"></textarea>
+    </div>
+    <div class="btnWrap">
+      <div class="noPass" @click="cancelHandle">取消</div>
+      <div class="pass" @click="handleConfirm">确定</div>
+    </div>
+  </div>
+</div>
+</template>
+
+<script>
+import {getVehicleMaintenanceDetail,vehicleMaintenanceStop,vehicleMaintenanceApproval} from "@/api/maintenance"
+import {myMixins} from  "@/utils/myMixins"
+import { ImagePreview } from "vant";
+export default {
+  name: "maintenance-application",
+  mixins:[myMixins],
+  data() {
+    return {
+      rowInfo:'',
+      noClick:true,
+      detailInfo:'',
+      show:false,
+      auditRemark:'',
+      reason:'',
+      status:'',
+      // activeIndex:'',
+    }
+  },
+  mounted() {
+    this.rowInfo=this.$route.params.info
+    this.status=this.$route.params.status
+    this.getDetail()
+  },
+  computed: {
+     // 维保申请不通过，维保完成不通过
+     noPassStatus(){
+       return  this.detailInfo.states===5 || this.detailInfo.states===4 || this.detailInfo.states===6;
+     },
+  },
+  methods: {
+    goPrePage(){
+      this.$router.push({
+        name: 'vehicleMaintenanceList',
+        params: {
+          activeIndex:this.$route.params?.activeIndex,
+          status:this.status,
+        }
+      });
+    },
+    previewPhoto(url) {
+      let urls=[]
+      // this.auditPhotoList.forEach((item)=>{
+        urls.push(url)
+      // })
+      ImagePreview({
+        images: urls,
+        startPosition: 0,
+        closeable: true,
+      });
+
+    },
+    cancelHandle(){
+      this.show=false
+      console.log('this.show0',this.show)
+    },
+    async handleConfirm(){
+      let res=await vehicleMaintenanceStop({id:this.rowInfo.id, vehicleId:this.rowInfo.vehicleId, auditRemark:this.reason,})
+      if (res.code==200){
+        this.show=false
+        await this.getDetail();
+      }
+    },
+    async approvalHandle(approvalType){
+      let res=await vehicleMaintenanceApproval({
+        id:this.rowInfo.id,
+        vehicleId:this.rowInfo.vehicleId,
+        auditResult:approvalType,
+        auditRemark:this.auditRemark,
+      })
+      if(res.code==200){
+        await this.getDetail();
+      }
+    },
+    // 1申请审批，2申请不通过，3申请通过，4完成审批中，5完成不通过，6完成通过，9维保终止
+    getStatusColor(i){
+      switch (i){
+        case 1://
+        case 4://
+          return 'yelColor'
+        case 2://
+        case 5://
+          return 'redColor'
+        case 3://
+        case 6://
+          return 'greColor'
+        case 9://
+          return 'garyColor'
+        default:
+          return ''
+      }
+    },
+    getStatus(i){
+      switch (i){
+        case 1://
+        case 4://
+          return require('@/assets/waitSubmit.png')
+        case 2://审核通过
+        case 5://已打款
+          return require('@/assets/unpass.png')
+        case 3://
+        case 6://
+          return require('@/assets/dakuan.png')
+        case 9://报销失败
+          return require('@/assets/unSubmit.png')
+        default:
+          return ''
+      }
+    },
+    async getDetail() {
+      let res=await getVehicleMaintenanceDetail ({
+        id:this.rowInfo.id,
+        vehicleId:this.rowInfo.vehicleId,
+      })
+      if(res.code===200 && res.data){
+        this.detailInfo=res.data
+      }
+    },
+  }
+}
+</script>
+
+<style scoped lang="scss">
+@import "@/styles/mixin.scss";
+@import "@/styles/common.scss";
+@import "@/styles/approval.scss";
+.dialogWrap{
+  position:absolute ;
+  top: 0;
+  bottom: 0;
+  left: 0;
+  right: 0;
+  margin: auto;
+  z-index: 111;
+  width: 326px;
+  box-sizing: border-box;
+  height: 180px;
+  background: #F1F5F7;
+  box-shadow: 0px 6px 21px 0px rgba(0,0,0,0.3);
+  border-radius: 6px;
+  .title{
+    width: 100%;
+    height: 40px;
+    line-height: 40px;
+    text-align: center;
+    background: #E3ECF1;
+    border-radius: 6px 6px 0px 0px;
+    @include fontWeightSize(16px,bold);
+    color: #262628;
+  }
+  .textWrap{
+    width: 100%;
+    box-sizing: border-box;
+    padding: 15px 25px;
+    .ipt{
+      width: 100%;
+      height: 52px;
+      box-sizing: border-box;
+      padding-left: 5px;
+      background: #ECF4F9;
+      border-radius: 3px;
+      border: 1px solid #3364B7;
+      backdrop-filter: blur(10px);
+    }
+  }
+  .btnWrap div{
+    width: 130px;
+    @include all-height(40px);
+  }
+
+}
+::v-deep .van-field__control{
+  border: 1px solid #eee8e8 !important;
+}
+.navBar{
+  margin-bottom: 46px;
+}
+.wrap{
+  background-color: #F4F5F7;
+}
+.flowWrap{
+  height: calc(100% - 120px);
+  overflow-y: auto;
+}
+.line{
+  margin: 5px 0;
+  width: 325px;
+  border-bottom: 2px solid;
+  opacity: 0.16;
+  border-image: linear-gradient(270deg, rgba(217, 217, 217, 0.6), rgba(178, 178, 178, 1), rgba(178, 178, 178, 1), rgba(217, 217, 217, 0.6)) 1 1;
+}
+.commonTitle{
+  @include fontWeightSize(14px,bold);
+  @include colHeight( #323643,20px);
+}
+.detailInfo{
+  width: 100%;
+  background: #FFFFFF;
+  @include sizing4Padding(13px,25px,14px,24px);
+  margin-bottom: 10px;
+  .line1{
+    @include flexColBet;
+    line-height: 23px;
+    .leftTitle{
+      opacity: .66;
+    }
+    .right{
+      @include flexCenter;
+    }
+  }
+  .opa{
+    display: inline-block;
+    width: 60px;
+    @include colorOpa(#000000,.5);
+    font-size: 12px;
+    line-height: 27px;
+  }
+  .shopName{
+    width: 100%;
+    display: flex;
+    align-items: baseline;
+    .textarea{
+      width: calc(100% - 60px);
+    }
+  }
+  .project{
+    color: #E8A524;
+    //width: calc(100% -  60px);
+  }
+  .shopImgList{
+    margin-top: 6px;
+    @include flexColBet;
+    flex-wrap: wrap;
+    img{
+      background: #FAFAFA;
+      border-radius: 3px;
+      border: 1px solid #EAEAEA;
+      backdrop-filter: blur(10px);
+      @include wh(154px,93px);
+      margin-bottom: 10px;
+    }
+  }
+}
+.approvalContent{
+  background-color: #FFFFFF;
+  width: 100%;
+  @include sizing4Padding(13px,25px,24px,25px);
+  .title {
+    margin-bottom: 8px;
+  }
+  .multiple{
+    @include wh(100%,125px);
+    background: #FAFAFA;
+    border: 1px solid #E6E6E6;
+    backdrop-filter: blur(10px);
+    @include sizingPadRadius(7px,10px,3px);
+  }
+}
+.resultWrap{
+  width: 100%;
+  background: #FFFFFF;
+  @include sizing4Padding(12px,23px,16px,24px);
+  @include flexBetween;
+  .title {
+    margin-bottom: 8px;
+  }
+  .result{
+    @include flexColBet;
+  }
+  .right{
+    @include flexCenter;
+  }
+  .commonImg{
+    @include widHeiMar(13px,13px,4px);
+  }
+  .time{
+    text-align: right;
+  }
+  .reason {
+    font-size: 13px;
+    color: #FF5D2E;
+    line-height: 20px;
+  }
+}
+.btnWrap{
+  @include wh(100%, 54px);
+  @include sizingPadding(0,30px);
+  @include flexBetCen;
+  position: absolute;
+  bottom: 12px;
+  background-color: #F4F5F7;
+  div{
+    @include wh(152px, 48px);
+    line-height: 48px;
+    text-align: center;
+    border-radius: 5px;
+    @include fontWeightSize(15px,bold);
+    color: #FFFFFF;
+  }
+  .noPass{
+    background: #9EA7C0;
+  }
+  .pass{
+    background: #354D93;
+  }
+  .stoping{
+    width: 100% !important;
+  }
+}
+</style>

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

@@ -0,0 +1,242 @@
+<template>
+<div class="wrap">
+  <div class="navBar">
+    <van-nav-bar
+        title="车辆维保"
+        :left-arrow="isShowBackBtn ? true : false"
+        left-arrow-color="#FFFFFF"
+        :border="false"
+        :fixed="true"
+        :safe-area-inset-top="true"
+        @click-left="goPrePage"
+    />
+  </div>
+  <div class="tab_wrap">
+    <div v-for="(item, index) in tabArr" :key="index"
+         @click="changeTab(index)">
+      <span :class="{'active' : activeIndex == index , 'alpha' :true}"> {{ item.name }}</span>
+      <span class="numTip" style="opacity: 1 !important;" v-if="index===0 && item.num">{{item.num}}</span>
+    </div>
+  </div>
+  <van-pull-refresh class="refresh" v-model="isLoading" @refresh="onRefresh" v-show="!show">
+    <van-list
+        v-model="loading"
+        :finished="finished"
+        finished-text="没有更多了"
+        @load="onLoad"
+    >
+      <div class="listWrap">
+        <div class="listItem"  @click="noMultipleClicks(goPageDetail,item)" v-for="(item,index) in pageList" :key="index">
+          <div class="line1">
+            <div class="title">{{item.stage}}</div>
+            <div class="right">
+              <img class="commonImg" :src="getStatus(item.states?.code)">
+              <div :class="getStatusColor(item.states?.code)">{{ item.states?.label }}</div>
+            </div>
+          </div>
+          <div class="driverInfo">{{ item.vehicleName }} /  {{ item.plateNumber }}</div>
+          <div class="time">{{ item.createTime }}</div>
+        </div>
+      </div>
+    </van-list>
+  </van-pull-refresh>
+  <div class="bgEmptyImg" v-show="show" >
+    <img  src="@/assets/empty.png" />
+  </div>
+</div>
+</template>
+
+<script>
+import {myMixins} from  "@/utils/myMixins"
+import {vehicleMaintenanceList,vehicleMaintenanceCount} from "@/api/maintenance"
+export default {
+  name: "vehicle-maintenance-list",
+  mixins:[myMixins],
+  data() {
+    return {
+      id:'',
+      tabArr: [ {name: '待审批', status: 2,num:0 },{name: '已审批', status: 2,num:0 },],
+      activeIndex: 0,
+      pageList:[],
+      pageNum:1,
+      pageSize:10,
+      total:'',
+      noClick:true,
+      isShowBackBtn:true,
+      inApprovalCount:0,
+      status:'',
+      isLoading:"",
+      loading: false,
+      finished: false,
+    }
+  },
+  mounted() {
+    const urlParams = new URLSearchParams(window.location.search);
+    this.status=urlParams.get('status')
+    if(this.status=='crm' || this.$route.params.status == 'crm' ){//后台进入此页面没有返回按钮
+      this.isShowBackBtn=false
+    }else{
+      this.isShowBackBtn=true
+    }
+    this.activeIndex=this.$route.params?.activeIndex || 0
+    this.getList()
+  },
+  computed:{
+    show() {
+      return (this.pageList.length < 0 || this.pageList.length == 0); // 判断数组长度是否大于 0
+    },
+  },
+  methods: {
+    async onLoad(){
+      this.pageNum++;
+      await this.getList()
+      this.loading = false;
+      console.log("this.pageList.length",this.pageList.length)
+      console.log("this.total",this.total)
+
+      if (this.pageList.length >= this.total) {
+        this.finished = true;
+      }
+    },
+    goPrePage(){
+      this.$router.push({  name: 'toDoList' });
+    },
+    // 1申请审批，2申请不通过，3申请通过，4完成审批中，5完成不通过，6完成通过，9维保终止
+    getStatusColor(i){
+      switch (i){
+        case 1://
+        case 4://
+          return 'yelColor'
+        case 2://
+        case 5://
+          return 'redColor'
+        case 3://
+        case 6://
+          return 'greColor'
+        case 9://
+          return 'garyColor'
+        default:
+          return 'yelColor'
+      }
+    },
+    getStatus(i){
+      switch (i){
+        case 1://
+        case 4://
+          return require('@/assets/waitSubmit.png')
+        case 2://审核通过
+        case 5://已打款
+          return require('@/assets/unpass.png')
+        case 3://
+        case 6://
+          return require('@/assets/dakuan.png')
+        case 9://报销失败
+          return require('@/assets/unSubmit.png')
+        default:
+          return require('@/assets/waitSubmit.png')
+      }
+    },
+/*    onRefresh() {
+      vehicleMaintenanceCount();
+      // this.getList()
+      setTimeout(() => {
+        this.$toast('刷新成功');
+        this.isLoading = false;
+      }, 1000);
+    },*/
+    onRefresh() {
+      vehicleMaintenanceCount();
+      this.pageNum=1
+      // this.getList()
+      setTimeout(() => {
+        this.$toast('刷新成功');
+        this.isLoading = false;
+      }, 1000);
+    },
+    async changeTab(index) {
+      this.activeIndex = index
+      this.pageNum = 1
+      this.pageList = [];
+      this.total=0
+      await this.getList()
+    },
+    async getList() {
+      let result=await vehicleMaintenanceCount();
+      if(result.code==200 && result.data){
+        this.tabArr[0].num=result.data.inApprovalCount
+      }
+      let res=await vehicleMaintenanceList ({
+        pageNum:this.pageNum,
+        pageSize:this.pageSize,
+        queryType:this.activeIndex+1,
+      })
+      // this.pageList=res.data
+      // console.log("===",this.pageList)
+      this.total=res.total
+      if(this.pageNum == 1){// 第一页直接赋值
+        this.pageList=res.data
+      }else{// 第二页数据拼接
+        console.log("第二页数据拼接")
+        let preList = this.pageList;
+        // console.log("preList",preList)
+        let arr = res.data;
+        // console.log("arr",arr)
+        this.pageList = preList.concat(arr)
+        console.log("this.pageList====",this.pageList)
+      }
+    },
+    goPageDetail(item){
+      this.$router.push({
+        name: 'maintenanceApplication',  // 目标路由的名称
+        params: {
+          info:item,
+          activeIndex:this.activeIndex,
+          status:this.status,
+        }
+      });
+
+    },
+  }
+}
+</script>
+
+<style scoped lang="scss">
+@import "@/styles/mixin.scss";
+@import "@/styles/common.scss";
+@import "@/styles/approval.scss";
+.wrap{
+  @include wh(100%,100%);
+  box-sizing: border-box;
+  overflow-y: auto;
+}
+.navBar{
+  margin-bottom: 46px;
+}
+::v-deep .van-list__finished-text{
+  background-color: #F4F5F7 !important;
+  padding-bottom: 10px;
+}
+::v-deep .van-pull-refresh{
+  height: calc(100% - 86px) ;
+  overflow-y: auto;
+  background-color: #F4F5F7;
+}
+.listItem{
+  padding: 11px 28px 11px 23px;
+  div{
+    .title{
+      @include fontWeightSize(bold,14px);
+      line-height: 20px;
+      margin-bottom: 8px;
+    }
+    .right{
+      @include flexCenter();
+    }
+  }
+  .driverInfo{
+    font-size: 12px;
+    line-height: 18px;
+    margin-bottom: 5px;
+  }
+}
+</style>

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>

yarn.lock

@@ -287,6 +287,11 @@
   resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.22.10.tgz#e37634f9a12a1716136c44624ef54283cabd3f55"
   integrity sha512-lNbdGsQb9ekfsnjFGhEiF4hfFqGgfOP3H3d27re3n+CGhNuTSUEQdfWk556sTLNTloczcdM5TYF2LhzmDQKyvQ==
 
+"@babel/parser@^7.23.5":
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.24.7.tgz#9a5226f92f0c5c8ead550b750f5608e766c8ce85"
+  integrity sha512-9uUYRm6OqQrCqQdG1iCBwBPZgN8ciDBro2nIOFaiRz1/BCxaI7CNvQbDHvsArAC7Tw9Hda/B3U+6ui9u4HWXPw==
+
 "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.22.5":
   version "7.22.5"
   resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.22.5.tgz#87245a21cd69a73b0b81bcda98d443d6df08f05e"
@@ -1613,6 +1618,17 @@
     postcss "^8.4.14"
     source-map "^0.6.1"
 
+"@vue/compiler-sfc@2.7.16":
+  version "2.7.16"
+  resolved "https://registry.yarnpkg.com/@vue/compiler-sfc/-/compiler-sfc-2.7.16.tgz#ff81711a0fac9c68683d8bb00b63f857de77dc83"
+  integrity sha512-KWhJ9k5nXuNtygPU7+t1rX6baZeqOYLEforUPjgNDBnLicfHCoi48H87Q8XyLZOrNNsmhuwKqtpDQWjEFe6Ekg==
+  dependencies:
+    "@babel/parser" "^7.23.5"
+    postcss "^8.4.14"
+    source-map "^0.6.1"
+  optionalDependencies:
+    prettier "^1.18.2 || ^2.0.0"
+
 "@vue/component-compiler-utils@^3.1.0", "@vue/component-compiler-utils@^3.3.0":
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/@vue/component-compiler-utils/-/component-compiler-utils-3.3.0.tgz#f9f5fb53464b0c37b2c8d2f3fbfe44df60f61dc9"
@@ -1942,6 +1958,13 @@ astral-regex@^2.0.0:
   resolved "https://registry.yarnpkg.com/astral-regex/-/astral-regex-2.0.0.tgz#483143c567aeed4785759c0865786dc77d7d2e31"
   integrity sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==
 
+async-validator@~1.8.1:
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/async-validator/-/async-validator-1.8.5.tgz#dc3e08ec1fd0dddb67e60842f02c0cd1cec6d7f0"
+  integrity sha512-tXBM+1m056MAX0E8TL2iCjg8WvSyXu0Zc8LNtYqrVeyoL3+esHRZ4SieE9fKQyyU09uONjnMEjrNBMqT0mbvmA==
+  dependencies:
+    babel-runtime "6.x"
+
 async@^2.6.4:
   version "2.6.4"
   resolved "https://registry.yarnpkg.com/async/-/async-2.6.4.tgz#706b7ff6084664cd7eae713f6f965433b5504221"
@@ -1980,6 +2003,11 @@ axios@^1.4.0:
     form-data "^4.0.0"
     proxy-from-env "^1.1.0"
 
+babel-helper-vue-jsx-merge-props@^2.0.0:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/babel-helper-vue-jsx-merge-props/-/babel-helper-vue-jsx-merge-props-2.0.3.tgz#22aebd3b33902328e513293a8e4992b384f9f1b6"
+  integrity sha512-gsLiKK7Qrb7zYJNgiXKpXblxbV5ffSwR0f5whkPAaBAR4fhi6bwRZxX9wBlIc5M/v8CCkXUbXZL4N/nSE97cqg==
+
 babel-loader@^8.2.2:
   version "8.3.0"
   resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-8.3.0.tgz#124936e841ba4fe8176786d6ff28add1f134d6a8"
@@ -2021,6 +2049,14 @@ babel-plugin-polyfill-regenerator@^0.5.2:
   dependencies:
     "@babel/helper-define-polyfill-provider" "^0.4.2"
 
+babel-runtime@6.x:
+  version "6.26.0"
+  resolved "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.26.0.tgz#965c7058668e82b55d7bfe04ff2337bc8b5647fe"
+  integrity sha512-ITKNuq2wKlW1fJg9sSW52eepoYgZBggvOAHC0u/CYu/qxQ9EVzThCgR69BnSXLHjy2f7SY5zaQ4yt7H9ZVxY2g==
+  dependencies:
+    core-js "^2.4.0"
+    regenerator-runtime "^0.11.0"
+
 balanced-match@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee"
@@ -2463,6 +2499,11 @@ core-js-compat@^3.31.0, core-js-compat@^3.8.3:
   dependencies:
     browserslist "^4.21.9"
 
+core-js@^2.4.0:
+  version "2.6.12"
+  resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.12.tgz#d9333dfa7b065e347cc5682219d6f690859cc2ec"
+  integrity sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ==
+
 core-js@^3.8.3:
   version "3.32.0"
   resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.32.0.tgz#7643d353d899747ab1f8b03d2803b0312a0fb3b6"
@@ -2634,6 +2675,11 @@ csstype@^3.1.0:
   resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.1.2.tgz#1d4bf9d572f11c14031f0436e1c10bc1f571f50b"
   integrity sha512-I7K1Uu0MBPzaFKg4nI5Q7Vs2t+3gWWW648spaF+Rg7pI9ds18Ugn+lvg4SHczUdKlHI5LWBXyqfS8+DufyBsgQ==
 
+dayjs@^1.8.14:
+  version "1.11.11"
+  resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.11.11.tgz#dfe0e9d54c5f8b68ccf8ca5f72ac603e7e5ed59e"
+  integrity sha512-okzr3f11N6WuqYtZSvm+F776mB41wRZMhKP+hc34YdW+KmtYYK9iqvHSwo2k9FEH3fhGXvOPV6yz2IcSrfRUDg==
+
 de-indent@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/de-indent/-/de-indent-1.0.2.tgz#b2038e846dc33baa5796128d0804b455b8c1e21d"
@@ -2665,7 +2711,7 @@ deep-is@^0.1.3:
   resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.4.tgz#a6f2dce612fadd2ef1f519b73551f17e85199831"
   integrity sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==
 
-deepmerge@^1.5.2:
+deepmerge@^1.2.0, deepmerge@^1.5.2:
   version "1.5.2"
   resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-1.5.2.tgz#10499d868844cdad4fee0842df8c7f6f0c95a753"
   integrity sha512-95k0GDqvBjZavkuvzx/YqVLv/6YYa17fz6ILMSf7neqQITCPbnfEnQvEgMPNjH4kgobe7+WIL0yJEHku+H3qtQ==
@@ -2813,6 +2859,14 @@ easy-stack@1.0.1:
   resolved "https://registry.yarnpkg.com/easy-stack/-/easy-stack-1.0.1.tgz#8afe4264626988cabb11f3c704ccd0c835411066"
   integrity sha512-wK2sCs4feiiJeFXn3zvY0p41mdU5VUgbgs1rNsc/y5ngFUijdWd+iIN8eoyuZHKB8xN6BL4PdWmzqFmxNg6V2w==
 
+echarts@^5.2.2:
+  version "5.5.0"
+  resolved "https://registry.yarnpkg.com/echarts/-/echarts-5.5.0.tgz#c13945a7f3acdd67c134d8a9ac67e917830113ac"
+  integrity sha512-rNYnNCzqDAPCr4m/fqyUFv7fD9qIsd50S6GDFgO1DxZhncCsNsG7IfUlAlvZe5oSEQxtsjnHiUuppzccry93Xw==
+  dependencies:
+    tslib "2.3.0"
+    zrender "5.5.0"
+
 ee-first@1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
@@ -2823,6 +2877,18 @@ electron-to-chromium@^1.4.477:
   resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.487.tgz#e2ef8b15f2791bf68fa6f38f2656f1a551d360ae"
   integrity sha512-XbCRs/34l31np/p33m+5tdBrdXu9jJkZxSbNxj5I0H1KtV2ZMSB+i/HYqDiRzHaFx2T5EdytjoBRe8QRJE2vQg==
 
+element-ui@^2.15.9:
+  version "2.15.14"
+  resolved "https://registry.yarnpkg.com/element-ui/-/element-ui-2.15.14.tgz#3c34df79467636592812d720d2e6784e7a6ec2ea"
+  integrity sha512-2v9fHL0ZGINotOlRIAJD5YuVB8V7WKxrE9Qy7dXhRipa035+kF7WuU/z+tEmLVPBcJ0zt8mOu1DKpWcVzBK8IA==
+  dependencies:
+    async-validator "~1.8.1"
+    babel-helper-vue-jsx-merge-props "^2.0.0"
+    deepmerge "^1.2.0"
+    normalize-wheel "^1.0.1"
+    resize-observer-polyfill "^1.5.0"
+    throttle-debounce "^1.0.1"
+
 emoji-regex@^8.0.0:
   version "8.0.0"
   resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37"
@@ -4398,6 +4464,11 @@ normalize-url@^6.0.1:
   resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-6.1.0.tgz#40d0885b535deffe3f3147bec877d05fe4c5668a"
   integrity sha512-DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A==
 
+normalize-wheel@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/normalize-wheel/-/normalize-wheel-1.0.1.tgz#aec886affdb045070d856447df62ecf86146ec45"
+  integrity sha512-1OnlAPZ3zgrk8B91HyRj+eVv+kS5u+Z0SCsak6Xil/kmgEia50ga7zfkumayonZrImffAxPU/5WcyGhzetHNPA==
+
 npm-run-path@^2.0.0:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-2.0.2.tgz#35a9232dfa35d7067b4cb2ddf2357b1871536c5f"
@@ -5137,6 +5208,11 @@ regenerate@^1.4.2:
   resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.4.2.tgz#b9346d8827e8f5a32f7ba29637d398b69014848a"
   integrity sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A==
 
+regenerator-runtime@^0.11.0:
+  version "0.11.1"
+  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz#be05ad7f9bf7d22e056f9726cee5017fbf19e2e9"
+  integrity sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==
+
 regenerator-runtime@^0.14.0:
   version "0.14.0"
   resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.14.0.tgz#5e19d68eb12d486f797e15a3c6a918f7cec5eb45"
@@ -5204,6 +5280,11 @@ requires-port@^1.0.0:
   resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff"
   integrity sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==
 
+resize-observer-polyfill@^1.5.0, resize-observer-polyfill@^1.5.1:
+  version "1.5.1"
+  resolved "https://registry.yarnpkg.com/resize-observer-polyfill/-/resize-observer-polyfill-1.5.1.tgz#0e9020dd3d21024458d4ebd27e23e40269810464"
+  integrity sha512-LwZrotdHOo12nQuZlHEmtuXdqGoOD0OhaxopaNFxWzInpEgaLWoVuAMbTzixuosCx2nEG58ngzW3vxdWoxIgdg==
+
 resolve-from@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6"
@@ -5775,6 +5856,11 @@ thread-loader@^3.0.0:
     neo-async "^2.6.2"
     schema-utils "^3.0.0"
 
+throttle-debounce@^1.0.1:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/throttle-debounce/-/throttle-debounce-1.1.0.tgz#51853da37be68a155cb6e827b3514a3c422e89cd"
+  integrity sha512-XH8UiPCQcWNuk2LYePibW/4qL97+ZQ1AN3FNXwZRBNPPowo/NRU5fAlDCSNBJIYCKbioZfuYtMhG4quqoJhVzg==
+
 thunky@^1.0.2:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/thunky/-/thunky-1.1.0.tgz#5abaf714a9405db0504732bbccd2cedd9ef9537d"
@@ -5807,6 +5893,11 @@ tr46@~0.0.3:
   resolved "https://registry.yarnpkg.com/tr46/-/tr46-0.0.3.tgz#8184fd347dac9cdc185992f3a6622e14b9d9ab6a"
   integrity sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==
 
+tslib@2.3.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.3.0.tgz#803b8cdab3e12ba581a4ca41c8839bbb0dacb09e"
+  integrity sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg==
+
 tslib@^2.0.3, tslib@^2.3.0:
   version "2.6.1"
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.6.1.tgz#fd8c9a0ff42590b25703c0acb3de3d3f4ede0410"
@@ -5939,6 +6030,7 @@ vary@~1.1.2:
   resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc"
   integrity sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==
 
+
 vue-eslint-parser@^8.0.1:
   version "8.3.0"
   resolved "https://registry.yarnpkg.com/vue-eslint-parser/-/vue-eslint-parser-8.3.0.tgz#5d31129a1b3dd89c0069ca0a1c88f970c360bd0d"
@@ -5984,6 +6076,14 @@ vue-style-loader@^4.1.0, vue-style-loader@^4.1.3:
     hash-sum "^1.0.2"
     loader-utils "^1.0.2"
 
+vue-template-compiler@^2.6.11:
+  version "2.7.16"
+  resolved "https://registry.yarnpkg.com/vue-template-compiler/-/vue-template-compiler-2.7.16.tgz#c81b2d47753264c77ac03b9966a46637482bb03b"
+  integrity sha512-AYbUWAJHLGGQM7+cNTELw+KsOG9nl2CnSv467WobS5Cv9uk3wFcnr1Etsz2sEIHEZvw1U+o9mRlEO6QbZvUPGQ==
+  dependencies:
+    de-indent "^1.0.2"
+    he "^1.2.0"
+
 vue-template-compiler@^2.6.14:
   version "2.7.14"
   resolved "https://registry.yarnpkg.com/vue-template-compiler/-/vue-template-compiler-2.7.14.tgz#4545b7dfb88090744c1577ae5ac3f964e61634b1"
@@ -5997,6 +6097,14 @@ vue-template-es2015-compiler@^1.9.0:
   resolved "https://registry.yarnpkg.com/vue-template-es2015-compiler/-/vue-template-es2015-compiler-1.9.1.tgz#1ee3bc9a16ecbf5118be334bb15f9c46f82f5825"
   integrity sha512-4gDntzrifFnCEvyoO8PqyJDmguXgVPxKiIxrBKjIowvL9l+N66196+72XVYR8BBf1Uv1Fgt3bGevJ+sEmxfZzw==
 
+vue@^2.6.12:
+  version "2.7.16"
+  resolved "https://registry.yarnpkg.com/vue/-/vue-2.7.16.tgz#98c60de9def99c0e3da8dae59b304ead43b967c9"
+  integrity sha512-4gCtFXaAA3zYZdTp5s4Hl2sozuySsgz4jy1EnpBHNfpMa9dK1ZCG7viqBPCwXtmgc8nHqUsAu3G4gtmXkkY3Sw==
+  dependencies:
+    "@vue/compiler-sfc" "2.7.16"
+    csstype "^3.1.0"
+
 vue@^2.6.14:
   version "2.7.14"
   resolved "https://registry.yarnpkg.com/vue/-/vue-2.7.14.tgz#3743dcd248fd3a34d421ae456b864a0246bafb17"
@@ -6286,3 +6394,10 @@ yorkie@^2.0.0:
     is-ci "^1.0.10"
     normalize-path "^1.0.0"
     strip-indent "^2.0.0"
+
+zrender@5.5.0:
+  version "5.5.0"
+  resolved "https://registry.yarnpkg.com/zrender/-/zrender-5.5.0.tgz#54d0d6c4eda81a96d9f60a9cd74dc48ea026bc1e"
+  integrity sha512-O3MilSi/9mwoovx77m6ROZM7sXShR/O/JIanvzTwjN3FORfLSr81PsUGd7jlaYOeds9d8tw82oP44+3YucVo+w==
+  dependencies:
+    tslib "2.3.0"