表单修改

zjugis-business/src/main/java/com/zjugis/business/flow/project/event/ProjectEvent.java

@@ -190,21 +190,6 @@ public class ProjectEvent extends BaseController {
                     map.put("id",entity.getXmjlId());
                     userMaps.add(map);
                 }
-                return ok(userMaps);
-            } else {
-                throw new BusinessException("执行事件出错，请联系管理员！");
-            }
-        } catch (Exception e) {
-            log.error(e.getMessage(),e);
-            throw new BusinessException("执行事件出错，请联系管理员！");
-        }
-    }
-    @PostMapping("/to-sale-person")
-    public String toSalePerson(String flowInstanceId) {
-        try {
-            if (StringUtils.isNotBlank(flowInstanceId)) {
-                Project entity = projectService.selectByInstanceId(flowInstanceId);
-                List<Map<String, String>> userMaps = new ArrayList<>();
                 if(StringUtils.isNotBlank(entity.getXsryId())) {
                     HashMap<String,String> map = new HashMap<>();
                     map.put("id",entity.getXsryId());
@@ -233,32 +218,9 @@ public class ProjectEvent extends BaseController {
                         HashMap<String,String> map = new HashMap<>();
                         map.put("id",deptLeader.getId());
                         userMaps.add(map);
-                    }
-                }
-                return ok(userMaps);
-            } else {
-                throw new BusinessException("找不到流程id");
-            }
-        } catch (Exception e) {
-            log.error(e.getMessage(),e);
-            throw new BusinessException("执行事件出错，请联系管理员！");
-        }
-    }
-
-    @PostMapping("/to-dept-manager-leader")
-    public String toDeptManagerLeader(String flowInstanceId) {
-        try {
-            if (StringUtils.isNotBlank(flowInstanceId)) {
-                Project entity = projectService.selectByInstanceId(flowInstanceId);
-                List<Map<String, String>> userMaps = new ArrayList<>();
-                if(StringUtils.isNotBlank(entity.getZrbmId())){
-                    CommonResult<AdminUserRespDTO> result = deptApi.getDeptLeader(entity.getZrbmId());
-                    AdminUserRespDTO deptLeader = result.getCheckedData();
-                    if(deptLeader != null){
                         CommonResult<AdminUserRespDTO> userRes = adminUserApi.getUserLeader(deptLeader.getId());
                         AdminUserRespDTO userLeader = userRes.getCheckedData();
                         if(userLeader != null){
-                            HashMap<String,String> map = new HashMap<>();
                             map.put("id",userLeader.getId());
                             userMaps.add(map);
                         }

zjugis-business/src/main/resources/templates/FlowProject/apply.ftl

@@ -3,7 +3,9 @@
   <div class="z-position form-boss ow-tabs" name="flow-form">
     <ul class="ow-tab-nav">
       <li z-tabindex="0" class="ow-tab-item on" data-name="jbxx">基础信息</li>
-      <li z-tabindex="1" class="ow-tab-item" data-name="yj">审批意见</li>
+    <#if WORKFLOW.OPINION! !="">
+        <li z-tabindex="1" class="ow-tab-item" data-name="yj">审批意见</li>
+     </#if>
     </ul>
     <div class="ow-tab-scroll">
       <div class="ow-tab-content on" name="jbxx">
@@ -77,7 +79,7 @@
             </tr>
             <tr>
               <td class="th">
-                <div class="form-label">预估合同额：</div>
+                <div class="form-label">预估合同额(万元)：</div>
               </td>
               <td>
                 <div class="form-group">
@@ -140,7 +142,7 @@
               </td>
               <td>
                 <div class="form-group">
-                  <div class="form-item" style="margin: 10px 0;">
+                  <div class="form-item">
                     <div class="z-comp-input" name="project$yggq">
                       <input type="text" value="${formEntity.yggq!}">
                     </div>
@@ -177,6 +179,8 @@
                   </div>
                 </div>
               </td>
+              <td class="th"></td>
+              <td></td>
             </tr>
           </table>
         </div>
@@ -224,8 +228,9 @@
           </div>
         </div>
       </div>
-      <div class="ow-tab-content" name="yj">
         <#if WORKFLOW.OPINION! !="">
+      <div class="ow-tab-content" name="yj">
+
           <div class="form-title">
             <div class="form-icon">
               <img src="/imgs/titleIcon.png" alt="">
@@ -239,8 +244,8 @@
               <div class="z-form-row"> ${WORKFLOW.OPINION!} </div>
             </div>
           </div>
-        </#if>
       </div>
+        </#if>
     </div>
   </div>
   <style type="text/css">