zhangjie 1 jaar geleden
bovenliggende
commit
deb1191b4a
26 gewijzigde bestanden met toevoegingen van 270 en 74 verwijderingen
  1. 12 0
      src/assets/icons/icon-device-control.svg
  2. 12 0
      src/assets/icons/icon-ding-detail.svg
  3. 12 0
      src/assets/icons/icon-ding-submit.svg
  4. 12 0
      src/assets/icons/icon-exception.svg
  5. 12 0
      src/assets/icons/icon-export.svg
  6. 12 0
      src/assets/icons/icon-hour-submit.svg
  7. 12 0
      src/assets/icons/icon-import.svg
  8. 12 0
      src/assets/icons/icon-right-circle.svg
  9. 12 0
      src/assets/icons/icon-user-allocate.svg
  10. 12 0
      src/assets/icons/icon-user-archives.svg
  11. 12 0
      src/assets/icons/icon-wrong-circle.svg
  12. 3 1
      src/components/common/upload-button/index.vue
  13. 4 4
      src/router/modules/resourceGuard.js
  14. 4 4
      src/router/modules/workHours.js
  15. 6 0
      src/style/global.less
  16. 2 0
      src/style/tdesign-reset.less
  17. 23 12
      src/views/resource-guard/person-guard/person-allocate/index.vue
  18. 29 16
      src/views/resource-guard/person-guard/person-files/index.vue
  19. 12 5
      src/views/service-unit/service-unit-manage/range-manage/index.vue
  20. 1 0
      src/views/sop/sop-manage/quality-issue/index.vue
  21. 1 0
      src/views/sop/sop-manage/sop-step/index.vue
  22. 6 8
      src/views/system/config-manage/customer-manage/index.vue
  23. 8 4
      src/views/work-hours/work-hours-manage/abnormal-check/wait-check.vue
  24. 11 5
      src/views/work-hours/work-hours-manage/work-attendance-detail/index.vue
  25. 12 7
      src/views/work-hours/work-hours-manage/work-attendance/index.vue
  26. 16 8
      src/views/work-hours/work-hours-manage/work-statistics/index.vue

+ 12 - 0
src/assets/icons/icon-device-control.svg

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="13.7500966px" height="15.7289302px" viewBox="0 0 13.7500966 15.7289302" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>icon-设备保障监控</title>
+    <g id="资源保障" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="16.01-人员档案管理" transform="translate(-99.125, -226.5)">
+            <g id="icon-设备保障监控" transform="translate(96, 224)">
+                <rect id="secured-(Background)" opacity="0" x="0" y="0" width="20" height="20"></rect>
+                <path d="M13.7054956,7.94224262 L12.8216034,7.05836773 L9.23674345,10.643295 L7.1783179,8.58487248 L6.29443526,9.46875691 L9.23675299,12.4110699 L13.7054956,7.94224262 Z M3.125,11.2500578 C3.125,13.0205953 4.05394033,14.6613109 5.57214528,15.572269 L9.99974072,18.2289302 L14.4278467,15.5721962 C15.9460855,14.6612966 16.8750966,13.0205917 16.8750966,11.2500626 L16.8750966,2.5 L3.125,2.5 L3.125,11.2500578 Z M4.37503085,3.75 L15.6250918,3.75 L15.6250596,11.2500578 C15.6250596,12.5815046 14.9264693,13.8153183 13.7847507,14.5003164 L9.99976933,16.7711937 L6.21528327,14.5004141 C5.07357433,13.8153625 4.375,12.5815237 4.375,11.2500626 L4.37503085,3.75 Z" id="secured" fill="#262626"></path>
+            </g>
+        </g>
+    </g>
+</svg>

+ 12 - 0
src/assets/icons/icon-ding-detail.svg

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="15px" height="15px" viewBox="0 0 15 15" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>icon-考勤明细查询</title>
+    <g id="工时管理" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="20.01-考勤明细查询" transform="translate(-98.5, -26.5)">
+            <g id="icon-考勤明细查询" transform="translate(96, 24)">
+                <rect id="view-module-(Background)" opacity="0" x="0" y="0" width="20" height="20"></rect>
+                <path d="M13.75,9.37500119 L13.75,10.6250012 L5,10.6249994 L5,9.3749994 L13.75,9.37500119 Z M5,12.5 L5,13.75 L12.5,13.75 L12.5,12.5 L5,12.5 Z M3.75,2.5 L16.25,2.5 C16.9403565,2.5 17.5,3.0596441 17.5,3.75 L17.5,16.25 C17.5,16.9403565 16.9403553,17.5 16.25,17.5 L3.7499997,17.5 C3.05964381,17.5 2.5,16.9403553 2.5,16.25 L2.5,3.7499997 C2.5,3.05964381 3.0596441,2.5 3.75,2.5 Z M16.25,3.75 L16.25,6.25 L3.74999993,6.25 L3.75,3.75 L16.25,3.75 Z M3.7499997,16.25 L16.25,16.25 L16.25,7.5 L3.74999993,7.5 L3.7499997,16.25 Z" id="view-module" fill="#165DFF"></path>
+            </g>
+        </g>
+    </g>
+</svg>

+ 12 - 0
src/assets/icons/icon-ding-submit.svg

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="15px" height="15.0000703px" viewBox="0 0 15 15.0000703" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>icon-考勤提交</title>
+    <g id="工时管理" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="20.01-考勤明细查询" transform="translate(-98.5, -107.7499)">
+            <g id="icon-考勤提交" transform="translate(106, 114) rotate(-90) translate(-106, -114)translate(96, 104)">
+                <rect id="login-(Background)" opacity="0" x="0" y="0" width="20" height="20"></rect>
+                <path d="M7.78957844,6.5677619 L8.67346227,5.68387866 L12.6360205,9.64644619 C12.8312824,9.84170855 12.8312821,10.158291 12.6360197,10.353553 C12.6360197,10.353553 12.6360197,10.353553 12.6360196,10.353553 L8.67346168,14.3161011 L8.67346168,14.3161011 L7.78957844,13.4322178 L10.5968088,10.6249875 L1.25,10.624969 L1.25,9.37496841 L10.5968034,9.37498748 L7.78957844,6.5677619 Z M5.00007033,3.75 L15.0000703,3.75 L15.0000703,16.25 L5.00007033,16.25 L5.00007033,13.75 L3.75007033,13.75 L3.75007033,16.875 C3.75007033,17.2201777 4.02989268,17.5 4.37507063,17.5 L15.6250703,17.5 C15.970248,17.5 16.2500703,17.2201777 16.2500703,16.875 L16.2500703,3.125 C16.2500703,2.77982205 15.970248,2.5 15.6250703,2.5 L4.37507033,2.5 C4.02989239,2.5 3.75007033,2.77982235 3.75007033,3.1250003 L3.75007033,6.25 L5.00007033,6.25 L5.00007033,3.75 Z" id="login" fill="#262626"></path>
+            </g>
+        </g>
+    </g>
+</svg>

+ 12 - 0
src/assets/icons/icon-exception.svg

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="15px" height="15px" viewBox="0 0 15 15" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>icon-异常审核</title>
+    <g id="工时管理" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="20.01-考勤明细查询" transform="translate(-98.5, -66.5)">
+            <g id="icon-异常审核" transform="translate(96, 64)">
+                <rect id="delete-(Background)" opacity="0" x="0" y="0" width="16" height="16"></rect>
+                <path d="M10,2.5 C12.0710678,2.5 13.75,4.17893219 13.75,6.25 C13.75,7.51769219 13.1209689,8.63846628 12.158006,9.31722284 L13.125,11.25 L16.25,11.25 C16.9403559,11.25 17.5,11.8096441 17.5,12.5 L17.5,16.25 C17.5,16.9403559 16.9403559,17.5 16.25,17.5 L3.75,17.5 C3.05964406,17.5 2.5,16.9403559 2.5,16.25 L2.5,12.5 C2.5,11.8096441 3.05964406,11.25 3.75,11.25 L6.875,11.25 L7.84199398,9.31722284 C6.87903114,8.63846628 6.25,7.51769219 6.25,6.25 C6.25,4.17893219 7.92893219,2.5 10,2.5 Z M10,3.75 C8.61928813,3.75 7.5,4.86928813 7.5,6.25 C7.5,7.0741996 7.90029685,7.8290051 8.56215247,8.29552242 L9.44096629,8.91496548 L7.99289389,11.8092971 L7.6473261,12.5 L3.75,12.5 L3.75,16.25 L16.25,16.25 L16.25,12.5 L12.3526739,12.5 L12.0071061,11.8092971 L10.5590337,8.91496548 L11.4378475,8.29552242 C12.0997032,7.8290051 12.5,7.0741996 12.5,6.25 C12.5,4.86928813 11.3807119,3.75 10,3.75 Z M13.125,13.75 L13.125,15 L6.875,15 L6.875,13.75 L13.125,13.75 Z" id="形状结合" fill="#262626" fill-rule="nonzero"></path>
+            </g>
+        </g>
+    </g>
+</svg>

+ 12 - 0
src/assets/icons/icon-export.svg

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="12px" height="13.5000238px" viewBox="0 0 12 13.5000238" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>icon-批量导出</title>
+    <g id="资源保障" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="16.01-人员档案管理" transform="translate(-466, -24.5)">
+            <g id="icon-批量导出" transform="translate(464, 24)">
+                <rect id="download-(Background)" opacity="0" x="0" y="0" width="16" height="16"></rect>
+                <path d="M8.5,9.57746124 L8.49998093,0.5 L7.49998093,0.5 L7.5,9.57745647 L3.73641205,5.81387091 L3.02930534,6.5209775 L7.64644662,11.1381191 C7.84170875,11.3333813 8.15829124,11.3333813 8.35355339,11.1381192 C8.35355339,11.1381191 8.3535534,11.1381191 8.35355339,11.1381191 L12.9706955,6.52097702 L12.9706955,6.52097702 L12.2635889,5.81386995 L8.5,9.57746124 Z M2,13.0000238 C2,13.5523081 2.44771534,14.0000238 3,14.0000238 L13,14.0000238 C13.5522842,14.0000238 14,13.552309 14,13.0000238 L14,11.0000238 L13,11.0000238 L13,13.0000238 L3,13.0000238 L3,11.0000238 L2,11.0000238 L2,13.0000238 Z" id="download" fill="#262626"></path>
+            </g>
+        </g>
+    </g>
+</svg>

+ 12 - 0
src/assets/icons/icon-hour-submit.svg

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="15px" height="15px" viewBox="0 0 15 15" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>icon-工时统计</title>
+    <g id="工时管理" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="20.01-考勤明细查询" transform="translate(-98.5, -146.5)">
+            <g id="icon-工时统计" transform="translate(96, 144)">
+                <rect id="chart-(Background)" opacity="0" x="0" y="0" width="20" height="20"></rect>
+                <path d="M5.62500149,9.37492192 L6.87500149,9.37492549 L6.87498897,15 L5.62498897,15 L5.62500149,9.37492192 Z M9.37500238,15 L10.6250024,15 L10.6250012,5.625 L9.37500119,5.625 L9.37500238,15 Z M13.1250012,11.2499976 L14.3750012,11.25 L14.3749952,15 L13.1249952,15 L13.1250012,11.2499976 Z M3.75000238,2.5 L16.2500024,2.5 C16.9403589,2.5 17.5,3.05964641 17.5,3.75000238 L17.5,16.2500024 C17.5,16.9403589 16.9403553,17.5 16.25,17.5 L3.74999948,17.5 C3.05964358,17.5 2.5,16.9403553 2.5,16.25 L2.5,3.7499994 C2.5,3.05964351 3.05964649,2.5 3.75000238,2.5 Z M16.2500024,3.75000209 L16.25,16.2500024 L3.7499997,16.25 L3.75000224,3.74999993 L16.2500024,3.75000209 Z" id="chart" fill="#262626"></path>
+            </g>
+        </g>
+    </g>
+</svg>

+ 12 - 0
src/assets/icons/icon-import.svg

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="12px" height="12.7928656px" viewBox="0 0 12 12.7928656" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>icon-批量导入</title>
+    <g id="资源保障" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="16.01-人员档案管理" transform="translate(-594, -25.2071)">
+            <g id="icon-批量导入" transform="translate(592, 24)">
+                <rect id="upload-(Background)" opacity="0" x="0" y="0" width="16" height="16"></rect>
+                <path d="M7.50118113,2.91421127 L7.50119781,11.4999733 L8.50119781,11.4999714 L8.50118113,2.91421592 L12.2647667,6.67780113 L12.9718733,5.97069454 L8.35473213,1.35355339 C8.15946998,1.15829126 7.8428875,1.15829126 7.64762534,1.35355338 L3.03048337,5.97069502 L3.03048337,5.97069502 L3.73759019,6.67780209 L7.50118113,2.91421127 Z M2,12.9999723 C2,13.5522566 2.44771534,13.9999723 3,13.9999723 L13,13.9999723 C13.5522842,13.9999723 14,13.5522575 14,12.9999723 L14,10.9999723 L13,10.9999723 L13,12.9999723 L3,12.9999723 L3,10.9999723 L2,10.9999723 L2,12.9999723 Z" id="upload" fill="#262626"></path>
+            </g>
+        </g>
+    </g>
+</svg>

+ 12 - 0
src/assets/icons/icon-right-circle.svg

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="14px" height="14.000003px" viewBox="0 0 14 14.000003" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>icon-批量通过</title>
+    <g id="工时管理" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="21.01-异常审核" transform="translate(-337, -89)">
+            <g id="icon-批量通过" transform="translate(336, 88)">
+                <rect id="check-circle-(Background)" opacity="0" x="0" y="0" width="16" height="16"></rect>
+                <path d="M7,10.7069998 L11.5,6.20749998 L10.7924995,5.5 L7,9.29300022 L5.20650005,7.5 L4.5,8.20650005 L7,10.7069998 Z M8,1 C9.85651875,1 11.6369953,1.73749781 12.9497499,3.05025244 C14.2625046,4.36300707 15,6.14348459 15,8 C15,9.38446903 14.5894604,10.7378473 13.8202906,11.8889914 C13.0511208,13.0401354 11.9578705,13.9373426 10.6787872,14.4671564 C9.39970398,14.9969702 7.99223804,15.1355934 6.63437128,14.8654966 C5.27650452,14.5953999 4.02922297,13.9287148 3.05025554,12.9497471 C2.07128799,11.9707794 1.40460272,10.7234993 1.13450618,9.36563206 C0.86440964,8.00776482 1.00303298,6.60029888 1.53284639,5.32121611 C2.06265974,4.04213333 2.95986724,2.94888258 4.11101127,2.17971277 C5.26215553,1.41054291 6.61553383,1 8,1 Z M8,14 C9.59130192,14 11.117425,13.3678589 12.2426434,12.2426405 C13.3678617,11.1174221 14,9.59129906 14,8 C14,6.81331205 13.6481085,5.65327358 12.9888201,4.66657877 C12.3295317,3.67988396 11.3924599,2.9108485 10.2961035,2.45672274 C9.19974709,2.00259697 7.99334764,1.8837769 6.82946157,2.11528826 C5.6655755,2.34679961 4.59647751,2.91824412 3.75736237,3.75735927 C2.91824722,4.59647441 2.34680283,5.66557217 2.11529148,6.82945824 C1.88378012,7.99334431 2.00260019,9.19974422 2.45672596,10.2961006 C2.91085172,11.392457 3.67988682,12.3295288 4.66658187,12.9888172 C5.65327692,13.6481056 6.81331539,14 8,14 Z" id="Union" fill-opacity="0.9" fill="#000000"></path>
+            </g>
+        </g>
+    </g>
+</svg>

+ 12 - 0
src/assets/icons/icon-user-allocate.svg

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="18.125px" height="18.125px" viewBox="0 0 18.125 18.125" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>icon-人员调配</title>
+    <g id="资源保障" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="16.01-人员档案管理" transform="translate(-97.875, -105.875)">
+            <g id="icon-人员调配" transform="translate(96, 104)">
+                <polygon id="Rectangle-4117" opacity="0" transform="translate(10, 10) rotate(0) translate(-10, -10)" points="3.49691085e-06 3.49691086e-06 20.0000035 3.49691086e-06 20.0000035 20.0000035 3.49691085e-06 20.0000035"></polygon>
+                <path d="M14.375007,6.2499997 C14.375007,3.83375376 12.4162529,1.875 10.000007,1.875 C7.58376106,1.875 5.6250067,3.83375376 5.6250067,6.2499997 C5.6250067,8.66624594 7.58376106,10.625 10.000007,10.625 C12.4162529,10.625 14.375007,8.66624594 14.375007,6.2499997 Z M13.125007,6.2499997 C13.125007,4.52410966 11.7258964,3.1249994 10.000007,3.1249994 C8.27411636,3.1249994 6.87500699,4.52410966 6.87500699,6.2499997 C6.87500699,7.97588944 8.27411636,9.375 10.000007,9.375 C11.7258964,9.375 13.125007,7.97589004 13.125007,6.2499997 Z M10.0000076,13.125 C7.54176184,13.125 5.21793826,13.6821592 3.12500819,14.6747887 L3.12500819,16.875 L11.875007,16.875 L11.875007,18.125 L2.50000863,18.125 C2.15483065,18.125 1.87500699,17.8451777 1.87500699,17.5 L1.87500699,14.6557856 C1.87500699,14.1933203 2.1287769,13.7652826 2.54608727,13.5659683 C4.81176085,12.4838448 7.33314319,11.875 10.0000076,11.875 C11.5117834,11.875 12.9768096,12.0706511 14.375007,12.4372554 L14.375007,13.7330043 C12.982987,13.3372021 11.5170954,13.125 10.0000076,13.125 Z M15.937507,20 L17.187507,20 L17.187507,17.1875 L20.000007,17.1875 L20.000007,15.9375 L17.187507,15.9375 L17.187507,13.125 L15.937507,13.125 L15.937507,15.9375 L13.125007,15.9375 L13.125007,17.1875 L15.937507,17.1875 L15.937507,20 Z" id="Vector" fill="#262626"></path>
+            </g>
+        </g>
+    </g>
+</svg>

+ 12 - 0
src/assets/icons/icon-user-archives.svg

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="16.25px" height="15.3200912px" viewBox="0 0 16.25 15.3200912" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>icon-人员档案管理</title>
+    <g id="资源保障" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="16.01-人员档案管理" transform="translate(-97.875, -66.1799)">
+            <g id="icon-人员档案管理" transform="translate(96, 64)">
+                <rect id="folder-open-(Background)" opacity="0" x="0" y="0" width="20" height="20"></rect>
+                <path d="M8.03571463,3.4299469 L10.625,5.49334407 L16.875,5.49334407 L16.875,4.24334392 L11.062147,4.24334392 L8.47286165,2.1799469 L3.125,2.1799469 L3.125,3.4299469 L8.03571463,3.4299469 Z M1.875,6.74332201 L1.875,16.2500381 C1.875,16.9403946 2.43464462,17.5000381 3.1250003,17.5000381 L16.875,17.5000381 C17.5653565,17.5000381 18.125,16.9403875 18.125,16.2500322 L18.125,8.80671382 C18.125,8.11635792 17.5653565,7.55671382 16.875,7.55671382 L10.2185732,7.55671382 L7.62928784,5.49331665 L3.125,5.49332261 C2.4346447,5.49332261 1.875,6.05296552 1.875,6.74332201 Z M7.19214082,6.74331665 L9.78142619,8.80671382 L16.875,8.80671382 L16.875,16.2500322 L3.125,16.2500381 L3.125,6.74332201 L7.19214082,6.74331665 Z" id="folder-open" fill="#165DFF"></path>
+            </g>
+        </g>
+    </g>
+</svg>

+ 12 - 0
src/assets/icons/icon-wrong-circle.svg

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="14px" height="14px" viewBox="0 0 14 14" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>icon-批量拒绝</title>
+    <g id="工时管理" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="21.01-异常审核" transform="translate(-465, -89)">
+            <g id="icon-批量拒绝" transform="translate(464, 88)">
+                <rect id="close-circle-(Background)" opacity="0" x="0" y="0" width="16" height="16"></rect>
+                <path d="M7.2928915,7.99995184 L4.9810369,5.688097 L5.68814373,4.98099017 L8,7.29284477 L10.3118525,4.98099017 L11.018959,5.68809748 L8.70710468,7.99995184 L11.0190525,10.3118992 L10.311945,11.0190058 L8,8.70705843 L5.68805075,11.0190058 L4.98094392,10.3118992 L7.2928915,7.99995184 Z M15,8 C15,11.8659954 11.8659916,15 8,15 C4.13400483,15 1,11.8659916 1,8 C1,4.13400459 4.13400912,1 8,1 C11.8659954,1 15,4.13400888 15,8 Z M14,8 C14,11.3137102 11.3137064,14 8,14 C4.68628979,14 2,11.3137074 2,8 C2,4.68629003 4.6862936,2 8,2 C11.3137102,2 14,4.68629384 14,8 Z" id="Union" fill-opacity="0.9" fill="#000000"></path>
+            </g>
+        </g>
+    </g>
+</svg>

+ 3 - 1
src/components/common/upload-button/index.vue

@@ -11,7 +11,9 @@
     @success="handleSuccess"
     @success="handleSuccess"
     @validate="handleValidate"
     @validate="handleValidate"
   >
   >
-    <t-button theme="primary" v-bind="buttonProps"></t-button>
+    <slot>
+      <t-button theme="primary" v-bind="buttonProps"></t-button>
+    </slot>
   </t-upload>
   </t-upload>
 </template>
 </template>
 
 

+ 4 - 4
src/router/modules/resourceGuard.js

@@ -31,7 +31,7 @@ export default {
             title: '人员档案管理',
             title: '人员档案管理',
             sort: 1,
             sort: 1,
             alias: 'userArchives',
             alias: 'userArchives',
-            icon: 'service-crm',
+            icon: 'user-archives',
           },
           },
         },
         },
         {
         {
@@ -45,7 +45,7 @@ export default {
             title: '人员调配',
             title: '人员调配',
             sort: 2,
             sort: 2,
             alias: 'userAllocate',
             alias: 'userAllocate',
-            icon: 'service-crm',
+            icon: 'user-allocate',
           },
           },
         },
         },
       ],
       ],
@@ -71,7 +71,7 @@ export default {
             title: '出入库登记查询',
             title: '出入库登记查询',
             sort: 1,
             sort: 1,
             alias: 'deviceInOut',
             alias: 'deviceInOut',
-            icon: 'service-crm',
+            icon: 'device-outin',
           },
           },
         },
         },
         {
         {
@@ -85,7 +85,7 @@ export default {
             title: '设备资源监控',
             title: '设备资源监控',
             sort: 2,
             sort: 2,
             alias: 'deviceControl',
             alias: 'deviceControl',
-            icon: 'service-crm',
+            icon: 'device-control',
           },
           },
         },
         },
       ],
       ],

+ 4 - 4
src/router/modules/workHours.js

@@ -31,7 +31,7 @@ export default {
             title: '异常审核',
             title: '异常审核',
             sort: 1,
             sort: 1,
             alias: 'exception',
             alias: 'exception',
-            icon: 'service-crm',
+            icon: 'exception',
           },
           },
         },
         },
         {
         {
@@ -45,7 +45,7 @@ export default {
             title: '考勤提交',
             title: '考勤提交',
             sort: 2,
             sort: 2,
             alias: 'dingSubmit',
             alias: 'dingSubmit',
-            icon: 'service-crm',
+            icon: 'ding-submit',
           },
           },
         },
         },
         {
         {
@@ -59,7 +59,7 @@ export default {
             title: '考勤明细查询',
             title: '考勤明细查询',
             sort: 2,
             sort: 2,
             alias: 'dingDetail',
             alias: 'dingDetail',
-            icon: 'service-crm',
+            icon: 'ding-detail',
           },
           },
         },
         },
         {
         {
@@ -73,7 +73,7 @@ export default {
             title: '工时统计',
             title: '工时统计',
             sort: 3,
             sort: 3,
             alias: 'hourSubmit',
             alias: 'hourSubmit',
-            icon: 'service-crm',
+            icon: 'hour-submit',
           },
           },
         },
         },
       ],
       ],

+ 6 - 0
src/style/global.less

@@ -85,6 +85,12 @@ body {
     .t-icon {
     .t-icon {
       margin-top: -3px;
       margin-top: -3px;
     }
     }
+    .t-space-item-separator {
+      font-size: 0;
+    }
+    .t-divider {
+      border-color: #4e5969;
+    }
   }
   }
   > .t-table {
   > .t-table {
     background-color: transparent;
     background-color: transparent;

+ 2 - 0
src/style/tdesign-reset.less

@@ -64,6 +64,8 @@
 .t-button {
 .t-button {
   .svg-icon {
   .svg-icon {
     margin-right: 8px;
     margin-right: 8px;
+    width: 13px;
+    height: 13px;
   }
   }
 
 
   &.t-button--theme-default:hover {
   &.t-button--theme-default:hover {

+ 23 - 12
src/views/resource-guard/person-guard/person-allocate/index.vue

@@ -26,18 +26,29 @@
     </SearchForm>
     </SearchForm>
     <div class="flex-1 page-wrap">
     <div class="flex-1 page-wrap">
       <p class="page-wrap-tips">
       <p class="page-wrap-tips">
-        <ErrorCircleFilledIcon /> 已发布派单:{{
-          statisticsInfo.publishedCrmCount
-        }}
-        / {{ statisticsInfo.totalCrmCount }},实施工程师配额:{{
-          statisticsInfo.effectDistributed
-        }}
-        / {{ statisticsInfo.effectQuota }},助理工程师配额:{{
-          statisticsInfo.assistantDistributed
-        }}/ {{ statisticsInfo.assistantQuota }},区域协调人配额:{{
-          statisticsInfo.coordinatorDistributed
-        }}
-        / {{ statisticsInfo.coordinatorQuota }}
+        <t-space :size="0">
+          <span>
+            <ErrorCircleFilledIcon /> 已发布派单:{{
+              statisticsInfo.publishedCrmCount
+            }}
+            / {{ statisticsInfo.totalCrmCount }}
+          </span>
+          <span>
+            实施工程师配额:{{ statisticsInfo.effectDistributed }} /
+            {{ statisticsInfo.effectQuota }}
+          </span>
+          <span>
+            助理工程师配额:{{ statisticsInfo.assistantDistributed }}/
+            {{ statisticsInfo.assistantQuota }}
+          </span>
+          <span>
+            区域协调人配额:{{ statisticsInfo.coordinatorDistributed }} /
+            {{ statisticsInfo.coordinatorQuota }}
+          </span>
+          <template #separator>
+            <t-divider layout="vertical" />
+          </template>
+        </t-space>
       </p>
       </p>
 
 
       <t-table
       <t-table

+ 29 - 16
src/views/resource-guard/person-guard/person-files/index.vue

@@ -8,14 +8,17 @@
         </t-button>
         </t-button>
         <upload-button
         <upload-button
           upload-url="/api/admin/user/archives/import"
           upload-url="/api/admin/user/archives/import"
-          :button-props="{
-            content: '批量导入',
-            variant: 'outline',
-            theme: 'default',
-          }"
           param-file-name="MultipartFile"
           param-file-name="MultipartFile"
-        ></upload-button>
-        <t-button variant="outline" @click="multExport">批量导出</t-button>
+        >
+          <t-button variant="outline">
+            <template #icon><svg-icon name="import" color="#262626" /></template
+            >批量导入
+          </t-button>
+        </upload-button>
+        <t-button variant="outline" @click="multExport">
+          <template #icon><svg-icon name="export" color="#262626" /></template
+          >批量导出
+        </t-button>
         <t-button
         <t-button
           variant="outline"
           variant="outline"
           :disabled="!selectedRowKeys.length"
           :disabled="!selectedRowKeys.length"
@@ -37,15 +40,25 @@
     </SearchForm>
     </SearchForm>
     <div class="flex-1 page-wrap">
     <div class="flex-1 page-wrap">
       <p class="page-wrap-tips">
       <p class="page-wrap-tips">
-        <ErrorCircleFilledIcon /> 在册:{{
-          statisticsInfo.totalCount
-        }}人,无效:{{ statisticsInfo.validCount }}人,有效:{{
-          statisticsInfo.invalidCount
-        }}人, 实施工程师有效:{{
-          statisticsInfo.effectEngineerCount
-        }}人,区域负责人有效:{{
-          statisticsInfo.regionCoordinatorCount
-        }}人,助理实施工程师有效:{{ statisticsInfo.assistantEngineerCount }}人
+        <t-space :size="0">
+          <span>
+            <ErrorCircleFilledIcon /> 在册:{{ statisticsInfo.totalCount }}人
+          </span>
+          <span>无效:{{ statisticsInfo.validCount }}人</span>
+          <span>有效:{{ statisticsInfo.invalidCount }}人</span>
+          <span>
+            实施工程师有效:{{ statisticsInfo.effectEngineerCount }}人
+          </span>
+          <span>
+            区域负责人有效:{{ statisticsInfo.regionCoordinatorCount }}人
+          </span>
+          <span>
+            助理实施工程师有效:{{ statisticsInfo.assistantEngineerCount }}人
+          </span>
+          <template #separator>
+            <t-divider layout="vertical" />
+          </template>
+        </t-space>
       </p>
       </p>
 
 
       <t-table
       <t-table

+ 12 - 5
src/views/service-unit/service-unit-manage/range-manage/index.vue

@@ -16,11 +16,18 @@
     </SearchForm>
     </SearchForm>
     <div class="flex-1 page-wrap">
     <div class="flex-1 page-wrap">
       <p class="page-wrap-tips">
       <p class="page-wrap-tips">
-        <ErrorCircleFilledIcon /> 共计服务派单:{{
-          totalData.totalCrmCount
-        }}个,已划定派单:{{ totalData.bindCrmCount }}个,待划定派单:{{
-          totalData.unbindCrmCount
-        }}个
+        <t-space :size="0">
+          <span>
+            <ErrorCircleFilledIcon /> 共计服务派单:{{
+              totalData.totalCrmCount
+            }}个
+          </span>
+          <span>已划定派单:{{ totalData.bindCrmCount }}个</span>
+          <span>待划定派单:{{ totalData.unbindCrmCount }}个</span>
+          <template #separator>
+            <t-divider layout="vertical" />
+          </template>
+        </t-space>
       </p>
       </p>
 
 
       <t-table
       <t-table

+ 1 - 0
src/views/sop/sop-manage/quality-issue/index.vue

@@ -54,6 +54,7 @@
           :label-width="labelWidth"
           :label-width="labelWidth"
           :rules="rules"
           :rules="rules"
           :data="formData"
           :data="formData"
+          labelAlign="top"
         >
         >
           <t-row :gutter="[0, 20]">
           <t-row :gutter="[0, 20]">
             <t-col
             <t-col

+ 1 - 0
src/views/sop/sop-manage/sop-step/index.vue

@@ -93,6 +93,7 @@
           :label-width="labelWidth"
           :label-width="labelWidth"
           :rules="rules"
           :rules="rules"
           :data="formData"
           :data="formData"
+          labelAlign="top"
         >
         >
           <t-row :gutter="[0, 20]">
           <t-row :gutter="[0, 20]">
             <t-col
             <t-col

+ 6 - 8
src/views/system/config-manage/customer-manage/index.vue

@@ -6,14 +6,12 @@
           <template #icon><svg-icon name="add-circle" color="#fff" /></template
           <template #icon><svg-icon name="add-circle" color="#fff" /></template
           >新增客户
           >新增客户
         </t-button>
         </t-button>
-        <upload-button
-          upload-url="/api/sys/custom/import"
-          :button-props="{
-            content: '批量导入',
-            variant: 'outline',
-            theme: 'default',
-          }"
-        ></upload-button>
+        <upload-button upload-url="/api/sys/custom/import">
+          <t-button variant="outline">
+            <template #icon><svg-icon name="import" color="#262626" /></template
+            >批量导入
+          </t-button>
+        </upload-button>
       </t-space>
       </t-space>
     </div>
     </div>
     <SearchForm :fields="fields" :params="params">
     <SearchForm :fields="fields" :params="params">

+ 8 - 4
src/views/work-hours/work-hours-manage/abnormal-check/wait-check.vue

@@ -2,17 +2,21 @@
   <div class="wait-check">
   <div class="wait-check">
     <div class="page-action">
     <div class="page-action">
       <t-button
       <t-button
-        theme="primary"
+        variant="outline"
         :disabled="!selectedRowKeys.length"
         :disabled="!selectedRowKeys.length"
         @click="handleAudit(selectedRowKeys, true)"
         @click="handleAudit(selectedRowKeys, true)"
-        >批量通过</t-button
       >
       >
+        <template #icon><svg-icon name="right-circle" color="#fff" /></template
+        >批量通过
+      </t-button>
       <t-button
       <t-button
-        theme="primary"
+        variant="outline"
         :disabled="!selectedRowKeys.length"
         :disabled="!selectedRowKeys.length"
         @click="handleAudit(selectedRowKeys, false)"
         @click="handleAudit(selectedRowKeys, false)"
-        >批量拒绝</t-button
       >
       >
+        <template #icon><svg-icon name="wrong-circle" color="#fff" /></template
+        >批量拒绝
+      </t-button>
     </div>
     </div>
     <SearchForm :fields="fields" :params="params" showAll>
     <SearchForm :fields="fields" :params="params" showAll>
       <template #service="{ item, params }">
       <template #service="{ item, params }">

+ 11 - 5
src/views/work-hours/work-hours-manage/work-attendance-detail/index.vue

@@ -11,11 +11,17 @@
 
 
     <div class="flex-1 page-wrap">
     <div class="flex-1 page-wrap">
       <p class="page-wrap-tips">
       <p class="page-wrap-tips">
-        <ErrorCircleFilledIcon /> 考勤总计:{{
-          statisticsInfo.total
-        }},异常考勤:{{ statisticsInfo.abnormal }},累计人天:{{
-          statisticsInfo.allDays
-        }}天,累计工时:{{ statisticsInfo.allHours }}小时
+        <t-space :size="0">
+          <span>
+            <ErrorCircleFilledIcon /> 考勤总计:{{ statisticsInfo.total }}
+          </span>
+          <span>异常考勤:{{ statisticsInfo.abnormal }}</span>
+          <span>累计人天:{{ statisticsInfo.allDays }}天</span>
+          <span>累计工时:{{ statisticsInfo.allHours }}小时</span>
+          <template #separator>
+            <t-divider layout="vertical" />
+          </template>
+        </t-space>
       </p>
       </p>
 
 
       <t-table
       <t-table

+ 12 - 7
src/views/work-hours/work-hours-manage/work-attendance/index.vue

@@ -28,13 +28,18 @@
 
 
     <div class="flex-1 page-wrap">
     <div class="flex-1 page-wrap">
       <p class="page-wrap-tips">
       <p class="page-wrap-tips">
-        <ErrorCircleFilledIcon /> 考勤总计:{{
-          statisticsInfo.dingCount
-        }},已提交:{{ statisticsInfo.submitCount }},待提交:{{
-          statisticsInfo.willSubmitCount
-        }},累计人天:{{ statisticsInfo.totalActualDays }}天,累计工时:{{
-          statisticsInfo.totalWorkHours
-        }}小时
+        <t-space :size="0">
+          <span>
+            <ErrorCircleFilledIcon /> 考勤总计:{{ statisticsInfo.dingCount }}
+          </span>
+          <span>已提交:{{ statisticsInfo.submitCount }}</span>
+          <span>待提交:{{ statisticsInfo.willSubmitCount }}</span>
+          <span>累计人天:{{ statisticsInfo.totalActualDays }}天</span>
+          <span>累计工时:{{ statisticsInfo.totalWorkHours }}小时</span>
+          <template #separator>
+            <t-divider layout="vertical" />
+          </template>
+        </t-space>
       </p>
       </p>
 
 
       <t-table
       <t-table

+ 16 - 8
src/views/work-hours/work-hours-manage/work-statistics/index.vue

@@ -1,7 +1,10 @@
 <template>
 <template>
   <div class="work-statistics flex flex-col h-full">
   <div class="work-statistics flex flex-col h-full">
     <div class="page-action">
     <div class="page-action">
-      <t-button theme="primary" @click="handleExport">导出统计结果</t-button>
+      <t-button theme="primary" @click="handleExport">
+        <template #icon><svg-icon name="export" color="#fff" /></template
+        >导出统计结果
+      </t-button>
     </div>
     </div>
     <SearchForm :fields="fields" :params="params">
     <SearchForm :fields="fields" :params="params">
       <template #service="{ item, params }">
       <template #service="{ item, params }">
@@ -16,13 +19,18 @@
     </SearchForm>
     </SearchForm>
     <div class="flex-1 page-wrap">
     <div class="flex-1 page-wrap">
       <p class="page-wrap-tips">
       <p class="page-wrap-tips">
-        <ErrorCircleFilledIcon /> 考勤总计:{{
-          statisticsInfo.total
-        }},已提交:{{ statisticsInfo.submitted }},待提交:{{
-          statisticsInfo.unSubmitted
-        }},已提交累计人天:{{ statisticsInfo.allDays }}天,已提交累计工时:{{
-          statisticsInfo.allHours
-        }}小时
+        <t-space :size="0">
+          <span>
+            <ErrorCircleFilledIcon /> 考勤总计:{{ statisticsInfo.total }}
+          </span>
+          <span>已提交:{{ statisticsInfo.submitted }}</span>
+          <span>待提交:{{ statisticsInfo.unSubmitted }}</span>
+          <span>已提交累计人天:{{ statisticsInfo.allDays }}天</span>
+          <span>已提交累计工时:{{ statisticsInfo.allHours }}小时</span>
+          <template #separator>
+            <t-divider layout="vertical" />
+          </template>
+        </t-space>
       </p>
       </p>
 
 
       <t-table
       <t-table