CRM_25-10-15#story#7339,服务商在APP中查看救援相关资料内容优化

package-lock.json

@@ -18,6 +18,7 @@
         "element-ui": "^2.15.9",
         "less": "^4.1.3",
         "less-loader": "^11.1.3",
+        "qrcode": "^1.5.4",
         "qs": "^6.11.2",
         "sass": "^1.65.1",
         "sass-loader": "^13.3.2",
@@ -3350,7 +3351,6 @@
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
       "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
-      "dev": true,
       "engines": {
         "node": ">=8"
       }
@@ -4801,6 +4801,15 @@
       "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
       "dev": true
     },
+    "node_modules/decamelize": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmmirror.com/decamelize/-/decamelize-1.2.0.tgz",
+      "integrity": "sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/decimal.js": {
       "version": "10.4.3",
       "resolved": "https://registry.npmmirror.com/decimal.js/-/decimal.js-10.4.3.tgz",
@@ -5020,6 +5029,12 @@
       "integrity": "sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g==",
       "dev": true
     },
+    "node_modules/dijkstrajs": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmmirror.com/dijkstrajs/-/dijkstrajs-1.0.3.tgz",
+      "integrity": "sha512-qiSlmBq9+BCdCA/L46dw8Uy93mloxsPSbwnm5yrKn2vMPiy8KyAskTF6zuV/j5BMsmOGZDPs7KjU+mjb670kfA==",
+      "license": "MIT"
+    },
     "node_modules/dir-glob": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz",
@@ -5210,8 +5225,7 @@
     "node_modules/emoji-regex": {
       "version": "8.0.0",
       "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
-      "dev": true
     },
     "node_modules/emojis-list": {
       "version": "3.0.0",
@@ -6215,7 +6229,6 @@
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
       "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
-      "dev": true,
       "dependencies": {
         "locate-path": "^5.0.0",
         "path-exists": "^4.0.0"
@@ -6370,7 +6383,6 @@
       "version": "2.0.5",
       "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
       "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
-      "dev": true,
       "engines": {
         "node": "6.* || 8.* || >= 10.*"
       }
@@ -6992,7 +7004,6 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
       "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
-      "dev": true,
       "engines": {
         "node": ">=8"
       }
@@ -7408,7 +7419,6 @@
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
       "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
-      "dev": true,
       "dependencies": {
         "p-locate": "^4.1.0"
       },
@@ -8445,7 +8455,6 @@
       "version": "2.3.0",
       "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
       "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
-      "dev": true,
       "dependencies": {
         "p-try": "^2.0.0"
       },
@@ -8460,7 +8469,6 @@
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
       "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
-      "dev": true,
       "dependencies": {
         "p-limit": "^2.2.0"
       },
@@ -8485,7 +8493,6 @@
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
       "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
-      "dev": true,
       "engines": {
         "node": ">=6"
       }
@@ -8582,7 +8589,6 @@
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
       "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
-      "dev": true,
       "engines": {
         "node": ">=8"
       }
@@ -8663,6 +8669,15 @@
         "node": ">=8"
       }
     },
+    "node_modules/pngjs": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmmirror.com/pngjs/-/pngjs-5.0.0.tgz",
+      "integrity": "sha512-40QW5YalBNfQo5yRYmiw7Yz6TKKVr3h6970B2YE+3fQpsWcrbj1PzJgxeJ19DRQjhMbKPIuMY8rFaXc8moolVw==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=10.13.0"
+      }
+    },
     "node_modules/portfinder": {
       "version": "1.0.32",
       "resolved": "https://registry.npmjs.org/portfinder/-/portfinder-1.0.32.tgz",
@@ -9394,6 +9409,131 @@
         "node": ">=6"
       }
     },
+    "node_modules/qrcode": {
+      "version": "1.5.4",
+      "resolved": "https://registry.npmmirror.com/qrcode/-/qrcode-1.5.4.tgz",
+      "integrity": "sha512-1ca71Zgiu6ORjHqFBDpnSMTR2ReToX4l1Au1VFLyVeBTFavzQnv5JxMFr3ukHVKpSrSA2MCk0lNJSykjUfz7Zg==",
+      "license": "MIT",
+      "dependencies": {
+        "dijkstrajs": "^1.0.1",
+        "pngjs": "^5.0.0",
+        "yargs": "^15.3.1"
+      },
+      "bin": {
+        "qrcode": "bin/qrcode"
+      },
+      "engines": {
+        "node": ">=10.13.0"
+      }
+    },
+    "node_modules/qrcode/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmmirror.com/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "license": "MIT",
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/qrcode/node_modules/camelcase": {
+      "version": "5.3.1",
+      "resolved": "https://registry.npmmirror.com/camelcase/-/camelcase-5.3.1.tgz",
+      "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/qrcode/node_modules/cliui": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmmirror.com/cliui/-/cliui-6.0.0.tgz",
+      "integrity": "sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==",
+      "license": "ISC",
+      "dependencies": {
+        "string-width": "^4.2.0",
+        "strip-ansi": "^6.0.0",
+        "wrap-ansi": "^6.2.0"
+      }
+    },
+    "node_modules/qrcode/node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmmirror.com/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "license": "MIT",
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/qrcode/node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmmirror.com/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "license": "MIT"
+    },
+    "node_modules/qrcode/node_modules/wrap-ansi": {
+      "version": "6.2.0",
+      "resolved": "https://registry.npmmirror.com/wrap-ansi/-/wrap-ansi-6.2.0.tgz",
+      "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==",
+      "license": "MIT",
+      "dependencies": {
+        "ansi-styles": "^4.0.0",
+        "string-width": "^4.1.0",
+        "strip-ansi": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/qrcode/node_modules/y18n": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmmirror.com/y18n/-/y18n-4.0.3.tgz",
+      "integrity": "sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==",
+      "license": "ISC"
+    },
+    "node_modules/qrcode/node_modules/yargs": {
+      "version": "15.4.1",
+      "resolved": "https://registry.npmmirror.com/yargs/-/yargs-15.4.1.tgz",
+      "integrity": "sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==",
+      "license": "MIT",
+      "dependencies": {
+        "cliui": "^6.0.0",
+        "decamelize": "^1.2.0",
+        "find-up": "^4.1.0",
+        "get-caller-file": "^2.0.1",
+        "require-directory": "^2.1.1",
+        "require-main-filename": "^2.0.0",
+        "set-blocking": "^2.0.0",
+        "string-width": "^4.2.0",
+        "which-module": "^2.0.0",
+        "y18n": "^4.0.0",
+        "yargs-parser": "^18.1.2"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/qrcode/node_modules/yargs-parser": {
+      "version": "18.1.3",
+      "resolved": "https://registry.npmmirror.com/yargs-parser/-/yargs-parser-18.1.3.tgz",
+      "integrity": "sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==",
+      "license": "ISC",
+      "dependencies": {
+        "camelcase": "^5.0.0",
+        "decamelize": "^1.2.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
     "node_modules/qs": {
       "version": "6.11.2",
       "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.2.tgz",
@@ -9643,7 +9783,6 @@
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
       "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==",
-      "dev": true,
       "engines": {
         "node": ">=0.10.0"
       }
@@ -9657,6 +9796,12 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/require-main-filename": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmmirror.com/require-main-filename/-/require-main-filename-2.0.0.tgz",
+      "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==",
+      "license": "ISC"
+    },
     "node_modules/requires-port": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz",
@@ -10033,6 +10178,12 @@
         "node": ">= 0.8.0"
       }
     },
+    "node_modules/set-blocking": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmmirror.com/set-blocking/-/set-blocking-2.0.0.tgz",
+      "integrity": "sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==",
+      "license": "ISC"
+    },
     "node_modules/setprototypeof": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz",
@@ -10324,7 +10475,6 @@
       "version": "4.2.3",
       "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
       "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
-      "dev": true,
       "dependencies": {
         "emoji-regex": "^8.0.0",
         "is-fullwidth-code-point": "^3.0.0",
@@ -10338,7 +10488,6 @@
       "version": "6.0.1",
       "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
       "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
-      "dev": true,
       "dependencies": {
         "ansi-regex": "^5.0.1"
       },
@@ -11702,6 +11851,12 @@
         "which": "bin/which"
       }
     },
+    "node_modules/which-module": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmmirror.com/which-module/-/which-module-2.0.1.tgz",
+      "integrity": "sha512-iBdZ57RDvnOR9AGBhML2vFZf7h8vmBjhoaZqODJBFWHVtKkDmKuHai3cx5PgVMrX5YDNp27AofYbAwctSS+vhQ==",
+      "license": "ISC"
+    },
     "node_modules/wildcard": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/wildcard/-/wildcard-2.0.1.tgz",
@@ -14418,8 +14573,7 @@
     "ansi-regex": {
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
-      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ=="
-      "dev": true
     },
     "ansi-styles": {
       "version": "3.2.1",
@@ -15473,6 +15627,11 @@
         }
       }
     },
+    "decamelize": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmmirror.com/decamelize/-/decamelize-1.2.0.tgz",
+      "integrity": "sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA=="
+    },
     "decimal.js": {
       "version": "10.4.3",
       "resolved": "https://registry.npmmirror.com/decimal.js/-/decimal.js-10.4.3.tgz",
@@ -15627,6 +15786,11 @@
       "integrity": "sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g==",
       "dev": true
     },
+    "dijkstrajs": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmmirror.com/dijkstrajs/-/dijkstrajs-1.0.3.tgz",
+      "integrity": "sha512-qiSlmBq9+BCdCA/L46dw8Uy93mloxsPSbwnm5yrKn2vMPiy8KyAskTF6zuV/j5BMsmOGZDPs7KjU+mjb670kfA=="
+    },
     "dir-glob": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz",
@@ -15783,8 +15947,7 @@
     "emoji-regex": {
       "version": "8.0.0",
       "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
-      "dev": true
     },
     "emojis-list": {
       "version": "3.0.0",
@@ -16545,7 +16708,6 @@
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
       "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
-      "dev": true,
       "requires": {
         "locate-path": "^5.0.0",
         "path-exists": "^4.0.0"
@@ -16650,8 +16812,7 @@
     "get-caller-file": {
       "version": "2.0.5",
       "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
-      "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
+      "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg=="
-      "dev": true
     },
     "get-intrinsic": {
       "version": "1.2.1",
@@ -17088,8 +17249,7 @@
     "is-fullwidth-code-point": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg=="
-      "dev": true
     },
     "is-glob": {
       "version": "4.0.3",
@@ -17399,7 +17559,6 @@
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
       "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
-      "dev": true,
       "requires": {
         "p-locate": "^4.1.0"
       }
@@ -18184,7 +18343,6 @@
       "version": "2.3.0",
       "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
       "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
-      "dev": true,
       "requires": {
         "p-try": "^2.0.0"
       }
@@ -18193,7 +18351,6 @@
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
       "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
-      "dev": true,
       "requires": {
         "p-limit": "^2.2.0"
       }
@@ -18211,8 +18368,7 @@
     "p-try": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
-      "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
+      "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ=="
-      "dev": true
     },
     "param-case": {
       "version": "3.0.4",
@@ -18292,8 +18448,7 @@
     "path-exists": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
-      "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
+      "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w=="
-      "dev": true
     },
     "path-is-absolute": {
       "version": "1.0.1",
@@ -18350,6 +18505,11 @@
         "find-up": "^4.0.0"
       }
     },
+    "pngjs": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmmirror.com/pngjs/-/pngjs-5.0.0.tgz",
+      "integrity": "sha512-40QW5YalBNfQo5yRYmiw7Yz6TKKVr3h6970B2YE+3fQpsWcrbj1PzJgxeJ19DRQjhMbKPIuMY8rFaXc8moolVw=="
+    },
     "portfinder": {
       "version": "1.0.32",
       "resolved": "https://registry.npmjs.org/portfinder/-/portfinder-1.0.32.tgz",
@@ -18835,6 +18995,96 @@
       "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.0.tgz",
       "integrity": "sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA=="
     },
+    "qrcode": {
+      "version": "1.5.4",
+      "resolved": "https://registry.npmmirror.com/qrcode/-/qrcode-1.5.4.tgz",
+      "integrity": "sha512-1ca71Zgiu6ORjHqFBDpnSMTR2ReToX4l1Au1VFLyVeBTFavzQnv5JxMFr3ukHVKpSrSA2MCk0lNJSykjUfz7Zg==",
+      "requires": {
+        "dijkstrajs": "^1.0.1",
+        "pngjs": "^5.0.0",
+        "yargs": "^15.3.1"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmmirror.com/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+          "requires": {
+            "color-convert": "^2.0.1"
+          }
+        },
+        "camelcase": {
+          "version": "5.3.1",
+          "resolved": "https://registry.npmmirror.com/camelcase/-/camelcase-5.3.1.tgz",
+          "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg=="
+        },
+        "cliui": {
+          "version": "6.0.0",
+          "resolved": "https://registry.npmmirror.com/cliui/-/cliui-6.0.0.tgz",
+          "integrity": "sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==",
+          "requires": {
+            "string-width": "^4.2.0",
+            "strip-ansi": "^6.0.0",
+            "wrap-ansi": "^6.2.0"
+          }
+        },
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmmirror.com/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "requires": {
+            "color-name": "~1.1.4"
+          }
+        },
+        "color-name": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmmirror.com/color-name/-/color-name-1.1.4.tgz",
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
+        },
+        "wrap-ansi": {
+          "version": "6.2.0",
+          "resolved": "https://registry.npmmirror.com/wrap-ansi/-/wrap-ansi-6.2.0.tgz",
+          "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==",
+          "requires": {
+            "ansi-styles": "^4.0.0",
+            "string-width": "^4.1.0",
+            "strip-ansi": "^6.0.0"
+          }
+        },
+        "y18n": {
+          "version": "4.0.3",
+          "resolved": "https://registry.npmmirror.com/y18n/-/y18n-4.0.3.tgz",
+          "integrity": "sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ=="
+        },
+        "yargs": {
+          "version": "15.4.1",
+          "resolved": "https://registry.npmmirror.com/yargs/-/yargs-15.4.1.tgz",
+          "integrity": "sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==",
+          "requires": {
+            "cliui": "^6.0.0",
+            "decamelize": "^1.2.0",
+            "find-up": "^4.1.0",
+            "get-caller-file": "^2.0.1",
+            "require-directory": "^2.1.1",
+            "require-main-filename": "^2.0.0",
+            "set-blocking": "^2.0.0",
+            "string-width": "^4.2.0",
+            "which-module": "^2.0.0",
+            "y18n": "^4.0.0",
+            "yargs-parser": "^18.1.2"
+          }
+        },
+        "yargs-parser": {
+          "version": "18.1.3",
+          "resolved": "https://registry.npmmirror.com/yargs-parser/-/yargs-parser-18.1.3.tgz",
+          "integrity": "sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==",
+          "requires": {
+            "camelcase": "^5.0.0",
+            "decamelize": "^1.2.0"
+          }
+        }
+      }
+    },
     "qs": {
       "version": "6.11.2",
       "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.2.tgz",
@@ -19021,8 +19271,7 @@
     "require-directory": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
-      "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==",
+      "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q=="
-      "dev": true
     },
     "require-from-string": {
       "version": "2.0.2",
@@ -19030,6 +19279,11 @@
       "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==",
       "dev": true
     },
+    "require-main-filename": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmmirror.com/require-main-filename/-/require-main-filename-2.0.0.tgz",
+      "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg=="
+    },
     "requires-port": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz",
@@ -19293,6 +19547,11 @@
         "send": "0.18.0"
       }
     },
+    "set-blocking": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmmirror.com/set-blocking/-/set-blocking-2.0.0.tgz",
+      "integrity": "sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw=="
+    },
     "setprototypeof": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz",
@@ -19534,7 +19793,6 @@
       "version": "4.2.3",
       "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
       "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
-      "dev": true,
       "requires": {
         "emoji-regex": "^8.0.0",
         "is-fullwidth-code-point": "^3.0.0",
@@ -19545,7 +19803,6 @@
       "version": "6.0.1",
       "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
       "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
-      "dev": true,
       "requires": {
         "ansi-regex": "^5.0.1"
       }
@@ -20524,6 +20781,11 @@
         "isexe": "^2.0.0"
       }
     },
+    "which-module": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmmirror.com/which-module/-/which-module-2.0.1.tgz",
+      "integrity": "sha512-iBdZ57RDvnOR9AGBhML2vFZf7h8vmBjhoaZqODJBFWHVtKkDmKuHai3cx5PgVMrX5YDNp27AofYbAwctSS+vhQ=="
+    },
     "wildcard": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/wildcard/-/wildcard-2.0.1.tgz",

package.json

@@ -19,6 +19,7 @@
     "element-ui": "^2.15.9",
     "less": "^4.1.3",
     "less-loader": "^11.1.3",
+    "qrcode": "^1.5.4",
     "qs": "^6.11.2",
     "sass": "^1.65.1",
     "sass-loader": "^13.3.2",

public/index.html

@@ -32,6 +32,10 @@
     </script>
     <script type="text/javascript" src="https://webapi.amap.com/maps?v=2.0&key=2560bbf04daef66c810c5e6a97e8c508&plugin=AMap.AutoComplete,AMap.PlaceSearch,AMap.Geolocation,AMap.Geocoder,AMap.Marker,AMap.Driving"></script>
 <!--    <script src="https://unpkg.com/vconsole@latest/dist/vconsole.min.js"></script>-->
+    <script>
+        window.selfLink = window.location.href;
+        window.selfSearch = window.location.search;
+    </script>
     <script>
         // VConsole 默认会挂载到 `window.VConsole` 上
         // let vConsole = new window.VConsole();

src/api/mine.js

@@ -323,6 +323,7 @@ export function jumpPage(data){
     return request({
         url:'/supplierAppV2/dispatchApp/user/jumpPage',
         method:'POST',
+        contentType:'application/json',
         data
     })
 }

src/router/index.js

@@ -11,6 +11,22 @@ const routes = [
       path: '/',
       redirect: '/index'
     },
+    {
+        path: '/supplierAdd',
+        name: 'supplierAdd',
+        component: () => import('@/views/index/supplierAdd'),
+        meta:{
+            title: '信息录入',
+        }
+    },
+    {
+        path: '/supplierInfo',
+        name: 'supplierInfo',
+        component: () => import('@/views/index/supplierInfo'),
+        meta:{
+            title: '信息查看',
+        }
+    },
     {
       path: '/toDoList',
       name: 'toDoList',

src/views/documentView/diverTrainDocment.vue

@@ -90,6 +90,7 @@ export default {
       totalList:[],
       numInfo:'',
       keyword:'',
+      serviceTypeName:'',
       show:false,
       showEmpty:false,
       isLoading:false,
@@ -102,6 +103,7 @@ export default {
     this.driverId = urlParams.get('driverId');
     this.time=timeFormat(Date.now())
     this.keyword=urlParams.get('keyword') || ''
+    this.serviceTypeName=urlParams.get('serviceTypeName') || ''
     this.getTrainingList();
     document.addEventListener('visibilitychange', async (  ) => {
       let state = document.visibilityState
@@ -129,6 +131,7 @@ export default {
         type:1,
         id:this.driverId,
         text:this.keyword || '',
+        serviceTypeName:this.serviceTypeName || ''
       })
       this.totalList=[]
       this.pageList=[]

src/views/documentView/trainDocment.vue

@@ -68,6 +68,7 @@ export default {
       pageList:[],
       totalList:[],
       keyword:'',
+      serviceTypeName:'',
       show:false,
       showEmpty:false,
       isLoading:false,
@@ -77,6 +78,8 @@ export default {
   mounted() {
     const urlParams = new URLSearchParams(window.location.search);
     this.supplierId = urlParams.get('supplierId');
+    this.keyword=urlParams.get('keyword') || ''
+    this.serviceTypeName=urlParams.get('serviceTypeName') || ''
     this.getTrainingList();
     document.addEventListener('visibilitychange', async (  ) => {
       let state = document.visibilityState
@@ -104,6 +107,7 @@ export default {
         type:2,
         id: this.supplierId,
         text:this.keyword || '',
+        serviceTypeName:this.serviceTypeName || ''
       })
       this.totalList=[]
       this.pageList=[]

src/views/index/invoicingNotify.vue

@@ -175,7 +175,7 @@ export default {
             confirmButtonColor: '#0E76F4',
             showCancelButton: false,
           }).then(async() => {
-            this.goPage('newTrainingList', { supplierId : this.supplierId })
+            this.goPage('newTrainingList', { supplierId : this.supplierId, type: 'invoice' })
           }).catch(() => {
             // on cancel
           });
@@ -189,7 +189,9 @@ export default {
       this.getNotifyList()
     },
     async getJumpHandler() {
-      let res = await jumpPage();
+      let res = await jumpPage({
+        type: 'invoice'
+      });
       return res
     },
     getMonth(item) {

src/views/index/supplierAdd.vue

@@ -0,0 +1,299 @@
+<template>
+  <div class="wrap">
+    <div class="top_banner">
+      <img src="@/assets/supplier/topBg.png" alt="">
+    </div>
+    <div class="content_wrap">
+      <div class="credentials_info">
+        <img class="title1" src="@/assets/supplier/title1.png" alt="">
+        <div class="credentials_wrap">
+          <div class="credentials_item">
+            <div class="credentials_title">1. 法人身份证正面</div>
+            <van-uploader
+              accept="image/*"
+              v-model="idFrontPhotoList"
+              :after-read="idFrontPhotoHandler"
+              :max-size="5 * 1024 * 1024"
+              max-count="1">
+              <div class="custom-background">
+                <img src="@/assets/supplier/idCardPerson.png" alt="">
+              </div>
+            </van-uploader>
+          </div>
+          <div class="credentials_item ml2">
+            <div class="credentials_title">2. 法人身份证反面</div>
+            <van-uploader
+              accept="image/*"
+              v-model="idBackPhotoList"
+              :after-read="idBackPhotoHandler"
+              :max-size="5 * 1024 * 1024"
+              max-count="1">
+              <div class="custom-background">
+                <img src="@/assets/supplier/idCardBack.png" alt="">
+              </div>
+            </van-uploader>
+          </div>
+          <div class="credentials_item ml2">
+            <div class="credentials_title">3. 营业执照</div>
+            <van-uploader
+              accept="image/*"
+              v-model="companyPhotoList"
+              :after-read="companyPhotoHandler"
+              :max-size="5 * 1024 * 1024"
+              max-count="1">
+              <div class="custom-background">
+                <img src="@/assets/supplier/companyPhoto.png" alt="">
+              </div>
+            </van-uploader>
+          </div>
+        </div>
+      </div>
+      <div class="company_info">
+        <img class="title2" src="@/assets/supplier/title2.png" alt="">
+        <div class="company_wrap">
+          <van-form>
+            <van-field :border="true" v-model="form.supplierName" class="required" name="supplierName" label="服务商名称" placeholder="请输入"  :rules="[{ required: true, message: '请输入服务商名称' }]" />
+            <van-field :border="true" v-model="form.supplierName" class="required" name="supplierName" label="法人名称" placeholder="请输入"  :rules="[{ required: true, message: '请输入法人名称' }]" />
+            <van-field :border="true" v-model="form.supplierName" class="required" name="supplierName" label="联系人姓名" placeholder="请输入"  :rules="[{ required: true, message: '请输入联系人姓名' }]" />
+            <van-field :border="true" v-model="form.supplierName" class="required" name="supplierName" label="联系电话" placeholder="请输入"  :rules="[{ required: true, message: '请输入联系电话' }]" />
+            <van-field :border="true" v-model="form.supplierName" class="required" name="supplierName" label="服务能力" placeholder="请输入"  :rules="[{ required: true, message: '请选择服务能力' }]" />
+            <van-field :border="true" v-model="form.supplierName" class="required" name="supplierName" label="服务能力"  :rules="[{ required: true, message: '请选择服务能力' }]">
+              <template #input>
+                <el-tree
+                  show-checkbox
+                  node-key="id"
+                  ref="tree"
+                  :highlight-current="true"
+                  :expand-on-click-node="false"
+                  :data="supplierServiceList"
+                  :props="defaultProps">
+                </el-tree>
+              </template>
+            </van-field>
+            <van-field :border="true" v-model="form.supplierName" class="required" name="supplierName" label="拖车数量" placeholder="请输入"  :rules="[{ required: true, message: '请输入拖车数量' }]" />
+            <van-field :border="true" v-model="form.supplierName" class="required" name="supplierName" label="抢修车数量" placeholder="请输入"  :rules="[{ required: true, message: '请输入抢修车数量' }]" />
+            <van-field name="supplierName" class="required" label="服务区域" placeholder="请选择"  :rules="[{ required: true, message: '请选择服务区域' }]">
+              <template #input>
+                <span @click="areaShow = true">省/市/区</span>
+              </template>
+            </van-field>
+          </van-form>
+          <div class="wei_code_wrap">
+            <div class="wei_title">请先添加企业微信，保证申请流程正常进行。</div>
+            <div class="wei_code_bg">
+              <img v-if="qrCodeUrl" :src="qrCodeUrl" alt="企业微信二维码" />
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+    <div class="btn_wrap">
+      <div class="btn">
+        提交申请
+      </div>
+    </div>
+    <van-popup
+      v-model="areaShow"
+      position="bottom"
+    >
+      <van-area title="服务区域" :area-list="areaList" :columns-num="3"  closeable="true" :value="form.areaCode ? String(form.areaCode) : ''"
+                @cancel="areaShow = false" @confirm="confirmHandle"/>
+    </van-popup>
+  </div>
+</template>
+
+<script>
+  import QRCode from 'qrcode'
+  import { uploadImage, supplierServiceTree } from "@/api/mine"
+  import {myMixins} from "@/utils/myMixins"
+  import {areaList} from "@vant/area-data";
+  export default {
+    name: "supplierAdd",
+    mixins:[myMixins],
+    data() {
+      return {
+        id:'', //车辆Id
+        idBackPhotoList: [],
+        idBackPhoto: '',
+        idFrontPhotoList: [],
+        idFrontPhoto: '',
+        companyPhotoList: [],
+        companyPhoto: '',
+        form: {
+          supplierName: '',
+        },
+        qrCodeUrl: '',
+        areaShow: false,
+        areaList: areaList,
+        region: [],
+        supplierServiceList: [],
+        defaultProps: {
+          children: 'children',
+          label: 'name'
+        },
+      }
+    },
+    mounted() {
+      this.getQrCode();
+      this.getSupplierServiceTree();
+    },
+    methods: {
+      async getSupplierServiceTree(){
+        let res = await supplierServiceTree();
+        this.supplierServiceList=res.data
+      },
+      confirmHandle(val){
+        this.region=[]
+        val?.forEach(item => this.region.push(item.name))
+        let code=[]
+        val?.forEach(item => code.push(item.code))
+        this.form.areaCode=code[code.length - 1]
+        this.areaShow=false
+      },
+      async getQrCode() {
+        try {
+          this.qrCodeUrl = await QRCode.toDataURL('123123', {
+            width: 150,
+            margin: 2,
+            color: {
+              dark: '#000000',
+              light: '#FFFFFF'
+            },
+          })
+        } catch (error) {
+          console.error('生成二维码失败:', error)
+        }
+      },
+      async idBackPhotoHandler(file) {
+        const formData = new FormData();
+        formData.append("file" , file.file);
+        let res = await uploadImage(formData);
+        this.idBackPhoto = res.data
+      },
+      async idFrontPhotoHandler(file) {
+        const formData = new FormData();
+        formData.append("file" , file.file);
+        let res = await uploadImage(formData);
+        this.idFrontPhoto = res.data
+      },
+      async companyPhotoHandler(file) {
+        const formData = new FormData();
+        formData.append("file" , file.file);
+        let res = await uploadImage(formData);
+        this.companyPhoto = res.data
+      }
+    },
+    computed: {
+      regionText() {
+        return this.region.length ? `${this.region[0]}/${this.region[1]}/${this.region[2]}` : '请选择所在地区';
+      }
+    },
+  }
+</script>
+
+<style scoped lang="scss">
+  @import "@/styles/mixin.scss";
+  @import "@/styles/common.scss";
+  .wrap{
+    @include wh(100%,100%);
+    box-sizing: border-box;
+    padding-bottom: 100px;
+    overflow-y: auto;
+  }
+.top_banner {
+  width: 100%;
+  img {
+    width: 100%;
+    height: 169px;
+  }
+}
+.content_wrap {
+  padding: 0 20px;
+}
+.credentials_info {
+  height: 170px;
+}
+.credentials_wrap {
+  display: flex;
+  width: 100%;
+  margin-top: 10px;
+  .credentials_item {
+    width: 32%;
+    text-align: center;
+    .credentials_title {
+      font-size: 12px;
+      color: #4A4A4A;
+      padding: 10px 0;
+    }
+    .custom-background img {
+      width: 97px;
+      height: 64px;
+    }
+  }
+  .ml2 {
+    margin-left: 2%;
+  }
+}
+::v-deep .van-uploader__preview-image {
+  width: 97px;
+  height: 64px;
+}
+.title1 {
+  width: 106px;
+  height: 19px;
+  margin-top: 25px;
+}
+.title2 {
+  width: 90px;
+  height: 18px;
+  margin-top: 25px;
+  margin-bottom: 10px;
+}
+.van-cell.required::before{
+  content: "＊";
+  position: absolute;
+  color: #F00;
+  left: 0px;
+  top: .25rem;
+  font-size: .3rem;
+}
+  .wei_code_wrap {
+    .wei_title {
+      font-size: 15px;
+      color: #FF553B;
+      text-align: center;
+    }
+    .wei_code_bg {
+      width: 163px;
+      height: 173px;
+      background-image: url("~@/assets/supplier/weiCodeBg.png");
+      background-size: 100% 100%;
+      margin: 8px auto;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+    }
+  }
+
+  .btn_wrap {
+    width: 100%;
+    padding: 15px 0;
+    position: fixed;
+    bottom: 0;
+    background: #F7F7F9;
+    box-shadow: 0px -7px 24px 0px rgba(0, 0, 0, 0.11);
+    z-index: 10000 !important;
+    .btn {
+      width: calc(100% - 80px);
+      margin-left: 40px;
+      height: 46px;
+      background: #0E76F4;
+      border-radius: 5px;
+      font-size: 15px;
+      color: #FFFFFF;
+      text-align: center;
+      line-height: 46px;
+    }
+  }
+
+</style>

src/views/index/supplierInfo.vue

@@ -0,0 +1,226 @@
+<template>
+  <div>
+    <div class="nav_bar_bg status_danger">
+      <template v-if="false">
+        <div class="status_wrap">
+          <img class="wait_icon" src="@/assets/supplier/waitIcon.png" alt="">
+          <span class="wait_status">审批中</span>
+        </div>
+      </template>
+      <template v-if="false">
+        <div class="status_wrap">
+          <img class="wait_icon" src="@/assets/supplier/successIcon.png" alt="">
+          <span class="wait_status success_status">恭喜你，审核通过！</span>
+        </div>
+      </template>
+      <template>
+        <div class="status_wrap">
+          <img class="wait_icon" src="@/assets/supplier/failIcon.png" alt="">
+          <span class="wait_status danger_status">审核不通过</span>
+        </div>
+        <div class="danger_tip">
+          不知道是多是少，就按照这样给字号了不知道不知道是多是少，就按照这样给字号了不知道不知道是多是少，就按照这样给字号了不知道
+        </div>
+      </template>
+    </div>
+    <div class="supplier_content">
+      <div class="credentials_info">
+        <div class="common_title">证件照信息</div>
+        <div class="credentials_wrap">
+          <div class="credentials_item">
+            <div class="credentials_title">1. 法人身份证正面</div>
+            <img src="@/assets/supplier/idCardPerson.png" alt="">
+          </div>
+          <div class="credentials_item ml2">
+            <div class="credentials_title">2. 法人身份证反面</div>
+            <img src="@/assets/supplier/idCardPerson.png" alt="">
+          </div>
+          <div class="credentials_item ml2">
+            <div class="credentials_title">3. 营业执照</div>
+            <img src="@/assets/supplier/idCardPerson.png" alt="">
+          </div>
+        </div>
+      </div>
+      <div class="company_info">
+        <div class="common_title">公司信息</div>
+        <div class="info_wrap">
+          <div class="info_item">
+            <div class="label">服务商名称：</div>
+            <div class="content">苏州速道汽车服务有限公司</div>
+          </div>
+          <div class="info_item">
+            <div class="label">法人姓名：</div>
+            <div class="content">666</div>
+          </div>
+          <div class="info_item">
+            <div class="label">联系人姓名：</div>
+            <div class="content">666</div>
+          </div>
+          <div class="info_item">
+            <div class="label">联系电话：</div>
+            <div class="content">666</div>
+          </div>
+          <div class="info_item">
+            <div class="label">服务能力：</div>
+            <div class="content service_color">拖车服务、抢修服务</div>
+          </div>
+          <div class="info_item">
+            <div class="label">拖车数量：</div>
+            <div class="content">23</div>
+          </div>
+          <div class="info_item">
+            <div class="label">抢修车数量：</div>
+            <div class="content">12</div>
+          </div>
+          <div class="info_item">
+            <div class="label">服务区域：</div>
+            <div class="content">省/市/区</div>
+          </div>
+        </div>
+      </div>
+      <div class="btn_wrap">
+        修改信息
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+  import {myMixins} from "@/utils/myMixins"
+  export default {
+    name: "supplierInfo",
+    mixins:[myMixins],
+    data() {
+      return {
+        id:'', //车辆Id
+      }
+    }
+  }
+</script>
+
+<style scoped lang="scss">
+  .nav_bar_bg {
+    width: 100%;
+    height: 125px;
+    padding-top: 50px;
+  }
+  .status_wait {
+    background: linear-gradient( 180deg, #FFE4C9 0%, rgba(255,248,233,0) 100%);
+  }
+  .status_success {
+    background: linear-gradient( 180deg, #DAFFF8 0%, rgba(237,255,233,0) 100%);
+  }
+  .status_danger {
+    background: linear-gradient( 180deg, #FFE8DA 0%, rgba(255,233,233,0) 100%);
+  }
+  .status_wrap {
+    display: flex;
+    align-items: center;
+    .wait_icon {
+      width: 34px;
+      height: 34px;
+      margin-left: 31px;
+    }
+    .wait_status {
+      color: #E69B0B;
+      font-weight: 600;
+      font-size: 16px;
+      margin-left: 11px;
+    }
+    .success_status {
+      color: #37B864;
+    }
+    .danger_status {
+      color: #ED440C;
+    }
+  }
+  .danger_tip {
+    font-size: 12px;
+    color: #FF553B;
+    line-height: 18px;
+    padding-left: 38px;
+    padding-right: 23px;
+    margin-top: 5px;
+  }
+  .supplier_content {
+    padding: 0 24px;
+    width: 100%;
+    box-sizing: border-box;
+  }
+  .common_title {
+    font-weight: 500;
+    font-size: 14px;
+    color: rgba(50, 54, 67, 0.66);
+    padding-left: 2px;
+  }
+  .common_title::after {
+    content: '';
+    display: block;
+    width: 100%;
+    border: 1px solid;
+    margin-top: 10px;
+    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;
+  }
+  .credentials_wrap {
+    display: flex;
+    width: 100%;
+    margin-top: 10px;
+    .credentials_item {
+      width: 32%;
+      text-align: center;
+      .credentials_title {
+        font-size: 12px;
+        color: #4A4A4A;
+        padding: 10px 0;
+      }
+      img {
+        width: 97px;
+        height: 64px;
+      }
+    }
+    .ml2 {
+      margin-left: 2%;
+    }
+  }
+  .company_info {
+    margin-top: 20px;
+    .company_wrap {
+      .info_wrap {
+        margin-top: 10px;
+        .info_item {
+          display: flex;
+          padding: 10px 2px;
+          .label {
+            font-size: 13px;
+            color: rgba(50, 54, 67, 0.6);
+            width: 90px;
+            flex-shrink: 0;
+          }
+          .content {
+            font-size: 13px;
+            color: #323643;
+            /*font-weight: bold;*/
+            flex: 1;
+          }
+          .service_color {
+            color: rgba(230, 155, 11, 0.9);
+          }
+        }
+      }
+    }
+  }
+  .btn_wrap {
+    width: calc(100% - 80px);
+    height: 46px;
+    position: fixed;
+    bottom: 20px;
+    left: 40px;
+    background: #0E76F4;
+    border-radius: 5px;
+    font-size: 15px;
+    color: #FFFFFF;
+    text-align: center;
+    line-height: 46px;
+  }
+</style>

src/views/index/vehicleAdd.vue

@@ -72,7 +72,7 @@
   <div class="itemContent">
     <div class="titleType">
       <img class="startImg" src="@/assets/start.png" />
-      <span>车辆类型</span>
+      <span>车辆类别</span>
     </div>
 <!--
     <select
@@ -95,6 +95,7 @@
         multiple
         :multiple-limit="isMultiple ? 2 : 1"
         v-model="selectedOption"
+        :disabled="vehicleInfoDisabled"
         value-key="name"
         class="elSelect"
         collapse-tags="collapse-tags"
@@ -111,6 +112,30 @@
     </el-select>
 
   </div>
+  <div class="itemContent">
+    <div class="titleType">
+      <img class="startImg" src="@/assets/start.png" />
+      <span>车辆属性</span>
+    </div>
+    <el-select
+      v-model="virtualVehicle"
+      value-key="name"
+      class="elSelect"
+      collapse-tags="collapse-tags"
+      :disabled="vehicleInfoDisabled"
+      placeholder="请选择"  style="width: 55%"
+    >
+      <el-option
+        v-for="item in virtualVehicleOptions"
+        :key="item.name"
+        :label="item.name"
+        :value="item.value"
+      >
+      </el-option>
+    </el-select>
+
+  </div>
+  <div class="lineBot"></div>
   <div class="itemContent">
     <div class="titleType">
       <span>牌照</span>
@@ -134,7 +159,7 @@
 
   </div>
   <div class="lineBot"></div>
-  <div class="itemContent">
+  <!--<div class="itemContent">
     <div class="titleType">
       <img class="startImg" src="@/assets/start.png" />
       <span>是否参与聚合</span>
@@ -160,7 +185,115 @@
       </van-radio-group>
     </div>
   </div>
+  <div class="lineBot"></div>-->
+  <div class="itemContent">
+    <div class="titleType">
+      <img class="startImg" src="@/assets/start.png" />
+      <span>车辆状态</span>
+    </div>
+    <div class="isJoin">
+      <van-radio-group v-model="vehicleStatus"  :class="{ 'disabled-tree': vehicleInfoDisabled }" :disabled="vehicleInfoDisabled" @change="isVehicleChange"  class="joinWrap">
+        <van-radio :name="1" style="margin-right: 26px">
+          启用
+          <img
+            slot="icon"
+            slot-scope="props"
+            :src="props.checked ? activeIcon : inactiveIcon"
+          >
+        </van-radio>
+        <van-radio :name="2">
+          停用
+          <img
+            slot="icon"
+            slot-scope="props"
+            :src="props.checked ? activeIcon : inactiveIcon"
+          >
+        </van-radio>
+      </van-radio-group>
+    </div>
+  </div>
+  <div class="itemContent">
+    <div class="titleType">
+      <img class="startImg" src="@/assets/start.png" />
+      <span>救援职业责任险</span>
+    </div>
+    <div class="isJoin">
+      <van-radio-group v-model="hasLiabilityInsurance" @change="isChange"  class="joinWrap">
+        <van-radio :name="1" style="margin-right: 26px">
+          有
+          <img
+            slot="icon"
+            slot-scope="props"
+            :src="props.checked ? activeIcon : inactiveIcon"
+          >
+        </van-radio>
+        <van-radio :name="0">
+          无
+          <img
+            slot="icon"
+            slot-scope="props"
+            :src="props.checked ? activeIcon : inactiveIcon"
+          >
+        </van-radio>
+      </van-radio-group>
+    </div>
+  </div>
   <div class="lineBot"></div>
+  <template v-if="hasLiabilityInsurance == 1">
+    <div class="itemContent">
+      <div class="titleType">
+        <img class="startImg" src="@/assets/start.png" />
+        <span>保单</span>
+      </div>
+      <van-uploader
+        v-model="insurancePictureFiles"
+        :after-read="insurancePictureFilesHandler"
+        max-count="1"
+        :preview-size="54"
+        accept="image "
+      />
+    </div>
+    <div class="lineBot"></div>
+    <div class="itemContent">
+      <div class="titleType">
+        <img class="startImg" src="@/assets/start.png" />
+        <span>承保保司</span>
+      </div>
+      <el-select
+        v-model="insuranceCorp"
+        value-key="name"
+        class="elSelect"
+        collapse-tags="collapse-tags"
+        placeholder="请选择"  style="width: 55%"
+      >
+        <el-option
+          v-for="item in insuranceOptions"
+          :key="item.name"
+          :label="item.name"
+          :value="item.value"
+        >
+        </el-option>
+      </el-select>
+    </div>
+    <div class="lineBot"></div>
+    <div class="itemContent">
+      <div class="titleType">
+        <img class="startImg" src="@/assets/start.png" />
+        <span>保险有效期</span>
+      </div>
+      <el-input style="width: 55%" readonly @focus="showDatePicker = true"  v-model="dateVal"  placeholder="请选择发布日期" :class="{'customSel':true,'customInput':true , 'has-value': dateVal }" >
+        <template #suffix>
+          <i
+            v-if="dateVal"
+            class="el-icon-circle-close el-input__icon"
+            @click="dateVal = ''"
+          ></i>
+        </template>
+      </el-input>
+    </div>
+  </template>
+
+
   <div class="itemContent">
     <div class="titleType">
       <img class="startImg" src="@/assets/start.png" />
@@ -168,28 +301,40 @@
     </div>
   </div>
   <div class="serviceType">
-
+    <el-tree
-    <div class="trailerService" v-for="(item,index) in supplierServiceList" :key="index">
+      show-checkbox
-      <div class="serviceline"  @click="loadAll(index)">
+      node-key="id"
-        <img  :ref="'serviceline' + index" :src="imageUrl" style="width: 20px;height: 15px" >
+      ref="tree"
-        <span  class="service">{{ item.name }}:</span>
+      :highlight-current="true"
-        <span class="line"></span>
+      :expand-on-click-node="false"
-      </div>
+      :class="{ 'disabled-tree': vehicleInfoDisabled }"
-      <div :ref="'checkboxGroup' + index"  class="checkbox-group">
+      :data="supplierServiceList"
-        <van-checkbox-group  v-model="serviceIds" v-for="(item2,index2) in item.children" :key="index2" class="radioWrap">
+      :props="defaultProps">
-          <van-checkbox class="item" :name="item2.id">{{item2.name }}</van-checkbox>
+    </el-tree>
-        </van-checkbox-group>
+      <!--<div class="trailerService" v-for="(item,index) in supplierServiceList" :key="index">
-      </div>
+        <div class="serviceline"  @click="loadAll(index)">
-
+          <img  :ref="'serviceline' + index" :src="imageUrl" style="width: 20px;height: 15px" >
-    </div>
+          <span  class="service">{{ item.name }}:</span>
+          <span class="line"></span>
+        </div>
+        <div :ref="'checkboxGroup' + index"  class="checkbox-group">
+          <van-checkbox-group  v-model="serviceIds" v-for="(item2,index2) in item.children" :key="index2" class="radioWrap">
+            <van-checkbox class="item" :name="item2.id">{{item2.name }}</van-checkbox>
+          </van-checkbox-group>
+        </div>
+      </div>-->
   </div>
   <two-common-btn class="btn" @cancelClick="h5GoBack" @submitClick="submitBtn" />
+  <van-calendar v-model="showDatePicker"  :min-date="minDate"
+                :max-date="maxDate" type="range" @confirm="onConfirm" />
 </div>
 </div>
 </template>
 
 <script>
   // uploadImage
+  import {Dialog} from "vant";
+  import {formatDate1} from "@/utils/common"
 import {myMixins} from "@/utils/myMixins"
 import {vehicleTypeList,saveVehicle,getInfoById,supplierServiceTree, uploadImage, ocrHandler} from "@/api/mine"
 import TwoCommonBtn from "@/components/twoBtnCommon.vue"
@@ -199,8 +344,20 @@ export default {
   mixins:[myMixins],
   data(){
     return{
+      defaultProps: {
+        children: 'children',
+        label: 'name'
+      },
+      minDate: new Date(1970, 0, 1),  // 设置最小可选日期（1970年1月1日）
+      maxDate: new Date(2099, 11, 31), // 设置最大可选日期（2099年12月31日）
+      checkList: [],
+      virtualVehicle: '',
+      vehicleStatus: '',
+      showDatePicker: false,
+      dateVal: '',
       trailerService: '',//拖车服务
       isJoin:'',//是否参与
+      hasLiabilityInsurance: '',   // 有无责任险
       activeIcon: require('@/assets/check.png'),
       inactiveIcon: require('@/assets/uncheck.png'),
       // result: [],
@@ -218,15 +375,19 @@ export default {
       vehicleLicenseBackList: [],
       vehicleLicenseCarPhotoList: [],
       vehicleFrontPhotoList: [],
+      insurancePictureFiles: [],
       vehicleLicenseFront: '',  // 行驶证首页
       vehicleLicenseBack: '',   // 行驶证副页
       vehicleLicenseCarPhoto: '',  // 行驶证车辆照片
       vehicleFrontPhoto: '',    // 车头照
+      insurancePicturePhoto: '',    // 保单照片
       vehicleLicenseInfo: {},
       vehicleLicenseBackOcrFlag: false,   // 行驶证副页 修改时默认不需要 ocr识别
       isMultiple: false,     // 是否支持多选
       vehicleLicense:'',//牌照
       vehicleFrontLicensePlate:'',//车头照车牌号码
+      insuranceCorp: '',
+      auditStatus: '',
       vehicleTypes:[{
         name: '小修车',
         value: 1
@@ -244,7 +405,7 @@ export default {
           name:'牵引车',
           value: 5 },
         {
-          name:'大力神',
+          name:'随车吊平板车',
           value:6},
         {
           name:'充电车',
@@ -275,9 +436,70 @@ export default {
       }, {
         name: '其他',
         value: 5
+      }],
+      virtualVehicleOptions: [{
+        name: '自有车辆',
+        value: 1
+      }, {
+        name: '挂靠车辆',
+        value: 2
+      }, {
+        name: '虚拟车辆',
+        value: 3
+      }, {
+        name: '借入车辆',
+        value: 4
+      }],
+      insuranceOptions: [{
+        name: '太平洋',
+        value: 1
+      }, {
+        name: '人保',
+        value: 2
+      }, {
+        name: '平安',
+        value: 3
+      }, {
+        name: '中华联合',
+        value: 4
+      }, {
+        name: '大地',
+        value: 5
+      }, {
+        name: '阳光',
+        value: 6
+      }, {
+        name: '太平',
+        value: 7
+      }, {
+        name: '人寿',
+        value: 8
+      }, {
+        name: '永安',
+        value: 9
+      }, {
+        name: '华安',
+        value: 10
+      }, {
+        name: '申能',
+        value: 11
+      }, {
+        name: '大家',
+        value: 12
+      }, {
+        name: '富德',
+        value: 13
+      }, {
+        name: '其他',
+        value: 14
       }]
     }
   },
+  computed: {
+    vehicleInfoDisabled() {
+      return [1,2].includes(this.auditStatus)
+    },
+  },
   watch:{
     selectedOption(newVal){
       if(newVal == 4){
@@ -297,7 +519,7 @@ export default {
         this.vehicleTypes[8].disabled=false
         this.vehicleTypes[9].disabled=false
       }
-      if (newVal == 1 || newVal == 7){
+      if (newVal == 1 || newVal == 7 || newVal == 9){
         let arr = []
         this.supplierServiceList.forEach((item)=>{
           if(!(item.name == '拖车服务' || item.name == '大型车救援')){
@@ -321,6 +543,25 @@ export default {
     }
   },
   methods:{
+    formatDate(date) {
+      return `${date.getFullYear()}/${date.getMonth() + 1}/${date.getDate()}`;
+    },
+    onConfirm(date) {
+      const [start, end] = date;
+      this.showDatePicker = false;
+      this.dateVal = `${this.formatDate(start)} - ${this.formatDate(end)}`;
+    },
+    formatDateTimeRange(str) {
+      const [startStr, endStr] = str.split(' - ').map(s => s.trim());
+      const startDate = new Date(startStr);
+      const startTime = `${startDate.getFullYear()}-${(startDate.getMonth() + 1).toString().padStart(2, '0')}-${startDate.getDate().toString().padStart(2, '0')} 00:00:00`;
+      const endDate = new Date(endStr);
+      const endTime = `${endDate.getFullYear()}-${(endDate.getMonth() + 1).toString().padStart(2, '0')}-${endDate.getDate().toString().padStart(2, '0')} 23:59:59`;
+      return {
+        startTime,
+        endTime
+      };
+    },
     setDefault() {
       if( this.vehicleLicenseInfo?.vehicleType?.includes('小型') || this.vehicleLicenseInfo?.vehicleType?.includes('微型') || this.vehicleLicenseInfo?.vehicleType?.includes('普通') || this.vehicleLicenseInfo?.vehicleType?.includes('摩托') ) {
         this.vehicleTypes.map(item => {
@@ -331,6 +572,14 @@ export default {
           }
         })
         this.$forceUpdate();
+      } else if( this.vehicleLicenseInfo?.vehicleType?.includes('载货') || this.vehicleLicenseInfo?.vehicleType?.includes('中型') || this.vehicleLicenseInfo?.vehicleType?.includes('重型')) {
+        this.vehicleTypes.map(item => {
+          if( item.value == 1 || item.value == 9 ) {
+            item.disabled = true;
+          } else {
+            item.disabled = false;
+          }
+        })
       } else {
         this.vehicleTypes.map(item => {
           item.disabled = false;
@@ -379,6 +628,12 @@ export default {
       this.vehicleFrontPhoto = res.data;
       await this.ocrCarFrontHandler()
     },
+    async insurancePictureFilesHandler(file) {
+      const formData = new FormData();
+      formData.append("file" , file.file);
+      let res = await uploadImage(formData);
+      this.insurancePicturePhoto = res.data;
+    },
     async ocrCarFrontHandler() {     // 车辆正面 orc 识别
       let res = await ocrHandler({
         ocrType: 10,
@@ -420,8 +675,21 @@ export default {
         this.vehicleLicenseInfo.issueDate = frontInfo?.issueDate;
         this.vehicleLicenseInfo.issueAuthority = frontInfo?.seal;
         this.setDefault();
+        this.checkDisabledItems();
       }
     },
+    checkDisabledItems() {
+      let _arr = [];
+      this.selectedOption.map(item => {
+        let _tempArr = this.vehicleTypes.filter(_item => _item.disabled && _item.value == item);
+        _arr = [..._arr, ..._tempArr]
+      })
+      if (_arr.length > 0) {
+        this.$toast(`车辆类别数据不合法：${_arr.map(item => item.name).join('、')}`)
+        return false
+      }
+      return  true
+    },
     async vehicleBackOcrHandler() {     // 行驶证副页 ocr 识别
       this.vehicleLicenseInfo.recordNumber = '';
       this.vehicleLicenseInfo.passengerCapacity = '';
@@ -493,14 +761,23 @@ export default {
       this.selectedOption=result.vehicleType?.split(',').map((item)=>{
         return Number(item);
       });
-      this.serviceIds=result.serviceIds
+      this.auditStatus = result.auditStatus;
+      this.virtualVehicle = result.virtualVehicle;
+      this.$refs.tree.setCheckedKeys(result.serviceIds)
+      this.vehicleStatus = result.vehicleStatus
       this.vehicleLicenseFront = result.vehicleLicenseFront;
       this.vehicleLicenseBack = result.vehicleLicenseBack;
       this.vehicleFrontPhoto = result.vehicleFrontPhoto;
+      this.insurancePicturePhoto = result.insurancePicturePhoto;
       this.vehicleLicenseInfo = result.vehicleLicenseInfo;
       this.vehicleLicenseCarPhoto = result.vehicleLicenseCarPhoto;
       this.vehicleLicense = result.vehicleLicense;
       this.vehicleFrontLicensePlate = result.vehicleFrontLicensePlate;
+      this.hasLiabilityInsurance = result.hasLiabilityInsurance
+      this.insuranceCorp = result.insuranceCorp;
+      if(this.insurancePicturePhoto) {
+        this.insurancePictureFiles = [{url: this.insurancePicturePhoto}]
+      }
       if( this.vehicleLicenseFront ) {
         this.vehicleLicenseFrontList = [{ url : this.vehicleLicenseFront }];
       }
@@ -513,9 +790,28 @@ export default {
       if(this.vehicleLicenseCarPhoto) {
         this.vehicleLicenseCarPhotoList = [{ url : this.vehicleLicenseCarPhoto }];
       }
+      if(this.vehicleLicenseCarPhoto) {
+        this.vehicleLicenseCarPhotoList = [{ url : this.vehicleLicenseCarPhoto }];
+      }
+      if( result.liabilityInsuranceEndTime && result.liabilityInsuranceStartTime ) {
+        this.dateVal =  formatDate1(result.liabilityInsuranceStartTime) + ' - ' + formatDate1(result.liabilityInsuranceEndTime)
+      }
     },
     isChange(e){
-      this.isJoin=e
+      this.hasLiabilityInsurance=e
+      if (e === 0) {
+        Dialog.confirm({
+          title: '提醒',
+          message: '有救援职业责任险车辆会提升案件聚合能力和接单能力。',
+          confirmButtonText: '我已知晓', // 确认按钮文字，默认为“确认”
+          showCancelButton: false // 是否显示取消按钮，默认为 true。如果不需要取消按钮，可以设置为 false。
+        })
+        .then(() => { /* 确认后的操作 */ })
+        .catch(() => { /* 取消后的操作 */ });
+      }
+    },
+    isVehicleChange(e) {
+      this.vehicleStatus=e
     },
     async submitBtn(){
         if( !this.vehicleLicenseFront ) {
@@ -543,18 +839,51 @@ export default {
         return
       }
       if(!(this.selectedOption.length > 0)){
-        this.$toast('车辆类型不能为空')
+        this.$toast('车辆类别不能为空')
+        return
+      }
+      let res = this.checkDisabledItems();
+      if(!res) {
+        return false
+      }
+      if( !this.virtualVehicle ) {
+        this.$toast('车辆属性不能为空')
+        return
+      }
+      if( !this.vehicleStatus ) {
+        this.$toast('车辆状态不能为空')
+        return
+      }
+      if(this.hasLiabilityInsurance === null || this.hasLiabilityInsurance === undefined || this.hasLiabilityInsurance === '') {  // 有职业责任险，就需要有保单照片
+        this.$toast('救援职业责任险不能为空')
+        return
+      }
+      if(!this.insurancePicturePhoto && this.hasLiabilityInsurance == 1) {  // 有职业责任险，就需要有保单照片
+        this.$toast('保单照片不能为空')
         return
       }
       if(this.selectedOption?.length==1 && this.selectedOption.includes(1)){//选择小修车时需清除原本的拖车服务类型
         let data=this.oldSupplierServiceList.filter(item => item.name ==='拖车服务')
         this.serviceIds = this.serviceIds.filter(item => !data[0].children.some(obj => obj.id === item));
       }
+      if(!this.insuranceCorp && this.hasLiabilityInsurance == 1) {  // 有职业责任险，就需要有保单照片
+        this.$toast('承保保司不能为空')
+        return
+      }
+      if(!this.dateVal && this.hasLiabilityInsurance == 1) {  // 有职业责任险，就需要有保单照片
+        this.$toast('保单有效期不能为空')
+        return
+      }
+      let timeObj;
+      if(this.dateVal) {
+        timeObj = this.formatDateTimeRange(this.dateVal)
+      }
+      this.serviceIds = this.$refs.tree.getCheckedKeys(true)
       await saveVehicle({
           vehicleId:this.id ? this.id : '',
           plateNumber:this.carNum ? this.carNum :'',
           vehicleType:this.selectedOption?.length>0 ? this.selectedOption.join(',') : '',
-          hasPolymerization:this.isJoin,
+          // hasPolymerization:this.isJoin,
           serviceIds:this.serviceIds ? this.serviceIds : [],
           vehicleLicenseFront: this.vehicleLicenseFront,
           vehicleLicenseBack: this.vehicleLicenseBack,
@@ -563,6 +892,12 @@ export default {
           vehicleLicenseCarPhoto: this.vehicleLicenseCarPhoto,
           vehicleLicense: this.vehicleLicense,
           vehicleFrontLicensePlate:this.vehicleFrontLicensePlate,
+          hasLiabilityInsurance: this.hasLiabilityInsurance,
+          insurancePicturePhoto: this.hasLiabilityInsurance == 1 ? this.insurancePicturePhoto : '',
+          insuranceCorp: this.hasLiabilityInsurance == 1 ? this.insuranceCorp : '',
+          liabilityInsuranceStartTime: this.hasLiabilityInsurance == 1 ? (timeObj?.startTime || '' ) : '',
+          liabilityInsuranceEndTime: this.hasLiabilityInsurance == 1 ? (timeObj?.endTime || '') : '',
+          virtualVehicle: this.virtualVehicle,
         })
         if(this.id){
           this.$toast('修改成功')
@@ -685,4 +1020,8 @@ export default {
   border: none !important;
   text-align: right !important;
 }
+.disabled-tree {
+  pointer-events: none;
+  opacity: 0.6;
+}
 </style>

src/views/index/vehicleManage.vue

@@ -18,36 +18,101 @@
       </template>
     </van-nav-bar>
   </div>
-  <van-pull-refresh v-model="isLoading" @refresh="onRefresh">
+  <van-search
-    <van-list
+    v-model="searchVal"
+    show-action
+    placeholder="车辆名称/车牌号/车架号"
+    @search="resetHandler"
+  >
+    <template #action>
+      <div @click="resetHandler">搜索</div>
+    </template>
+  </van-search>
+  <div class="filterWrap">
+<!--    <div >-->
+      <!--<el-input v-model="searchVal" @blur="resetHandler" placeholder="车辆名称/车牌号/车架号" :class="{'customSel':true,'customInput':true , 'has-value': searchVal }" >
+        <template #suffix>
+          <i
+            v-if="searchVal"
+            class="el-icon-circle-close el-input__icon"
+            @click="searchVal = ''"
+          ></i>
+        </template>
+      </el-input>-->
+      <el-select @change="resetHandler" multiple :collapse-tags="true" v-model="inputStatusList" placeholder="录入状态" :class="{'customSel':true , 'has-value': inputStatusList }" clearable>
+        <el-option
+          v-for="item in inputStatusListOptions"
+          :key="item.value"
+          :label="item.name"
+          :value="item.value">
+        </el-option>
+      </el-select>
+<!--    </div>-->
+<!--    <div>-->
+      <el-select @change="resetHandler" multiple :collapse-tags="true" v-model="authStates" placeholder="认证状态" :class="{'customSel':true , 'has-value': authStates }" clearable>
+        <el-option
+          v-for="item in authStatesOptions"
+          :key="item.value"
+          :label="item.name"
+          :value="item.value">
+        </el-option>
+      </el-select>
+      <el-select @change="resetHandler" multiple :collapse-tags="true" v-model="liabilityInsuranceAuditList" placeholder="职业责任险" :class="{'customSel':true , 'has-value': liabilityInsuranceAuditList }" clearable>
+        <el-option
+          v-for="item in insuresOptions"
+          :key="item.value"
+          :label="item.name"
+          :value="item.value">
+        </el-option>
+      </el-select>
+<!--    </div>-->
+
+  </div>
+  <div class="wrap_cls">
+    <van-pull-refresh v-model="isLoading" @refresh="onRefresh">
+      <van-list
         v-model="loading"
         :finished="finished"
         finished-text="没有更多了"
         @load="onLoad"
-    >
+      >
-      <div class="carItem" v-for="(item,index) in vehicleList" :key="index">
+        <div class="carItem" v-for="(item,index) in vehicleList" :key="index" @click="updateVehicle(item)">
-        <div class="carCode">
+          <div class="carCode">
-          <div class="codeLeft">{{item.plateNumber}} / {{item.vehicleTypeString}}</div>
+            <div class="codeLeft">{{item.plateNumber}} / {{item.vehicleTypeString}}
-          <div class="twoBtn">
+              <span class="ml10" v-if="item.vehicleStatus" :class="{'insuranceSuccess': item.vehicleStatus == 1, 'insuranceDanger': item.vehicleStatus != 1}">{{ item.vehicleStatus == 1 ? '启用' : '停用' }} </span>
-            <button v-if="permissonList.includes('vehicleAddBtn')" class="del" @click="deleteItem(item.vehicleId)">删除</button>
+            </div>
-            <button v-if="permissonList.includes('vehicleModifyBtn')" class="revise" @click="updateVehicle(item)">修改</button>
           </div>
+          <div class="juhe flex-between">
+            <span class="zdJuhe">核验认证</span>
+            <span class="flex-right">
+            <span class="common_cls" v-if="item.inputStatusString" :class="getClass(item.inputStatusString)?.className">{{item.inputStatusString}}</span>
+            <span class="common_cls" v-if="item.authStateString" :class="getClass(item.authStateString)?.className">{{item.authStateString}}</span>
+          </span>
+          </div>
+          <div class="juhe flex-between">
+            <span class="zdJuhe">救援责任险</span>
+            <span class="flex-right" v-if="item.rescueInsurance">
+            <span class="common_cls" @click.stop="showTip(item.liabilityInsuranceAuditMsg)" :class="getClass(item.rescueInsurance)?.className">{{item.rescueInsurance}}</span>
+          </span>
+          </div>
+          <div class="juhe flex-between">
+            <span class="zdJuhe">最近登录时间</span>
+            <span class="flex-right">{{item.lastLoginTime}}</span>
+          </div>
+          <van-icon class="arrow_position" v-if="permissonList.includes('vehicleModifyBtn')" name="arrow" />
         </div>
-        <div class="carType">{{ item.serviceName }}</div>
-        <div class="juhe">
-          <span class="zdJuhe">是否参与中道聚合:        </span>
-          <span :class="item.hasPolymerization.code == 0  ? 'isYes' :'isNo'">{{item.hasPolymerization.label}}</span>
-        </div>
-      </div>
 
-    </van-list>
+      </van-list>
- </van-pull-refresh>
+    </van-pull-refresh>
+  </div>
+
   <van-dialog v-model="show" title="确定删除吗" show-cancel-button @confirm="handleConfirm"></van-dialog>
 </div>
 
 </template>
 
 <script>
+  import {Dialog} from "vant";
 import { myMixins} from "@/utils/myMixins";
 import {supplierVehicleList,deleteVehicle,userOperationPermissions} from "@/api/mine"
 export default {
@@ -64,14 +129,106 @@ export default {
       isLoading: false,
       loading: false,
       finished: false,
+      showPopover: false,
       permissonList:[],
+      inputStatusList: [],
+      searchVal: '',
+      authStates: [],
+      liabilityInsuranceAuditList: [],
+      inputStatusListOptions: [{
+        name: '行驶证未录入',
+        value: 0
+      },{
+        name: '行驶证核验通过',
+        value: 1
+      },{
+        name: '行驶证核验不通过',
+        value: 2
+      }],
+      authStatesOptions: [{
+        name: '车头照片未录入',
+        value: 1
+      },{
+        name: '车头照片认证通过',
+        value: 2
+      },{
+        name: '车头照片认证不通过',
+        value: 3
+      }],
+        insuresOptions: [{
+          name: '待审核',
+          value: 1
+        },{
+          name: '有责任险',
+          value: 2
+        },{
+          name: '有货物险',
+          value: 3
+        },{
+          name: '未通过',
+          value: 4
+        },{
+          name: '无',
+          value: 5
+        },{
+          name: '空',
+          value: 6
+        }],
     }
   },
   mounted() {
-    // this.getVehicleList();
     this.getPermissions();
   },
   methods:{
+    showTip(msg) {
+      Dialog.alert({
+        title: '未通过原因',
+        message: msg,
+      }).then(() => {
+      });
+    },
+    getClass(id) {
+      const ids = String(id)
+      const steps = {
+        '待审核': {
+          className: 'main_cls'
+        },
+        '有责任险': {
+          className: 'success_cls'
+        },
+        '有货物险': {
+          className: 'info_cls'
+        },
+        '未通过': {
+          className: 'danger_cls'
+        },
+        '无': {
+          className: 'default_cls'
+        },
+        '空': {
+          className: 'default_cls'
+        },
+        '行驶证未录入': {
+          className: 'default_cls'
+        },
+        '行驶证核验通过': {
+          className: 'success_cls'
+        },
+        '行驶证核验不通过': {
+          className: 'danger_cls'
+        },
+        '车头照未录入': {
+          className: 'default_cls'
+        },
+        '车头照认证通过': {
+          className: 'success_cls'
+        },
+        '车头照认证不通过': {
+          className: 'danger_cls'
+        }
+      }
+      return steps[ids] || { className: 'default_cls' }
+    },
     async onLoad(){
       await this.getVehicleList()
       this.pageNum++;
@@ -80,11 +237,12 @@ export default {
       // 数据全部加载完成
       if (this.vehicleList.length >= this.total) {
         this.finished = true;
+      } else {
+        this.finished = false;
       }
     },
-    onRefresh() {
+    async onRefresh() {
-      this.pageNum=1
+      await this.resetHandler()
-      // this.getVehicleList()
       setTimeout(() => {
         this.$toast('刷新成功');
         this.isLoading = false;
@@ -93,7 +251,11 @@ export default {
     async getVehicleList(){
         let result = await supplierVehicleList({
           pageNum:this.pageNum,
-          pageSize:this.pageSize
+          pageSize:this.pageSize,
+          searchVal: this.searchVal,
+          inputStatusList: this.inputStatusList,
+          authStates: this.authStates,
+          liabilityInsuranceAuditList: this.liabilityInsuranceAuditList,
         })
           this.total=result.total
           if(this.pageNum == 1){// 第一页直接赋值
@@ -121,13 +283,22 @@ export default {
       this.pageNum=1
       await this.getVehicleList();
     },
+    async resetHandler() {
+        this.pageNum=1
+        this.finished = false;
+        this.total = 0;
+        // this.vehicleList = [];
+        await this.getVehicleList();
+    },
     updateVehicle(item){//修改
-      this.$router.push({
+      if( this.permissonList.includes('vehicleModifyBtn') ) {
-        name:'vehicleAdd',
+        this.$router.push({
-        params:{
+          name:'vehicleAdd',
-          id:item.vehicleId
+          params:{
-        }
+            id:item.vehicleId
-      })
+          }
+        })
+      }
     },
 
   }
@@ -137,12 +308,41 @@ export default {
 <style scoped lang="scss">
 @import "@/styles/mixin.scss";
 @import "@/styles/common.scss";
+.ml10 {
+  margin-left: 10px;
+}
 .wrap{
   background: #F4F5F7;
-  @include sizingPadding(13px,13px);
   @include wh(100%, 100%);
   overflow-y: auto;
 }
+.wrap_cls {
+  width: 100%;
+  padding-left: 13px;
+  padding-right: 13px;
+  box-sizing: border-box;
+}
+.common_cls {
+  color: #fff;
+  padding: 4px 8px;
+  border-radius: 3px;
+  margin-right: 6px;
+}
+.default_cls {
+  background-color: #B0BEC5;
+}
+.danger_cls {
+  background-color: red;
+}
+.success_cls {
+  background-color: #4CAF50;
+}
+.info_cls {
+  background-color: #FF9800;
+}
+.main_cls {
+  background-color: #6C9BFF;
+}
 .navBar{
   margin-bottom: 46px;
   .rightWrap{
@@ -161,13 +361,14 @@ export default {
   }
 }
 .carItem{
-  @include wh(100%,86px);
+  @include wh(100%,120px);
   background: #FFFFFF;
   box-shadow: 0px 2px 10px 0px rgba(216,216,216,0.5);
   @include radiusSizing(6px);
   padding: 11px 13px 11px 15px;
   margin-bottom: 10px;
   @include flexBetween;
+  position: relative;
   .carCode{
     @include flexColBet;
     .codeLeft{
@@ -175,6 +376,7 @@ export default {
     }
     .twoBtn{
       display: flex;
+      align-items: center;
       button{
         border: none;
         padding: 4px  8px;
@@ -202,6 +404,11 @@ export default {
     opacity: .7;
     @include fontWeightSize(400,12px)
   }
+  .zdJuhe {
+    width: 80px;
+    text-align: right;
+    margin-left: -10px;
+  }
   .isYes{
     color: #09B820;
     @include fontWeightSize(400,12px);
@@ -211,4 +418,122 @@ export default {
     @include fontWeightSize(400,12px);
   }
 }
+.arrow_position {
+  position: absolute;
+  right: 5px;
+  top: 50px;
+  font-size: 20px;
+  opacity: 0.6;
+}
+  .mr10 {
+    margin-right: 10px;
+  }
+  .insuranceMain {
+    color: #354D93;
+  }
+  .insuranceSuccess {
+    color: green;
+  }
+  .insuranceTip {
+    color: orange;
+  }
+  .insuranceDanger {
+    color: red;
+  }
+  .flex-between {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+  }
+
+.filterWrap {
+  width: 100%;
+  padding-right: 13px;
+  padding-left: 13px;
+  display: flex;
+  overflow-x: auto; /* 允许横向滚动 */
+  white-space: nowrap; /* 防止子元素换行 */
+  padding-bottom: 10px;
+  -webkit-overflow-scrolling: touch; /* 在iOS上平滑滚动 */
+  scrollbar-width: none; /* Firefox */
+  padding-bottom: 10px;
+  /*padding: 10px;*/
+  margin-bottom: 10px;
+  background-color: #fff;
+  box-sizing: border-box;
+  &::-webkit-scrollbar {
+    display: none; /* Chrome/Safari */
+  }
+  .customSel {
+    flex: 0 0 auto; /* 防止子元素被压缩 */
+    width: calc(33% - 5px);
+    /*width: 100%;*/
+    height: 25px;
+    background: #F5F5F5;
+    border-radius: 4px;
+    font-size: 10px;
+    color: #323233;
+    margin-right: 5px;
+    ::v-deep .el-input__inner{
+      padding: 0 2px;
+      height: 25px;
+      font-size: 10px;
+      background: #F5F5F5;
+      border-radius: 4px;
+      border: none;
+    }
+    ::v-deep .el-input__icon{
+      line-height: 25px;
+      font-size: 10px;
+      width: 18px;
+      color: #2A5094;
+    }
+    ::v-deep .el-input__suffix{
+      right: 2px;
+    }
+  }
+  .customInput{
+    /*width: 49%;*/
+    width: 130px;
+  }
+  .has-value  ::v-deep .el-input__inner{
+    background: #F1F6FF ;
+    color: #007BE9;
+    font-weight: bold;
+    padding-left: 8px;
+  }
+  .has-value ::v-deep .el-input__icon{
+    color: #007BE9;
+  }
+  .priceSel{
+    display: flex;
+    justify-content: space-around;
+    align-items: center;
+    color: #C0C4CC;
+    .iconSpan{
+      display: flex;
+      flex-direction: column;
+      justify-content: center;
+      align-items: center;
+      font-size: 8px;
+    }
+  }
+  .has-price{
+    color: #007BE9 !important;
+  }
+}
+
+::v-deep .el-select .el-select__tags>span {
+  display: flex;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+  .flex-right {
+    display: flex;
+    flex: 1;
+    justify-content: flex-start;
+    margin-left: 10px;
+  }
+
 </style>

src/views/kpi/kpiIndex.vue

@@ -112,38 +112,28 @@
           <circle-char v-show="showScoreChart"  ref="Doughnut7" :data="indexData && indexData.score" :bg-color="Number(indexData?.score || 0) >= 60 ? 'green' : 'red'" :is-store="true"></circle-char>
           <div  v-show="!showScoreChart"  class="detailScore">
             <div class="left">
-              <div>
+<!--              <div><span class="defen">接单得分:</span></div>-->
-                <span class="defen">接单得分:</span>
+              <div><span class="defen">接单时效得分:</span></div>
-              </div>
+              <div><span class="defen">到达时效得分:</span></div>
-              <div>
+              <div><span class="defen">聚合成功率得分:</span></div>
-                <span class="defen">接单时效得分:</span>
+              <div><span class="defen">APP使用率得分:</span></div>
-              </div>
+              <div><span class="defen">催促率得分:</span></div>
-              <div>
+              <div><span class="defen">投诉率得分:</span></div>
-                <span class="defen">接单时效得分:</span>
+              <div><span class="defen">超时率得分:</span></div>
-              </div>
+              <div><span class="defen">拒单率得分:</span></div>
-              <div><span class="defen">聚合成功率得分:</span>
+              <div><span class="defen">3'联系率得分:</span></div>
-              </div>
-              <div><span class="defen">APP使用率得分:</span>
-              </div>
-              <div><span class="defen">催促率得分:</span>
-              </div>
-              <div><span class="defen">投诉率得分:</span>
-              </div>
             </div>
             <div class="right">
-              <div>
+<!--              <div><span>{{ indexData.orderScore }}</span></div>-->
-                <span>{{ indexData.orderScore }}</span>
+              <div><span>{{ indexData.orderAgeingScore }}</span></div>
-              </div>
+              <div><span>{{ indexData.arriveAgeingScore }}</span></div>
-              <div>
-                <span>{{ indexData.orderAgeingScore }}</span>
-              </div>
-              <div>
-                <span>{{ indexData.arriveAgeingScore }}</span>
-              </div>
               <div> <span>{{ indexData.polymerizationSuccessScore }}</span></div>
               <div> <span>{{ indexData.appUseScore }}</span></div>
               <div> <span>{{ indexData.urgeScore }}</span></div>
               <div><span>{{ indexData.urgeScore }}</span></div>
+              <div> <span>{{ indexData.timeOutScore }}</span></div>
+              <div> <span>{{ indexData.refuseOrderScore }}</span></div>
+              <div><span>{{ indexData.threeMinutesContactSocre }}</span></div>
             </div>
           </div>
         </div>
@@ -200,8 +190,8 @@
         <noFit-table v-else :active='active'  :is-mobile='isMobile' :table-data="detailList" :label-list="labelList"></noFit-table>
      </div>
     </div>
-    <div v-loading="loadingData" class="contentWrap  monthTotal" v-if="[2,4,5].includes(active)">
+    <div v-loading="loadingData" class="contentWrap  monthTotal" v-if="[2,3,4].includes(active)">
-      <div class="searchDriverName" v-if="[5,4].includes(active)">
+      <div class="searchDriverName" v-if="[3,4].includes(active)">
         <el-select
             v-model="driverName"
             filterable
@@ -223,12 +213,12 @@
         </el-select>
       </div>
       <div :class="{'tabWrap':true,'webTabWrap':!isMobile,'mobileTab':isMobile}">
-        <div v-for="(item,index) in (active===4 ? driverList : list)" :class="activeIndex===index ? 'active' : ''"
+        <div v-for="(item,index) in (active===3 ? driverList : list)" :class="activeIndex===index ? 'active' : ''"
              :key="index"
              @click="changeTab(index)">{{ item.name }}
         </div>
       </div>
-      <div :class="{'comTab':active !== 4,'comTabActive3':active === 4}">
+      <div :class="{'comTab':active !== 3,'comTabActive3':active === 3}">
         <noFit-table :active='active'  :is-mobile='isMobile' :table-data="detailList" :label-list="labelList"></noFit-table>
       </div>
       <el-pagination
@@ -243,7 +233,7 @@
           :total="total">
       </el-pagination>
     </div>
-    <div v-loading="loadingData" class="contentWrap  monthTotal" v-if="[3,6,7,8,9,10, 11].includes(active)">
+    <div v-loading="loadingData" class="contentWrap  monthTotal" v-if="[5,6,7,8,9,10, 11].includes(active)">
       <div :class="{'comTab':true,'detailTable':isMobile}">
         <noFit-table :active='active'  :is-mobile='isMobile' :table-data="detailList" :label-list="labelList"
                      ></noFit-table>
@@ -272,8 +262,9 @@ import {
   getStatisticsKpi,
   getSupplierId,
   getDriverName,getDriverStatisticsKpi,
-  getRecentSupplierKpi, querySupplierDriverStatisticsScore
+  getRecentSupplierKpi,
 } from "@/api/kpi.js"
+// querySupplierDriverStatisticsScore
 import {myMixins} from "@/utils/myMixins"
 import CircleChar from "@/views/kpi/components/circleChar.vue";
 import NoFitTable from "@/views/kpi/components/noFit-table.vue";
@@ -289,11 +280,13 @@ export default {
       activeIndex: 0,
       //
       tabArr: [
-        {name: '总览'}, {name: '月/总'}, {name: '日/总'},{name: '师傅满意度'},{name: '月/师傅'}, {name: '日/师傅'},  {name: '拒单明细'},
+        {name: '总览',value:0}, {name: '月/总'}, {name: '日/总'},{name: '月/师傅'}, {name: '日/师傅'},  {name: '拒单明细'},
-        {name: '超时明细'}, {name: '投诉明细'}, {name: '不使用APP案件明细'}, {name: '车辆在线情况'} , {name: '聚合失败案件明细'}
+        {name: '超时明细'}, {name: '催促明细'},{name: '投诉明细'}, {name: '不使用APP案件明细'}, {name: '车辆在线情况'} , {name: '聚合失败案件明细'}
       ],
-      list: [{name: '接单指标'}, {name: '客户评价'}, {name: 'APP使用'}, {name: ' 时效 '}],
+      list: [{name: '接单指标'}, {name: '服务评价'}, {name: 'APP使用情况'}, {name: ' 时效 '}],
-      driverList: [{name: '得分总览'},{name: '接单情况'}, {name: '服务评价'}, {name: 'APP使用情况'}, {name: '时效 '}],
+      // driverList: [{name: '得分总览'},{name: '接单情况'}, {name: '服务评价'}, {name: 'APP使用情况'}, {name: '时效 '}],
+      driverList: [{name: '接单情况'}, {name: '服务评价'}, {name: 'APP使用情况'}, {name: '时效 '}],//story#7149,要求暂时隐藏得分总览
+
       startMonthTime: '',
       startTime: '',
       endTime: '',
@@ -316,7 +309,6 @@ export default {
       isMobile: false,
       isZd: '',
       current:'2024-10',
-      // current: dayjs(new Date()).format('M'),
       supplierName:'',
       value: '1',
       options: [
@@ -370,21 +362,13 @@ export default {
       }
     },
     monthChangeHandle(value){
-      console.log('valuevaluevalue', dayjs(new Date(value)).format('YYYY-MM-DD'))
       if (value) {
         this.current = dayjs(new Date(value)).format('YYYY-MM')
         const _tempDate = dayjs(new Date(value)).format('YYYY-MM-DD')
         const lastDay = dayjs(_tempDate).endOf('month');
-
-        /*const year = value.getFullYear();
-        const month = value.getMonth() + 1; // 月份从 0 开始，需要加 1
-        const yearAndMonth = year + '-' + (month > 9 ? month : '0' + month);
-        this.current = dayjs(new Date(yearAndMonth)).format('YYYY-MM')*/
         this.startTime = `${this.current}-01 00:00:00`;
-        // const lastDay = new Date(year, month, 0).getDate(); // 获取该月的最后一天
         this.endTime = `${this.current}-${this.padZero(lastDay.date())} 23:59:59`;
         this.startMonthTime=this.getStartTimeFromEndTime(this.endTime)
-        console.log(" this.startMonthTime", this.startMonthTime)
         this.selectSupplierNameHandle();
         if(this.active===1){
           this.tabClickHandle()
@@ -400,7 +384,7 @@ export default {
         return
       }
       this.$refs.Doughnut1.initCircle()
-      this.$refs.Doughnut2.initCircle()
+      // this.$refs.Doughnut2.initCircle()
       this.$refs.Doughnut3.initCircle()
       this.$refs.Doughnut4.initCircle()
       this.$refs.Doughnut5.initCircle()
@@ -985,7 +969,7 @@ export default {
     async getKpiData() {
       try {
         this.loading = true
-        if (this.active === 0) {
+        if (this.active === 0) {//总览
           await this.allDataChart()
           let res = await getStatisticsKpiByMonth({
             startTime: this.startTime,
@@ -1016,7 +1000,7 @@ export default {
               this.indexData[key] = this.processPercentage(this.indexData[key]);
             }
           }
-        } else if ([1, 2].includes(this.active)) {
+        } else if ([1, 2].includes(this.active)) {//月总 日总
           let res = await getStatisticsKpi({
             startTime: this.active === 1 ? this.startMonthTime : this.startTime,
             endTime: this.endTime,
@@ -1047,8 +1031,6 @@ export default {
             item.minorFortyMinutesArrivalRate=this.formatPercentage(item.minorFortyMinutesArrivalRate) ;
             let formatVal = dayjs(item.statisticsDate).format('DD');
             let formatVal1 = dayjs(item.statisticsDate).format('M');
-            // console.log("formatVal1",formatVal1)
-            // return {...item, date: formatVal, month: (formatVal1 == this.current) ? '本月' : (formatVal1 + '月')};
             return {...item, date: formatVal, month: formatVal1 + '月'};
           });
           this.loading = false
@@ -1056,33 +1038,8 @@ export default {
             this.xAxisArr.push(item.month)
             this.xAxisArr = [...new Set(this.xAxisArr)]; // 去重
           })
-          console.log(" this.xAxisArr", this.xAxisArr)
-          // this.xAxisArr[this.xAxisArr.length - 1] = '本月'
           await this.twoTabHanldeData()
-        }else if (this.active === 3) {
+        } else if ([3,4].includes(this.active)) {//月师傅 日师傅
-          let res = await querySupplierDriverStatisticsScore({
-            startTime: this.startTime ,
-            endTime: this.endTime,
-            statisticsType: 1,
-            supplierId: this.supplierId,
-            driverId: this.driverId,
-            driverName:this.driverName,
-            pageNum: this.pageNum,
-            pageSize: this.pageSize
-          })
-          this.total = res.total
-          this.detailList = res.data?.map(item => {
-            let formatVal = dayjs(item.statisticsDate).format('DD');
-            return {...item, date: formatVal};
-          });
-          this.labelList = [
-            {label: '师傅姓名', prop: 'driverName'},
-            {label: '案件总量', prop: 'orderCount'},
-            {label: '满意度得分  ', prop: 'driverSatisfaction'},
-          ]
-          this.loading = false;
-        }
-        else if ([4,5].includes(this.active)) {
           let res = await getDriverStatisticsKpi({
             startTime: this.startTime ,
             endTime: this.endTime,
@@ -1113,13 +1070,32 @@ export default {
             return {...item, date: formatVal};
           });
           this.loading = false;
-          if(this.active===5 && !this.driverName){
+         /* if(this.active===5 && !this.driverName){
             this.detailList=[]
             this.total=0
-          }
+          }*/
           await this.twoTabHanldeData();
         }
-        else if ([ 6, 7, 8,9,10, 11].includes(this.active)) {
+    /*    else if (this.active ===7) {
+          let res = await querySupplierDriverStatisticsScore({
+            startTime: this.startTime ,
+            endTime: this.endTime,
+            statisticsType: 1,
+            supplierId: this.supplierId,
+            driverId: this.driverId,
+            driverName:this.driverName,
+            pageNum: this.pageNum,
+            pageSize: this.pageSize
+          })
+          this.total = res.total
+          this.detailList = res.data?.map(item => {
+            let formatVal = dayjs(item.statisticsDate).format('DD');
+            return {...item, date: formatVal};
+          });
+
+          this.loading = false;
+        } */
+        else if ([ 5,6,7, 8,9,10,11].includes(this.active)) {
           this.detailList = []
           this.labelList = []
           let result = await getKpiDetailsData({
@@ -1136,7 +1112,7 @@ export default {
             return {...item, date: formatVal};
           });
           this.loading = false
-          if (this.active === 6) {//拒单明细
+          if (this.active === 5) {//拒单明细
             this.labelList = [
               {label: '案件编号', prop: 'orderCode'},
               {label: '服务内容', prop: 'serviceName'},
@@ -1146,7 +1122,7 @@ export default {
               {label: '拒绝时间', prop: 'time'},
               {label: '拒单原因', prop: 'reason'},
             ]
-          } else if (this.active === 7) {//超时明细
+          } else if (this.active === 6) {//超时明细
             this.labelList = [
               {label: '案件编号', prop: 'orderCode'},
               {label: '服务内容', prop: 'serviceName'},
@@ -1156,6 +1132,23 @@ export default {
               {label: '超时时间', prop: 'time'},
               {label: '超时原因', prop: 'reason'},
             ]
+          } else if (this.active === 7) {//催促明细
+            this.labelList = [
+              {label: '案件编号', prop: 'orderCode'},
+              {label: '二级合同名称', prop: 'contractName'},
+              {label: '案件创建时间', prop: 'orderCreateTime'},
+              {label: '催促创建时间  ', prop: 'urgeTime'},
+              {label: '服务商接单时间  ', prop: 'taskAcceptTime'},
+              {label: '备注内容(催促内容)  ', prop: 'urgeRemark'},
+              {label: '催促次数', prop: 'urgeCount'},//无催促次数，催促一次生成一条新的
+              {label: '服务商名称', prop: 'supplierName'},
+              {label: '服务车辆', prop: 'vehicleName'},
+              {label: '服务完成状况', prop: 'orderStatusString'},
+              {label: '案件完成时间', prop: 'finishTime'},
+              {label: '省(B)', prop: 'bProvince'},
+              {label: '市(B)', prop: 'bCity'},
+              {label: '区(B)', prop: 'area'},
+            ]
           } else if (this.active === 8) {//投诉明细
             this.labelList = [
               {label: '案件编号', prop: 'orderCode'},
@@ -1176,15 +1169,14 @@ export default {
             ]
           } else if (this.active === 10) {//车辆在线情况
             this.labelList = [
-              {label: '日期', prop: 'date'},
+              // {label: '总车辆数', prop: 'totalCount'},
-              {label: '0点在线车辆数量', prop: 'zeroClockVehicleCount'},
+              {label: '在线车辆数(取每日的12点)', prop: 'twelveClockVehicleCount'},
-              {label: '8点在线车辆数量', prop: 'eightClockVehicleCount'},
+              {label: '在线拖车数(12点)', prop: 'trailCount'},
-              {label: '12点在线车辆数量', prop: 'twelveClockVehicleCount'},
+              {label: '在线小修车数(12点)', prop: 'minorCount'},
-              {label: '16点在线车辆数量', prop: 'sixteenClockVehicleCount'},
+              {label: '在线率(在线车辆数/总车辆数)', prop: 'onlineRate'},
-              {label: '20点在线车辆数量', prop: 'twentyClockVehicleCount'},
+              // {label: '车辆平均在线时长', prop: ''},
-              {label: '22点在线车辆数量', prop: 'twentyTwoClockVehicleCount'},
             ]
-          } else if (this.active === 11) {//车辆在线情况
+          } else if (this.active === 11) {//聚合失败案件明细
             this.labelList = [
               {label: '案件编号', prop: 'orderCode'},
               {label: '服务内容', prop: 'serviceName'},
@@ -1208,22 +1200,6 @@ export default {
     },
     // 初始化获取当月日期
     initDate() {
-      /*let year=''
-      let month=''
-      if( this.current ) {
-        year = new Date(this.current).getFullYear();
-        month = new Date(this.current).getMonth() + 1;
-      } else {
-        year = new Date().getFullYear();
-        month = new Date().getMonth() + 1;
-      }
-      let yearAndMonth = year + '-' + (month > 9 ? month : '0' + month);
-      this.current = dayjs(new Date(yearAndMonth)).format('YYYY-MM')
-      this.startTime = dayjs(new Date()).format('YYYY-MM') + '-01 00:00:00'
-      this.endTime = dayjs(new Date()).format('YYYY-MM') + '-' + this.getDayLen()+' 23:59:59'*/
-      // test
-      // let _testDate = new Date('2024-11-01 00:00:01')
-
       const today = dayjs(); // 获取当前日期
       const currentDay = today.date(); // 获取今天是几号（1-31）
       let targetMonth = today; // 默认目标月份是当前月
@@ -1240,7 +1216,6 @@ export default {
       }
       this.endTime = endTime.format('YYYY-MM-DD HH:mm:ss');
       this.startMonthTime=this.getStartTimeFromEndTime(this.endTime)
-      console.log(" this.startMonthTime", this.startMonthTime,this.startTime)
     },
     // 获取当月天数
     getDayLen() {
@@ -1295,7 +1270,7 @@ export default {
     twoTabHanldeData() {
       this.etlDetailList=[]
       this.etlLabelList=[]
-      if (this.active === 1) {
+      if (this.active === 1) {//月总
         const columnObj = {} //创建标题数组中第一个对象
         columnObj.label = 'KPI' //第一个标题名称
         columnObj.prop = 'month' //第一个标题名称对应的字段
@@ -1338,7 +1313,6 @@ export default {
           ]
         } else if (this.activeIndex === 1) {
           this.etlDetailList=[{ 'month': '投诉量' },{ 'month': '投诉率(%)' },{ 'month': '平安好评量' }, { 'month': '平安好评率' }]
-          console.log('detailList', this.detailList)
           let props = 'prop' //自定义字段名称
           this.detailList?.map((item,index) => {
             this.v1.push(item.complainOrderCount)
@@ -1447,7 +1421,7 @@ export default {
             {label: '平安聚合成功到达时效', prop: 'pinganJuheSuccessArriving'},
           ]
         }
-      } else if (this.active === 2) {
+      } else if (this.active === 2) {//日总
         if (this.activeIndex === 0) {//接单指标
           this.labelList = [
             {label: '日', prop: 'date'},
@@ -1491,12 +1465,8 @@ export default {
             {label: '平安聚合成功到达时效(分)', prop: 'pinganJuheSuccessArriving'},
           ]
         }
-      }
+      } else if (this.active === 3) {//月师傅
-     /* else if(this.active === 3){
+       /* if (this.activeIndex === 0) {
-
-      } */
-      else if (this.active === 4) {
-        if (this.activeIndex === 0) {
           this.labelList = [
             {label: '师傅姓名', prop: 'driverName'},
             {label: '总分', prop: 'score'},
@@ -1524,60 +1494,65 @@ export default {
             {label: '新手入列得分', prop: 'listedScore'},
             {label: '星级评分', prop: 'starRank'},
           ]
-        }if (this.activeIndex === 1) {
+        }else*/
+          if (this.activeIndex === 0) {
           this.labelList = [
             {label: '师傅姓名', prop: 'driverName'},
-            {label: '承接案件量', prop: 'receiveOrderCount'},
+            {label: '派单量', prop: 'dispatchOrderCount'},
+            {label: '接单量', prop: 'receiveOrderCount'},
             {label: '拒单量', prop: 'refuseOrderCount'},
             {label: '拒单率(%)', prop: 'refuseOrderRate'},
-            {label: '超时接单量', prop: 'timeoutOrderCount'},
+            {label: '超时量', prop: 'timeoutOrderCount'},
             {label: '超时率(%)', prop: 'timeoutOrderRate'},
           ]
+        } else if (this.activeIndex === 1) {
+          this.labelList = [
+            {label: '师傅姓名', prop: 'driverName'},
+            // {label: '承接案件量', prop: 'receiveOrderCount'},
+            {label: '投诉量', prop: 'complainOrderCount'},
+            {label: '投诉率(%)', prop: 'complainOrderRate'},
+            {label: '平安评价量', prop: 'pinganEvaluateCount'},
+            {label: '平安评价率(%)', prop: 'pinganEvaluateRate'},
+            {label: '平安好评量', prop: 'pinganFavorableCount'},
+            {label: '平安好评率(%)', prop: 'pinganFavorableRate'},
+            // {label: '催促率(%)', prop: 'urgeRate'},
+          ]
         } else if (this.activeIndex === 2) {
           this.labelList = [
             {label: '师傅姓名', prop: 'driverName'},
-            {label: '承接案件量', prop: 'receiveOrderCount'},
+            {label: 'App使用量', prop: 'appUseCount'},
-            {label: '投诉量', prop: 'complainOrderCount'},
+            {label: 'App使用率(%)', prop: 'appRate'},
-            {label: '投诉率(%)', prop: 'complainOrderRate'},
+            // {label: '3′联系客户率(%)', prop: 'threeMinutesContactRate'},
-            {label: '客户满意度(%)', prop: 'customerSatisfaction'},
+            {label: '平安聚合成功量', prop: 'pinganPolymerizationSuccessCount'},
-            {label: '客户评价率(%)', prop: 'customerEvaluateRate'},
+            {label: '平安聚合成功率(%)', prop: 'pinganPolymerizationSuccessRate'},
-            {label: '催促率(%)', prop: 'urgeRate'},
+            {label: '中华联合聚合成功量', prop: 'zhonghuaPolymerizationSuccessCount'},
+            {label: '中华联合聚合成功率(%)', prop: 'zhonghuaPolymerizationSuccessRate'},
+            // {label: '中道聚合成功率(%)', prop: 'zdPolymerizationSuccessRate'},
+            {label: '整体聚合成功量', prop: 'wholeJuheSuccessCount'},
+            {label: '整体聚合成功率(%)', prop: 'wholeJuheSuccessRate'},
+            // {label: '日均在线时长(h)', prop: 'onlineDuration'},
           ]
         } else if (this.activeIndex === 3) {
-          this.labelList = [
-            {label: '师傅姓名', prop: 'driverName'},
-            {label: '承接案件量', prop: 'receiveOrderCount'},
-            {label: 'App使用率(%)', prop: 'appRate'},
-            {label: '3′联系客户率(%)', prop: 'threeMinutesContactRate'},
-            {label: '平安聚合成功率(%)', prop: 'pinganPolymerizationSuccessRate'},
-            {label: '中华聚合成功率(%)', prop: 'zhonghuaPolymerizationSuccessRate'},
-            {label: '中道聚合成功率(%)', prop: 'zdPolymerizationSuccessRate'},
-            {label: '总聚合成功率(%)', prop: 'polymerizationSuccessRate'},
-            {label: '日均在线时长(h)', prop: 'onlineDuration'},
-          ]
-        } else if (this.activeIndex === 4) {
           this.labelList = [
             {label: '师傅姓名', prop: 'driverName'},
             {label: '接单时效(分)', prop: 'receiving'},
-            {label: '3′接单率(%)', prop: 'threeMinutesReceivingRate'},
+            {label: '3′联系客户率(%)', prop: 'threeMinutesReceivingRate'},
             {label: '到达时效(分)', prop: 'arriving'},
-            {label: '40′到达率(%)', prop: 'fortyMinutesArrivalRate'},
+            // {label: '40′到达率(%)', prop: 'fortyMinutesArrivalRate'},
-            {label: '聚合成功到达时效(分)', prop: 'polymerizationSuccessArriving'},
+            {label: '平安聚合成功到达时效(分)', prop: 'pinganJuheSuccessArriving'},
           ]
         }
-      } else if (this.active === 5) {
+      } else if (this.active === 4) {//日师傅
         if (this.activeIndex === 0) {//接单指标
           this.labelList = [
             {label: '日', prop: 'date'},
             {label: '师傅姓名', prop: 'driverName'},
-            {label: '派遣案件量', prop: 'dispatchOrderCount'},
+            {label: '派单量', prop: 'dispatchOrderCount'},
-            {label: '承接案件量', prop: 'receiveOrderCount'},
+            {label: '接单量', prop: 'receiveOrderCount'},
-            {label: '完成量', prop: 'finishOrderCount'},
             {label: '拒单量', prop: 'refuseOrderCount'},
             {label: '拒单率(%)', prop: 'refuseOrderRate'},
-            {label: '超时接单量', prop: 'timeoutOrderCount'},
+            {label: '超时量', prop: 'timeoutOrderCount'},
             {label: '超时率(%)', prop: 'timeoutOrderRate'},
-            {label: '客户取消率(%)', prop: 'cancelRate'},
           ]
         } else if (this.activeIndex === 1) {
           this.labelList = [
@@ -1585,31 +1560,32 @@ export default {
             {label: '师傅姓名', prop: 'driverName'},
             {label: '投诉量', prop: 'complainOrderCount'},
             {label: '投诉率(%)', prop: 'complainOrderRate'},
-            {label: '客户满意度(%)', prop: 'customerSatisfaction'},
+            {label: '平安评价量', prop: 'pinganEvaluateCount'},
-            {label: '客户评价率(%)', prop: 'customerEvaluateRate'},
+            {label: '平安评价率(%)', prop: 'pinganEvaluateRate'},
-            {label: '催促率(%)', prop: 'urgeRate'},
+            {label: '平安好评量', prop: 'pinganFavorableCount'},
+            {label: '平安好评率(%)', prop: 'pinganFavorableRate'},
           ]
         } else if (this.activeIndex === 2) {
           this.labelList = [
             {label: '日', prop: 'date'},
             {label: '师傅姓名', prop: 'driverName'},
-            {label: '使用率(%)', prop: 'appRate'},
+            {label: 'App使用量', prop: 'appUseCount'},
-            {label: '3′联系客户率(%)', prop: 'threeMinutesContactRate'},
+            {label: 'App使用率(%)', prop: 'appRate'},
+            {label: '平安聚合成功量', prop: 'pinganPolymerizationSuccessCount'},
             {label: '平安聚合成功率(%)', prop: 'pinganPolymerizationSuccessRate'},
-            {label: '中华聚合成功率(%)', prop: 'zhonghuaPolymerizationSuccessRate'},
+            {label: '中华联合聚合成功量', prop: 'zhonghuaPolymerizationSuccessCount'},
-            {label: '中道聚合成功率(%)', prop: 'zdPolymerizationSuccessRate'},
+            {label: '中华联合聚合成功率(%)', prop: 'zhonghuaPolymerizationSuccessRate'},
-            {label: '总聚合成功率(%)', prop: 'polymerizationSuccessRate'},
+            {label: '整体聚合成功量', prop: 'wholeJuheSuccessCount'},
-            {label: '日均在线时长(h)', prop: 'onlineDuration'},
+            {label: '整体聚合成功率(%)', prop: 'wholeJuheSuccessRate'},
           ]
         } else if (this.activeIndex === 3) {
           this.labelList = [
             {label: '日', prop: 'date'},
             {label: '师傅姓名', prop: 'driverName'},
             {label: '接单时效(分)', prop: 'receiving'},
-            {label: '3′接单率(%)', prop: 'threeMinutesReceivingRate'},
+            {label: '3′联系客户率(%)', prop: 'threeMinutesReceivingRate'},
             {label: '到达时效(分)', prop: 'arriving'},
-            {label: '40′到达率(%)', prop: 'fortyMinutesArrivalRate'},
+            {label: '平安聚合成功到达时效(分)', prop: 'pinganJuheSuccessArriving'},
-            {label: '聚合成功到达时效(分)', prop: 'polymerizationSuccessArriving'},
           ]
         }
       }
@@ -1621,10 +1597,12 @@ export default {
     },
     setType(type) {
       switch (type) {
-        case 6:
+        case 5:
           return 1;
-        case 7:
+        case 6:
           return 2;
+        case 7:
+          return 7;
         case 8:
           return 3;
         case 9:

src/views/liabilityInsurance/insuredPage.vue

@@ -22,7 +22,7 @@
         为此中道救援经过与保司沟通协调，特为与中道救援合作紧密的服务商，提供救援职业责任险参保渠道，提升服务商服务能力，降低运营风险，实现共同进步。
       </div>
       <div>一、救援职业责任险简介：</div>
-      <div>1、综合保额50万元，可全方位覆盖我们日常的经营活动。</div>
+      <div> 1、综合保额100万元（其中救援责任50万元，物流责任50万元），可全方位覆盖我们日常的经营活动。</div>
       <div> 2、保费支付可采用救援服务费抵扣的方式，降低资金压力。</div>
       <div> 3、详细保险条款、保费和其他问题，如需了解，请与辖区区域经理联系。</div>
       <div> 二、其他意见建议如需交流，请与18621558505曲仁杰联系。</div>

src/views/newcomerTraining/newTrainingList.vue

@@ -78,9 +78,11 @@ export default {
       isLoading:false,
       showPoup:true,//进入弹框
       isFinished:false,
+      type: '',
     }
   },
   mounted() {
+    this.type = this.$route.query?.type;
     // this.onRefresh();
     this.getList();
 
@@ -120,6 +122,7 @@ export default {
         pageSize:this.pageSize,
         docType:1,
         trainingType:4,
+        type: this.type,
       })
       this.pageList=res.data?.list || [];
       if(res.data.assessState == 0){

src/views/rvDriverAuthentication/personAudit.vue

@@ -109,7 +109,7 @@
       const urlParams = new URLSearchParams(window.location.search);
       console.log('window.location',window.location)
       // console.log("urlParams",urlParams)
-      // console.log("decodeURIComponent(  window.location.href)",decodeURIComponent(  window.location.href))
+      console.log("decodeURIComponent(  window.location.href)",decodeURIComponent(  window.location.href))
       this.esignFlag = urlParams.get('esignFlag') || localStorage.getItem("esignFlag")
       if(window.location.search){
         console.log('有参数')