zhongtianhaoyuan il y a 3 ans
Parent
commit
36e09295ee
36 fichiers modifiés avec 829 ajouts et 812 suppressions
  1. 0 0
      public/cdn/element-ui/2.12.0/theme-chalk/index.css
  2. 7 3
      public/cdn/element-ui/2.13.2/theme-chalk/index.css
  3. 4 4
      src/api/cargoOwnerManagement.js
  4. 3 3
      src/api/driverManagement.js
  5. 1 1
      src/api/enterpriseManagement.js
  6. 5 5
      src/api/orderManagement.js
  7. 4 4
      src/api/platformManagement.js
  8. 1 0
      src/components/SvgIcon/index.vue
  9. 2 0
      src/icons/svg/dingdanguanli.svg
  10. 2 0
      src/icons/svg/fankuiguanli.svg
  11. 2 0
      src/icons/svg/hetongguanli.svg
  12. 2 0
      src/icons/svg/huozhuguanli.svg
  13. 1 0
      src/icons/svg/pingtaiguanli.svg
  14. 2 0
      src/icons/svg/qiyeguanli.svg
  15. 2 0
      src/icons/svg/shouye.svg
  16. 2 0
      src/icons/svg/sijiguanli.svg
  17. 1 0
      src/layout/components/Sidebar/Item.vue
  18. 1 1
      src/layout/components/Sidebar/index.vue
  19. 5 5
      src/router/cargoOwnerManagement/index.js
  20. 2 2
      src/router/contractManagement/index.js
  21. 3 3
      src/router/driverManagement/index.js
  22. 2 2
      src/router/enterpriseManagement/index.js
  23. 2 2
      src/router/feedbackManagement/index.js
  24. 1 1
      src/router/index.js
  25. 2 2
      src/router/orderManagement/index.js
  26. 4 4
      src/router/platformManagement/index.js
  27. 8 1
      src/styles/sidebar.scss
  28. 8 8
      src/styles/variables.scss
  29. 0 1
      src/utils/request.js
  30. 14 15
      src/views/cargoOwnerManagement/empowerExamine.vue
  31. 15 16
      src/views/cargoOwnerManagement/merchantVerification.vue
  32. 9 10
      src/views/cargoOwnerManagement/taskAudit.vue
  33. 13 16
      src/views/driverManagement/identityExamine.vue
  34. 11 12
      src/views/driverManagement/vehicleExamine.vue
  35. 9 10
      src/views/enterpriseManagement/enterpriseAudit.vue
  36. 679 681
      src/views/orderManagement/orderAudit.vue

Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
public/cdn/element-ui/2.12.0/theme-chalk/index.css


+ 7 - 3
public/cdn/element-ui/2.13.2/theme-chalk/index.css

@@ -1722,7 +1722,7 @@
   padding-left: 0;
 }
 .el-submenu__title {
-  font-size: 14px;
+  font-size: 16px;
   color: #303133;
   padding: 0 20px;
   cursor: pointer;
@@ -1734,7 +1734,8 @@
   vertical-align: middle;
 }
 .el-submenu__title i {
-  color: #909399;
+  color: #000000 !important;
+  font-weight: 600 !important;
 }
 .el-submenu__title:focus,
 .el-submenu__title:hover {
@@ -1759,6 +1760,7 @@
   min-width: 200px;
 }
 .el-submenu__icon-arrow {
+	color: #000000 !important;
   position: absolute;
   top: 50%;
   right: 20px;
@@ -1767,7 +1769,8 @@
   transition: -webkit-transform 0.3s;
   transition: transform 0.3s;
   transition: transform 0.3s, -webkit-transform 0.3s;
-  font-size: 12px;
+  font-size: 14px;
+  font-weight: 600;
 }
 .el-submenu.is-active .el-submenu__title {
   border-bottom-color: #409eff;
@@ -12712,6 +12715,7 @@
 .el-scrollbar__wrap {
   overflow: scroll;
   height: 100%;
+  border-right: 1px solid #383838 !important;
 }
 .el-scrollbar__wrap--hidden-default {
   scrollbar-width: none;

+ 4 - 4
src/api/cargoOwnerManagement.js

@@ -12,7 +12,7 @@ export function toExamine(data) {
   return request({
     url: '/cargoOwnerInfo/api/examine',
     method: 'post',
-     params: data,
+     data: data,
   })
 }
 // 货主消息发送
@@ -20,7 +20,7 @@ export function postNews(data) {
   return request({
     url: '/newsInfo/api/addNewsInfo',
     method: 'post',
-     params: data,
+     data: data,
   })
 }
 // 货主任务列表
@@ -36,7 +36,7 @@ export function toTaskExamine(data) {
   return request({
     url: '/publishTaskInfo/api/examine',
     method: 'post',
-     params: data,
+     data: data,
   })
 }
 // 货主授权审核
@@ -53,6 +53,6 @@ export function toGrantExamine(data) {
   return request({
     url: '/cargoOwnerCompInfo/api/examine',
     method: 'post',
-     params: data,
+     data: data,
   })
 }

+ 3 - 3
src/api/driverManagement.js

@@ -12,7 +12,7 @@ export function toExamine(data) {
   return request({
     url: '/driverInfo/api/examine',
     method: 'post',
-     params: data,
+     data: data,
   })
 }
 // 消息
@@ -20,7 +20,7 @@ export function postNews(data) {
   return request({
     url: '/newsInfo/api/addNewsInfo',
     method: 'post',
-     params: data,
+     data: data,
   })
 }
 // 车辆审核列表
@@ -36,6 +36,6 @@ export function toCarExamine(data) {
   return request({
     url: '/driverCarInfo/api/examine',
     method: 'post',
-     params: data,
+     data: data,
   })
 }

+ 1 - 1
src/api/enterpriseManagement.js

@@ -12,6 +12,6 @@ export function toallowExamine(data) {
   return request({
     url: '/companyInfo/api/examine',
     method: 'post',
-     params: data,
+     data: data,
   })
 }

+ 5 - 5
src/api/orderManagement.js

@@ -20,7 +20,7 @@ export function auditData(data) {
   return request({
     url: '/orderInfo/api/examine',
     method: 'post',
-     params: data,
+     data: data,
   })
 }
 
@@ -29,7 +29,7 @@ export function endData(data) {
   return request({
     url: '/orderInfo/api/end',
     method: 'post',
-     params: data,
+     data: data,
   })
 }
 
@@ -38,14 +38,14 @@ export function editEndData(data) {
   return request({
     url: '/orderInfo/api/editEnd',
     method: 'post',
-     params: data,
+     data: data,
   })
 }
 // 批量开票
-export function batchData(data) {debugger
+export function batchData(data) {
   return request({
     url: '/orderInfo/api/readXmlManagement',
     method: 'post',
-     params: data,
+     data: data,
   })
 }

+ 4 - 4
src/api/platformManagement.js

@@ -13,7 +13,7 @@ export function addFormData(data) {
   return request({
     url: '/patformAnagementEgulations/api/add',
     method: 'post',
-     params: data,
+     data: data,
   })
 }
 
@@ -31,7 +31,7 @@ export function editFormData(data) {
   return request({
     url: '/patformAnagementEgulations/api/edit',
     method: 'post',
-     params: data,
+     data: data,
   })
 }
 
@@ -40,7 +40,7 @@ export function delFormData(data) {
   return request({
     url: '/patformAnagementEgulations/api/delete',
     method: 'post',
-     params: data,
+     data: data,
   })
 }
 
@@ -49,6 +49,6 @@ export function auditFormData(data) {
   return request({
     url: '/patformAnagementEgulations/api/examine',
     method: 'post',
-     params: data,
+     data: data,
   })
 }

+ 1 - 0
src/components/SvgIcon/index.vue

@@ -52,6 +52,7 @@ export default {
   vertical-align: -0.15em;
   fill: currentColor;
   overflow: hidden;
+  font-size: 20px;
 }
 
 .svg-external-icon {

+ 2 - 0
src/icons/svg/dingdanguanli.svg

@@ -0,0 +1,2 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1650526305901" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="8600" xmlns:xlink="http://www.w3.org/1999/xlink" width="128" height="128"><defs><style type="text/css">@font-face { font-family: feedback-iconfont; src: url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.woff2?t=1630033759944") format("woff2"), url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.woff?t=1630033759944") format("woff"), url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.ttf?t=1630033759944") format("truetype"); }
+</style></defs><path d="M792.546955 182.034008h-84.171311V125.895717h-75.53743c-24.384393-33.343399-69.034926-56.138291-120.802089-56.138291-51.767163 0-96.526071 22.758767-120.802088 56.138291H315.624356v56.138291h-84.171311c-61.918295 0-112.168207 50.177662-112.168208 112.168207v561.093911c0 61.918295 50.249912 112.168207 112.168208 112.168208h561.09391c61.990545 0 112.168207-50.286037 112.168208-112.168208V294.202215c0-61.990545-50.141537-112.168207-112.168208-112.168207z m-420.784308 0h62.351796c0-31.067523 34.860651-56.138291 77.921682-56.138291 42.952656 0 77.921682 25.070768 77.921682 56.138291h62.279546v112.168207H371.726522V182.034008z m476.9226 673.262118c0 30.959148-25.179143 56.138291-56.138292 56.138292H231.453045c-30.959148 0-56.029916-25.179143-56.029917-56.138292V294.202215c0-30.959148 25.070768-56.138291 56.029917-56.138291h84.171311v112.276583h392.751288V238.063924h84.171311c30.959148 0 56.138291 25.179143 56.138292 56.138291v561.093911z" fill="#231815" p-id="8601"></path><path d="M708.375644 799.157835H315.624356c-15.497636 0-28.033021-12.535384-28.03302-28.03302 0-15.497636 12.535384-28.105271 28.03302-28.105271h392.751288c15.461511 0 28.033021 12.643759 28.03302 28.105271a28.033021 28.033021 0 0 1-28.03302 28.03302zM708.375644 658.848233H315.624356c-15.497636 0-28.033021-12.535384-28.03302-28.033021a28.033021 28.033021 0 0 1 28.03302-28.033021h392.751288a28.033021 28.033021 0 0 1 28.03302 28.033021c0 15.497636-12.535384 28.033021-28.03302 28.033021zM708.375644 518.647005H315.624356c-15.497636 0-28.033021-12.535384-28.03302-28.105271a28.033021 28.033021 0 0 1 28.03302-28.03302h392.751288a28.033021 28.033021 0 0 1 28.03302 28.03302c0 15.569886-12.535384 28.105271-28.03302 28.105271z" fill="#231815" p-id="8602"></path></svg>

+ 2 - 0
src/icons/svg/fankuiguanli.svg

@@ -0,0 +1,2 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1650527107667" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="12236" xmlns:xlink="http://www.w3.org/1999/xlink" width="128" height="128"><defs><style type="text/css">@font-face { font-family: feedback-iconfont; src: url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.woff2?t=1630033759944") format("woff2"), url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.woff?t=1630033759944") format("woff"), url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.ttf?t=1630033759944") format("truetype"); }
+</style></defs><path d="M273.06 937.94c-5.53 0-11.07-1.39-16.06-4.17-10.47-5.81-16.97-16.84-17.01-28.82l-0.34-124.67H65.08c-18.26 0-33.08-14.8-33.08-33.08V119.13c0-18.27 14.82-33.08 33.08-33.08h893.85c18.26 0 33.08 14.8 33.08 33.08V747.2c0 18.27-14.82 33.08-33.08 33.08H537.6L290.43 933a32.927 32.927 0 0 1-17.37 4.94zM98.15 714.13h174.47c18.24 0 33.03 14.75 33.08 32.99l0.26 98.53 204.88-126.58a33.006 33.006 0 0 1 17.38-4.94h397.63V152.21H98.15v561.92z" p-id="12237" fill="#2c2c2c"></path><path d="M512 571.18H228.63c-18.26 0-33.08-14.8-33.08-33.08s14.82-33.08 33.08-33.08H512c18.26 0 33.08 14.8 33.08 33.08s-14.82 33.08-33.08 33.08zM795.37 377.81H228.63c-18.26 0-33.08-14.8-33.08-33.08s14.82-33.08 33.08-33.08h566.74c18.26 0 33.08 14.8 33.08 33.08s-14.82 33.08-33.08 33.08z" p-id="12238" fill="#2c2c2c"></path></svg>

+ 2 - 0
src/icons/svg/hetongguanli.svg

@@ -0,0 +1,2 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1650526438368" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="10487" xmlns:xlink="http://www.w3.org/1999/xlink" width="128" height="128"><defs><style type="text/css">@font-face { font-family: feedback-iconfont; src: url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.woff2?t=1630033759944") format("woff2"), url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.woff?t=1630033759944") format("woff"), url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.ttf?t=1630033759944") format("truetype"); }
+</style></defs><path d="M640 512l56.539429 120.393143 126.317714 19.309714L731.428571 745.325714 753.005714 877.714286l-113.005714-62.464L526.994286 877.714286l21.577143-132.315429L457.142857 651.702857l126.317714-19.309714z" fill="#333333" p-id="10488"></path><path d="M841.142857 0h-658.285714A109.714286 109.714286 0 0 0 73.142857 109.714286v804.571428A109.714286 109.714286 0 0 0 182.857143 1024h658.285714a109.714286 109.714286 0 0 0 109.714286-109.714286v-804.571428A109.714286 109.714286 0 0 0 841.142857 0z m-658.285714 73.142857h658.285714a36.571429 36.571429 0 0 1 36.571429 36.571429v804.571428a36.571429 36.571429 0 0 1-36.571429 36.571429h-658.285714a36.571429 36.571429 0 0 1-36.571429-36.571429v-804.571428a36.571429 36.571429 0 0 1 36.571429-36.571429z" fill="#333333" p-id="10489"></path><path d="M219.428571 182.857143m36.571429 0l438.857143 0q36.571429 0 36.571428 36.571428l0 0q0 36.571429-36.571428 36.571429l-438.857143 0q-36.571429 0-36.571429-36.571429l0 0q0-36.571429 36.571429-36.571428Z" fill="#333333" p-id="10490"></path><path d="M219.428571 329.142857m36.571429 0l292.571429 0q36.571429 0 36.571428 36.571429l0 0q0 36.571429-36.571428 36.571428l-292.571429 0q-36.571429 0-36.571429-36.571428l0 0q0-36.571429 36.571429-36.571429Z" fill="#333333" p-id="10491"></path><path d="M219.428571 475.428571m36.571429 0l146.285714 0q36.571429 0 36.571429 36.571429l0 0q0 36.571429-36.571429 36.571429l-146.285714 0q-36.571429 0-36.571429-36.571429l0 0q0-36.571429 36.571429-36.571429Z" fill="#333333" p-id="10492"></path></svg>

+ 2 - 0
src/icons/svg/huozhuguanli.svg

@@ -0,0 +1,2 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1650525815099" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="5155" width="128" height="128" xmlns:xlink="http://www.w3.org/1999/xlink"><defs><style type="text/css">@font-face { font-family: feedback-iconfont; src: url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.woff2?t=1630033759944") format("woff2"), url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.woff?t=1630033759944") format("woff"), url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.ttf?t=1630033759944") format("truetype"); }
+</style></defs><path d="M959.36 920.96c-15.36-181.76-139.52-332.16-307.84-386.56 70.4-45.44 117.12-124.16 117.12-214.4 0-141.44-115.2-256-256.64-256C369.92 64 255.36 178.56 255.36 320c0 90.24 46.72 168.96 117.12 214.4-168.32 54.4-292.48 204.8-307.84 386.56 0 3.2-0.64 5.76 0 10.24C65.92 947.2 80 960 96 960 113.92 960 128 945.28 128 928 144.64 730.24 310.4 576 512 576s366.72 154.24 384 352c0 17.28 14.08 32 32 32 16 0 30.08-12.8 31.36-28.8C960 926.72 959.36 924.16 959.36 920.96zM319.36 320c0-106.24 86.4-192 192.64-192 106.24 0 192.64 85.76 192.64 192 0 106.24-86.4 192-192.64 192C405.76 512 319.36 426.24 319.36 320z" p-id="5156"></path></svg>

Fichier diff supprimé car celui-ci est trop grand
+ 1 - 0
src/icons/svg/pingtaiguanli.svg


+ 2 - 0
src/icons/svg/qiyeguanli.svg

@@ -0,0 +1,2 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1650526003934" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="5833" xmlns:xlink="http://www.w3.org/1999/xlink" width="128" height="128"><defs><style type="text/css">@font-face { font-family: feedback-iconfont; src: url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.woff2?t=1630033759944") format("woff2"), url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.woff?t=1630033759944") format("woff"), url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.ttf?t=1630033759944") format("truetype"); }
+</style></defs><path d="M438.857 146.286c0-43.886-29.257-73.143-73.143-73.143H146.286c-43.886 0-73.143 29.257-73.143 73.143v731.428c0 43.886 29.257 73.143 73.143 73.143h292.571V146.286zM146.286 0h219.428C446.171 0 512 65.829 512 146.286V1024H146.286C65.829 1024 0 958.171 0 877.714V146.286C0 65.829 65.829 0 146.286 0z m36.571 219.429h146.286c21.943 0 36.571 14.628 36.571 36.571s-14.628 36.571-36.571 36.571H182.857c-21.943 0-36.571-14.628-36.571-36.571s14.628-36.571 36.571-36.571z m0 219.428h146.286c21.943 0 36.571 14.629 36.571 36.572S351.086 512 329.143 512H182.857c-21.943 0-36.571-14.629-36.571-36.571s14.628-36.572 36.571-36.572z m0 219.429h146.286c21.943 0 36.571 14.628 36.571 36.571s-14.628 36.572-36.571 36.572H182.857c-21.943 0-36.571-14.629-36.571-36.572s14.628-36.571 36.571-36.571z m512-219.429c21.943 0 36.572 14.629 36.572 36.572v73.142c0 21.943-14.629 36.572-36.572 36.572s-36.571-14.629-36.571-36.572V475.43c0-21.943 14.628-36.572 36.571-36.572z m0 219.429c21.943 0 36.572 14.628 36.572 36.571V768c0 21.943-14.629 36.571-36.572 36.571S658.286 789.943 658.286 768v-73.143c0-21.943 14.628-36.571 36.571-36.571zM512 950.857h365.714v-512c0-43.886-29.257-73.143-73.143-73.143H512v585.143z m-73.143-658.286h365.714c80.458 0 146.286 65.829 146.286 146.286V1024h-512V292.571z" p-id="5834"></path></svg>

+ 2 - 0
src/icons/svg/shouye.svg

@@ -0,0 +1,2 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1650527255057" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="15884" xmlns:xlink="http://www.w3.org/1999/xlink" width="128" height="128"><defs><style type="text/css">@font-face { font-family: feedback-iconfont; src: url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.woff2?t=1630033759944") format("woff2"), url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.woff?t=1630033759944") format("woff"), url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.ttf?t=1630033759944") format("truetype"); }
+</style></defs><path d="M234.057143 413.257143l321.828571-219.428572c51.2-36.571429 120.685714-32.914286 171.885715 3.657143l142.628571 106.057143c18.285714 14.628571 29.257143 36.571429 29.257143 58.514286v497.371428c0 40.228571-32.914286 73.142857-73.142857 73.142858h-548.571429c-40.228571 0-73.142857-32.914286-73.142857-73.142858V475.428571c-3.657143-25.6 7.314286-47.542857 29.257143-62.171428z" fill="#F2F2F2" p-id="15885"></path><path d="M804.571429 950.857143H219.428571c-80.457143 0-146.285714-65.828571-146.285714-146.285714V420.571429c0-47.542857 21.942857-91.428571 62.171429-117.028572l292.571428-201.142857c51.2-32.914286 117.028571-32.914286 164.571429 0l292.571428 201.142857c40.228571 25.6 62.171429 73.142857 62.171429 120.685714V804.571429c3.657143 80.457143-62.171429 146.285714-142.628571 146.285714zM168.228571 347.428571c-25.6 18.285714-40.228571 43.885714-40.228571 76.8V804.571429c0 51.2 40.228571 91.428571 91.428571 91.428571h585.142858c51.2 0 91.428571-40.228571 91.428571-91.428571V420.571429c0-29.257143-14.628571-58.514286-40.228571-76.8l-292.571429-201.142858c-29.257143-21.942857-73.142857-21.942857-102.4 0l-292.571429 204.8z" fill="#262626" p-id="15886"></path><path d="M431.542857 658.285714h164.571429c14.628571 0 29.257143 10.971429 29.257143 29.257143 0 14.628571-10.971429 29.257143-29.257143 29.257143h-164.571429c-14.628571 0-29.257143-10.971429-29.257143-29.257143s10.971429-29.257143 29.257143-29.257143z" fill="#262626" p-id="15887"></path></svg>

+ 2 - 0
src/icons/svg/sijiguanli.svg

@@ -0,0 +1,2 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1650525234196" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1301" xmlns:xlink="http://www.w3.org/1999/xlink" width="128" height="128"><defs><style type="text/css">@font-face { font-family: feedback-iconfont; src: url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.woff2?t=1630033759944") format("woff2"), url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.woff?t=1630033759944") format("woff"), url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.ttf?t=1630033759944") format("truetype"); }
+</style></defs><path d="M682.666667 512c53.638095-48.761905 87.771429-117.028571 87.771428-190.171429 0-141.409524-117.028571-258.438095-258.438095-258.438095S253.561905 180.419048 253.561905 321.828571c0 78.019048 34.133333 146.285714 87.771428 190.171429-180.419048 68.266667-307.2 243.809524-307.2 448.609524h97.52381c0-209.67619 170.666667-380.342857 380.342857-380.342857 39.009524 0 73.142857 4.87619 112.152381 14.628571L487.619048 746.057143c-107.27619 9.752381-195.047619 102.4-195.047619 214.552381h97.523809c0-68.266667 53.638095-121.904762 121.904762-121.904762s121.904762 53.638095 121.904762 121.904762h97.523809c0-87.771429-53.638095-165.790476-126.780952-199.92381l112.152381-126.780952c107.27619 68.266667 175.542857 185.295238 175.542857 321.828571h97.52381c0-199.92381-126.780952-375.466667-307.2-443.733333zM351.085714 321.828571c0-87.771429 73.142857-160.914286 160.914286-160.914285s160.914286 73.142857 160.914286 160.914285c0 87.771429-68.266667 160.914286-156.038096 160.914286-92.647619-4.87619-165.790476-73.142857-165.790476-160.914286z" p-id="1302"></path></svg>

+ 1 - 0
src/layout/components/Sidebar/Item.vue

@@ -37,5 +37,6 @@ export default {
   color: currentColor;
   width: 1em;
   height: 1em;
+  font-size: 20px;
 }
 </style>

+ 1 - 1
src/layout/components/Sidebar/index.vue

@@ -7,7 +7,7 @@
         :collapse="isCollapse"
         :background-color="variables.menuBg"
         :text-color="variables.menuText"
-        :unique-opened="false"
+        :unique-opened="true"
         :active-text-color="variables.menuActiveText"
         :collapse-transition="false"
         mode="vertical"

+ 5 - 5
src/router/cargoOwnerManagement/index.js

@@ -9,7 +9,7 @@ const cargoOwnerManagementRouter = {
     name: 'cargoOwnerManagement',
     meta: {
         title: '货主管理',
-        icon: 'el-icon-s-help'
+        icon: 'huozhuguanli'
     },
     children: [{
         path: 'empowerExamine',
@@ -17,7 +17,7 @@ const cargoOwnerManagementRouter = {
         component: () => import('@/views/cargoOwnerManagement/empowerExamine'),
         meta: {
             title: '身份审核',
-            icon: 'table'
+            icon: ''
         }
     },
     {
@@ -26,7 +26,7 @@ const cargoOwnerManagementRouter = {
         component: () => import('@/views/cargoOwnerManagement/merchantVerification'),
         meta: {
             title: '授权审核',
-            icon: 'tree'
+            icon: ''
         }
     },
     {
@@ -35,10 +35,10 @@ const cargoOwnerManagementRouter = {
         component: () => import('@/views/cargoOwnerManagement/taskAudit'),
         meta: {
             title: '任务审核',
-            icon: 'tree'
+            icon: ''
         }
     }
     ]
 }
 
-export default cargoOwnerManagementRouter
+export default cargoOwnerManagementRouter

+ 2 - 2
src/router/contractManagement/index.js

@@ -9,7 +9,7 @@ const contractManagementRouter = {
     name: 'contractManagement',
     meta: {
         title: '合同管理',
-        icon: 'el-icon-s-help'
+        icon: 'hetongguanli'
     },
     alwaysShow: true,
     children: [{
@@ -18,7 +18,7 @@ const contractManagementRouter = {
         component: () => import('@/views/contractManagement/contractModel'),
         meta: {
             title: '合同模板',
-            icon: 'table'
+            icon: ''
         }
     }
     ]

+ 3 - 3
src/router/driverManagement/index.js

@@ -9,7 +9,7 @@ const driverManagementRouter = {
     name: 'driverManagement',
     meta: {
         title: '司机管理',
-        icon: 'el-icon-menu'
+        icon: 'sijiguanli'
     },
     children: [{
         path: 'identityExamine',
@@ -17,7 +17,7 @@ const driverManagementRouter = {
         component: () => import('@/views/driverManagement/identityExamine'),
         meta: {
             title: '身份审核',
-            icon: 'table'
+            icon: ''
         }
     },
     {
@@ -26,7 +26,7 @@ const driverManagementRouter = {
         component: () => import('@/views/driverManagement/vehicleExamine'),
         meta: {
             title: '车辆审核',
-            icon: 'tree'
+            icon: ''
         }
     }
     ]

+ 2 - 2
src/router/enterpriseManagement/index.js

@@ -9,7 +9,7 @@ const enterpriseManagementRouter = {
     name: 'enterpriseManagement',
     meta: {
         title: '企业管理',
-        icon: 'el-icon-s-help'
+        icon: 'qiyeguanli'
     },
     alwaysShow: true,
     children: [{
@@ -18,7 +18,7 @@ const enterpriseManagementRouter = {
         component: () => import('@/views/enterpriseManagement/enterpriseAudit'),
         meta: {
             title: '企业审核',
-            icon: 'table'
+            icon: ''
         }
     }
     ]

+ 2 - 2
src/router/feedbackManagement/index.js

@@ -9,7 +9,7 @@ const feedbackManagementRouter = {
     name: 'feedbackManagement',
     meta: {
         title: '反馈管理',
-        icon: 'el-icon-s-help'
+        icon: 'fankuiguanli'
     },
     alwaysShow: true,
     children: [{
@@ -18,7 +18,7 @@ const feedbackManagementRouter = {
         component: () => import('@/views/feedbackManagement/userFeedback'),
         meta: {
             title: '用户反馈',
-            icon: 'table'
+            icon: ''
         }
     }
     ]

+ 1 - 1
src/router/index.js

@@ -36,7 +36,7 @@ export const constantRoutes = [{
 			component: () => import('@/views/dashboard/index'),
 			meta: {
 				title: '首页',
-				icon: 'el-icon-s-home'
+				icon: 'shouye'
 			}
 		}]
 	},

+ 2 - 2
src/router/orderManagement/index.js

@@ -9,7 +9,7 @@ const orderManagementRouter = {
     name: 'orderManagement',
     meta: {
         title: '订单管理',
-        icon: 'el-icon-s-help'
+        icon: 'dingdanguanli'
     },
     alwaysShow: true,
     children: [{
@@ -18,7 +18,7 @@ const orderManagementRouter = {
         component: () => import('@/views/orderManagement/orderAudit'),
         meta: {
             title: '订单审核',
-            icon: 'table'
+            icon: ''
         }
     }
     ]

+ 4 - 4
src/router/platformManagement/index.js

@@ -9,7 +9,7 @@ const platformManagementRouter = {
     name: 'platformManagement',
     meta: {
         title: '平台规定管理',
-        icon: 'el-icon-s-help'
+        icon: 'pingtaiguanli'
     },
     alwaysShow: true,
     children: [{
@@ -18,7 +18,7 @@ const platformManagementRouter = {
         component: () => import('@/views/platformManagement/specifiedRecords'),
         meta: {
             title: '规定记录',
-            icon: 'table'
+            icon: ''
         }
     },
 	{
@@ -27,7 +27,7 @@ const platformManagementRouter = {
 		component: () => import('@/views/platformManagement/specifiedRecordsAdd'),
 		meta: {
 		    title: '新增规定记录',
-		    icon: 'table'
+		    icon: ''
 		},
 		hidden: true
 	},
@@ -37,7 +37,7 @@ const platformManagementRouter = {
 		component: () => import('@/views/platformManagement/specifiedRecordsLook'),
 		meta: {
 		    title: '规定记录查看',
-		    icon: 'table'
+		    icon: ''
 		},
 		hidden: true
 	}

+ 8 - 1
src/styles/sidebar.scss

@@ -35,6 +35,7 @@
 
     .el-scrollbar {
       height: 100%;
+	  border-right: 1px solid #dbd4d4;
     }
 
     &.has-logo {
@@ -71,6 +72,7 @@
     // menu hover
     .submenu-title-noDropdown,
     .el-submenu__title {
+		font-weight: 600 !important;
       &:hover {
         background-color: $menuHover !important;
       }
@@ -79,12 +81,16 @@
     .is-active>.el-submenu__title {
       color: $subMenuActiveText !important;
     }
+	.nest-menu .is-active{
+		border-right: 4px solid #2A50ED;
+	}
 
     & .nest-menu .el-submenu>.el-submenu__title,
     & .el-submenu .el-menu-item {
+		margin-left: 30px;
       min-width: $sideBarWidth !important;
       background-color: $subMenuBg !important;
-
+	
       &:hover {
         background-color: $subMenuHover !important;
       }
@@ -199,6 +205,7 @@
 
   .nest-menu .el-submenu>.el-submenu__title,
   .el-menu-item {
+	  
     &:hover {
       // you can use $subMenuHover
       background-color: $menuHover !important;

+ 8 - 8
src/styles/variables.scss

@@ -1,15 +1,15 @@
 // sidebar
-$menuText:#bfcbd9;
-$menuActiveText:#409EFF;
-$subMenuActiveText:#f4f4f5; //https://github.com/ElemeFE/element/issues/12951
+$menuText:#000000; //文字颜色
+$menuActiveText:#2F53EB;//选择后文字颜色
+$subMenuActiveText:#2F53EB; //选中后父级标签文字颜色
 
-$menuBg: #FFFFFF ;//文字颜色
-$menuHover:#263445;
+$menuBg: #FFFFFF ;//背景颜色
+$menuHover:#F9FAFE;//悬浮背景
 
-$subMenuBg:#1f2d3d;
-$subMenuHover:#001528;
+$subMenuBg:#ffffff;
+$subMenuHover:#ffffff;//选中悬浮
 
-$sideBarWidth: 210px;
+$sideBarWidth: 220px;
 
 // the :export directive is the magic sauce for webpack
 // https://www.bluematador.com/blog/how-to-share-variables-between-js-and-sass

+ 0 - 1
src/utils/request.js

@@ -14,7 +14,6 @@ const service = axios.create({
 service.interceptors.request.use(
   config => {
     // do something before request is sent
-    debugger
     if (store.getters.token) {
       // let each request carry token
       // ['X-Token'] is a custom headers key

+ 14 - 15
src/views/cargoOwnerManagement/empowerExamine.vue

@@ -19,11 +19,11 @@
 				<el-row>
 					<el-col>
 						<div class="search_btn">
-							<div :class="search == '' ? 'search' : 'searchNo'" class="search_item"
-								@click="searchBtn('')"> 
+							<div :class="search == '' ? 'search' : 'searchNo'" class="search_item search_block"
+								@click="searchBtn('')">
 								全部
 							</div>
-							<div :class="search == 1 ? 'search' : 'searchNo'" class="search_item" @click="searchBtn(1)">
+							<div :class="search == 1 ? 'search' : 'searchNo'" class="search_item " @click="searchBtn(1)">
 								待审核
 							</div>
 							<div :class="search == 3 ? 'search' : 'searchNo'" class="search_item" @click="searchBtn(3)">
@@ -49,14 +49,7 @@
 				</el-row>
 			</div>
 			<el-table :data="tableData" style="width: 98%; margin: 0 auto; border-radius: 10px" height="55.8vh" border>
-				<el-table-column prop="name" label="货主姓名" min-width="130">
-					<template slot-scope="scope">
-						<div style="position: relative;">
-							<el-avatar :size="20" :src="scope.row.avatarUrl" style="margin: 0 10px 0 -25px;"></el-avatar>
-							<span style="position: absolute;display: inline-block;">{{scope.row.name}}</span>
-						</div>
-					</template>
-				</el-table-column>
+				<el-table-column prop="name" label="货主姓名" min-width="130"></el-table-column>
 				<el-table-column prop="phone" label="账号"  min-width="110"></el-table-column>
 				<el-table-column prop="cardNumber" label="身份证号" min-width="165"></el-table-column>
 				<el-table-column prop="amountMoney" label="发运次数"></el-table-column>
@@ -108,9 +101,9 @@
 				<div class="name_css">{{idSee.name}}</div>
 				<div class="title_css">身份证号</div>
 				<div class="name_css">{{idSee.cardNumber}}</div>
-				<div class="title_css">有效期</div> 	
+				<div class="title_css">有效期</div>
 				<div class="name_css">{{idSee.cardValidityDate}} <span style="color: #EF4C33;margin-left: 10px" v-if="false">已过期</span></div>
-				<div class="title_css">身份证人像面</div> 
+				<div class="title_css">身份证人像面</div>
 				<img :src="idSee.cardAddressUrl" class="user_item"/>
 				<div class="title_css">身份证国徽面</div>
 				<img :src="idSee.cardBackAddressUrl" class="user_item"/>
@@ -351,7 +344,7 @@
 				this.idSee.cardBackAddressUrl = row.cardBackAddressUrl
 				this.idSee.name = row.name
 				this.idSee.cardNumber = row.cardNumber
-				this.idSee.cardValidityDate = row.cardValidityDate 	
+				this.idSee.cardValidityDate = row.cardValidityDate
 				this.userInfo = true;
 			},
 			userInfoClose() {
@@ -398,8 +391,13 @@
 			padding: 10px;
 
 			.search_btn {
+        height: 80px;
+        background: linear-gradient(#fafbfb, #ffffff);
 				display: flex;
 				margin-top: 20px;
+        .search_block{
+          margin-left: 20px;
+        }
 
 				.search_item {
 					text-align: center;
@@ -409,7 +407,8 @@
 					width: 112px;
 					height: 40px;
 					background: #f7f8f9;
-					cursor: pointer
+					cursor: pointer;
+          margin-top: 30px;
 				}
 
 				.searchNo {

+ 15 - 16
src/views/cargoOwnerManagement/merchantVerification.vue

@@ -19,7 +19,7 @@
 				<el-row>
 					<el-col>
 						<div class="search_btn">
-							<div :class="search == '' ? 'search' : 'searchNo'" class="search_item"
+							<div :class="search == '' ? 'search' : 'searchNo'" class="search_item search_block"
 								@click="searchBtn('')">
 								全部
 							</div>
@@ -37,14 +37,7 @@
 				</el-row>
 			</div>
 			<el-table :data="tableData" style="width: 98%; margin: 0 auto; border-radius: 10px" height="55.8vh" border>
-				<el-table-column prop="reexType" label="货主姓名" min-width="130">
-					<template slot-scope="scope">
-						<div style="position: relative;">
-							<el-avatar :size="20" :src="scope.row.avatarUrl" style="margin: 0 10px 0 -25px;"></el-avatar>
-							<span style="position: absolute;display: inline-block;">{{scope.row.name}}</span>
-						</div>
-					</template>
-				</el-table-column>
+				<el-table-column prop="name" label="货主姓名" min-width="130"></el-table-column>
 				<el-table-column prop="phone" label="账号" min-width="107"></el-table-column>
 				<el-table-column prop="cardNumber" label="身份证号" min-width="162"></el-table-column>
 				<el-table-column prop="company" label="所属企业名称" min-width="110"></el-table-column>
@@ -72,9 +65,9 @@
 		<el-dialog title="授权书" :visible.sync="lookInfo" width="500px" center :before-close="lookBookClose">
 			<div class="InfoBook_css">
 					<img :src="bookUrl" class="InfoBook_img">
-				
+
 			</div>
-			
+
 		</el-dialog>
 		<el-dialog title="驳回认证" :visible.sync="rejectInfo" width="400px" :before-close="rejectClose">
 			<div>
@@ -99,7 +92,7 @@
 				</div>
 			</div>
 		</el-dialog>
-		
+
 	</div>
 </template>
 <script>
@@ -206,7 +199,7 @@
 						this.loading = false
 					})
 			},
-			
+
 			lookBook(row) {
 				this.bookUrl = row.certificateAddressUrl
 				this.lookInfo = true;
@@ -255,8 +248,13 @@
 			padding: 10px;
 
 			.search_btn {
+        height: 80px;
+        background: linear-gradient(#fafbfb, #ffffff);
 				display: flex;
 				margin-top: 20px;
+        .search_block{
+          margin-left: 20px;
+        }
 
 				.search_item {
 					text-align: center;
@@ -266,7 +264,8 @@
 					width: 112px;
 					height: 40px;
 					background: #f7f8f9;
-					cursor: pointer
+					cursor: pointer;
+           margin-top: 30px;
 				}
 
 				.searchNo {
@@ -420,12 +419,12 @@
 	}
 	//授权信息
 	.InfoBook_css{
-		
+
 		.InfoBook_img{
 			width: 100%;
 			height: 220px;
 			margin-top: 10px;
 		}
 	}
-	
+
 </style>

+ 9 - 10
src/views/cargoOwnerManagement/taskAudit.vue

@@ -19,7 +19,7 @@
 				<el-row>
 					<el-col>
 						<div class="search_btn">
-							<div :class="search == '' ? 'search' : 'searchNo'" class="search_item"
+							<div :class="search == '' ? 'search' : 'searchNo'" class="search_item search_block"
 								@click="searchBtn('')">
 								全部
 							</div>
@@ -37,14 +37,7 @@
 				</el-row>
 			</div>
 			<el-table :data="tableData" style="width: 98%; margin: 0 auto; border-radius: 10px" height="55.8vh" border>
-				<el-table-column prop="cargoOwnerName" label="货主姓名" min-width="125">
-					<template slot-scope="scope">
-						<div style="position: relative;">
-							<el-avatar :size="20" :src="scope.row.cargoOwnerPortrait" style="margin: 0 10px 0 -25px;"></el-avatar>
-							<span style="position: absolute;display: inline-block;">{{scope.row.cargoOwnerName}}</span>
-						</div>
-					</template>
-				</el-table-column>
+				<el-table-column prop="cargoOwnerName" label="货主姓名" min-width="125"></el-table-column>
 				<el-table-column prop="taskNo" label="任务编号" min-width="165"></el-table-column>
 				<el-table-column prop="cargoOwnerPhone" label="货主账号" min-width="108"></el-table-column>
 				<el-table-column prop="amountMoney" label="发货地" min-width="150">
@@ -280,8 +273,13 @@
 			padding: 10px;
 
 			.search_btn {
+        height: 80px;
+        background: linear-gradient(#fafbfb, #ffffff);
 				display: flex;
 				margin-top: 20px;
+        .search_block{
+          margin-left: 20px;
+        }
 
 				.search_item {
 					text-align: center;
@@ -291,7 +289,8 @@
 					width: 112px;
 					height: 40px;
 					background: #f7f8f9;
-					cursor: pointer
+					cursor: pointer;
+          margin-top: 30px;
 				}
 
 				.searchNo {

+ 13 - 16
src/views/driverManagement/identityExamine.vue

@@ -19,8 +19,8 @@
 				<el-row>
 					<el-col>
 						<div class="search_btn">
-							<div :class="search == '' ? 'search' : 'searchNo'" class="search_item"
-								@click="searchBtn('')"> 
+							<div :class="search == '' ? 'search' : 'searchNo'" class="search_item search_block"
+								@click="searchBtn('')">
 								全部
 							</div>
 							<div :class="search == 1 ? 'search' : 'searchNo'" class="search_item" @click="searchBtn(1)">
@@ -49,17 +49,7 @@
 				</el-row>
 			</div>
 			<el-table :data="tableData" style="width: 98%; margin: 0 auto; border-radius: 10px" height="55.8vh" border>
-				<el-table-column prop="driverName" label="司机姓名" min-width="130">
-					<template slot-scope="scope">
-						<div style="position: relative;">
-							<el-avatar :size="20"
-								:src="scope.row.avatarUrl"
-								style="margin: 0 10px 0 -25px;">
-							</el-avatar>
-							<span style="position: absolute;display: inline-block;">{{scope.row.driverName}}</span>
-						</div>
-					</template>
-				</el-table-column>
+				<el-table-column prop="driverName" label="司机姓名" min-width="130"></el-table-column>
 				<el-table-column prop="driverPhone" label="账号" min-width="110"></el-table-column>
 				<el-table-column prop="numberCard" label="身份证号" min-width="165"></el-table-column>
 				<el-table-column prop="amountMoney" label="承运次数"></el-table-column>
@@ -288,7 +278,7 @@
 					this.index = 0
 					this.img[0] = this.file.trailerOperationCertificate
 				}
-				
+
 			},
 			newInfo(row) {
 				this.Info.newsTypeKey = 1
@@ -499,9 +489,15 @@
 		.top_css {
 			padding: 10px;
 
+
 			.search_btn {
+         height: 80px;
+        background: linear-gradient(#fafbfb, #ffffff);
 				display: flex;
 				margin-top: 20px;
+        .search_block{
+          margin-left: 20px;
+        }
 
 				.search_item {
 					text-align: center;
@@ -511,7 +507,8 @@
 					width: 112px;
 					height: 40px;
 					background: #f7f8f9;
-					cursor: pointer
+					cursor: pointer;
+          margin-top: 30px;
 				}
 
 				.searchNo {
@@ -754,5 +751,5 @@
 		margin: 0 auto;
 	}
 	}
-	
+
 </style>

+ 11 - 12
src/views/driverManagement/vehicleExamine.vue

@@ -19,7 +19,7 @@
 				<el-row>
 					<el-col>
 						<div class="search_btn">
-							<div :class="search == '' ? 'search' : 'searchNo'" class="search_item"
+							<div :class="search == '' ? 'search' : 'searchNo'" class="search_item search_block"
 								@click="searchBtn('')">
 								全部
 							</div>
@@ -43,14 +43,7 @@
 				</el-row>
 			</div>
 			<el-table :data="tableData" style="width: 98%; margin: 0 auto; border-radius: 10px" height="55.8vh" border>
-				<el-table-column prop="driverName" label="司机姓名" min-width="130">
-					<template slot-scope="scope">
-						<div style="position: relative;">
-							<el-avatar :size="20" :src="scope.row.avatarUrl" style="margin: 0 10px 0 -25px;"></el-avatar>
-							<span style="position: absolute;display: inline-block;">{{scope.row.driverName}}</span>
-						</div>
-					</template>
-				</el-table-column>
+				<el-table-column prop="driverName" label="司机姓名" min-width="130"></el-table-column>
 				<el-table-column prop="driverPhone" label="账号" min-width="110"></el-table-column>
 				<el-table-column prop="numberCard" label="身份证号" min-width="165"></el-table-column>
 				<el-table-column prop="carNumber" label="车牌号"></el-table-column>
@@ -136,7 +129,7 @@
 				checkList: [],
 				form: {},
 				carSee:{}
-				
+
 			};
 		},
 		mounted() {
@@ -184,7 +177,7 @@
 									this.loading = false
 								})
 						})
-					
+
 			},
 			reject(row) {
 				this.form.id = row.id
@@ -268,8 +261,13 @@
 		.top_css {
 			padding: 10px;
 			.search_btn {
+         height: 80px;
 				display: flex;
 				margin-top: 20px;
+        background: linear-gradient(#fafbfb, #ffffff);
+        .search_block{
+          margin-left: 20px;
+        }
 
 				.search_item {
 					text-align: center;
@@ -279,7 +277,8 @@
 					width: 112px;
 					height: 40px;
 					background: #f7f8f9;
-					cursor: pointer
+					cursor: pointer;
+          margin-top: 30px;
 				}
 				.searchNo {
 					color: #323233;

+ 9 - 10
src/views/enterpriseManagement/enterpriseAudit.vue

@@ -19,7 +19,7 @@
 				<el-row>
 					<el-col>
 						<div class="search_btn">
-							<div :class="search == '' ? 'search' : 'searchNo'" class="search_item"
+							<div :class="search == '' ? 'search' : 'searchNo'" class="search_item search_block"
 								@click="searchBtn('')">
 								全部
 							</div>
@@ -40,14 +40,7 @@
 				</el-row>
 			</div>
 			<el-table :data="tableData" style="width: 98%; margin: 0 auto; border-radius: 10px" height="55.8vh" border>
-				<el-table-column prop="reexType" label="企业名称" min-width="150">
-					<template slot-scope="scope">
-						<div style="position: relative;">
-							<el-avatar :size="20" :src="scope.row.avatarUrl" style="margin: 0 10px 0 -25px;"></el-avatar>
-							<span style="position: absolute;display: inline-block;">{{scope.row.companyName}}</span>
-						</div>
-					</template>
-				</el-table-column>
+				<el-table-column prop="companyName" label="企业名称" min-width="150"></el-table-column>
 				<el-table-column prop="unifiedSocialCreditCode" label="统一社会信用代码" min-width="140"></el-table-column>
 				<el-table-column prop="legalPersonName" label="法定代表人" min-width="91"></el-table-column>
 				<el-table-column prop="accountNumber" label="账号" min-width="107"></el-table-column>
@@ -267,8 +260,13 @@
 			padding: 10px;
 
 			.search_btn {
+        height: 80px;
+        background: linear-gradient(#fafbfb, #ffffff);
 				display: flex;
 				margin-top: 20px;
+        .search_block{
+          margin-left: 20px;
+        }
 
 				.search_item {
 					text-align: center;
@@ -278,7 +276,8 @@
 					width: 112px;
 					height: 40px;
 					background: #f7f8f9;
-					cursor: pointer
+					cursor: pointer;
+          margin-top: 30px;
 				}
 
 				.searchNo {

+ 679 - 681
src/views/orderManagement/orderAudit.vue

@@ -1,696 +1,694 @@
 // 订单审核
 <template>
-	<div class="center">
-		<div class="center_css">
-			<div class="top_css">
-				<el-row>
-					<el-col :span="14">
-           	<el-button type="primary" @click="billing" style="margin-right:10px">批量开票</el-button>
-						<el-date-picker v-model="value1" value-format="yyyy-MM-dd" @change="dateChange" type="daterange"
-							range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期">
-						</el-date-picker>
-					</el-col>
-					<el-col :span="10">
-						<div class="screen">
-							<el-input placeholder="可按订单编号、姓名、账号查找" v-model="searchkeyWord" clearable></el-input>
-							<el-button class="search" @click="find"><img width="16" height="16"
-									style="margin-left: -8px" src="../../../public/img/sousuo.png" /></el-button><span
-								class="count_css">共{{ deptBudgetTotal }}条</span>
-						</div>
-					</el-col>
-				</el-row>
-				<el-row>
-					<el-col>
-						<div class="search_btn">
-							<div :class="search == '' ? 'search' : 'searchNo'" class="search_item"
-								@click="searchBtn('')">
-								全部
-							</div>
-							<div :class="search == 1 ? 'search' : 'searchNo'" class="search_item" @click="searchBtn(1)">
-								待审核
-							</div>
-							<div :class="search == 2 ? 'search' : 'searchNo'" class="search_item" @click="searchBtn(2)">
-								待付款
-							</div>
-							<div :class="search == 3 ? 'search' : 'searchNo'" class="search_item" @click="searchBtn(3)">
-								待还款
-							</div>
-							<div :class="search == 4 ? 'search' : 'searchNo'" class="search_item" @click="searchBtn(4)">
-								待开票
-							</div>
-							<div :class="search == 5 ? 'search' : 'searchNo'" class="search_item" @click="searchBtn(5)">
-								已完结
-							</div>
-						</div>
-					</el-col>
-				</el-row>
-			</div>
-			<el-table :data="tableData" style="width: 98%; margin: 0 auto; border-radius: 10px" height="60vh" border @row-click="handleRowClick" @selection-change="handleSelectionChange">
-         <el-table-column
-              type="selection"
-              width="55" :selectable="selectInit">
-            </el-table-column>
-				<el-table-column type="index" label="序号" width="50">
-					<template scope="scope">
-						<span v-if="scope.$index < 9">0{{ scope.$index + 1 }}</span>
-						<span v-else>{{ scope.$index + 1 }}</span>
-					</template>
-				</el-table-column>
-				<el-table-column prop="orderNo" label="订单编号" min-width="150"></el-table-column>
-				<el-table-column prop="cargoOwner" label="货主"></el-table-column>
-				<el-table-column prop="driverName" label="司机"></el-table-column>
-				<el-table-column prop="freight" label="运费(元)">
-				</el-table-column>
-				<el-table-column prop="amountMoney" label="已付(元)"></el-table-column>
-				<el-table-column prop="amountMon" label="超期费(元)">
-					<template slot-scope="scope">
-						<span class="btn_css"
-							@click="costLook(scope.row)">{{scope.row.freightAdvance == 0 ? "" : 0}}</span>
-					</template>
-				</el-table-column>
-				<el-table-column prop="amountMoney" label="应还(元)"></el-table-column>
-				<el-table-column prop="amountMoney" label="已还(元)">
-					<template slot-scope="scope">
-						<span>{{scope.row.freightAdvance == 0 ? "" : scope.row.alreadyRepaid}}</span>
-					</template>
-				</el-table-column>
-				<el-table-column prop="invoicing" label="发票">
-					<template slot-scope="scope">
-						<span>{{scope.row.invoicing == 0 ? "未开":"已开"}}</span>
-					</template>
-				</el-table-column>
-				<el-table-column prop="payee" label="合同">
-					<span @click="account" class="btn_css">查看</span>
-				</el-table-column>
-				<el-table-column prop="updateDate" label="更新时间" min-width="110"></el-table-column>
-				<el-table-column prop="orderStatus" label="状态" min-width="92"></el-table-column>
-				<el-table-column label="操作" min-width="350">
-					<template slot-scope="scope">
-						<el-link target="_blank" @click="see(scope.row)" type="primary" :underline="false"
-							:disabled="scope.row.orderStatusKey != 9 && scope.row.orderStatusKey != 19">确认
-						</el-link>
-						<el-divider direction="vertical"></el-divider>
-						<el-link target="_blank" @click="see(scope.row)" type="primary" :underline="false"
-							:disabled="scope.row.orderStatusKey != 9 && scope.row.orderStatusKey != 19">驳回
-						</el-link>
-						<el-divider direction="vertical"></el-divider>
-						<el-link target="_blank" @click="see(scope.row)" type="primary" :underline="false">查看</el-link>
-						<el-divider direction="vertical"></el-divider>
-						<el-dropdown>
-							<span class="btn_css">•••</span>
-							<el-dropdown-menu slot="dropdown">
-								<el-dropdown-item>
-									<el-link target="_blank" @click="end(scope.row)" type="primary" :underline="false"
-										:disabled="scope.row.cargoOwnerStatusKey > 18">终止</el-link>
-								</el-dropdown-item>
-								<el-dropdown-item>
-									<el-link target="_blank" @click="see(scope.row)" type="primary" :underline="false"
-										:disabled="scope.row.cargoOwnerStatusKey != 29">完结</el-link>
-								</el-dropdown-item>
-								<el-dropdown-item>
-									<el-link target="_blank" type="primary" :underline="false">预付</el-link>
-								</el-dropdown-item>
-								<el-dropdown-item>
-									<el-link target="_blank" type="primary" :underline="false">尾款</el-link>
-								</el-dropdown-item>
-							</el-dropdown-menu>
-						</el-dropdown>
-
-					</template>
-				</el-table-column>
-			</el-table>
-		</div>
-		<el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
-			style="text-align: center; margin-top: 10px" :page-size="deptCircularPage.pageSize"
-			layout="total, sizes, prev, pager, next, jumper" :total="deptBudgetTotal">
-		</el-pagination>
-		<el-dialog title="超期费用" :visible.sync="costInfo" width="500px" :before-close="costClose">
-			<div class="cost_css">
-				<div class="cost_item">
-					<div class="cost_title">起计日期</div>
-					<div class="cost_value">2022-02-15</div>
-				</div>
-				<div class="cost_item">
-					<div class="cost_title">终止日期</div>
-					<div class="cost_value">2022-02-15</div>
-				</div>
-				<div class="cost_item">
-					<div class="cost_title">超期费率</div>
-					<div class="cost_value">{{costData.interestRate}}</div>
-				</div>
-				<el-divider></el-divider>
-				<div class="cost_item">
-					<div class="cost_title">已付运费</div>
-					<div class="cost_value">{{costData.interestRate}}</div>
-				</div>
-				<div class="cost_item">
-					<div class="cost_title">超期费用</div>
-					<div class="cost_value">{{costData.interestRate}}</div>
-				</div>
-				<div class="right_btn">
-					<el-button @click="costInfo = false" type="primary">关闭</el-button>
-				</div>
-			</div>
-		</el-dialog>
-		<el-dialog title="账户信息" :visible.sync="userInfo" width="500px" :before-close="userClose">
-			<div class="user" v-for="item in 2">
-				<div class="user_id">
-					<div class="id_css">12121212121212121212</div>
-					<div class="name_css">张三</div>
-				</div>
-				<div>中国银行-鲅鱼圈支行</div>
-				<img src="../../../public/img/yonghu.jpg" class="user_item" />
-			</div>
-		</el-dialog>
-
-		<el-drawer title="任务详情" :visible.sync="rightSee" style="overflow-y: auto !important">
-			<div class="right_css">
-				<div class="title_name">基本信息</div>
-				<div class="right_item">订单编号:{{costData.orderNo}}</div>
-				<div class="right_title">货主</div>
-				<div class="right_item">{{costData.cargoOwner}}</div>
-				<div class="right_title">司机</div>
-				<div class="right_item">{{costData.driverName}}</div>
-				<div class="right_title">发货单位</div>
-				<div class="right_item">{{costData.compName}}</div>
-				<div class="right_title">发货地</div>
-				<div class="right_item">
-					{{costData.sendPrivate}}{{costData.sendCity}}{{costData.sendArea}}{{costData.sendDetailedAddress}}
-				</div>
-				<div class="right_title">卸货地</div>
-				<div class="right_item">
-					{{costData.unloadPrivate}}{{costData.unloadCity}}{{costData.unloadArea}}{{costData.unloadDetailedAddress}}
-				</div>
-				<div class="right_title">货名</div>
-				<div class="right_item">{{costData.goodsName}}</div>
-				<div class="right_title">距离</div>
-				<div class="right_item">约{{costData.distance ? costData.distance : 0}}km</div>
-				<div class="right_title">运费</div>
-				<div class="right_item">{{costData.freight}}</div>
-				<el-divider></el-divider>
-				<div v-if="costData.carrierInfo">
-					<div class="title_name">承运信息</div>
-					<div class="right_title">承运合同编号</div>
-					<div class="right_item">{{costData.carrierInfo.orderNo}}</div>
-					<div class="right_title">委托合同编号</div>
-					<div class="right_item">{{costData.carrierInfo.orderNo}}</div>
-					<div class="right_title">车牌号</div>
-					<div class="right_item">{{costData.carrierInfo.carNo}}</div>
-					<div class="right_title">预计运费</div>
-					<div class="right_item">{{costData.carrierInfo.estimatedFreight}}</div>
-					<div class="right_title">装车时间</div>
-					<div class="right_item">{{costData.carrierInfo.loadingDate}}</div>
-					<div class="right_title">装车照片</div>
-					<div style="display: flex;">
-						<div v-for="(item,index) in costData.carrierInfo.loadingImg.split(',')">
-							<img :src="item" class="img_css">
-						</div>
-					</div>
-				</div>
-				<el-divider></el-divider>
-				<div v-if="costData.freightInfo">
-					<div class="title_name">运费信息(单位:元)</div>
-					<div class="right_title">预付运费</div>
-					<div class="right_item">{{costData.freightInfo.prepaidFreight}} <span
-							style="margin-left: 100px;">{{costData.freightInfo.prepaidFreightDate}}</span></div>
-					<div class="right_title">运费尾款</div>
-					<div class="right_item">{{costData.freightInfo.freightBalance}} <span
-							style="margin-left: 100px;">{{costData.freightInfo.freightBalanceDate}}</span></div>
-					<div class="right_title">明细</div>
-					<div class="right_item">
-						预付{{costData.freightInfo.prepaidFreight ? costData.freightInfo.prepaidFreight : 0}}元,扣款{{costData.freightInfo.deduction ? costData.freightInfo.deduction : 0}}元,服务费{{costData.freightInfo.serviceCharge ? costData.freightInfo.serviceCharge:0}}元,尾款{{costData.freightInfo.freightBalance ? costData.freightInfo.freightBalance:0}}元,合计收款{{costData.freightInfo.totalRepayable ? costData.freightInfo.totalRepayable:0}}元。
-					</div>
-				</div>
-				<el-divider></el-divider>
-				<div v-if="costData.repaymentInfo">
-					<div class="title_name">还款信息</div>
-					<div class="right_title">运费</div>
-					<div class="right_item">{{costData.freight}}</div>
-					<div class="right_title">超期费(每天3%)</div>
-					<div class="right_item">{{costData.repaymentInfo.overdueFee}}</div>
-					<div class="right_title">合计应还</div>
-					<div class="right_item">{{costData.repaymentInfo.totalRepayable}}</div>
-					<div class="right_title">还款(尾号6666)</div>
-					<div class="right_item">{{costData.repaymentInfo.alreadyRepaid}}</div>
-				</div>
-				<div class="right_btn">
-					<el-button @click="submit(1)" v-if="costData.orderStatusKey == 9 && costData.orderStatusKey == 19">
-						确认</el-button>
-					<el-button @click="submit(2)" v-if="costData.orderStatusKey == 9 && costData.orderStatusKey == 19">
-						驳回</el-button>
-					<el-button @click="complete" v-if="costData.cargoOwnerStatusKey == 29">完结</el-button>
-					<el-button @click="rightSee = false">关闭</el-button>
-				</div>
-			</div>
-		</el-drawer>
-	</div>
+  <div class="center">
+    <div class="center_css">
+      <div class="top_css">
+        <el-row>
+          <el-col :span="14">
+            <el-button type="primary" @click="billing" style="margin-right:10px">批量开票</el-button>
+            <el-date-picker v-model="value1" value-format="yyyy-MM-dd" @change="dateChange" type="daterange"
+              range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期">
+            </el-date-picker>
+          </el-col>
+          <el-col :span="10">
+            <div class="screen">
+              <el-input placeholder="可按订单编号、姓名、账号查找" v-model="searchkeyWord" clearable></el-input>
+              <el-button class="search" @click="find"><img width="16" height="16" style="margin-left: -8px"
+                  src="../../../public/img/sousuo.png" /></el-button><span
+                class="count_css">共{{ deptBudgetTotal }}条</span>
+            </div>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col>
+            <div class="search_btn">
+              <div :class="search == '' ? 'search' : 'searchNo'" class="search_item search_block" @click="searchBtn('')">
+                全部
+              </div>
+              <div :class="search == 1 ? 'search' : 'searchNo'" class="search_item" @click="searchBtn(1)">
+                待审核
+              </div>
+              <div :class="search == 2 ? 'search' : 'searchNo'" class="search_item" @click="searchBtn(2)">
+                待付款
+              </div>
+              <div :class="search == 3 ? 'search' : 'searchNo'" class="search_item" @click="searchBtn(3)">
+                待还款
+              </div>
+              <div :class="search == 4 ? 'search' : 'searchNo'" class="search_item" @click="searchBtn(4)">
+                待开票
+              </div>
+              <div :class="search == 5 ? 'search' : 'searchNo'" class="search_item" @click="searchBtn(5)">
+                已完结
+              </div>
+            </div>
+          </el-col>
+        </el-row>
+      </div>
+      <el-table :data="tableData" style="width: 98%; margin: 0 auto; border-radius: 10px" height="60vh" border
+        @row-click="handleRowClick" @selection-change="handleSelectionChange">
+        <el-table-column type="selection" width="55" :selectable="selectInit">
+        </el-table-column>
+        <el-table-column type="index" label="序号" width="50">
+          <template scope="scope">
+            <span v-if="scope.$index < 9">0{{ scope.$index + 1 }}</span>
+            <span v-else>{{ scope.$index + 1 }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="orderNo" label="订单编号" min-width="150"></el-table-column>
+        <el-table-column prop="cargoOwner" label="货主"></el-table-column>
+        <el-table-column prop="driverName" label="司机"></el-table-column>
+        <el-table-column prop="freight" label="运费(元)">
+        </el-table-column>
+        <el-table-column prop="amountMoney" label="已付(元)"></el-table-column>
+        <el-table-column prop="amountMon" label="超期费(元)">
+          <template slot-scope="scope">
+            <span class="btn_css" @click="costLook(scope.row)">{{scope.row.freightAdvance == 0 ? "" : 0}}</span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="amountMoney" label="应还(元)"></el-table-column>
+        <el-table-column prop="amountMoney" label="已还(元)">
+          <template slot-scope="scope">
+            <span>{{scope.row.freightAdvance == 0 ? "" : scope.row.alreadyRepaid}}</span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="invoicing" label="发票">
+          <template slot-scope="scope">
+            <span>{{scope.row.invoicing == 0 ? "未开":"已开"}}</span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="payee" label="合同">
+          <span @click="account" class="btn_css">查看</span>
+        </el-table-column>
+        <el-table-column prop="updateDate" label="更新时间" min-width="110"></el-table-column>
+        <el-table-column prop="orderStatus" label="状态" min-width="92"></el-table-column>
+        <el-table-column label="操作" min-width="350">
+          <template slot-scope="scope">
+            <el-link target="_blank" @click="see(scope.row)" type="primary" :underline="false"
+              :disabled="scope.row.orderStatusKey != 9 && scope.row.orderStatusKey != 19">确认
+            </el-link>
+            <el-divider direction="vertical"></el-divider>
+            <el-link target="_blank" @click="see(scope.row)" type="primary" :underline="false"
+              :disabled="scope.row.orderStatusKey != 9 && scope.row.orderStatusKey != 19">驳回
+            </el-link>
+            <el-divider direction="vertical"></el-divider>
+            <el-link target="_blank" @click="see(scope.row)" type="primary" :underline="false">查看</el-link>
+            <el-divider direction="vertical"></el-divider>
+            <el-dropdown>
+              <span class="btn_css">•••</span>
+              <el-dropdown-menu slot="dropdown">
+                <el-dropdown-item>
+                  <el-link target="_blank" @click="end(scope.row)" type="primary" :underline="false"
+                    :disabled="scope.row.cargoOwnerStatusKey > 18">终止</el-link>
+                </el-dropdown-item>
+                <el-dropdown-item>
+                  <el-link target="_blank" @click="see(scope.row)" type="primary" :underline="false"
+                    :disabled="scope.row.cargoOwnerStatusKey != 29">完结</el-link>
+                </el-dropdown-item>
+                <el-dropdown-item>
+                  <el-link target="_blank" type="primary" :underline="false">预付</el-link>
+                </el-dropdown-item>
+                <el-dropdown-item>
+                  <el-link target="_blank" type="primary" :underline="false">尾款</el-link>
+                </el-dropdown-item>
+              </el-dropdown-menu>
+            </el-dropdown>
+
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+    <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
+      style="text-align: center; margin-top: 10px" :page-size="deptCircularPage.pageSize"
+      layout="total, sizes, prev, pager, next, jumper" :total="deptBudgetTotal">
+    </el-pagination>
+    <el-dialog title="超期费用" :visible.sync="costInfo" width="500px" :before-close="costClose">
+      <div class="cost_css">
+        <div class="cost_item">
+          <div class="cost_title">起计日期</div>
+          <div class="cost_value">2022-02-15</div>
+        </div>
+        <div class="cost_item">
+          <div class="cost_title">终止日期</div>
+          <div class="cost_value">2022-02-15</div>
+        </div>
+        <div class="cost_item">
+          <div class="cost_title">超期费率</div>
+          <div class="cost_value">{{costData.interestRate}}</div>
+        </div>
+        <el-divider></el-divider>
+        <div class="cost_item">
+          <div class="cost_title">已付运费</div>
+          <div class="cost_value">{{costData.interestRate}}</div>
+        </div>
+        <div class="cost_item">
+          <div class="cost_title">超期费用</div>
+          <div class="cost_value">{{costData.interestRate}}</div>
+        </div>
+        <div class="right_btn">
+          <el-button @click="costInfo = false" type="primary">关闭</el-button>
+        </div>
+      </div>
+    </el-dialog>
+    <el-dialog title="账户信息" :visible.sync="userInfo" width="500px" :before-close="userClose">
+      <div class="user" v-for="item in 2">
+        <div class="user_id">
+          <div class="id_css">12121212121212121212</div>
+          <div class="name_css">张三</div>
+        </div>
+        <div>中国银行-鲅鱼圈支行</div>
+        <img src="../../../public/img/yonghu.jpg" class="user_item" />
+      </div>
+    </el-dialog>
+
+    <el-drawer title="任务详情" :visible.sync="rightSee" style="overflow-y: auto !important">
+      <div class="right_css">
+        <div class="title_name">基本信息</div>
+        <div class="right_item">订单编号:{{costData.orderNo}}</div>
+        <div class="right_title">货主</div>
+        <div class="right_item">{{costData.cargoOwner}}</div>
+        <div class="right_title">司机</div>
+        <div class="right_item">{{costData.driverName}}</div>
+        <div class="right_title">发货单位</div>
+        <div class="right_item">{{costData.compName}}</div>
+        <div class="right_title">发货地</div>
+        <div class="right_item">
+          {{costData.sendPrivate}}{{costData.sendCity}}{{costData.sendArea}}{{costData.sendDetailedAddress}}
+        </div>
+        <div class="right_title">卸货地</div>
+        <div class="right_item">
+          {{costData.unloadPrivate}}{{costData.unloadCity}}{{costData.unloadArea}}{{costData.unloadDetailedAddress}}
+        </div>
+        <div class="right_title">货名</div>
+        <div class="right_item">{{costData.goodsName}}</div>
+        <div class="right_title">距离</div>
+        <div class="right_item">约{{costData.distance ? costData.distance : 0}}km</div>
+        <div class="right_title">运费</div>
+        <div class="right_item">{{costData.freight}}</div>
+        <el-divider></el-divider>
+        <div v-if="costData.carrierInfo">
+          <div class="title_name">承运信息</div>
+          <div class="right_title">承运合同编号</div>
+          <div class="right_item">{{costData.carrierInfo.orderNo}}</div>
+          <div class="right_title">委托合同编号</div>
+          <div class="right_item">{{costData.carrierInfo.orderNo}}</div>
+          <div class="right_title">车牌号</div>
+          <div class="right_item">{{costData.carrierInfo.carNo}}</div>
+          <div class="right_title">预计运费</div>
+          <div class="right_item">{{costData.carrierInfo.estimatedFreight}}</div>
+          <div class="right_title">装车时间</div>
+          <div class="right_item">{{costData.carrierInfo.loadingDate}}</div>
+          <div class="right_title">装车照片</div>
+          <div style="display: flex;">
+            <div v-for="(item,index) in costData.carrierInfo.loadingImg.split(',')">
+              <img :src="item" class="img_css">
+            </div>
+          </div>
+        </div>
+        <el-divider></el-divider>
+        <div v-if="costData.freightInfo">
+          <div class="title_name">运费信息(单位:元)</div>
+          <div class="right_title">预付运费</div>
+          <div class="right_item">{{costData.freightInfo.prepaidFreight}} <span
+              style="margin-left: 100px;">{{costData.freightInfo.prepaidFreightDate}}</span></div>
+          <div class="right_title">运费尾款</div>
+          <div class="right_item">{{costData.freightInfo.freightBalance}} <span
+              style="margin-left: 100px;">{{costData.freightInfo.freightBalanceDate}}</span></div>
+          <div class="right_title">明细</div>
+          <div class="right_item">
+            预付{{costData.freightInfo.prepaidFreight ? costData.freightInfo.prepaidFreight : 0}}元,扣款{{costData.freightInfo.deduction ? costData.freightInfo.deduction : 0}}元,服务费{{costData.freightInfo.serviceCharge ? costData.freightInfo.serviceCharge:0}}元,尾款{{costData.freightInfo.freightBalance ? costData.freightInfo.freightBalance:0}}元,合计收款{{costData.freightInfo.totalRepayable ? costData.freightInfo.totalRepayable:0}}元。
+          </div>
+        </div>
+        <el-divider></el-divider>
+        <div v-if="costData.repaymentInfo">
+          <div class="title_name">还款信息</div>
+          <div class="right_title">运费</div>
+          <div class="right_item">{{costData.freight}}</div>
+          <div class="right_title">超期费(每天3%)</div>
+          <div class="right_item">{{costData.repaymentInfo.overdueFee}}</div>
+          <div class="right_title">合计应还</div>
+          <div class="right_item">{{costData.repaymentInfo.totalRepayable}}</div>
+          <div class="right_title">还款(尾号6666)</div>
+          <div class="right_item">{{costData.repaymentInfo.alreadyRepaid}}</div>
+        </div>
+        <div class="right_btn">
+          <el-button @click="submit(1)" v-if="costData.orderStatusKey == 9 && costData.orderStatusKey == 19">
+            确认</el-button>
+          <el-button @click="submit(2)" v-if="costData.orderStatusKey == 9 && costData.orderStatusKey == 19">
+            驳回</el-button>
+          <el-button @click="complete" v-if="costData.cargoOwnerStatusKey == 29">完结</el-button>
+          <el-button @click="rightSee = false">关闭</el-button>
+        </div>
+      </div>
+    </el-drawer>
+  </div>
 </template>
 <script>
-	import {
-		getListData,
-		getData,
-		auditData,
-		endData,
-		editEndData,
+  import {
+    getListData,
+    getData,
+    auditData,
+    endData,
+    editEndData,
     batchData
-	} from '@/api/orderManagement'
-	export default {
-		data() {
-			return {
-				tableData: [],
-				//分页
-				searchkeyWord: "",
-				currentPage: 1,
-				pageSize: 10,
-				deptBudgetTotal: 0,
-				deptCircularPage: {},
-				search: "",
-				addressUrl: [],
-				disabled: false,
-				costInfo: false,
-				userInfo: false,
-				rejectInfo: false,
-				startDate: "",
-				endDate: "",
-				form: {
-					checkList: [],
-					textarea: "",
-				},
-				value1: "",
-				costData: {},
-				rightSee: false,
-        modification:[],
-			};
-		},
-		mounted() {
-			this.getList()
-		},
-		methods: {
-			getList() {
-				this.loading = true
-				let _obj = {}
-				_obj.currentPage = this.currentPage
-				_obj.pageSize = this.pageSize
-				_obj.searchKeyWord = this.searchkeyWord
-				_obj.searchType = this.search
-				_obj.startDate = this.startDate
-				_obj.endDate = this.endDate
-				getListData(_obj).then(response => {
-						this.tableData = response.data.records
-						this.deptBudgetTotal = response.data.total
-						this.listLoading = false
-					})
-					.catch(() => {
-						this.listLoading = false
-					})
-			},
+  } from '@/api/orderManagement'
+  export default {
+    data() {
+      return {
+        tableData: [],
+        //分页
+        searchkeyWord: "",
+        currentPage: 1,
+        pageSize: 10,
+        deptBudgetTotal: 0,
+        deptCircularPage: {},
+        search: "",
+        addressUrl: [],
+        disabled: false,
+        costInfo: false,
+        userInfo: false,
+        rejectInfo: false,
+        startDate: "",
+        endDate: "",
+        form: {
+          checkList: [],
+          textarea: "",
+        },
+        value1: "",
+        costData: {},
+        rightSee: false,
+        modification: [],
+      };
+    },
+    mounted() {
+      this.getList()
+    },
+    methods: {
+      getList() {
+        this.loading = true
+        let _obj = {}
+        _obj.currentPage = this.currentPage
+        _obj.pageSize = this.pageSize
+        _obj.searchKeyWord = this.searchkeyWord
+        _obj.searchType = this.search
+        _obj.startDate = this.startDate
+        _obj.endDate = this.endDate
+        getListData(_obj).then(response => {
+            this.tableData = response.data.records
+            this.deptBudgetTotal = response.data.total
+            this.listLoading = false
+          })
+          .catch(() => {
+            this.listLoading = false
+          })
+      },
       //开票
-      billing(){
-        console.log(this.modification)
-            let data = {
-                  orderInfoList: this.modification,
-                }
+      billing() {
+        let data = {
+          orderInfoList: this.modification,
+        }
         this.listLoading = true
-        debugger
         batchData(data).then(response => {
-          debugger
-          console.log(response)
-						// this.tableData = response.data.records
-						// this.deptBudgetTotal = response.data.total
-						this.listLoading = false
-					})
-					.catch(() => {
-						this.listLoading = false
-					})
+            this.getList()
+            this.listLoading = false
+          })
+          .catch(() => {
+            this.listLoading = false
+          })
       },
-      selectInit(){
+      selectInit() {
         return true;
       },
-      handleRowClick(){},
-      handleSelectionChange(val){
-         this.modification = val
+      handleRowClick() {},
+      handleSelectionChange(val) {
+        this.modification = val
+      },
+      see(row) {
+        this.loading = true
+        getData({
+            id: row.id
+          }).then(response => {
+            this.costData = response.data
+            this.rightSee = true
+            // this.deptBudgetTotal = response.data.total
+            this.listLoading = false
+          })
+          .catch(() => {
+            this.listLoading = false
+          })
+      },
+      complete() {
+        this.$confirm('确定订单已完结?', '提示', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning',
+          })
+          .then(() => {
+            this.listLoading = true
+            editEndData({
+                id: this.costData.id
+              }).then(response => {
+                this.getList()
+                this.listLoading = false
+              })
+              .catch(() => {
+                this.listLoading = false
+              })
+          })
+
+      },
+      end(row) {
+        this.$confirm('确定终止该订单?', '提示', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning',
+          })
+          .then(() => {
+            this.listLoading = true
+            endData({
+                id: row.id,
+                terminator: '3'
+              }).then(response => {
+                this.$notify({
+                  title: '成功',
+                  message: '终止成功!',
+                  type: 'success'
+                });
+                this.getList()
+                this.listLoading = false
+              })
+              .catch(() => {
+                this.listLoading = false
+              })
+          })
+      },
+      dateChange(e) {
+        this.startDate = e[0]
+        this.endDate = e[1]
+        this.getList()
+      },
+      account() {
+        this.userInfo = true;
+      },
+      userClose() {
+        this.userInfo = false;
+      },
+      costLook(row) {
+        this.costData = row
+        this.costInfo = true;
+      },
+      costClose() {
+        this.costInfo = false;
+      },
+      searchBtn(num) {
+        this.search = num;
+        this.getList();
+      },
+      find() {
+        this.getList();
+      },
+      submit(num) {
+        var _data = {}
+        _data.id = this.costData.id
+        _data.examineFlag = num
+        if (this.costData.orderStatusKey == 9) {
+          _data.loadingFlag = 1
+        } else if (this.costData.orderStatusKey == 19) {
+          _data.loadingFlag = 2
+        }
+        this.$confirm('确定订单已完结?', '提示', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning',
+          })
+          .then(() => {
+            this.listLoading = true
+            auditData(_data).then(response => {
+                this.$notify({
+                  title: '成功',
+                  message: '操作成功!',
+                  type: 'success'
+                });
+                this.rightSee = false
+                this.getList()
+                this.listLoading = false
+              })
+              .catch(() => {
+                this.listLoading = false
+              })
+          })
+      },
+      reject(row) {
+        this.rejectInfo = true
+      },
+      rejectClose() {
+        this.form = {}
+        this.form.checkList = []
+        this.rejectInfo = false
+      },
+      onChange() {
+        this.$refs.upload
+          .handleSaveBill()
+          .then(async (response) => {
+            this.formData.addressUrl = response;
+          })
+          .catch((res) => {
+            EventBus.$emit("error", (JSON.parse(res) || {}).message);
+            this.$refs.upload.clearFiles();
+          });
+      },
+      handleSizeChange(val) {
+        console.log(`每页 ${val} 条`);
+        this.pageSize = val;
+        this.getList();
+      },
+      handleCurrentChange(val) {
+        this.currentPage = val;
+        console.log(`当前页: ${val}`);
+        this.getList();
       },
-			see(row) {
-				this.loading = true
-				getData({
-						id: row.id
-					}).then(response => {
-						this.costData = response.data
-						this.rightSee = true
-						// this.deptBudgetTotal = response.data.total
-						this.listLoading = false
-					})
-					.catch(() => {
-						this.listLoading = false
-					})
-			},
-			complete() {
-				this.$confirm('确定订单已完结?', '提示', {
-						confirmButtonText: '确定',
-						cancelButtonText: '取消',
-						type: 'warning',
-					})
-					.then(() => {
-						this.listLoading = true
-						editEndData({
-								id: this.costData.id
-							}).then(response => {
-								this.getList()
-								this.listLoading = false
-							})
-							.catch(() => {
-								this.listLoading = false
-							})
-					})
-
-			},
-			end(row) {
-				this.$confirm('确定终止该订单?', '提示', {
-						confirmButtonText: '确定',
-						cancelButtonText: '取消',
-						type: 'warning',
-					})
-					.then(() => {
-						this.listLoading = true
-						endData({
-								id: row.id,
-								terminator: '3'
-							}).then(response => {
-								this.$notify({
-									title: '成功',
-									message: '终止成功!',
-									type: 'success'
-								});
-								this.getList()
-								this.listLoading = false
-							})
-							.catch(() => {
-								this.listLoading = false
-							})
-					})
-			},
-			dateChange(e) {
-				this.startDate = e[0]
-				this.endDate = e[1]
-				this.getList()
-			},
-			account() {
-				this.userInfo = true;
-			},
-			userClose() {
-				this.userInfo = false;
-			},
-			costLook(row) {
-				this.costData = row
-				this.costInfo = true;
-			},
-			costClose() {
-				this.costInfo = false;
-			},
-			searchBtn(num) {
-				this.search = num;
-				this.getList();
-			},
-			find() {
-				this.getList();
-			},
-			submit(num) {
-				var _data = {}
-				_data.id = this.costData.id
-				_data.examineFlag = num
-				if (this.costData.orderStatusKey == 9) {
-					_data.loadingFlag = 1
-				} else if (this.costData.orderStatusKey == 19) {
-					_data.loadingFlag = 2
-				}
-				this.$confirm('确定订单已完结?', '提示', {
-						confirmButtonText: '确定',
-						cancelButtonText: '取消',
-						type: 'warning',
-					})
-					.then(() => {
-						this.listLoading = true
-						auditData(_data).then(response => {
-								this.$notify({
-									title: '成功',
-									message: '操作成功!',
-									type: 'success'
-								});
-								this.rightSee = false
-								this.getList()
-								this.listLoading = false
-							})
-							.catch(() => {
-								this.listLoading = false
-							})
-					})
-			},
-			reject(row) {
-				this.rejectInfo = true
-			},
-			rejectClose() {
-				this.form = {}
-				this.form.checkList = []
-				this.rejectInfo = false
-			},
-			onChange() {
-				this.$refs.upload
-					.handleSaveBill()
-					.then(async (response) => {
-						this.formData.addressUrl = response;
-					})
-					.catch((res) => {
-						EventBus.$emit("error", (JSON.parse(res) || {}).message);
-						this.$refs.upload.clearFiles();
-					});
-			},
-			handleSizeChange(val) {
-				console.log(`每页 ${val} 条`);
-				this.pageSize = val;
-				this.getList();
-			},
-			handleCurrentChange(val) {
-				this.currentPage = val;
-				console.log(`当前页: ${val}`);
-				this.getList();
-			},
-		},
-	};
+    },
+  };
 </script>
 <style lang="scss" scoped>
-	.center {
-		padding: 10px 20px;
-		background: #f5f6f7;
-		height: calc(100vh - 5vh);
-
-
-		.top_css {
-			padding: 10px;
-
-			.search_btn {
-				display: flex;
-				margin-top: 20px;
-
-				.search_item {
-					text-align: center;
-					font-size: 14px;
-					font-weight: 600;
-					line-height: 40px;
-					width: 112px;
-					height: 40px;
-					background: #f7f8f9;
-					cursor: pointer
-				}
-
-				.searchNo {
-					color: #323233;
-				}
-
-				.search {
-					color: #2f53eb;
-					background: #ffffff;
-				}
-			}
-		}
-
-		.center_css {
-			background: #ffffff;
-			border-radius: 1px;
-			margin-top: 10px;
-			padding-bottom: 10px;
-		}
-
-		.screen {
-			display: flex;
-
-			.search {
-				width: 40px;
-				height: 40px;
-				background: #f7f8fa;
-				border-radius: 0px 2px 2px 0px;
-				border: 1px solid #f0f1f2;
-			}
-
-			.count_css {
-				width: 80px;
-				text-align: center;
-				line-height: 40px;
-				color: #666666;
-			}
-		}
-
-		.el-button {
-			padding: 10px 20px !important;
-		}
-
-		.center_css {
-
-			::v-deep .el-table th,
-			::v-deep .el-table td {
-				text-align: center;
-			}
-
-			.fujian {
-				font-size: 24px;
-				color: #409eff;
-			}
-
-			.warning {
-				font-size: 14px;
-				color: #ed1d1d;
-			}
-		}
-	}
-
-	.cost_css {
-		.cost_item {
-			width: 100%;
-			display: flex;
-			margin-bottom: 20px;
-
-			.cost_title {
-				width: 50%;
-				text-align: left;
-				color: #9D9D9D;
-			}
-
-			.cost_value {
-				width: 50%;
-				color: #0D0D0D;
-				text-align: right;
-			}
-
-		}
-
-		.right_btn {
-			text-align: right;
-			margin-top: 10px;
-		}
-	}
-
-	.user {
-		margin-bottom: 20px;
-
-		.user_id {
-			display: flex;
-			height: 30px;
-		}
-
-		.name_css,
-		.id_css {
-			width: 50%;
-		}
-
-		.name_css {
-			text-align: right;
-		}
-
-		.user_item {
-			width: 450px;
-			height: 300px;
-		}
-	}
-
-	::v-deep .el-table--border .el-table__header th {
-		background: #f7f8f9;
-	}
-
-	.btn_css {
-		color: #409EFF;
-		cursor: pointer
-	}
-
-	.sign {
-		font-size: 14px;
-		color: red;
-	}
-
-	.form_css {
-		width: 100%;
-		margin: 20px auto 20px;
-
-		::v-deep .el-checkbox {
-			width: 40%;
-			height: 30px;
-		}
-
-		// ::v-deep .el-dialog__body{
-		// 	padding: 10px 20px;
-		// }
-		::v-deep .el-dialog__title {
-			font-size: 16px;
-		}
-
-		::v-deep .el-textarea__inner {
-			background: #F0F1F2;
-		}
-
-		.form_btn {
-			text-align: right;
-			margin-top: 10px;
-		}
-	}
-
-	.right_css {
-		// overflow-y: auto !important;
-		min-height: 1266px;
-		padding: 0 20px;
-
-		.right_title {
-			color: #9D9D9D;
-			font-size: 14px;
-			margin-bottom: 4px;
-		}
-
-		.title_name {
-			margin-bottom: 10px;
-		}
-
-		.right_item {
-			color: #0D0D0D;
-			font-size: 14px;
-			margin-bottom: 10px;
-		}
-
-		.right_btn {
-			text-align: right;
-			margin: 10px 0;
-		}
-
-		.img_css {
-			width: 100px;
-			height: 80px;
-			margin-right: 5px;
-		}
-
-		.right_img {
-			width: 200px;
-			height: 120px;
-			margin-top: 10px;
-		}
-	}
-
-	::v-deep .el-drawer {
-		overflow: auto;
-	}
+  .center {
+    padding: 10px 20px;
+    background: #f5f6f7;
+    height: calc(100vh - 5vh);
+
+
+    .top_css {
+      padding: 10px;
+
+      .search_btn {
+        height: 80px;
+        background: linear-gradient(#fafbfb, #ffffff);
+        display: flex;
+        margin-top: 20px;
+        .search_block{
+          margin-left: 20px;
+        }
+
+        .search_item {
+          text-align: center;
+          font-size: 14px;
+          font-weight: 600;
+          line-height: 40px;
+          width: 112px;
+          height: 40px;
+          background: #f7f8f9;
+          cursor: pointer;
+          margin-top: 30px;
+        }
+
+        .searchNo {
+          color: #323233;
+        }
+
+        .search {
+          color: #2f53eb;
+          background: #ffffff;
+        }
+      }
+    }
+
+    .center_css {
+      background: #ffffff;
+      border-radius: 1px;
+      margin-top: 10px;
+      padding-bottom: 10px;
+    }
+
+    .screen {
+      display: flex;
+
+      .search {
+        width: 40px;
+        height: 40px;
+        background: #f7f8fa;
+        border-radius: 0px 2px 2px 0px;
+        border: 1px solid #f0f1f2;
+      }
+
+      .count_css {
+        width: 80px;
+        text-align: center;
+        line-height: 40px;
+        color: #666666;
+      }
+    }
+
+    .el-button {
+      padding: 10px 20px !important;
+    }
+
+    .center_css {
+
+      ::v-deep .el-table th,
+      ::v-deep .el-table td {
+        text-align: center;
+      }
+
+      .fujian {
+        font-size: 24px;
+        color: #409eff;
+      }
+
+      .warning {
+        font-size: 14px;
+        color: #ed1d1d;
+      }
+    }
+  }
+
+  .cost_css {
+    .cost_item {
+      width: 100%;
+      display: flex;
+      margin-bottom: 20px;
+
+      .cost_title {
+        width: 50%;
+        text-align: left;
+        color: #9D9D9D;
+      }
+
+      .cost_value {
+        width: 50%;
+        color: #0D0D0D;
+        text-align: right;
+      }
+
+    }
+
+    .right_btn {
+      text-align: right;
+      margin-top: 10px;
+    }
+  }
+
+  .user {
+    margin-bottom: 20px;
+
+    .user_id {
+      display: flex;
+      height: 30px;
+    }
+
+    .name_css,
+    .id_css {
+      width: 50%;
+    }
+
+    .name_css {
+      text-align: right;
+    }
+
+    .user_item {
+      width: 450px;
+      height: 300px;
+    }
+  }
+
+  ::v-deep .el-table--border .el-table__header th {
+    background: #f7f8f9;
+  }
+
+  .btn_css {
+    color: #409EFF;
+    cursor: pointer
+  }
+
+  .sign {
+    font-size: 14px;
+    color: red;
+  }
+
+  .form_css {
+    width: 100%;
+    margin: 20px auto 20px;
+
+    ::v-deep .el-checkbox {
+      width: 40%;
+      height: 30px;
+    }
+
+    // ::v-deep .el-dialog__body{
+    // 	padding: 10px 20px;
+    // }
+    ::v-deep .el-dialog__title {
+      font-size: 16px;
+    }
+
+    ::v-deep .el-textarea__inner {
+      background: #F0F1F2;
+    }
+
+    .form_btn {
+      text-align: right;
+      margin-top: 10px;
+    }
+  }
+
+  .right_css {
+    // overflow-y: auto !important;
+    min-height: 1266px;
+    padding: 0 20px;
+
+    .right_title {
+      color: #9D9D9D;
+      font-size: 14px;
+      margin-bottom: 4px;
+    }
+
+    .title_name {
+      margin-bottom: 10px;
+    }
+
+    .right_item {
+      color: #0D0D0D;
+      font-size: 14px;
+      margin-bottom: 10px;
+    }
+
+    .right_btn {
+      text-align: right;
+      margin: 10px 0;
+    }
+
+    .img_css {
+      width: 100px;
+      height: 80px;
+      margin-right: 5px;
+    }
+
+    .right_img {
+      width: 200px;
+      height: 120px;
+      margin-top: 10px;
+    }
+  }
+
+  ::v-deep .el-drawer {
+    overflow: auto;
+  }
 </style>

Certains fichiers n'ont pas été affichés car il y a eu trop de fichiers modifiés dans ce diff