修改申请单审批按钮

修改导师带徒流程
添加巡检首页图标

master/src/main/java/com/ruoyi/config/ActivitiConfig.java

@@ -153,9 +153,9 @@ public class ActivitiConfig {
 //        Resource spec15 = resourceLoader.getResource("classpath:/processes/sems/semsWeekcheck.bpmn"); //加载流程图资源文件
 //        deploymentBuilder15.enableDuplicateFiltering().addInputStream(spec15.getFilename(), spec15.getInputStream()).name("每周安全排查报告").deploy();//按流程id部署
 //
-//        DeploymentBuilder deploymentBuilder16 = repositoryService().createDeployment();
-//        Resource spec16 = resourceLoader.getResource("classpath:/processes/bccnew/dsdtTraining.bpmn"); //加载流程图资源文件
-//        deploymentBuilder16.enableDuplicateFiltering().addInputStream(spec16.getFilename(), spec16.getInputStream()).name("导师带徒经理签字").deploy();//按流程id部署
+        DeploymentBuilder deploymentBuilder16 = repositoryService().createDeployment();
+        Resource spec16 = resourceLoader.getResource("classpath:/processes/bccnew/dsdtTraining.bpmn"); //加载流程图资源文件
+        deploymentBuilder16.enableDuplicateFiltering().addInputStream(spec16.getFilename(), spec16.getInputStream()).name("导师带徒经理签字").deploy();//按流程id部署
 
     }
 }

master/src/main/java/com/ruoyi/project/patrol/patrol/domain/TPatrolPlan.java

@@ -79,6 +79,7 @@ public class TPatrolPlan extends BaseEntity
     private Long deptId;
     private String patrolType;
 
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date deadline;
 
     private Long checkedNum;

master/src/main/java/com/ruoyi/project/training/bccnew/service/impl/TTsApproveServiceImpl.java

@@ -96,7 +96,7 @@ public class TTsApproveServiceImpl implements ITTsApproveService {
         Authentication.setAuthenticatedUserId(applyUser);//设置当前申请人
         Map<String, Object> variables = new HashMap<>();
         variables.put("applyuser", applyUser);
-        variables.put("xyuser", sysUser.getUserId());
+//        variables.put("xyuser", sysUser.getUserId());
         TStaffmgr tStaffmgr = new TStaffmgr();
         tStaffmgr.setActualposts("24");
         StringBuilder executor = new StringBuilder();
@@ -138,12 +138,12 @@ public class TTsApproveServiceImpl implements ITTsApproveService {
         }
         // 处理流程节点
         Map<String, Object> param = new HashMap<>();
-        if (taskName.equals("学员确认")) {
-            tTsApprove.setStudentName(username);
-            tTsApprove.setStudentId(userId);
-            tTsApprove.setStudentConfirmTime(new Date());
-            param.put("condition1", "1");
-        }
+//        if (taskName.equals("学员确认")) {
+//            tTsApprove.setStudentName(username);
+//            tTsApprove.setStudentId(userId);
+//            tTsApprove.setStudentConfirmTime(new Date());
+//            param.put("condition1", "1");
+//        }
         if (taskName.equals("装置经理")) {
             tTsApprove.setApproverName(username);
             tTsApprove.setApprover(userId);

master/src/main/resources/processes/bccnew/dsdtTraining.bpmn

@@ -1,72 +1,48 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<definitions xmlns="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:omgdc="http://www.omg.org/spec/DD/20100524/DC" xmlns:omgdi="http://www.omg.org/spec/DD/20100524/DI" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:activiti="http://activiti.org/bpmn" targetNamespace="http://www.activiti.org/test" exporter="bpmn-js (https://demo.bpmn.io)" exporterVersion="17.7.1">
+<definitions xmlns="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:activiti="http://activiti.org/bpmn" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:omgdc="http://www.omg.org/spec/DD/20100524/DC" xmlns:omgdi="http://www.omg.org/spec/DD/20100524/DI" typeLanguage="http://www.w3.org/2001/XMLSchema" expressionLanguage="http://www.w3.org/1999/XPath" targetNamespace="http://www.activiti.org/test">
   <process id="dsdtTraining" name="导师带徒经理审批" isExecutable="true">
-    <startEvent id="startDsdt" name="开始" activiti:initiator="${applyUser}" />
-    <userTask id="jlTask" name="装置经理" activiti:candidateUsers="#{jluser}" />
-    <userTask id="xyTask" name="学员确认" activiti:assignee="#{xyuser}" />
-    <endEvent id="endDsdt" name="End" />
-    <sequenceFlow id="flow1" sourceRef="startDsdt" targetRef="xyTask" />
-    <sequenceFlow id="flow4" name="通过" sourceRef="xyTask" targetRef="jlTask">
-      <conditionExpression xsi:type="tFormalExpression">${condition1 == 1}</conditionExpression>
-    </sequenceFlow>
+    <startEvent id="startDsdt" name="开始" activiti:initiator="${applyUser}"></startEvent>
+    <userTask id="jlTask" name="装置经理" activiti:candidateUsers="#{jluser}"></userTask>
+    <endEvent id="endDsdt" name="End"></endEvent>
+    <sequenceFlow id="flow1" sourceRef="startDsdt" targetRef="jlTask"></sequenceFlow>
     <sequenceFlow id="flow2" name="通过" sourceRef="jlTask" targetRef="endDsdt">
-      <conditionExpression xsi:type="tFormalExpression">${condition == 1}</conditionExpression>
+      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${condition == 1}]]></conditionExpression>
     </sequenceFlow>
-    <endEvent id="endDsdt2" name="End" />
+    <endEvent id="endDsdt2" name="End"></endEvent>
     <sequenceFlow id="flow3" name="不通过" sourceRef="jlTask" targetRef="endDsdt2">
-      <conditionExpression xsi:type="tFormalExpression">${condition == 0}</conditionExpression>
+      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${condition == 0}]]></conditionExpression>
     </sequenceFlow>
   </process>
   <bpmndi:BPMNDiagram id="BPMNDiagram_dsdtTraining">
-    <bpmndi:BPMNPlane id="BPMNPlane_dsdtTraining" bpmnElement="dsdtTraining">
-      <bpmndi:BPMNShape id="BPMNShape_jlTask" bpmnElement="jlTask">
-        <omgdc:Bounds x="405" y="50" width="105" height="55" />
+    <bpmndi:BPMNPlane bpmnElement="dsdtTraining" id="BPMNPlane_dsdtTraining">
+      <bpmndi:BPMNShape bpmnElement="startDsdt" id="BPMNShape_startDsdt">
+        <omgdc:Bounds height="35.0" width="35.0" x="70.0" y="60.0"></omgdc:Bounds>
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="BPMNShape_endDsdt" bpmnElement="endDsdt">
-        <omgdc:Bounds x="570" y="60" width="35" height="35" />
-        <bpmndi:BPMNLabel>
-          <omgdc:Bounds x="578" y="95" width="20" height="14" />
-        </bpmndi:BPMNLabel>
+      <bpmndi:BPMNShape bpmnElement="jlTask" id="BPMNShape_jlTask">
+        <omgdc:Bounds height="55.0" width="105.0" x="170.0" y="50.0"></omgdc:Bounds>
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="BPMNShape_startDsdt" bpmnElement="startDsdt">
-        <omgdc:Bounds x="152" y="60" width="35" height="35" />
-        <bpmndi:BPMNLabel>
-          <omgdc:Bounds x="159" y="95" width="22" height="14" />
-        </bpmndi:BPMNLabel>
+      <bpmndi:BPMNShape bpmnElement="endDsdt" id="BPMNShape_endDsdt">
+        <omgdc:Bounds height="35.0" width="35.0" x="340.0" y="60.0"></omgdc:Bounds>
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="BPMNShape_xyTask" bpmnElement="xyTask">
-        <omgdc:Bounds x="237" y="50" width="105" height="55" />
-        <bpmndi:BPMNLabel />
+      <bpmndi:BPMNShape bpmnElement="endDsdt2" id="BPMNShape_endDsdt2">
+        <omgdc:Bounds height="35.0" width="35.0" x="205.0" y="140.0"></omgdc:Bounds>
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="BPMNShape_endDsdt2" bpmnElement="endDsdt2">
-        <omgdc:Bounds x="440" y="142" width="35" height="35" />
-        <bpmndi:BPMNLabel>
-          <omgdc:Bounds x="448" y="177" width="20" height="14" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNEdge id="BPMNEdge_flow1" bpmnElement="flow1">
-        <omgdi:waypoint x="187" y="77" />
-        <omgdi:waypoint x="237" y="77" />
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="BPMNEdge_flow4" bpmnElement="flow4">
-        <omgdi:waypoint x="342" y="77" />
-        <omgdi:waypoint x="405" y="77" />
-        <bpmndi:BPMNLabel>
-          <omgdc:Bounds x="363" y="59" width="22" height="14" />
-        </bpmndi:BPMNLabel>
+      <bpmndi:BPMNEdge bpmnElement="flow1" id="BPMNEdge_flow1">
+        <omgdi:waypoint x="105.0" y="77.0"></omgdi:waypoint>
+        <omgdi:waypoint x="170.0" y="77.0"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="BPMNEdge_flow2" bpmnElement="flow2">
-        <omgdi:waypoint x="510" y="77" />
-        <omgdi:waypoint x="570" y="77" />
+      <bpmndi:BPMNEdge bpmnElement="flow2" id="BPMNEdge_flow2">
+        <omgdi:waypoint x="275.0" y="77.0"></omgdi:waypoint>
+        <omgdi:waypoint x="340.0" y="77.0"></omgdi:waypoint>
         <bpmndi:BPMNLabel>
-          <omgdc:Bounds x="529" y="79" width="22" height="14" />
+          <omgdc:Bounds height="16.0" width="32.0" x="289.0" y="79.0"></omgdc:Bounds>
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="BPMNEdge_flow3" bpmnElement="flow3">
-        <omgdi:waypoint x="457" y="105" />
-        <omgdi:waypoint x="457" y="142" />
+      <bpmndi:BPMNEdge bpmnElement="flow3" id="BPMNEdge_flow3">
+        <omgdi:waypoint x="222.0" y="105.0"></omgdi:waypoint>
+        <omgdi:waypoint x="222.0" y="140.0"></omgdi:waypoint>
         <bpmndi:BPMNLabel>
-          <omgdc:Bounds x="413" y="120" width="33" height="14" />
+          <omgdc:Bounds height="16.0" width="48.0" x="227.0" y="109.0"></omgdc:Bounds>
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
     </bpmndi:BPMNPlane>

ui/src/assets/icons/svg/checked.svg

@@ -0,0 +1 @@
+<?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="1704260342809" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="6683" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M810.7 192h-85.3c0-23.5-19.2-42.7-42.7-42.7-23.5 0-42.7 19.2-42.7 42.7H384c0-23.5-19.2-42.7-42.7-42.7-23.5 0-42.7 19.2-42.7 42.7h-85.3c-46.9 0-85.3 38.4-85.3 85.3v512c0 46.9 38.4 85.3 85.3 85.3h597.3c46.9 0 85.3-38.4 85.3-85.3v-512c0.1-46.9-38.3-85.3-85.2-85.3z m-57.3 336.2L512 769.5c-16.6 16.6-43.7 16.6-60.3 0l-181-181c-16.6-16.6-16.6-43.7 0-60.3s43.7-16.6 60.3 0L481.8 679 693 467.8c16.6-16.6 43.7-16.6 60.3 0 16.7 16.6 16.7 43.8 0.1 60.4zM768 362.7H256c-23.5 0-42.7-19.2-42.7-42.7s19.2-42.7 42.7-42.7h42.7c0 23.5 19.2 42.7 42.7 42.7 23.5 0 42.7-19.2 42.7-42.7h256c0 23.5 19.2 42.7 42.7 42.7 23.5 0 42.7-19.2 42.7-42.7H768c23.5 0 42.7 19.2 42.7 42.7s-19.2 42.7-42.7 42.7z" p-id="6684" fill="#1afa29"></path></svg>

ui/src/assets/icons/svg/dev.svg

@@ -0,0 +1 @@
+<?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="1704260289375" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4287" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M960.42793 531.18976c-6.38976 38.4-19.21024 83.18976-38.42048 121.58976-12.8 19.21024-25.6 25.6-44.81024 19.21024-19.21024-12.8-25.62048-25.6-19.21024-44.81024 19.21024-38.4 32.01024-76.77952 38.42048-115.17952 25.6-102.4 19.21024-198.38976 12.8-255.97952L512.22313 70.4512 115.25929 256.02048c-6.41024 57.58976-12.82048 147.18976 12.8 255.97952 44.81024 211.16928 179.28192 358.35904 384.16384 447.95904 64.04096-25.6 115.26144-57.58976 166.48192-95.98976 12.8-12.8 32.01024-6.41024 44.83072 6.38976 12.8 12.8 6.38976 32.01024-6.41024 44.78976-57.63072 44.81024-121.6512 76.8-192.08192 108.78976h-25.62048C262.51049 927.9488 115.25929 761.56928 64.01833 524.8a973.1072 973.1072 0 0 1-12.8-294.37952c6.41024-12.8 12.8-19.18976 19.21024-25.6L499.42313 0.06144h25.62048l428.99456 204.75904c12.8 6.41024 19.21024 12.8 19.21024 25.6 6.38976 57.58976 12.8 166.4-12.82048 300.76928z m-435.38432 191.97952c-51.22048 0-108.8512-25.6-147.27168-63.97952-83.23072-83.18976-83.23072-211.18976 0-294.37952 83.23072-83.18976 211.29216-83.18976 294.52288 0 70.43072 70.38976 76.84096 185.58976 19.21024 268.77952l134.47168 134.38976c12.8 12.8 12.8 31.98976 0 44.78976-6.41024 6.38976-12.8 6.38976-25.62048 6.38976-12.8 0-19.21024 0-25.6-6.38976l-128.06144-128c-38.42048 25.6-76.84096 38.4-121.6512 38.4zM627.48457 409.6c-25.62048-31.98976-64.04096-44.78976-102.44096-44.78976-38.42048 0-76.84096 19.21024-102.46144 44.78976-57.61024 57.61024-57.61024 147.18976 0 204.77952 57.63072 51.2 147.27168 51.2 204.9024 0 57.63072-57.58976 57.63072-147.16928 0-204.77952z" fill="#1296db" p-id="4288"></path></svg>

ui/src/assets/icons/svg/issue.svg

@@ -0,0 +1 @@
+<?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="1704260370755" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="7941" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M512 0.00617a376.829937 376.829937 0 0 0-265.214956 107.007982 365.565939 365.565939 0 0 0-108.542982 259.069957v499.708917h743.419877v-499.709917a363.00594 363.00594 0 0 0-109.055982-259.069957A375.293938 375.293938 0 0 0 511.999 0.00717z m-30.719995 745.979876L470.528007 503.810086H287.233037L527.869997 200.197137l20.479997 195.582967 174.079971 6.143999-243.19996 344.061943zM0.003085 968.192009a55.807991 55.807991 0 0 1 55.806991-56.31999H968.189924a57.34399 57.34399 0 0 1 39.423994 16.384997 58.36799 58.36799 0 0 1 16.382997 39.934993A55.807991 55.807991 0 0 1 968.189924 1024H55.810076A55.807991 55.807991 0 0 1 0.003085 968.192009z m0 0" p-id="7942" fill="#d81e06"></path></svg>

ui/src/assets/icons/svg/uncheck.svg

@@ -0,0 +1 @@
+<?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="1704260326767" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="5492" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M450 820.5H212c-11 0-20-9-20-20v-577c0-11 9-20 20-20h480c11 0 20 9 20 20V381h50V223.5c0-38.7-31.3-70-70-70H212c-38.7 0-70 31.3-70 70v577c0 38.7 31.3 70 70 70h238v-50z" fill="#f4ea2a" p-id="5493"></path><path d="M737 381m-25 0a25 25 0 1 0 50 0 25 25 0 1 0-50 0Z" fill="#f4ea2a" p-id="5494"></path><path d="M450 845.5m-25 0a25 25 0 1 0 50 0 25 25 0 1 0-50 0Z" fill="#f4ea2a" p-id="5495"></path><path d="M524.1 368.5h-236c-13.8 0-25-11.2-25-25s11.2-25 25-25h236c13.8 0 25 11.2 25 25s-11.2 25-25 25zM374.1 567.5h-86c-13.8 0-25-11.2-25-25s11.2-25 25-25h86c13.8 0 25 11.2 25 25s-11.2 25-25 25zM677.5 511c41.3 0 80.1 16.1 109.2 45.3 29.2 29.2 45.3 68 45.3 109.2s-16.1 80.1-45.3 109.2c-29.2 29.2-68 45.3-109.2 45.3s-80.1-16.1-109.2-45.3c-29.2-29.2-45.3-68-45.3-109.2s16.1-80.1 45.3-109.2c29.1-29.2 67.9-45.3 109.2-45.3m0-50C564.6 461 473 552.6 473 665.5S564.6 870 677.5 870 882 778.4 882 665.5 790.4 461 677.5 461z" fill="#f4ea2a" p-id="5496"></path><path d="M664.5 704c-13.8 0-25-11.2-25-25v-78c0-13.8 11.2-25 25-25s25 11.2 25 25v78c0 13.8-11.2 25-25 25z" fill="#f4ea2a" p-id="5497"></path><path d="M754 704h-89c-13.8 0-25-11.2-25-25s11.2-25 25-25h89c13.8 0 25 11.2 25 25s-11.2 25-25 25z" fill="#f4ea2a" p-id="5498"></path></svg>

ui/src/views/approve/approveDetail/offlinevalve-detail.vue

@@ -209,7 +209,7 @@
                  @click="dataFormSubmit(2)" :disabled="submitDisabled">{{ $t('驳回') }}</el-button>
       <el-button v-if="!this.taskForm.taskId == ''" type="primary"
                  @click="dataFormSubmit(1)"
-                 :disabled="submitDisabled">{{ $t(taskName != '申请人提交申请' ? '通过' : '提交') }}</el-button>
+                 :disabled="submitDisabled">{{ getButtonName() }}</el-button>
       <el-button v-if="!this.taskForm.taskId == ''&&(this.taskName=='临时措施制定人'||this.taskName=='批准人')"
                  type="danger"
                  @click="dataFormSubmit(0)" :disabled="submitDisabled">{{ $t('拒绝') }}</el-button>
@@ -424,6 +424,18 @@ export default {
         this.lockList = res.data;
       })
     },
+    getButtonName(){
+      switch (this.taskName){
+        case '申请人提交申请':
+          return '提交';
+        case '临时措施执行人':
+          return '确认已执行';
+        case '临时措施确认人':
+          return '确认';
+        default:
+          return '通过';
+      }
+    },
     dataFormSubmit(val) {
       if (val == 2||val==0) {
         if (this.form.remarks == "" || this.form.remarks == null || this.form.remarks == undefined) {