普通报销,差旅报销工作流表单修改以及添加加盟商负责人事件

zjugis-business/src/main/java/com/zjugis/business/flow/commoncost/event/CommonCostEvent.java

@@ -386,6 +386,22 @@ public class CommonCostEvent extends BaseController {
         }
     }
 
+    @PostMapping("/toFranchise")
+    public String toFranchise(@ParamModel Map flowInstance, @ParamModel Map flowDirectionInstance, @ParamModel Map previousActivityInstance, @ParamModel Map previousGatewayInstance, @ParamModel Map nextActivityTemplate, @ParamModel Map nextGatewayInstance) {
+        try {
+            String flowInstanceId = flowInstance.get("id").toString();
+            CommonCostDO entity = commonCostService.findByInstanceId(flowInstanceId);
+            List<PostRespDTO> postList = postApi.getPostByUser(entity.getUserId()).getCheckedData();
+            Set<String> postCodes = convertSet(postList, PostRespDTO::getCode);
+            if (entity != null && CollectionUtil.contains(postCodes, "jmfzr")) {
+                return "true";
+            }
+            return "false";
+        } catch (Exception ex) {
+            return error(ex.getMessage(), ErrorCode.DEFAULT);
+        }
+    }
+
     @PostMapping("/toGMO")
     public String toGMO(@ParamModel Map flowInstance, @ParamModel Map flowDirectionInstance, @ParamModel Map previousActivityInstance, @ParamModel Map previousGatewayInstance, @ParamModel Map nextActivityTemplate, @ParamModel Map nextGatewayInstance) {
         try {

zjugis-business/src/main/java/com/zjugis/business/flow/travelcost/event/TravelCostEvent.java

@@ -326,6 +326,22 @@ public class TravelCostEvent extends BaseController {
         }
     }
 
+    @PostMapping("/toFranchise")
+    public String toFranchise(@ParamModel Map flowInstance, @ParamModel Map flowDirectionInstance, @ParamModel Map previousActivityInstance, @ParamModel Map previousGatewayInstance, @ParamModel Map nextActivityTemplate, @ParamModel Map nextGatewayInstance) {
+        try {
+            String flowInstanceId = flowInstance.get("id").toString();
+            TravelCostDO entity = travelCostService.findByInstanceId(flowInstanceId);
+            List<PostRespDTO> postList = postApi.getPostByUser(entity.getUserId()).getCheckedData();
+            Set<String> postCodes = convertSet(postList, PostRespDTO::getCode);
+            if (entity != null && CollectionUtil.contains(postCodes, "jmfzr")) {
+                return "true";
+            }
+            return "false";
+        } catch (Exception ex) {
+            return error(ex.getMessage(), ErrorCode.DEFAULT);
+        }
+    }
+
     @PostMapping("/toGMO")
     public String toGMO(@ParamModel Map flowInstance, @ParamModel Map flowDirectionInstance, @ParamModel Map previousActivityInstance, @ParamModel Map previousGatewayInstance, @ParamModel Map nextActivityTemplate, @ParamModel Map nextGatewayInstance) {
         try {

zjugis-business/src/main/resources/templates/CommonCost/agentIndex.ftl

@@ -197,15 +197,15 @@
           <table class="form-table-info">
             <tr style="height: 37px;">
               <td style="width: 2%;"></td>
-              <td style="width: 20%;">项目名称</td>
-              <td style="width: 10%;">项目部门</td>
-              <td style="width: 9%;">发生日期</td>
-              <td style="width: 13%;">费用实际所属类型</td>
-              <td style="width: 10%;">发票内容</td>
-              <td style="width: 8%;">单据张数</td>
-              <td style="width: 8%;">金额</td>
+              <td style="width: 17%;">项目名称</td>
+              <td style="width: 13%;">项目部门</td>
+              <td style="width: 10%;">发生日期</td>
+              <td style="width: 15%;">费用实际所属类型</td>
+              <td style="width: 8%;">发票内容</td>
+              <td style="width: 7%;">张数</td>
+              <td style="width: 10%;">金额</td>
               <td style="width: 10%;">备注</td>
-              <td style="width: 10%;">操作</td>
+              <td style="width: 8%;">操作</td>
             </tr>
             <tbody class="tbody tbodyQjsq">
             </tbody>

zjugis-business/src/main/resources/templates/CommonCost/index.ftl

@@ -180,15 +180,15 @@
           <table class="form-table-info">
             <tr style="height: 37px;">
               <td style="width: 2%;"></td>
-              <td style="width: 20%;">项目名称</td>
+              <td style="width: 17%;">项目名称</td>
               <td style="width: 13%;">项目部门</td>
               <td style="width: 10%;">发生日期</td>
               <td style="width: 15%;">费用实际所属类型</td>
               <td style="width: 8%;">发票内容</td>
-              <td style="width: 7%;">单据张数</td>
-              <td style="width: 7%;">金额</td>
+              <td style="width: 7%;">张数</td>
+              <td style="width: 10%;">金额</td>
               <td style="width: 10%;">备注</td>
-              <td style="width: 10%;">操作</td>
+              <td style="width: 8%;">操作</td>
             </tr>
             <tbody class="tbody tbodyQjsq">
             </tbody>

zjugis-business/src/main/resources/templates/CommonCost/js/index.js

@@ -9,6 +9,7 @@
     let costTypeJSON = JSON.parse(document.querySelector('#costTypeJSON').value)
     let lastProjectId = '';
     let lastProjectName = '';
+    let lastProjectDeptName = '';
     window.onload = function (ex) {
         let timeObject = document.querySelector('#detailList')
         let arrays = JSON.parse(timeObject.value)
@@ -180,6 +181,9 @@
         if(!(!lastProjectName || lastProjectName.trim() === '')){
             z.ui.input("[name='CommonCostDetailDO[" + i + "]$projectName']").setValue(lastProjectName);
         }
+        if(!(!lastProjectDeptName || lastProjectDeptName.trim() === '')){
+            z.ui.input("[name='CommonCostDetailDO[" + i + "]$xmzrbm']").setValue(lastProjectDeptName);
+        }
         if (!(!isTimes[i].projectId || isTimes[i].projectId.trim() === '')) {
             $("[name='CommonCostDetailDO[" + i + "]$projectId']").val(isTimes[i].projectId);
         }
@@ -231,6 +235,7 @@
                 }
                 lastProjectId = $("[name='CommonCostDetailDO[" + i + "]$projectId']").val();
                 lastProjectName = z.ui.input("[name='CommonCostDetailDO[" + i + "]$projectName']").getValue();
+                lastProjectDeptName = z.ui.input("[name='CommonCostDetailDO[" + i + "]$xmzrbm']").getValue();
                 if(!z.ui.date("[name='CommonCostDetailDO[" + i + "]$costDate']").getValue()){
                     z.ui.alertWarning(`发生日期不能为空！`)
                     return false;