用车申请修改

oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcCarApprovalController.java

             cmcCarApproval.setGmComment(formDataJson.getString("gmComment"));
             cmcCarApproval.setGmTime(new Date());
         }
+        if (formDataJson.getString("dszComment") != null && formDataJson.getString("dispatchComment") == null) {
+            cmcCarApproval.setDszUserId(getLoginUser().getUserId());
+            cmcCarApproval.setDszComment(formDataJson.getString("dszComment"));
+            cmcCarApproval.setDszTime(new Date());
+        }
         if (formDataJson.getString("unionComment") != null && formDataJson.getString("dispatchComment") == null) {
             cmcCarApproval.setUnionUserId(getLoginUser().getUserId());
             cmcCarApproval.setUnionComment(formDataJson.getString("unionComment"));

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/domain/CmcCarApproval.java

     {
         return gmUserId;
     }
+    public void setDszUserId(Long dszUserId)
+    {
+        this.dszUserId = dszUserId;
+    }
+
+    public Long getDszUserId()
+    {
+        return dszUserId;
+    }
     public void setGmComment(String gmComment)
     {
         this.gmComment = gmComment;

oa-ui/src/assets/icons/svg/borrow.svg

-<?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="1718775673725" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="17455" xmlns:xlink="http://www.w3.org/1999/xlink" width="32" height="32"><path d="M917.7 221.5H106.3c-39.9 0-72.2 32.3-72.2 72v572.6c0 39.8 32.3 72.2 72.2 72.2h811.5c39.8 0 72.2-32.3 72.2-72.2V293.5a72.3 72.3 0 0 0-72.4-72z m-270 414.7c18.8 0 34.1 15.4 34.1 34.1s-15.4 34.1-34.1 34.1H546.1v56.3c0 18.8-15.4 34.1-34.1 34.1s-34.1-15.4-34.1-34.1v-56.3H376.4c-18.8 0-34.1-15.4-34.1-34.1s15.4-34.1 34.1-34.1h101.5v-67.4H376.4c-18.8 0-34.1-15.4-34.1-34.1s15.4-34.1 34.1-34.1h75.9l-77.5-77.5c-13.3-13.3-13.3-35 0-48.3s35-13.3 48.3 0l88.9 88.9 88.9-88.9c13.3-13.3 35-13.3 48.3 0s13.3 35 0 48.3l-77.5 77.5h75.9c18.8 0 34.1 15.4 34.1 34.1s-15.4 34.1-34.1 34.1H546.1v67.4h101.5z m226.1-497.1H150.2c-18.8 0-34.1-15.4-34.1-34.1s15.4-34.1 34.1-34.1h723.6c18.8 0 34.1 15.4 34.1 34.1s-15.4 34.1-34.1 34.1z" fill="#ffffff" p-id="17456"></path></svg>
+<?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="1718775673725" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="17455" xmlns:xlink="http://www.w3.org/1999/xlink" width="32" height="32"><path d="M917.7 221.5H106.3c-39.9 0-72.2 32.3-72.2 72v572.6c0 39.8 32.3 72.2 72.2 72.2h811.5c39.8 0 72.2-32.3 72.2-72.2V293.5a72.3 72.3 0 0 0-72.4-72z m-270 414.7c18.8 0 34.1 15.4 34.1 34.1s-15.4 34.1-34.1 34.1H546.1v56.3c0 18.8-15.4 34.1-34.1 34.1s-34.1-15.4-34.1-34.1v-56.3H376.4c-18.8 0-34.1-15.4-34.1-34.1s15.4-34.1 34.1-34.1h101.5v-67.4H376.4c-18.8 0-34.1-15.4-34.1-34.1s15.4-34.1 34.1-34.1h75.9l-77.5-77.5c-13.3-13.3-13.3-35 0-48.3s35-13.3 48.3 0l88.9 88.9 88.9-88.9c13.3-13.3 35-13.3 48.3 0s13.3 35 0 48.3l-77.5 77.5h75.9c18.8 0 34.1 15.4 34.1 34.1s-15.4 34.1-34.1 34.1H546.1v67.4h101.5z m226.1-497.1H150.2c-18.8 0-34.1-15.4-34.1-34.1s15.4-34.1 34.1-34.1h723.6c18.8 0 34.1 15.4 34.1 34.1s-15.4 34.1-34.1 34.1z" p-id="17456"></path></svg>

oa-ui/src/assets/icons/svg/business.svg

-<?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="1718776318420" class="icon" viewBox="0 0 1114 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="36968" xmlns:xlink="http://www.w3.org/1999/xlink" width="34.8125" height="32"><path d="M43.971765 206.456471l114.025411-176.248471a46.351059 46.351059 0 0 1 39.152942-21.323294h724.690823c15.751529 0 30.268235 8.041412 39.092706 21.202823l112.519529 174.682353c12.137412 8.673882 19.696941 22.708706 19.696942 37.888v713.667765c0 25.479529-21.082353 46.501647-46.652236 46.501647H73.095529c-25.539765 0-46.682353-21.022118-46.682353-46.501647V242.657882c0-14.215529 6.625882-27.437176 17.528471-36.201411z m913.347764-10.300236l-60.897882-94.268235H222.569412l-60.928 94.268235h795.648zM119.747765 289.129412v620.66447h880.097882V289.159529H119.747765z m93.184 270.757647a26.322824 26.322824 0 0 1-26.292706-26.322824v-40.387764c0-14.546824 11.745882-26.322824 26.292706-26.322824h399.540706c14.546824 0 26.322824 11.776 26.322823 26.322824v40.357647a26.322824 26.322824 0 0 1-26.322823 26.322823H212.931765z m188.084706 193.626353H212.931765a26.322824 26.322824 0 0 1-26.292706-26.322824v-40.357647c0-14.546824 11.745882-26.322824 26.292706-26.322823h188.084706c14.516706 0 26.292706 11.745882 26.292705 26.292706v40.387764a26.322824 26.322824 0 0 1-26.292705 26.322824z m467.847529-201.276236a26.292706 26.292706 0 0 1 37.195294-0.060235l28.852706 28.702118c10.300235 10.24 10.360471 26.925176 0.090353 37.225412l-180.103529 180.404705c-8.643765 8.643765-20.540235 13.552941-33.008942 13.552942-12.197647 0-23.250824-4.638118-32.527058-13.040942l-0.481883-0.451764-83.06447-82.160941a26.322824 26.322824 0 0 1-0.210824-37.195295l0.150588-0.150588 28.852706-28.732235a26.322824 26.322824 0 0 1 37.044706-0.090353l50.145882 49.483294 147.064471-147.486118z" fill="#ffffff" p-id="36969"></path></svg>
+<?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="1718776318420" class="icon" viewBox="0 0 1114 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="36968" xmlns:xlink="http://www.w3.org/1999/xlink" width="34.8125" height="32"><path d="M43.971765 206.456471l114.025411-176.248471a46.351059 46.351059 0 0 1 39.152942-21.323294h724.690823c15.751529 0 30.268235 8.041412 39.092706 21.202823l112.519529 174.682353c12.137412 8.673882 19.696941 22.708706 19.696942 37.888v713.667765c0 25.479529-21.082353 46.501647-46.652236 46.501647H73.095529c-25.539765 0-46.682353-21.022118-46.682353-46.501647V242.657882c0-14.215529 6.625882-27.437176 17.528471-36.201411z m913.347764-10.300236l-60.897882-94.268235H222.569412l-60.928 94.268235h795.648zM119.747765 289.129412v620.66447h880.097882V289.159529H119.747765z m93.184 270.757647a26.322824 26.322824 0 0 1-26.292706-26.322824v-40.387764c0-14.546824 11.745882-26.322824 26.292706-26.322824h399.540706c14.546824 0 26.322824 11.776 26.322823 26.322824v40.357647a26.322824 26.322824 0 0 1-26.322823 26.322823H212.931765z m188.084706 193.626353H212.931765a26.322824 26.322824 0 0 1-26.292706-26.322824v-40.357647c0-14.546824 11.745882-26.322824 26.292706-26.322823h188.084706c14.516706 0 26.292706 11.745882 26.292705 26.292706v40.387764a26.322824 26.322824 0 0 1-26.292705 26.322824z m467.847529-201.276236a26.292706 26.292706 0 0 1 37.195294-0.060235l28.852706 28.702118c10.300235 10.24 10.360471 26.925176 0.090353 37.225412l-180.103529 180.404705c-8.643765 8.643765-20.540235 13.552941-33.008942 13.552942-12.197647 0-23.250824-4.638118-32.527058-13.040942l-0.481883-0.451764-83.06447-82.160941a26.322824 26.322824 0 0 1-0.210824-37.195295l0.150588-0.150588 28.852706-28.732235a26.322824 26.322824 0 0 1 37.044706-0.090353l50.145882 49.483294 147.064471-147.486118z" p-id="36969"></path></svg>

oa-ui/src/assets/icons/svg/delete.svg

-<?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="1718268584150" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="5461" xmlns:xlink="http://www.w3.org/1999/xlink" width="32" height="32"><path d="M916.29 159.48H646.43C635.67 102.6 585.75 59.39 525.78 59.39S415.91 102.6 405.15 159.48H135.3a25 25 0 0 0 0 49.9h67.17A80.57 80.57 0 0 0 192 253.31l36 624.49a80.47 80.47 0 0 0 80.28 75.8h435a80.47 80.47 0 0 0 80.28-75.8l36-624.49a80.53 80.53 0 0 0-10.44-43.93h67.19a25 25 0 0 0 0-49.9zM773.76 874.93a30.56 30.56 0 0 1-30.48 28.77h-435a30.55 30.55 0 0 1-30.48-28.77l-36-624.5a30.54 30.54 0 0 1 30.48-32.28h506.98a30.53 30.53 0 0 1 30.48 32.28z m-248-765.64c32.26 0 59.39 21.15 69.05 50.19H456.76c9.66-29.04 36.77-50.19 69.02-50.19z" fill="#ffffff" p-id="5462"></path><path d="M374 305.45a24.93 24.93 0 0 0-25 24.94v446.23a24.95 24.95 0 1 0 49.9 0V330.39a24.93 24.93 0 0 0-24.9-24.94zM525.78 305.45a24.93 24.93 0 0 0-24.95 24.94v446.23a24.95 24.95 0 0 0 49.9 0V330.39a24.93 24.93 0 0 0-24.95-24.94zM686.9 305.45a24.93 24.93 0 0 0-24.9 24.94v446.23a24.95 24.95 0 0 0 49.9 0V330.39a24.93 24.93 0 0 0-25-24.94z" fill="#ffffff" p-id="5463"></path></svg>
+<?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="1718268584150" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="5461" xmlns:xlink="http://www.w3.org/1999/xlink" width="32" height="32"><path d="M916.29 159.48H646.43C635.67 102.6 585.75 59.39 525.78 59.39S415.91 102.6 405.15 159.48H135.3a25 25 0 0 0 0 49.9h67.17A80.57 80.57 0 0 0 192 253.31l36 624.49a80.47 80.47 0 0 0 80.28 75.8h435a80.47 80.47 0 0 0 80.28-75.8l36-624.49a80.53 80.53 0 0 0-10.44-43.93h67.19a25 25 0 0 0 0-49.9zM773.76 874.93a30.56 30.56 0 0 1-30.48 28.77h-435a30.55 30.55 0 0 1-30.48-28.77l-36-624.5a30.54 30.54 0 0 1 30.48-32.28h506.98a30.53 30.53 0 0 1 30.48 32.28z m-248-765.64c32.26 0 59.39 21.15 69.05 50.19H456.76c9.66-29.04 36.77-50.19 69.02-50.19z" p-id="5462"></path><path d="M374 305.45a24.93 24.93 0 0 0-25 24.94v446.23a24.95 24.95 0 1 0 49.9 0V330.39a24.93 24.93 0 0 0-24.9-24.94zM525.78 305.45a24.93 24.93 0 0 0-24.95 24.94v446.23a24.95 24.95 0 0 0 49.9 0V330.39a24.93 24.93 0 0 0-24.95-24.94zM686.9 305.45a24.93 24.93 0 0 0-24.9 24.94v446.23a24.95 24.95 0 0 0 49.9 0V330.39a24.93 24.93 0 0 0-25-24.94z" p-id="5463"></path></svg>

oa-ui/src/assets/icons/svg/pass.svg

-<?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="1718268777068" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="6583" xmlns:xlink="http://www.w3.org/1999/xlink" width="32" height="32"><path d="M938.75 388.44L644.58 94.26c-7.5-7.49-25.47-9.77-35.24-5.67s-22.87 13.59-22.87 24.17v145.8C365.31 301.9 184.78 471.34 131.43 738c-2.42 12.11 7.31 24.25 18.63 29.15a34.58 34.58 0 0 0 12.07 2.15c8.25 0 10.38-3.91 15.42-10.95 94.77-132.67 232.17-197.57 408.91-203v145.76c0 10.59 13.1 20.13 22.87 24.18s24.38 1.82 31.88-5.67l295.86-294.18c10.22-10.23 11.91-26.79 1.67-37z m0 0" fill="#ffffff" p-id="6584"></path></svg>
+<?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="1718268777068" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="6583" xmlns:xlink="http://www.w3.org/1999/xlink" width="32" height="32"><path d="M938.75 388.44L644.58 94.26c-7.5-7.49-25.47-9.77-35.24-5.67s-22.87 13.59-22.87 24.17v145.8C365.31 301.9 184.78 471.34 131.43 738c-2.42 12.11 7.31 24.25 18.63 29.15a34.58 34.58 0 0 0 12.07 2.15c8.25 0 10.38-3.91 15.42-10.95 94.77-132.67 232.17-197.57 408.91-203v145.76c0 10.59 13.1 20.13 22.87 24.18s24.38 1.82 31.88-5.67l295.86-294.18c10.22-10.23 11.91-26.79 1.67-37z m0 0" p-id="6584"></path></svg>

oa-ui/src/assets/icons/svg/price.svg

-<?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="1718772412027" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="10246" xmlns:xlink="http://www.w3.org/1999/xlink" width="32" height="32"><path d="M509.11 936.5A424.16 424.16 0 0 1 344 121.73a424.15 424.15 0 0 1 330.18 781.44 421.43 421.43 0 0 1-165.07 33.33z m0-788.11c-200.74 0-364.05 163.31-364.05 364.05S308.37 876.5 509.11 876.5s364.05-163.31 364.05-364.05S709.85 148.4 509.11 148.4z" fill="#ffffff" p-id="10247"></path><path d="M480.34 701.59v-88.87h-75.09q-31.94-1.85-31.91-28.16 0-28.16 31.91-26.28h75.09v-30h-75.09q-33.79 0-31.91-28.16-1.89-28.16 31.91-26.28h45.05l-88.23-135.2q-15-28.16 7.51-41.3 24.37-13.11 41.3 15l97.62 146.44 95.74-146.42q20.64-28.16 45.05-15 22.53 16.9 5.63 43.18L566.69 473.8h43.18q37.53 0 33.79 28.16 1.85 26.31-31.91 26.28h-75.09v30h75.09q37.53-1.85 33.79 28.16 1.85 26.31-33.79 26.28h-75.09v88.88q0 31.9-28.16 30-28.16 1.92-28.16-29.97z" fill="#ffffff" p-id="10248"></path></svg>
+<?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="1718772412027" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="10246" xmlns:xlink="http://www.w3.org/1999/xlink" width="32" height="32"><path d="M509.11 936.5A424.16 424.16 0 0 1 344 121.73a424.15 424.15 0 0 1 330.18 781.44 421.43 421.43 0 0 1-165.07 33.33z m0-788.11c-200.74 0-364.05 163.31-364.05 364.05S308.37 876.5 509.11 876.5s364.05-163.31 364.05-364.05S709.85 148.4 509.11 148.4z" p-id="10247"></path><path d="M480.34 701.59v-88.87h-75.09q-31.94-1.85-31.91-28.16 0-28.16 31.91-26.28h75.09v-30h-75.09q-33.79 0-31.91-28.16-1.89-28.16 31.91-26.28h45.05l-88.23-135.2q-15-28.16 7.51-41.3 24.37-13.11 41.3 15l97.62 146.44 95.74-146.42q20.64-28.16 45.05-15 22.53 16.9 5.63 43.18L566.69 473.8h43.18q37.53 0 33.79 28.16 1.85 26.31-31.91 26.28h-75.09v30h75.09q37.53-1.85 33.79 28.16 1.85 26.31-33.79 26.28h-75.09v88.88q0 31.9-28.16 30-28.16 1.92-28.16-29.97z" p-id="10248"></path></svg>

oa-ui/src/assets/icons/svg/refresh.svg

-<?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="1718958475481" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4302" xmlns:xlink="http://www.w3.org/1999/xlink" width="32" height="32"><path d="M544.56312 1023.978003h-389.753564c-51.093913 0-92.788945-42.094985-92.788945-93.988802v-836.000399c0-51.793829 41.795021-93.988802 92.988921-93.988802h701.216457c51.393877 0 92.988921 42.194973 92.988921 94.188778v463.744749c0 18.79776-15.198189 34.095938-34.095938 34.095938s-34.095938-15.198189-34.095938-34.095938v-463.544773c0-14.298296-11.198666-25.896915-24.797045-25.896914h-701.216457c-13.698368 0-24.797046 11.49863-24.797046 25.696938v836.000399c0 14.398285 10.798713 25.696938 24.497082 25.696938h389.753564c18.79776 0 34.095938 15.198189 34.095938 34.095938 0 18.79776-15.098201 33.99595-33.99595 33.99595zM768.936388 337.159831h-526.537268c-18.79776 0-34.095938-15.198189-34.095937-34.095938s15.198189-34.095938 34.095937-34.095938h526.537268c18.79776 0 34.095938 15.198189 34.095938 34.095938s-15.198189 34.095938-34.095938 34.095938zM534.864276 516.338483h-292.465156c-18.79776 0-34.095938-15.198189-34.095937-34.095938s15.198189-34.095938 34.095937-34.095937h292.465156c18.79776 0 34.095938 15.198189 34.095938 34.095937s-15.198189 34.095938-34.095938 34.095938zM739.639879 964.285114c-115.586229 0-209.575031-95.788588-209.575031-213.27459 0-18.79776 15.198189-34.095938 34.095938-34.095938 18.79776 0 34.095938 15.198189 34.095937 34.095938 0 79.99047 63.492435 145.082715 141.283168 145.082715 19.897629 0 39.095342-4.1995 57.193186-12.398523 17.197951-7.799071 37.395545-0.199976 45.194615 16.897987 7.799071 17.197951 0.199976 37.395545-16.897987 45.194615-26.896795 12.198547-55.593377 18.497796-85.389826 18.497796z m175.579081-179.178652c-18.79776 0-34.095938-15.198189-34.095938-34.095938 0-79.99047-63.492435-145.082715-141.283167-145.082715-18.697772 0-36.995592 3.699559-54.093555 10.99869-17.397927 7.399118-37.395545-0.699917-44.794663-17.997856-7.399118-17.397927 0.699917-37.395545 17.997855-44.794663 25.696938-10.898702 52.893698-16.398046 80.890363-16.398046 115.586229 0 209.575031 95.788588 209.575031 213.27459-0.099988 18.79776-15.398165 34.095938-34.195926 34.095938zM681.146848 665.620698h-58.593019c-11.798594 0-22.697296-6.099273-28.896558-16.098083-6.199261-9.998809-6.79919-22.397332-1.699797-33.096056l29.296509-59.792877c5.799309-11.798594 17.597903-19.097725 30.596355-19.097724 13.098439 0 24.997022 7.399118 30.596355 19.097724l29.296509 59.792877c5.199381 10.598737 4.599452 22.99726-1.699797 33.096056-6.099273 10.098797-17.197951 16.098082-28.896557 16.098083zM826.929479 973.683995h-1.199857c-11.798594-0.399952-22.597308-6.79919-28.396617-16.997975l-29.296509-50.593972c-5.899297-10.198785-6.099273-22.697296-0.599929-33.096057 5.499345-10.398761 16.098082-17.197951 27.796688-17.997856l66.39209-4.599452c12.998451-0.799905 25.296986 5.799309 31.8962 16.997975 6.499226 11.298654 5.999285 25.296986-1.199857 36.095699l-37.09558 55.193425c-6.399238 9.39888-16.897987 14.998213-28.296629 14.998213z" p-id="4303" fill="#ffffff"></path></svg>
+<?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="1718958475481" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4302" xmlns:xlink="http://www.w3.org/1999/xlink" width="32" height="32"><path d="M544.56312 1023.978003h-389.753564c-51.093913 0-92.788945-42.094985-92.788945-93.988802v-836.000399c0-51.793829 41.795021-93.988802 92.988921-93.988802h701.216457c51.393877 0 92.988921 42.194973 92.988921 94.188778v463.744749c0 18.79776-15.198189 34.095938-34.095938 34.095938s-34.095938-15.198189-34.095938-34.095938v-463.544773c0-14.298296-11.198666-25.896915-24.797045-25.896914h-701.216457c-13.698368 0-24.797046 11.49863-24.797046 25.696938v836.000399c0 14.398285 10.798713 25.696938 24.497082 25.696938h389.753564c18.79776 0 34.095938 15.198189 34.095938 34.095938 0 18.79776-15.098201 33.99595-33.99595 33.99595zM768.936388 337.159831h-526.537268c-18.79776 0-34.095938-15.198189-34.095937-34.095938s15.198189-34.095938 34.095937-34.095938h526.537268c18.79776 0 34.095938 15.198189 34.095938 34.095938s-15.198189 34.095938-34.095938 34.095938zM534.864276 516.338483h-292.465156c-18.79776 0-34.095938-15.198189-34.095937-34.095938s15.198189-34.095938 34.095937-34.095937h292.465156c18.79776 0 34.095938 15.198189 34.095938 34.095937s-15.198189 34.095938-34.095938 34.095938zM739.639879 964.285114c-115.586229 0-209.575031-95.788588-209.575031-213.27459 0-18.79776 15.198189-34.095938 34.095938-34.095938 18.79776 0 34.095938 15.198189 34.095937 34.095938 0 79.99047 63.492435 145.082715 141.283168 145.082715 19.897629 0 39.095342-4.1995 57.193186-12.398523 17.197951-7.799071 37.395545-0.199976 45.194615 16.897987 7.799071 17.197951 0.199976 37.395545-16.897987 45.194615-26.896795 12.198547-55.593377 18.497796-85.389826 18.497796z m175.579081-179.178652c-18.79776 0-34.095938-15.198189-34.095938-34.095938 0-79.99047-63.492435-145.082715-141.283167-145.082715-18.697772 0-36.995592 3.699559-54.093555 10.99869-17.397927 7.399118-37.395545-0.699917-44.794663-17.997856-7.399118-17.397927 0.699917-37.395545 17.997855-44.794663 25.696938-10.898702 52.893698-16.398046 80.890363-16.398046 115.586229 0 209.575031 95.788588 209.575031 213.27459-0.099988 18.79776-15.398165 34.095938-34.195926 34.095938zM681.146848 665.620698h-58.593019c-11.798594 0-22.697296-6.099273-28.896558-16.098083-6.199261-9.998809-6.79919-22.397332-1.699797-33.096056l29.296509-59.792877c5.799309-11.798594 17.597903-19.097725 30.596355-19.097724 13.098439 0 24.997022 7.399118 30.596355 19.097724l29.296509 59.792877c5.199381 10.598737 4.599452 22.99726-1.699797 33.096056-6.099273 10.098797-17.197951 16.098082-28.896557 16.098083zM826.929479 973.683995h-1.199857c-11.798594-0.399952-22.597308-6.79919-28.396617-16.997975l-29.296509-50.593972c-5.899297-10.198785-6.099273-22.697296-0.599929-33.096057 5.499345-10.398761 16.098082-17.197951 27.796688-17.997856l66.39209-4.599452c12.998451-0.799905 25.296986 5.799309 31.8962 16.997975 6.499226 11.298654 5.999285 25.296986-1.199857 36.095699l-37.09558 55.193425c-6.399238 9.39888-16.897987 14.998213-28.296629 14.998213z" p-id="4303"></path></svg>

oa-ui/src/assets/icons/svg/settle.svg

-<?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="1718769012223" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="9855" xmlns:xlink="http://www.w3.org/1999/xlink" width="32" height="32"><path d="M397.226667 896H170.666667a42.666667 42.666667 0 0 1-42.666667-42.666667V170.666667a42.666667 42.666667 0 0 1 42.666667-42.666667h512a42.666667 42.666667 0 0 1 42.666666 42.666667v324.266666a42.666667 42.666667 0 1 0 85.333334 0V170.666667a128 128 0 0 0-128-128H170.666667a128 128 0 0 0-128 128v682.666666a128 128 0 0 0 128 128h226.56a42.666667 42.666667 0 1 0 0-85.333333zM585.813333 859.306667a11.093333 11.093333 0 0 0-2.133333 3.84v2.133333L554.666667 970.24a8.533333 8.533333 0 0 0 10.666666 10.666667l104.533334-28.586667a6.826667 6.826667 0 0 0 3.84 0l235.52-235.093333-90.88-90.453334zM961.706667 592.213333l-17.92-18.346666a51.2 51.2 0 0 0-72.533334 0l-23.893333 24.32L938.666667 688.64l23.893333-24.32a50.773333 50.773333 0 0 0-0.853333-72.106667z" p-id="9856" fill="#ffffff"></path><path d="M597.333333 546.986667a21.333333 21.333333 0 0 0 21.333334-21.333334 21.333333 21.333333 0 0 0-21.333334-21.333333h-149.333333v-85.333333H597.333333a21.333333 21.333333 0 0 0 21.333334-21.333334 21.333333 21.333333 0 0 0-21.333334-21.333333h-159.146666 2.133333l128-109.653333a21.333333 21.333333 0 0 0-27.733333-32.426667L426.666667 330.666667l-112.213334-98.133334a21.76 21.76 0 0 0-30.293333 0 20.906667 20.906667 0 0 0 0 29.866667l128 110.506667h2.56H256a21.333333 21.333333 0 0 0-21.333333 21.333333 21.333333 21.333333 0 0 0 21.333333 21.333333h149.333333v85.333334H256a21.333333 21.333333 0 0 0-21.333333 21.333333 21.333333 21.333333 0 0 0 21.333333 21.333333h149.333333V682.666667a21.333333 21.333333 0 0 0 42.666667 0v-135.68z" p-id="9857" fill="#ffffff"></path></svg>
+<?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="1718769012223" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="9855" xmlns:xlink="http://www.w3.org/1999/xlink" width="32" height="32"><path d="M397.226667 896H170.666667a42.666667 42.666667 0 0 1-42.666667-42.666667V170.666667a42.666667 42.666667 0 0 1 42.666667-42.666667h512a42.666667 42.666667 0 0 1 42.666666 42.666667v324.266666a42.666667 42.666667 0 1 0 85.333334 0V170.666667a128 128 0 0 0-128-128H170.666667a128 128 0 0 0-128 128v682.666666a128 128 0 0 0 128 128h226.56a42.666667 42.666667 0 1 0 0-85.333333zM585.813333 859.306667a11.093333 11.093333 0 0 0-2.133333 3.84v2.133333L554.666667 970.24a8.533333 8.533333 0 0 0 10.666666 10.666667l104.533334-28.586667a6.826667 6.826667 0 0 0 3.84 0l235.52-235.093333-90.88-90.453334zM961.706667 592.213333l-17.92-18.346666a51.2 51.2 0 0 0-72.533334 0l-23.893333 24.32L938.666667 688.64l23.893333-24.32a50.773333 50.773333 0 0 0-0.853333-72.106667z" p-id="9856"></path><path d="M597.333333 546.986667a21.333333 21.333333 0 0 0 21.333334-21.333334 21.333333 21.333333 0 0 0-21.333334-21.333333h-149.333333v-85.333333H597.333333a21.333333 21.333333 0 0 0 21.333334-21.333334 21.333333 21.333333 0 0 0-21.333334-21.333333h-159.146666 2.133333l128-109.653333a21.333333 21.333333 0 0 0-27.733333-32.426667L426.666667 330.666667l-112.213334-98.133334a21.76 21.76 0 0 0-30.293333 0 20.906667 20.906667 0 0 0 0 29.866667l128 110.506667h2.56H256a21.333333 21.333333 0 0 0-21.333333 21.333333 21.333333 21.333333 0 0 0 21.333333 21.333333h149.333333v85.333334H256a21.333333 21.333333 0 0 0-21.333333 21.333333 21.333333 21.333333 0 0 0 21.333333 21.333333h149.333333V682.666667a21.333333 21.333333 0 0 0 42.666667 0v-135.68z" p-id="9857"></path></svg>

oa-ui/src/views/flowable/form/oa/carForm.vue

  * @Author: ysh
  * @Date: 2024-02-29 11:44:28
  * @LastEditors: wrh
- * @LastEditTime: 2024-07-05 17:57:11
+ * @LastEditTime: 2024-07-10 11:27:00
 -->
 
 <template>
                   </el-form-item>
                 </el-col>
               </el-row>
+              <!-- 董事长审核意见 -->
+              <el-form-item label="董事长审核意见" prop="dszComment" label-width="120px" v-if="showFormItem('董事长审核')">
+                <el-input type="textarea" :rows="2" placeholder="请输入董事长审核意见" v-model="form.dszComment"
+                  :disabled="taskName != '董事长审核'">
+                </el-input>
+              </el-form-item>
+              <el-row>
+                <el-col :span="6" :xs="24" :offset="12">
+                  <el-form-item label="签名：" label-width="120px" v-if="showFormItem('总经理审核签名')">
+                    <span class="auditor"> {{ form.dszUser ? form.dszUser.nickName : dszUser }} </span>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="6">
+                  <el-form-item label="日期：" label-width="120px" v-if="showFormItem('总经理审核签名')">
+                    <span> {{ form.dszTime ? form.dszTime : dszTime }} </span>
+                  </el-form-item>
+                </el-col>
+              </el-row>
               <el-divider></el-divider>
               <!-- 安排用车意见 -->
               <el-form-item label="安排用车意见：" prop="dispatchComment" label-width="120px">
       this.gmUser = this.$store.getters.name;
       this.gmTime = parseTime(new Date(), '{y}-{m}-{d}')
     }
+    if (this.taskName == '董事长审核') {
+      this.dszUser = this.$store.getters.name;
+      this.dszTime = parseTime(new Date(), '{y}-{m}-{d}')
+    }
     if (this.taskName == '安排用车') {
       this.dispatchUser = this.$store.getters.name;
       this.dispatchTime = parseTime(new Date(), '{y}-{m}-{d}')
       managerUser: '',
       unionUser: '',
       gmUser: '',
+      dszUser: '',
       dispatchUser: '',
       deptTime: undefined,
       managerTime: undefined,
       unionTime: undefined,
       gmTime: undefined,
+      dszTime: undefined,
       dispatchTime: undefined,
       form: {
         carUsage: '0',
             { required: true, message: '请输入总经理审核意见', trigger: 'blur' }
           ]
         }
+      } else if (this.taskName == '董事长审核') {
+        this.rules = {
+          dszComment: [
+            { required: true, message: '请输入董事长审核意见', trigger: 'blur' }
+          ]
+        }
       } else if (this.taskName == '党工团审核') {
         this.rules = {
           unionComment: [
     // 获取下一个审批人
     getNextFlowNodeApproval() {
       if (this.taskName == '用车申请') {
-        if (this.dept < 102 && this.dept != 0)
-          this.dept = 102
+        // if (this.dept < 102 && this.dept != 0)
+        //   this.dept = 102
         this.$set(this.taskForm.variables, "dept", this.dept);
-        if (this.dept == 102) {
+        if (this.dept == 101) {
+          getUserByPost({ postName: '董事长' }).then(result => {
+            this.$set(this.taskForm.variables, "approval", result.data[0].userId);
+            complete(this.taskForm).then(response => {
+              this.$modal.msgSuccess(response.msg);
+              this.$emit('goBack')
+            })
+          })
+        }
+        else if (this.dept == 102) {
           getUserByPost({ postName: '总经理' }).then(result => {
             this.$set(this.taskForm.variables, "approval", result.data[0].userId);
             complete(this.taskForm).then(response => {
           })
         }
         else {
-          if (this.deptId == 105)
-          getDeptLeaders({ userId: this.form.drafter }).then(res => {
-              this.$set(this.taskForm.variables, "approval", res.data[1].userId);
+          getUsersDeptLeader({ userId: this.$store.getters.userId }).then(res => {
+            if (res.data) {
+              this.$set(this.taskForm.variables, "approval", res.data.userId);
               complete(this.taskForm).then(response => {
                 this.$modal.msgSuccess(response.msg);
                 this.$emit('goBack')
-              });
-            })
-          else
-            getUsersDeptLeader({ userId: this.$store.getters.userId }).then(res => {
-              if (res.data) {
-                this.$set(this.taskForm.variables, "approval", res.data.userId);
-                complete(this.taskForm).then(response => {
-                  this.$modal.msgSuccess(response.msg);
-                  this.$emit('goBack')
-                })
-              }
-            })
+              })
+            }
+          })
         }
       } else if (this.taskName == '部门审核') {
         getUsersManageLeader({ userId: this.$store.getters.userId }).then(res => {
             this.$emit('goBack')
           });
         })
-      } else if (this.taskName == '分管审核' || this.taskName == '党工团审核' || this.taskName == '总经理审核') {
+      } else if (this.taskName == '分管审核' || this.taskName == '党工团审核' || this.taskName == '总经理审核' || this.taskName == '董事长审核') {
         getUserByRole({ roleId: 5 }).then(result => {
           this.$set(this.taskForm.variables, "approvalList", result.data);
           complete(this.taskForm).then(response => {
       else if (name == '总经理审核')
         isShow = (this.dept == 102 && this.taskName == '用车申请') || this.taskName == '总经理审核' || ((this.taskName == '安排用车' || this.taskName == '申请确认') && this.form.gmUserId != null)
           || (this.dept == 102 && this.taskName == '' && (this.form.carUsage == '0' || this.form.carUsage == '1'));
+      else if (name == '董事长审核')
+        isShow = (this.dept == 101 && this.taskName == '用车申请') || this.taskName == '董事长审核' || ((this.taskName == '安排用车' || this.taskName == '申请确认') && this.form.gmUserId != null)
+          || (this.dept == 101 && this.taskName == '' && (this.form.carUsage == '0' || this.form.carUsage == '1'));
       else if (name == '部门审核签名')
         isShow = (this.taskName == '部门审核' || this.taskName == '分管审核') || ((this.taskName == '安排用车' || this.taskName == '申请确认') && this.form.deptUserId != null)
           || (this.dept > 102 && this.taskName == '' && (this.form.carUsage == '0' || this.form.carUsage == '1'));
       else if (name == '总经理审核签名')
         isShow = this.taskName == '总经理审核' || ((this.taskName == '安排用车' || this.taskName == '申请确认') && this.form.gmUserId != null)
           || (this.dept == 102 && this.taskName == '' && (this.form.carUsage == '0' || this.form.carUsage == '1'));
+      else if (name == '董事长审核签名')
+        isShow = this.taskName == '董事长审核' || ((this.taskName == '安排用车' || this.taskName == '申请确认') && this.form.gmUserId != null)
+          || (this.dept == 101 && this.taskName == '' && (this.form.carUsage == '0' || this.form.carUsage == '1'));
       return isShow;
     },
   },