Browse Source

离职交接+离职申请bug

jzh 1 year ago
parent
commit
b26a5ed567

+ 21 - 2
zjugis-business/src/main/java/com/zjugis/business/flow/resign/service/impl/ResignServiceImpl.java

@@ -17,10 +17,13 @@ import com.zjugis.business.flow.resign.dao.ResignDetailDAO;
 import com.zjugis.business.flow.resign.entity.ResignDO;
 import com.zjugis.business.flow.resign.entity.ResignDetailDO;
 import com.zjugis.business.flow.resign.service.ResignService;
+import com.zjugis.business.flow.resignApply.entity.ResignApplyDO;
+import com.zjugis.business.flow.resignApply.service.ResignApplyService;
 import com.zjugis.framework.common.pojo.CommonResult;
 import com.zjugis.framework.common.pojo.PageResult;
 import com.zjugis.framework.mybatis.core.query.LambdaQueryWrapperX;
 import com.zjugis.framework.security.core.util.SecurityFrameworkUtils;
+import com.zjugis.framework.workflow.exception.BusinessException;
 import com.zjugis.framework.workflow.model.IFlowInstance;
 import com.zjugis.framework.workflow.rpc.remote.WorkflowClient;
 import com.zjugis.framework.workflow.utils.Select;
@@ -30,6 +33,7 @@ import com.zjugis.module.system.api.dict.DictDataApi;
 import com.zjugis.module.system.api.dict.dto.DictDataRespDTO;
 import com.zjugis.module.system.api.user.AdminUserApi;
 import com.zjugis.module.system.api.user.dto.AdminUserRespDTO;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -48,6 +52,11 @@ import static com.zjugis.framework.common.util.collection.CollectionUtils.conver
  */
 @Service
 public class ResignServiceImpl implements ResignService {
+
+    @Value("${serviceUrl.z_workflow}")
+    private String workflowUrl;
+    @Resource
+    private ResignApplyService resignApplyService;
     @Resource
     private DictDataApi dictDataApi;
     @Resource
@@ -58,6 +67,7 @@ public class ResignServiceImpl implements ResignService {
     private ResignDAO resignDAO;
     @Resource
     private ResignDetailDAO resignDetailDAO;
+
     @Resource
     private StaffApi staffApi;
 
@@ -83,6 +93,9 @@ public class ResignServiceImpl implements ResignService {
                 entity.setRgssj(dto.getRgssj());
                 entity.setHtdqs(dto.getHtdqs());
                 entity.setDrzw(dto.getPostName());
+
+                ResignApplyDO resignApplyDO = resignApplyService.findByUserId(userId);
+                entity.setLzygszd(resignApplyDO.getLzygszd());
                 resignDAO.insert(entity);
             }
             return createMap(flowInstanceId, entity, userId);
@@ -112,7 +125,7 @@ public class ResignServiceImpl implements ResignService {
     @Override
     public void update(ResignPageReqVO vo) {
         validateExists(vo.getId());
-        if(CollectionUtil.isEmpty(vo.getFinishedList()) || CollectionUtil.isEmpty(vo.getUnfinishedList())){
+        if (CollectionUtil.isEmpty(vo.getFinishedList()) || CollectionUtil.isEmpty(vo.getUnfinishedList())) {
             throw exception(RESIGN_DETAIL_NOT_EXISTS);
         }
         ResignDO resignDO = ResignConvert.INSTANCE.convert(vo);
@@ -167,7 +180,7 @@ public class ResignServiceImpl implements ResignService {
         Map<String, Object> map = new HashMap<>();
         map.put("formEntity", entity);
         //查字典
-        List<DictDataRespDTO>resData = dictDataApi.getDictDataListByTypes(getTypeList()).getCheckedData();
+        List<DictDataRespDTO> resData = dictDataApi.getDictDataListByTypes(getTypeList()).getCheckedData();
         Map<String, List<DictDataRespDTO>> map1 = new HashMap<>();
         resData.forEach(v -> {
             if (map1.get(v.getDictType()) != null) {
@@ -181,6 +194,12 @@ public class ResignServiceImpl implements ResignService {
             }
         });
         map1.forEach((k, v) -> map.put(k, JSON.toJSONString(SelectConvert.INSTANCE.convertList(v))));
+
+        ResignApplyDO resignApplyDO = resignApplyService.findByUserId(entity.getUserId());
+        //离职申请
+        map.put("lzsq", JSON.toJSONString(resignApplyDO));
+        map.put("z_work_flow", workflowUrl);
+
         //列表
         List<ResignDetailDO> detailDOS = resignDetailDAO.selectList(new LambdaQueryWrapperX<ResignDetailDO>().eq(ResignDetailDO::getResignId, entity.getId()));
         map.put("unfinishedList", JSON.toJSONString(detailDOS.stream().filter(v -> v.getState().equals("1")).collect(Collectors.toList())));

+ 3 - 0
zjugis-business/src/main/java/com/zjugis/business/flow/resignApply/controller/vo/ResignApplyPageVO.java

@@ -22,4 +22,7 @@ public class ResignApplyPageVO extends PageParam {
     @Schema(description = "流程状态")
     private Integer status;
 
+    @Schema(description = "用户id")
+    private String userId;
+
 }

+ 15 - 0
zjugis-business/src/main/java/com/zjugis/business/flow/resignApply/dao/ResignApplyDAO.java

@@ -7,6 +7,7 @@ import com.zjugis.business.flow.resignApply.entity.ResignApplyDO;
 import com.zjugis.framework.common.pojo.PageResult;
 import com.zjugis.framework.mybatis.core.mapper.BaseMapperX;
 import com.zjugis.framework.mybatis.core.query.LambdaQueryWrapperX;
+import com.zjugis.framework.workflow.exception.BusinessException;
 import org.apache.ibatis.annotations.Mapper;
 
 /**
@@ -25,7 +26,21 @@ public interface ResignApplyDAO extends BaseMapperX<ResignApplyDO> {
                 .eqIfPresent(ResignApplyDO::getLoginName, pageReqVO.getLoginName())
                 .eqIfPresent(ResignApplyDO::getDeptId, pageReqVO.getDeptId())
                 .eqIfPresent(ResignApplyDO::getFlowStatus, pageReqVO.getStatus())
+                .eqIfPresent(ResignApplyDO::getUserId, pageReqVO.getUserId())
                 .orderByDesc(ResignApplyDO::getLatestModifyTime)
         );
     }
+
+    default ResignApplyDO findByUserId(String userId) {
+        ResignApplyPageVO vo = new ResignApplyPageVO();
+        vo.setPageNo(1);
+        vo.setPageSize(1);
+        vo.setUserId(userId);
+        vo.setStatus(90);
+        PageResult<ResignApplyDO>page=getPage(vo);
+        if(page.getTotal()==0){
+            throw new BusinessException("请先提交离职申请!");
+        }
+        return getPage(vo).getList().get(0);
+    }
 }

+ 0 - 184
zjugis-business/src/main/java/com/zjugis/business/flow/resignApply/event/ResignApplyEvent.java

@@ -125,13 +125,6 @@ public class ResignApplyEvent extends BaseController {
                 entity.setFlowStatus(FLOW_FINISHED);
                 entity.setFlowFinishtime(LocalDateTime.now());
                 resignDAO.updateById(entity);
-
-                //数据归档 更新员工状态并员工账号
-                StaffStateDTO dto = new StaffStateDTO();
-                dto.setUserId(entity.getUserId());
-                dto.setState(StaffStateConstants.RESIGN);
-                CommonResult<String> res = staffApi.updateStaffState(dto);
-                res.getCheckedData();
                 return ok("true");
             } else {
                 throw new BusinessException("执行事件出错,请联系管理员!");
@@ -222,181 +215,4 @@ public class ResignApplyEvent extends BaseController {
             throw new BusinessException("执行事件出错,请联系管理员!");
         }
     }
-
-
-    /**
-     * 工作接收人
-     *
-     * @param flowInstanceId
-     * @return
-     */
-    @PostMapping("/workReceiver")
-    public String unfinishedReceiver(String flowInstanceId) {
-        try {
-            if (StringUtils.isNotBlank(flowInstanceId)) {
-                ResignDO entity = resignService.findByInstanceId(flowInstanceId);
-                List<Map<String, String>> userMaps = new ArrayList<>();
-                List<ResignDetailDO> detailDOS = resignDetailService.getListByResignId(entity.getId());
-                if (CollectionUtil.isNotEmpty(detailDOS)) {
-                    Set<String> ids = convertSet(detailDOS, ResignDetailDO::getReceiver);
-
-
-                    ids.forEach(v -> {
-                        HashMap<String, String> map = new HashMap<>();
-                        if (v != null) {
-                            map.put("id", v);
-                            userMaps.add(map);
-                        }
-                    });
-
-
-                    return ok(userMaps);
-                } else {
-                    throw new BusinessException("执行事件出错,请联系管理员!");
-                }
-
-            } else {
-                throw new BusinessException("执行事件出错,请联系管理员!");
-            }
-        } catch (Exception e) {
-            log.error(e.getMessage(), e);
-            throw new BusinessException("执行事件出错,请联系管理员!");
-        }
-    }
-
-
-    /**
-     * 数据中心接收人
-     */
-    @PostMapping("/dataReceiver")
-    public String dataReceiver(String flowInstanceId) {
-        try {
-            if (StringUtils.isNotBlank(flowInstanceId)) {
-                ResignDO entity = resignService.findByInstanceId(flowInstanceId);
-                List<Map<String, String>> userMaps = new ArrayList<>();
-                String deptId = deptApi.getSecondDeptByDeptId(entity.getDeptId()).getCheckedData().getId();
-                if (deptId != null) {
-                    List<AdminUserRespDTO> users = adminUserApi.getUserListByPostIds(dataLocationCheck(deptId)).getCheckedData();
-                    if (CollectionUtil.isNotEmpty(users)) {
-                        Set<String> ids = convertSet(users, AdminUserRespDTO::getId);
-
-                        ids.forEach(v -> {
-                            HashMap<String, String> map = new HashMap<>();
-                            if (v != null) {
-                                map.put("id", v);
-                                userMaps.add(map);
-                            }
-                        });
-
-
-                        return ok(userMaps);
-                    } else {
-                        throw new BusinessException("执行事件出错,请联系管理员!");
-                    }
-                }
-                throw new BusinessException("执行事件出错,请联系管理员!");
-
-
-            } else {
-                throw new BusinessException("执行事件出错,请联系管理员!");
-            }
-        } catch (Exception e) {
-            log.error(e.getMessage(), e);
-            throw new BusinessException("执行事件出错,请联系管理员!");
-        }
-    }
-
-
-    /**
-     * 判断是否存在
-     */
-    @PostMapping("/location/{type}")
-    public String existLocation(@ParamModel Map flowInstance, @PathVariable String type) {
-        try {
-            String flowInstanceId = flowInstance.get("id").toString();
-
-            ResignDO entity = resignService.findByInstanceId(flowInstanceId);
-
-            if (type.equals(entity.getLzygszd())) {
-                return "true";
-            } else {
-                return "false";
-            }
-
-
-        } catch (Exception ex) {
-            return error(ex.getMessage(), ErrorCode.DEFAULT);
-        }
-    }
-
-
-    /**
-     * 判断部门是软件板块还是规划板块
-     * 1空间信息/规划/江苏分公司  2其他
-     */
-    @PostMapping("/department/{type}")
-    public String department(@ParamModel Map flowInstance, @PathVariable String type) {
-        try {
-            String flowInstanceId = flowInstance.get("id").toString();
-
-
-            ResignDO entity = resignService.findByInstanceId(flowInstanceId);
-            String deptId = deptApi.getSecondDeptByDeptId(entity.getDeptId()).getCheckedData().getId();
-
-            switch (type) {
-                case "1":
-                    if (deptCheck(deptId)) {
-                        return "true";
-                    } else {
-                        return "false";
-                    }
-                case "2":
-                    if (!deptCheck(deptId)) {
-                        return "true";
-                    } else {
-                        return "false";
-                    }
-
-                default:
-                    return "false";
-            }
-
-
-        } catch (Exception ex) {
-            return error(ex.getMessage(), ErrorCode.DEFAULT);
-        }
-    }
-
-    private boolean deptCheck(String deptId) {
-        return checkDeptIds.contains(deptId);
-    }
-
-    private List<Long> dataLocationCheck(String deptId) {
-        List<Long> postIds = new ArrayList<>();
-        if (softDeptIds.contains(deptId)) {
-            postIds.addAll(convertStringListToLongList(Arrays.asList(softPostIds.split(","))));
-        } else if (planDeptIds.contains(deptId)) {
-            postIds.addAll(convertStringListToLongList(Arrays.asList(planPostIds.split(","))));
-        } else {
-            throw new BusinessException("部门不存在,请联系管理员");
-        }
-
-        return postIds;
-    }
-
-
-    public static List<Long> convertStringListToLongList(List<String> stringList) {
-        List<Long> longList = new ArrayList<>();
-        for (String item : stringList) {
-            try {
-                Long.parseLong(item);
-                longList.add(Long.valueOf(item));
-            } catch (NumberFormatException e) {
-                throw new BusinessException("格式转换失败,请联系管理员");
-            }
-        }
-        return longList;
-    }
-
-
 }

+ 2 - 0
zjugis-business/src/main/java/com/zjugis/business/flow/resignApply/service/ResignApplyService.java

@@ -26,4 +26,6 @@ public interface ResignApplyService {
     ResignApplyDO findByInstanceId(String flowInstanceId);
 
     ResignApplyPageReqVO flowAdd(String flowInstanceId, String userId);
+
+    ResignApplyDO findByUserId(String userId);
 }

+ 8 - 0
zjugis-business/src/main/java/com/zjugis/business/flow/resignApply/service/impl/ResignApplyApplyServiceImpl.java

@@ -20,6 +20,7 @@ import com.zjugis.module.adm.api.staff.dto.StaffDeptPostDTO;
 import com.zjugis.module.system.api.dict.DictDataApi;
 import com.zjugis.module.system.api.dict.dto.DictDataRespDTO;
 import com.zjugis.module.system.api.user.AdminUserApi;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -36,6 +37,8 @@ import static com.zjugis.framework.common.exception.util.ServiceExceptionUtil.ex
  */
 @Service
 public class ResignApplyApplyServiceImpl implements ResignApplyService {
+
+
     @Resource
     private DictDataApi dictDataApi;
     @Resource
@@ -120,6 +123,11 @@ public class ResignApplyApplyServiceImpl implements ResignApplyService {
         return ResignApplyConvert.INSTANCE.convert(entity);
     }
 
+    @Override
+    public ResignApplyDO findByUserId(String userId) {
+       return resignApplyDAO.findByUserId(userId);
+    }
+
 
     private Map<String, Object> createMap(String flowInstanceId, ResignApplyDO entity, String userId) {
         Map<String, Object> map = new HashMap<>();

+ 367 - 773
zjugis-business/src/main/resources/templates/Resign/index.ftl

@@ -1,328 +1,23 @@
-<@w.workFlow javascripts=['/Resign/js/index.js','/flow/js/formCommon.js', '/OwCommon/OwCommon.js','/timeSelector/TimeSelector.js','/js/moment.js']
+<@w.workFlow javascripts=['/Resign/js/index.js','/flow/js/formCommon.js', '/OwCommon/OwCommon.js','/timeSelector/TimeSelector.js']
 styles=[ '/flow/css/formCommon.css', '/OwCommon/OwCommon.css','/timeSelector/TimeSelector.css' ]>
-
-    <div class="z-position form-boss ow-tabs" name="createReqVO">
+    <div class="z-position form-boss ow-tabs" name="flow-form">
         <ul class="ow-tab-nav oa_tabBox">
-            <li z-tabindex="0" class="ow-tab-item on" data-name="lzsq">离职申请表</li>
-            <li z-tabindex="1" class="ow-tab-item" data-name="jjqd">离职员工交接清单</li>
+            <li z-tabindex="0" class="ow-tab-item on" data-name="jbxx">基础信息</li>
             <#if WORKFLOW.OPINION! !="">
-                <li z-tabindex="2" class="ow-tab-item" data-name="yj">审批意见</li>
+                <li z-tabindex="1" class="ow-tab-item" data-name="yj">审批意见</li>
             </#if>
         </ul>
 
         <div class="ow-tab-scroll z-tab-content">
-            <div class="ow-tab-content" name="lzsq" style="padding-bottom: 40px;">
+            <div class="ow-tab-content" name="jbxx" style="padding-bottom: 50px;">
                 <div class="z-form-row" style="display: none;">
                     <input type="text" value="${formEntity.instanceId!}" name="createReqVO$instanceId">
                     <input type="text" value="${formEntity.id!}" name="createReqVO$id">
                     <input type="text" value='${unfinishedList!}' id="unfinished">
                     <input type="text" value='${finishedList!}' id="finished">
                 </div>
-                <div class="form-title" style="margin-top: 0;">
-                    <div class="form-icon">
-                        <img src="/imgs/titleIcon.png" alt="">
-                        <span>离职申请</span>
-                    </div>
-                    <div class="form-btn">
-                    </div>
-                </div>
-                <div class="jbxx-box jbxx-box-flex">
-                    <table class="jbxx-table-info">
-
-                        <tr>
-
-                            <td class="th">
-                                <div class="form-label">姓名:</div>
-                            </td>
-                            <td>
-                                <div class="form-group">
-                                    <div class="z-comp-input z-readonly" name="nickname">
-                                        <input type="text" name="createReqVO$nickname"
-                                               value="${formEntity.nickname!}">
-                                        <input type="hidden" name="createReqVO$userId" value="${formEntity.userId!}">
-                                    </div>
-                                </div>
-                            </td>
-
-                            <td class="th">
-                                <div class="form-label">部门:</div>
-                            </td>
-                            <td>
-                                <div class="form-group">
-                                    <div class="z-comp-input z-readonly" name="createReqVO$deptName">
-                                        <input type="text" value="${formEntity.deptName!}">
-                                        <input type="hidden" name="createReqVO$deptId" value="${formEntity.deptId!}">
-                                    </div>
-                                </div>
-                            </td>
-
-
-                            <td class="th">
-                                <div class="form-label ">岗位:</div>
-                            </td>
-                            <td>
-                                <div class="form-group">
-                                    <div class="form-item">
-                                        <div class="z-comp-select z-readonly" name="createReqVO$drzw"
-                                             data='${post_type!}' value="${formEntity.drzw!}">
-                                            <div class="z-inputselect-bar">
-                                                <span></span><i></i>
-                                            </div>
-                                        </div>
-                                    </div>
-                                </div>
-                            </td>
-
-
-                        </tr>
-
-
-                        <tr>
-
-                            <td class="th">
-                                <div class="form-label">入职时间:</div>
-                            </td>
-                            <td>
-                                <div class="form-group">
-                                    <div class="form-item">
-                                        <div class="z-comp-date z-readonly" name="createReqVO$rgssj">
-                                            <input type="text" value="${(formEntity.rgssj?date)!}">
-                                        </div>
-                                    </div>
-                                </div>
-
-                            </td>
-
-                            <td class="th">
-                                <div class="form-label">合同期限:</div>
-                            </td>
-                            <td>
-                                <div class="form-group">
-                                    <div class="form-item">
-                                        <div class="z-comp-date z-readonly" name="createReqVO$htdqs">
-                                            <input type="text" value="${(formEntity.htdqs?date)!}">
-                                        </div>
-                                    </div>
-                                </div>
-                            </td>
-
-                            <td class="th">
-                                <div class="form-label ">员工所在地:</div>
-                            </td>
-                            <td>
-                                <div class="form-group">
-                                    <div class="form-item">
-                                        <div class="z-comp-select" name="createReqVO$lzygszd"
-                                             data='${location_type!}' value="${formEntity.lzygszd!}">
-                                            <div class="z-inputselect-bar">
-                                                <span></span><i></i>
-                                            </div>
-                                        </div>
-                                    </div>
-                                </div>
-                            </td>
-
-
-                        </tr>
-
-                        <tr>
-
-                            <td class="th">
-                                <div class="form-label">最后上班日期:</div>
-                            </td>
-                            <td>
-                                <div class="form-group">
-                                    <div class="form-item">
-                                        <div class="z-comp-date" name="createReqVO$zhsbrq">
-                                            <input type="text" value="${(formEntity.zhsbrq?date)!}">
-                                        </div>
-                                    </div>
-                                </div>
-
-                            </td>
-
-                            <td class="th">
-                                <div class="form-label">离职生效日期:</div>
-                            </td>
-                            <td>
-                                <div class="form-group">
-                                    <div class="form-item">
-                                        <div class="z-comp-date" name="createReqVO$lzsxrq">
-                                            <input type="text" value="${(formEntity.lzsxrq?date)!}">
-                                        </div>
-                                    </div>
-                                </div>
-                            </td>
-
-
-
-
-                            <td class="th">
-                            </td>
-                            <td>
-                            </td>
-                        </tr>
-
-                    </table>
-                </div>
-
-
-                <div class="form-title" style="margin-top: 0;">
-                    <div class="form-icon">
-                        <img src="/imgs/titleIcon.png" alt="">
-                        <span>离职原因</span>
-                    </div>
-                    <div class="form-btn">
-                    </div>
-                </div>
-                <div class="jbxx-box jbxx-box-flex">
-                    <table class="jbxx-table-info">
-                        <tr>
-                            <td class="th">
-                                <div class="form-label">请进行勾选:</div>
-                            </td>
-
-
-                            <td class="z-checkbox-column">
-                                <div class="z-comp-checkbox" name="createReqVO$v1">
-                                    <div class="z-checkbox-item <#if (formEntity.lzyy!)? contains(",1,")>checked</#if>"
-                                         value="1"><i></i>个人原因
-                                    </div>
-                                </div>
-                                <div class="z-comp-checkbox" name="createReqVO$v2">
-                                    <div class="z-checkbox-item <#if (formEntity.lzyy!)? contains(",2,")>checked</#if>"
-                                         value="2"><i></i>晋升机会
-                                    </div>
-                                </div>
-                                <div class="z-comp-checkbox" name="createReqVO$v3">
-                                    <div class="z-checkbox-item <#if (formEntity.lzyy!)? contains(",3,")>checked</#if>"
-                                         value="3"><i></i>换个行业发展
-                                    </div>
-                                </div>
-                                <div class="z-comp-checkbox" name="createReqVO$v4">
-                                    <div class="z-checkbox-item <#if (formEntity.lzyy!)? contains(",4,")>checked</#if>"
-                                         value="4"><i></i>薪资偏低
-                                    </div>
-                                </div>
-                                <div class="z-comp-checkbox" name="createReqVO$v5">
-                                    <div class="z-checkbox-item <#if (formEntity.lzyy!)? contains(",5,")>checked</#if>"
-                                         value="5"><i></i>福利不佳
-                                    </div>
-                                </div>
-                            </td>
 
 
-                            <td class="z-checkbox-column">
-
-
-                                <div class="z-comp-checkbox" name="createReqVO$v6">
-                                    <div class="z-checkbox-item <#if (formEntity.lzyy!)? contains(",6,")>checked</#if>"
-                                         value="6"><i></i>劳动合同到期
-                                    </div>
-                                </div>
-                                <div class="z-comp-checkbox" name="createReqVO$v7">
-                                    <div class="z-checkbox-item <#if (formEntity.lzyy!)? contains(",7,")>checked</#if>"
-                                         value="7"><i></i>无归属感
-                                    </div>
-                                </div>
-                                <div class="z-comp-checkbox" name="createReqVO$v8">
-                                    <div class="z-checkbox-item <#if (formEntity.lzyy!)? contains(",8,")>checked</#if>"
-                                         value="8"><i></i>健康因素
-                                    </div>
-                                </div>
-                                <div class="z-comp-checkbox" name="createReqVO$v9">
-                                    <div class="z-checkbox-item <#if (formEntity.lzyy!)? contains(",9,")>checked</#if>"
-                                         value="9"><i></i>文化理念不同
-                                    </div>
-                                </div>
-                                <div class="z-comp-checkbox" name="createReqVO$v10">
-                                    <div class="z-checkbox-item <#if (formEntity.lzyy!)? contains(",10,")>checked</#if>"
-                                         value="10"><i></i>求学深造
-                                    </div>
-                                </div>
-                            </td>
-
-                            <td class="z-checkbox-column">
-
-
-                                <div class="z-comp-checkbox" name="createReqVO$v11">
-                                    <div class="z-checkbox-item <#if (formEntity.lzyy!)? contains(",11,")>checked</#if>"
-                                         value="11"><i></i>家庭因素
-                                    </div>
-                                </div>
-                                <div class="z-comp-checkbox" name="createReqVO$v12">
-                                    <div class="z-checkbox-item <#if (formEntity.lzyy!)? contains(",12,")>checked</#if>"
-                                         value="12"><i></i>领导风格不适
-                                    </div>
-                                </div>
-                                <div class="z-comp-checkbox" name="createReqVO$v13">
-                                    <div class="z-checkbox-item <#if (formEntity.lzyy!)? contains(",13,")>checked</#if>"
-                                         value="13"><i></i>工作环境
-                                    </div>
-                                </div>
-                                <div class="z-comp-checkbox" name="createReqVO$v14">
-                                    <div class="z-checkbox-item <#if (formEntity.lzyy!)? contains(",14,")>checked</#if>"
-                                         value="14"><i></i>人际关系
-                                    </div>
-                                </div>
-                                <div class="z-comp-checkbox" name="createReqVO$v15">
-                                    <div class="z-checkbox-item <#if (formEntity.lzyy!)? contains(",15,")>checked</#if>"
-                                         value="15"><i></i>遭受不公平待遇
-                                    </div>
-                                </div>
-                            </td>
-
-
-                            <td class="z-checkbox-column">
-
-                                <div class="z-comp-checkbox" name="createReqVO$v16">
-                                    <div class="z-checkbox-item <#if (formEntity.lzyy!)? contains(",16,")>checked</#if>"
-                                         value="16"><i></i>不能胜任本质工作
-                                    </div>
-                                </div>
-
-                                <div class="z-comp-checkbox" name="createReqVO$v17">
-                                    <div class="z-checkbox-item <#if (formEntity.lzyy!)? contains(",17,")>checked</#if>"
-                                         value="17"><i></i>严重违反公司规章制度
-                                    </div>
-                                </div>
-                            </td>
-
-                        </tr>
-                    </table>
-                </div>
-
-                <div class="form-title" style="margin-top: 0;">
-                    <div class="form-icon">
-                        <img src="/imgs/titleIcon.png" alt="">
-                        <span>对公司的建议</span>
-                    </div>
-                    <div class="form-btn">
-                    </div>
-                </div>
-                <div class="jbxx-box jbxx-box-flex">
-                    <table class="jbxx-table-info">
-
-                        <tr>
-                            <td colspan="3">
-                                <div class="form-group">
-                                    <div class="form-item">
-                                        <div class="z-comp-textarea" name="createReqVO$dgsjy">
-                                            <textarea>${formEntity.dgsjy!}</textarea>
-                                        </div>
-                                    </div>
-                                </div>
-                            </td>
-                        </tr>
-
-
-                    </table>
-                </div>
-
-
-            </div>
-
-            <div class="ow-tab-content" name="jjqd">
 
                 <div class="form-title">
                     <div class="form-icon">
@@ -344,7 +39,6 @@ styles=[ '/flow/css/formCommon.css', '/OwCommon/OwCommon.css','/timeSelector/Tim
                             <td style="width: 2%;"></td>
                             <td style="width: 60%;">未完成工作</td>
                             <td style="width: 15%;">接收人</td>
-<#--                            <td style="width: 15%;">审核人</td>-->
                             <td style="width: 8%;">操作</td>
                         </tr>
                         </thead>
@@ -372,7 +66,6 @@ styles=[ '/flow/css/formCommon.css', '/OwCommon/OwCommon.css','/timeSelector/Tim
                             <td style="width: 2%;"></td>
                             <td style="width: 60%;">已完成工作成果</td>
                             <td style="width: 15%;">接收人</td>
-<#--                            <td style="width: 15%;">审核人</td>-->
                             <td style="width: 8%;">操作</td>
                         </tr>
                         </thead>
@@ -381,520 +74,421 @@ styles=[ '/flow/css/formCommon.css', '/OwCommon/OwCommon.css','/timeSelector/Tim
                 </div>
 
 
+
+
                 <div class="form-title">
+                    <div class="form-icon">
+                        <img src="/imgs/titleIcon.png" alt="">
+                        <span>部门</span>
+                    </div>
+                </div>
+                <div class="jbxx-box jbxx-box-flex">
+                    <table class="jbxx-table-info">
+                        <tr>
+                            <td class="form-td-table-two" colspan="3">
+                                <table>
+                                    <tr>
+                                        <td style="width: 50%">
+                                           关联离职申请:
+                                        </td>
+                                        <td>
+                                            <div class="form-group">
+                                                <div class="form-item" style="margin: 10px 0;">
+                                                    <div class="z-comp-textarea" style="height: 40px;">
+                                                        <div id="lzsqhtml" style="margin: 10px;cursor: pointer;"></div>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </td>
+                                    </tr>
+                                    <tr>
+                                        <td>是否完成当月日志项目工时申报</td>
+                                        <td>
+                                            <div class="form-group">
+                                                <div class="form-item" style="margin: 10px 0;">
+                                                    <div class="z-comp-radio" name="createReqVO$rztb">
+                                                        <div class="z-radio-item <#if (formEntity.rztb!)? contains("1")>checked</#if>"
+                                                             value="1"><i></i>是
+                                                        </div>
+                                                        <div class="z-radio-item <#if (formEntity.rztb!)? contains("2")>checked</#if>"
+                                                             value="2"><i></i>否
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </td>
+                                    </tr>
 
+                                    <tr>
+                                        <td>是否完成所有项目成果、客户信息等交接</td>
+                                        <td>
+                                            <div class="form-group">
+                                                <div class="form-item" style="margin: 10px 0;">
+                                                    <div class="z-comp-radio" name="createReqVO$cgjjqr">
+                                                        <div class="z-radio-item <#if (formEntity.cgjjqr!)? contains("1")>checked</#if>"
+                                                             value="1"><i></i>是
+                                                        </div>
+                                                        <div class="z-radio-item <#if (formEntity.cgjjqr!)? contains("2")>checked</#if>"
+                                                             value="2"><i></i>否
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </td>
+                                    </tr>
+                                </table>
+                            </td>
+                        </tr>
+                    </table>
                 </div>
-                <div class="TableTotal">
-                    <div class="Box">
-                        <h2>部门交接清单</h2>
-                        <table class="tables">
-                            <tr>
-
-                                <td class="span2">
-                                    完成当月日志项目工时申报
-                                </td>
-
-                                <td class="span2">
-                                    <div class="z-comp-radio" name="createReqVO$rztb">
-                                        <div class="z-radio-item <#if (formEntity.rztb!)? contains("1")>checked</#if>"
-                                             value="1"><i></i>是
-                                        </div>
-                                        <div class="z-radio-item <#if (formEntity.rztb!)? contains("2")>checked</#if>"
-                                             value="2"><i></i>否
-                                        </div>
-                                    </div>
-                                </td>
-
-                                <td class="span2">
-                                    部门经理确认
-                                </td>
-                            </tr>
-
-
-                            <tr>
-                                <td class="span2">
-                                    完成所有项目成果、客户信息等交接
-                                </td>
-                                <td class="span2">
-                                    <div class="z-comp-radio" name="createReqVO$cgjjqr">
-                                        <div class="z-radio-item <#if (formEntity.cgjjqr!)? contains("1")>checked</#if>"
-                                             value="1"><i></i>是
-                                        </div>
-                                        <div class="z-radio-item <#if (formEntity.cgjjqr!)? contains("2")>checked</#if>"
-                                             value="2"><i></i>否
-                                        </div>
-                                    </div>
-                                </td>
-                                <td class="span2">
-                                    分管领导确认
-                                </td>
-                            </tr>
-                        </table>
+
+
+                <div class="form-title">
+                    <div class="form-icon">
+                        <img src="/imgs/titleIcon.png" alt="">
+                        <span>数据中心</span>
                     </div>
                 </div>
+                <div class="jbxx-box jbxx-box-flex">
+                    <table class="jbxx-table-info">
 
-                <div class="TableTotal">
-                    <div class="Box">
-                        <h2>人力中心交接清单</h2>
-                        <table class="tables">
-                            <tr>
-                                <td class="span2">
-                                    设备明细
-                                </td>
-
-                                <td class="span2">
-                                    处理方式
-                                </td>
-                            </tr>
-
-
-                            <tr>
-
-                                <td class="span2">
-                                    手提电脑、台式机
-                                </td>
-
-                                <td class="span2">
-                                    <div class="z-comp-radio" name="createReqVO$clfscb1">
-                                        <div class="z-radio-item <#if (formEntity.clfscb1!)? contains("1")>checked</#if>"
-                                             value="1"><i></i>上交人力资源
-                                        </div>
-                                        <div class="z-radio-item <#if (formEntity.clfscb1!)? contains("2")>checked</#if>"
-                                             value="2"><i></i>部门内部交接
-                                        </div>
-                                    </div>
-                                </td>
-                            </tr>
-
-
-                            <tr>
-                                <td class="span2">
-                                    移动硬盘、U盘
-                                </td>
-                                <td class="span2">
-                                    <div class="z-comp-radio" name="createReqVO$clfscb2">
-                                        <div class="z-radio-item <#if (formEntity.clfscb2!)? contains("1")>checked</#if>"
-                                             value="1"><i></i>上交人力资源
-                                        </div>
-                                        <div class="z-radio-item <#if (formEntity.clfscb2!)? contains("2")>checked</#if>"
-                                             value="2"><i></i>部门内部交接
-                                        </div>
-                                        <div class="z-radio-item <#if (formEntity.clfscb2!)? contains("3")>checked</#if>"
-                                             value="3"><i></i>无
-                                        </div>
-                                    </div>
-                                </td>
-                            </tr>
-
-
-                            <tr>
-                                <td class="span2">
-                                    公司邮箱、OA账号、钉钉账号
-                                </td>
-                                <td class="span2">
-                                    <div class="z-comp-radio" name="createReqVO$clfscb3">
-                                        <div class="z-radio-item <#if (formEntity.clfscb3!)? contains("1")>checked</#if>"
-                                             value="1"><i></i>注销
-                                        </div>
-                                        <div class="z-radio-item <#if (formEntity.clfscb3!)? contains("2")>checked</#if>"
-                                             value="2"><i></i>保留
-                                        </div>
-                                    </div>
-                                </td>
-                            </tr>
-
-                            <tr>
-                                <td class="span2">
-                                    其他
-                                </td>
-
-                                <td class="span2">
-                                    <div class="z-comp-radio" name="createReqVO$clfscb4">
-                                        <div class="z-radio-item <#if (formEntity.clfscb4!)? contains("1")>checked</#if>"
-                                             value="1"><i></i>无
-                                        </div>
-                                        <div class="z-radio-item <#if (formEntity.clfscb4!)? contains("2")>checked</#if>"
-                                             value="2"><i></i>备注
-                                        </div>
-                                    </div>
-                                </td>
-                            </tr>
-
-
-                            <tr>
-                                <td class="span2">
-                                    OA系统更新
-                                </td>
-                                <td class="span2">
-                                    <div class="z-comp-radio" name="createReqVO$clfscb5">
-                                        <div class="z-radio-item <#if (formEntity.clfscb5!)? contains("1")>checked</#if>"
-                                             value="1"><i></i>无
-                                        </div>
-                                        <div class="z-radio-item <#if (formEntity.clfscb5!)? contains("2")>checked</#if>"
-                                             value="2"><i></i>已更新
-                                        </div>
-                                    </div>
-                                </td>
-                            </tr>
-
-                            <tr>
-                                <td class="span2">
-                                    数据中心
-                                </td>
-                                <td class="span2">
-                                    <div class="z-comp-radio" name="createReqVO$clfscb6">
-                                        <div class="z-radio-item <#if (formEntity.clfscb6!)? contains("1")>checked</#if>"
-                                             value="1"><i></i>无
-                                        </div>
-                                        <div class="z-radio-item <#if (formEntity.clfscb6!)? contains("2")>checked</#if>"
-                                             value="2"><i></i>已归还
-                                        </div>
-                                        <div class="z-radio-item <#if (formEntity.clfscb6!)? contains("3")>checked</#if>"
-                                             value="3"><i></i>未归还
-                                        </div>
-                                    </div>
-                                </td>
-                            </tr>
-
-
-                            <tr>
-                                <td class="span2">
-                                    社保
-                                </td>
-
-                                <td class="span2">
-                                    <div class="zdr-table-info" style="display: flex; align-items: center;">
-                                        缴纳至
-                                        <div class="z-comp-input" name="createReqVO$clfscb7"
-                                             style="width: 60px; display: inline-block; margin: 10px;">
-                                            <input type="number" value="${formEntity.clfscb7!}">
-                                        </div>
-                                        月底,
-                                        <div class="z-comp-input" name="createReqVO$clfscb8"
-                                             style="width: 60px; display: inline-block; margin: 10px;">
-                                            <input type="number" value="${formEntity.clfscb8!}">
-                                        </div>
-                                        月初停止缴纳
-                                    </div>
-                                </td>
-
-
-                            </tr>
-
-                            <tr>
-                                <td class="span2">
-                                    公积金
-                                </td>
-                                <td class="span2">
-                                    <div class="zdr-table-info" style="display: flex; align-items: center;">
-                                        缴纳至
-                                        <div class="z-comp-input" name="createReqVO$clfscb9"
-                                             style="width: 60px; display: inline-block; margin: 10px;">
-                                            <input type="number" value="${formEntity.clfscb9!}">
-                                        </div>
-                                        月底,
-                                        <div class="z-comp-input" name="createReqVO$clfscb10"
-                                             style="width: 60px; display: inline-block; margin: 10px;">
-                                            <input type="number" value="${formEntity.clfscb10!}">
-                                        </div>
-                                        月初停止缴纳
-                                    </div>
-                                </td>
-
-                            </tr>
-
-
-                            <tr>
-                                <td class="span2">
-                                    人事档案
-                                </td>
-                                <td class="span2">
-                                    <div class="z-comp-radio" name="createReqVO$clfscb11">
-                                        <div class="z-radio-item <#if (formEntity.clfscb11!)? contains("1")>checked</#if>"
-                                             value="1"><i></i>无
-                                        </div>
-                                        <div class="z-radio-item <#if (formEntity.clfscb11!)? contains("2")>checked</#if>"
-                                             value="2"><i></i>转个人
-                                        </div>
-                                    </div>
-                                </td>
-                            </tr>
-
-                            <tr>
-                                <td class="span2">
-                                    职称证书
-                                </td>
-                                <td class="span2">
-
-                                    <div class="z-comp-radio" name="createReqVO$clfscb12">
-                                        <div class="z-radio-item <#if (formEntity.clfscb12!)? contains("1")>checked</#if>"
-                                             value="1"><i></i>无
-                                        </div>
-                                        <div class="z-radio-item <#if (formEntity.clfscb12!)? contains("2")>checked</#if>"
-                                             value="2"><i></i>已取走
-                                        </div>
-                                    </div>
-
-                                </td>
-                            </tr>
-
-                            <tr>
-                                <td class="span2">
-                                    培训、职称费用结算
-                                </td>
-                                <td class="span2">
-
-                                    <div class="z-comp-radio" name="createReqVO$clfscb14">
-                                        <div class="z-radio-item <#if (formEntity.clfscb14!)? contains("1")>checked</#if>"
-                                             value="1"><i></i>无
-                                        </div>
-                                        <div class="z-radio-item <#if (formEntity.clfscb14!)? contains("2")>checked</#if>"
-                                             value="2"><i></i>
-                                            培训费用:
-                                            <div class="z-comp-input" name="createReqVO$clfscb15"
-                                                 style="width: 60px; display: inline-block; margin: 10px;">
-                                                <input type="number" value="${formEntity.clfscb15!}">
+                        <tr>
+                            <td class="form-td-table-two" colspan="3">
+                                <table>
+                                    <tr>
+                                        <td>数据中心资料借阅</td>
+                                        <td>
+                                            <div class="form-group">
+                                                <div class="form-item" style="margin: 10px 0;">
+                                                    <div class="z-comp-radio" name="createReqVO$clfscb6">
+                                                        <div class="z-radio-item <#if (formEntity.clfscb6!)? contains("1")>checked</#if>"
+                                                             value="1"><i></i>无
+                                                        </div>
+                                                        <div class="z-radio-item <#if (formEntity.clfscb6!)? contains("2")>checked</#if>"
+                                                             value="2"><i></i>已归还
+                                                        </div>
+                                                        <div class="z-radio-item <#if (formEntity.clfscb6!)? contains("3")>checked</#if>"
+                                                             value="3"><i></i>未归还
+                                                        </div>
+                                                    </div>
+                                                </div>
                                             </div>
-                                            元
-                                        </div>
-                                        <div class="z-radio-item <#if (formEntity.clfscb14!)? contains("3")>checked</#if>"
-                                             value="3"><i></i>
-                                            职称费用:
-                                            <div class="z-comp-input" name="createReqVO$clfscb16"
-                                                 style="width: 60px; display: inline-block; margin: 10px;">
-                                                <input type="number" value="${formEntity.clfscb16!}">
+                                        </td>
+                                    </tr>
+
+                                    <tr>
+                                        <td>软件源代码账户</td>
+                                        <td>
+                                            <div class="form-group">
+                                                <div class="form-item" style="margin: 10px 0;">
+                                                    <div class="z-comp-radio" name="createReqVO$clfscb22">
+                                                        <div class="z-radio-item <#if (formEntity.clfscb22!)? contains("1")>checked</#if>"
+                                                             value="1"><i></i>无
+                                                        </div>
+                                                        <div class="z-radio-item <#if (formEntity.clfscb22!)? contains("2")>checked</#if>"
+                                                             value="2"><i></i>已归还
+                                                        </div>
+                                                        <div class="z-radio-item <#if (formEntity.clfscb22!)? contains("3")>checked</#if>"
+                                                             value="3"><i></i>未归还
+                                                        </div>
+                                                    </div>
+                                                </div>
                                             </div>
-                                            元
-                                        </div>
-                                    </div>
-                                </td>
-                            </tr>
-
-                            <tr>
-                                <td class="span2">
-                                    当月考勤表
-                                </td>
-
-                                <td class="span2">
-                                    <div class="zdr-table-info" style="display: flex; align-items: center;">
-                                        本月出勤考勤:
-                                        <div class="z-comp-input" name="createReqVO$clfscb17"
-                                             style="width: 60px; display: inline-block; margin: 10px;">
-                                            <input type="number" value="${formEntity.clfscb17!}">
-                                        </div>
-                                        天
-                                    </div>
-                                    <div class="zdr-table-info" style="display: flex; align-items: center;">
-                                        本月餐补考勤:
-                                        <div class="z-comp-input" name="createReqVO$clfscb18"
-                                             style="width: 60px; display: inline-block; margin: 10px;">
-                                            <input type="number" value="${formEntity.clfscb18!}">
-                                        </div>
-                                        天
-                                    </div>
-                                </td>
-                            </tr>
-
-                        </table>
-                    </div>
-                </div>
+                                        </td>
+                                    </tr>
+                                </table>
+                            </td>
+                        </tr>
 
+                    </table>
+                </div>
 
-                <div class="TableTotal">
-                    <div class="Box">
-                        <h2>财务中心交接清单</h2>
-                        <table class="tables">
-                            <tr>
-                                <td class="span2">
-                                    财务借款及款项结算
-                                </td>
-                                <td class="span2">
-                                    <div class="zdr-table-info" style="display: flex; align-items: center;">
-                                        未发放当月工资:
-                                        <div class="z-comp-input" name="createReqVO$clfscb19"
-                                             style="width: 60px; display: inline-block; margin: 10px;">
-                                            <input type="number" value="${formEntity.clfscb19!}">
-                                        </div>
-                                        元
-                                    </div>
-
-                                    <div class="zdr-table-info" style="display: flex; align-items: center;">
-                                        借款金额:
-                                        <div class="z-comp-input" name="createReqVO$clfscb20"
-                                             style="width: 60px; display: inline-block; margin: 10px;">
-                                            <input type="number" value="${formEntity.clfscb20!}">
-                                        </div>
-                                        元;
-                                    </div>
-
-                                    <div class="zdr-table-info" style="display: flex; align-items: center;">
-                                        已结清:
-                                        <div class="z-comp-input" name="createReqVO$clfscb21"
-                                             style="width: 60px;  display: inline-block; margin: 10px;">
-                                            <input type="number" value="${formEntity.clfscb21!}">
-                                        </div>
-                                        元
-                                    </div>
-                                </td>
-                            </tr>
-                        </table>
+                <div class="form-title">
+                    <div class="form-icon">
+                        <img src="/imgs/titleIcon.png" alt="">
+                        <span>综合管理部</span>
                     </div>
                 </div>
+                <div class="jbxx-box jbxx-box-flex">
+                    <table class="jbxx-table-info">
+                        <tr>
+                            <td class="form-td-table-two" colspan="3">
+                                <table>
+                                    <tr>
+                                        <td>手提电脑、台式机:</td>
+                                        <td>
+                                            <div class="form-group">
+                                                <div class="form-item" style="margin: 10px 0;">
+                                                    <div class="z-comp-radio" name="createReqVO$clfscb1">
+                                                        <div class="z-radio-item <#if (formEntity.clfscb1!)? contains("1")>checked</#if>"
+                                                             value="1"><i></i>上交人力资源
+                                                        </div>
+                                                        <div class="z-radio-item <#if (formEntity.clfscb1!)? contains("2")>checked</#if>"
+                                                             value="2"><i></i>部门内部交接
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </td>
+                                    </tr>
+
+                                    <tr>
+                                        <td>移动硬盘、U盘:</td>
+                                        <td>
+                                            <div class="form-group">
+                                                <div class="form-item" style="margin: 10px 0;">
+                                                    <div class="z-comp-radio" name="createReqVO$clfscb2">
+                                                        <div class="z-radio-item <#if (formEntity.clfscb2!)? contains("1")>checked</#if>"
+                                                             value="1"><i></i>上交人力资源
+                                                        </div>
+                                                        <div class="z-radio-item <#if (formEntity.clfscb2!)? contains("2")>checked</#if>"
+                                                             value="2"><i></i>部门内部交接
+                                                        </div>
+                                                        <div class="z-radio-item <#if (formEntity.clfscb2!)? contains("3")>checked</#if>"
+                                                             value="3"><i></i>无
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </td>
+                                    </tr>
 
-                <div class="qjsjxx-box">
-                    <div class="z-form-row">
-                        <div class="qjsjxx-box">
-                            <div class="z-form-row">
-                                <table class="jbxx-table-info">
                                     <tr>
+                                        <td>公司邮箱、OA账号、OA系统更新项目负责人、钉钉账号:</td>
                                         <td>
+                                            <div class="form-group">
+                                                <div class="form-item" style="margin: 10px 0;">
+                                                    <div class="z-comp-radio" name="createReqVO$clfscb3">
+                                                        <div class="z-radio-item <#if (formEntity.clfscb3!)? contains("1")>checked</#if>"
+                                                             value="1"><i></i>注销
+                                                        </div>
+                                                        <div class="z-radio-item <#if (formEntity.clfscb3!)? contains("2")>checked</#if>"
+                                                             value="2"><i></i>保留
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </td>
+                                    </tr>
+
+                                    <tr>
+                                        <td>社保:</td>
+                                        <td class="th">
+                                            <div class="zdr-table-info" style="display: flex; align-items: center;">
+                                                缴纳至
+                                                <div class="z-comp-input" name="createReqVO$clfscb7"
+                                                     style="width: 60px; display: inline-block; margin: 10px;">
+                                                    <input type="number" value="${formEntity.clfscb7!}">
+                                                </div>
+                                                月底,
+                                                <div class="z-comp-input" name="createReqVO$clfscb8"
+                                                     style="width: 60px; display: inline-block; margin: 10px;">
+                                                    <input type="number" value="${formEntity.clfscb8!}">
+                                                </div>
+                                                月初停止缴纳
+                                            </div>
+                                        </td>
+                                        </td>
+                                    </tr>
 
-                                                本人申明:除上述工资未结费用外,本人与公司之间再无任何应结、未结的费用。
+                                    <tr>
+                                        <td>公积金:</td>
+                                        <td class="th">
+                                            <div class="zdr-table-info" style="display: flex; align-items: center;">
+                                                缴纳至
+                                                <div class="z-comp-input" name="createReqVO$clfscb9"
+                                                     style="width: 60px; display: inline-block; margin: 10px;">
+                                                    <input type="number" value="${formEntity.clfscb9!}">
+                                                </div>
+                                                月底,
+                                                <div class="z-comp-input" name="createReqVO$clfscb10"
+                                                     style="width: 60px; display: inline-block; margin: 10px;">
+                                                    <input type="number" value="${formEntity.clfscb10!}">
+                                                </div>
+                                                月初停止缴纳
+                                            </div>
                                         </td>
                                     </tr>
 
+                                    <tr>
+                                        <td>当月考勤表:</td>
+                                        <td class="th">
+                                            <div class="zdr-table-info" style="display: flex; align-items: center;">
+                                                本月出勤考勤:
+                                                <div class="z-comp-input" name="createReqVO$clfscb17"
+                                                     style="width: 60px; display: inline-block; margin: 10px;">
+                                                    <input type="number" value="${formEntity.clfscb17!}">
+                                                </div>
+                                                天
+                                            </div>
+                                            <div class="zdr-table-info" style="display: flex; align-items: center;">
+                                                本月餐补考勤:
+                                                <div class="z-comp-input" name="createReqVO$clfscb18"
+                                                     style="width: 60px; display: inline-block; margin: 10px;">
+                                                    <input type="number" value="${formEntity.clfscb18!}">
+                                                </div>
+                                                天
+                                            </div>
+                                        </td>
+                                    </tr>
 
                                     <tr>
+                                        <td>职称证书:</td>
                                         <td>
-                                                1.相关领导未在离职审批表签字确认离职前办理离职交接程序无效;
+                                            <div class="form-group">
+                                                <div class="form-item" style="margin: 10px 0;">
+                                                    <div class="z-comp-radio" name="createReqVO$clfscb12">
+                                                        <div class="z-radio-item <#if (formEntity.clfscb12!)? contains("1")>checked</#if>"
+                                                             value="1"><i></i>无 &nbsp;
+                                                        </div>
+                                                        <div class="z-radio-item <#if (formEntity.clfscb12!)? contains("2")>checked</#if>"
+                                                             value="2"><i></i>已取走
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                            </div>
                                         </td>
                                     </tr>
+
                                     <tr>
+                                        <td>培训、职称费用结算:</td>
                                         <td>
-                                                2.离职交接程序必须严格按照本表规定流程办理,在前一责任人未签核前其他责任人签核无效。
+                                            <div class="z-comp-radio" name="createReqVO$clfscb14">
+                                                <div class="z-radio-item <#if (formEntity.clfscb14!)? contains("1")>checked</#if>"
+                                                     style="display: flex; align-items: center;"
+                                                     value="1"><i></i>无
+                                                </div>
+                                                <div class="z-radio-item <#if (formEntity.clfscb14!)? contains("2")>checked</#if>"
+                                                     style="display: flex; align-items: center;"
+                                                     value="2"><i></i>
+                                                    培训费用:
+                                                    <div class="z-comp-input" name="createReqVO$clfscb15"
+                                                         style="width: 80px; display: inline-block; margin: 10px;">
+                                                        <input type="number" value="${formEntity.clfscb15!}">
+                                                    </div>
+                                                    元
+                                                </div>
+                                                <div class="z-radio-item <#if (formEntity.clfscb14!)? contains("3")>checked</#if>"
+                                                     style="display: flex; align-items: center;"
+                                                     value="3"><i></i>
+                                                    职称费用:
+                                                    <div class="z-comp-input" name="createReqVO$clfscb16"
+                                                         style="width: 80px; display: inline-block; margin: 10px;">
+                                                        <input type="number" value="${formEntity.clfscb16!}">
+                                                    </div>
+                                                    元
+                                                </div>
+                                            </div>
                                         </td>
                                     </tr>
+
                                 </table>
-                            </div>
-                        </div>
+                            </td>
+                        </tr>
+
+                    </table>
+                </div>
+
+                <div class="form-title">
+                    <div class="form-icon">
+                        <img src="/imgs/titleIcon.png" alt="">
+                        <span>财务中心</span>
                     </div>
                 </div>
+                <div class="jbxx-box jbxx-box-flex">
+                    <table class="jbxx-table-info">
 
+                        <tr>
+                            <td class="form-td-table-two" colspan="3">
+                                <table>
+                                    <tr>
+                                        <td>财务借款及款项结算</td>
+                                        <td>
+                                            <div class="zdr-table-info" style="display: flex; align-items: center;">
+                                                未发放当月工资:
+                                                <div class="z-comp-input" name="createReqVO$clfscb19"
+                                                     style="width: 80px; display: inline-block; margin: 10px;">
+                                                    <input type="number" value="${formEntity.clfscb19!}">
+                                                </div>
+                                                元
+                                            </div>
+
+                                            <div class="zdr-table-info" style="display: flex; align-items: center;">
+                                                借款金额:
+                                                <div class="z-comp-input" name="createReqVO$clfscb20"
+                                                     style="width: 80px; display: inline-block; margin: 10px;">
+                                                    <input type="number" value="${formEntity.clfscb20!}">
+                                                </div>
+                                                元;
+                                            </div>
+
+                                            <div class="zdr-table-info" style="display: flex; align-items: center;">
+                                                已结清:
+                                                <div class="z-comp-input" name="createReqVO$clfscb21"
+                                                     style="width: 80px;  display: inline-block; margin: 10px;">
+                                                    <input type="number" value="${formEntity.clfscb21!}">
+                                                </div>
+                                                元
+                                            </div>
+                                        </td>
+                                    </tr>
+                                </table>
+                            </td>
+                        </tr>
+
+                    </table>
+                </div>
 
-            </div>
 
+            </div>
             <#if WORKFLOW.OPINION! !="">
                 <div class="ow-tab-content" name="yj">
-                    <div class="form-title">
-                        <div class="form-icon">
-                            <img src="/imgs/titleIcon.png" alt="">
-                            <span>审批意见</span>
-                        </div>
-                        <div class="form-btn">
+                    <#if WORKFLOW.OPINION! !="">
+                        <div class="form-title">
+                            <div class="form-icon">
+                                <img src="/imgs/titleIcon.png" alt="">
+                                <span>审批意见</span>
+                            </div>
+                            <div class="form-btn">
+                            </div>
                         </div>
-                    </div>
-                    <div class="qjsjxx-box">
-                        <div class="z-form-wrap" name="opinionsDiv">
-                            <div class="z-form-row"> ${WORKFLOW.OPINION!} </div>
+                        <div class="qjsjxx-box">
+                            <div class="z-form-wrap" name="opinionsDiv">
+                                <div class="z-form-row"> ${WORKFLOW.OPINION!} </div>
+                            </div>
                         </div>
-                    </div>
+                    </#if>
                 </div>
             </#if>
         </div>
     </div>
-
-    <script language="javascript">
-        ;
-        (function () {
-        })();
-    </script>
     <style type="text/css">
-
-        .zdr-table-info {
-            width: calc(100%);
-            border-collapse: collapse;
-            border: none;
-            border-spacing: 0; /* 设置单元格之间的间距为0 */
-            table-layout: fixed; /* 将表格布局设置为固定布局 */
-        }
-
-        .zdr-table-info td {
-            border: 1px solid #000; /* 添加底部边框 */
-            font-size: 14px; /* 设置字体大小为12像素 */
-        }
-
-
-        .z-checkbox-column {
-            display: flex;
-            flex-direction: column;
-            align-items: flex-start;
-            justify-content: flex-start;
-        }
-
-        .z-comp-checkbox {
-            margin-bottom: 20px; /* 每个复选框之间的间距 */
-            width: 100%; /* 确保复选框占据整个容器的宽度 */
-        }
-
-        .short-centered-td {
-            text-align: center; /* 让文本居中 */
-            vertical-align: middle;
-            /* 还可以添加其他样式,比如padding或border */
-            padding: 5px; /* 添加一些内边距,使内容看起来更美观 */
-        }
-
-
-        .span1 {
-            text-align: left;
-            font-size: 15px; /*字体大小*/
-            border: 1px solid #242A32; /*表格的边框*/
-            border-collapse: collapse; /* 确保边框合并为一个单一的边框,而不是双重边框 */
-            width: 50%; /* 设置表格宽度为100%,可以根据需要调整 */
-            padding: 10px; /* 上、下、左、右都添加10像素的内部空间 */
-            border-spacing: 0; /* 设置单元格之间的间距为0 */
-        }
-
-        .span2 {
-            text-align: left;
-            font-size: 15px; /*字体大小*/
-            border: 1px solid #242A32; /*表格的边框*/
-            border-collapse: collapse; /* 确保边框合并为一个单一的边框,而不是双重边框 */
-            width: 50%; /* 设置表格宽度为100%,可以根据需要调整 */
-            padding: 10px; /* 上、下、左、右都添加10像素的内部空间 */
-            border-spacing: 0; /* 设置单元格之间的间距为0 */
+        .jbxx-box-flex .th {
+            width: 160px !important;
         }
 
-        .TableTotal {
-            width: calc(100% - 40px);
-            height: 100%;
-            background-color: #F9F9F9;
+        .jbxx-box-flex > table > tbody > tr {
             display: flex;
-            align-items: center;
-            justify-content: center;
-            padding: 20px 0;
-            margin: 0 20px;
-        }
-
-        .TableTotal .Box {
-            width: 800px;
-            background: #FFFFFF;
-            box-shadow: 0 0 29px 0 rgba(154, 154, 154, 0.21);
-            border-radius: 0 0 0 0;
-            padding: 15px 30px;
-            position: relative;
-            overflow: hidden;
+            height: auto !important;
         }
 
-        .TableTotal .Box h2 {
-            text-align: center;
-            font-size: 20px;
-            font-weight: 600;
-            letter-spacing: 3px;
-            margin: 0 0 10px;
+        .jbxx-box-flex > table > tbody > tr > td {
+            padding: 10px 10px;
         }
 
-        .tables {
-            margin: 16px 0;
-            width: 100%;
+        .jbxx-box-flex > table > tbody > tr > td:not(.th) {
+            flex: 1;
         }
 
-
-        .z-radio-item {
-            display: flex; /* 子元素也使用Flexbox布局,以便内部元素可以横向排列 */
-            align-items: center; /* 垂直居中 */
-            margin-right: 10px; /* 如果需要添加间隔 */
-            /* 其他你需要的样式 */
+        .qjsjxx-box .form-table-info tr:nth-child(1) {
+            height: 63px;
         }
 
     </style>
+    <script>
+        ;
+        (function() {})();
+        window.url = '${z_work_flow}'
+        window.lzsq = '${lzsq!}'
+    </script>
 </@w.workFlow>

+ 900 - 0
zjugis-business/src/main/resources/templates/Resign/index1.ftl

@@ -0,0 +1,900 @@
+<@w.workFlow javascripts=['/Resign/js/index.js','/flow/js/formCommon.js', '/OwCommon/OwCommon.js','/timeSelector/TimeSelector.js','/js/moment.js']
+styles=[ '/flow/css/formCommon.css', '/OwCommon/OwCommon.css','/timeSelector/TimeSelector.css' ]>
+
+    <div class="z-position form-boss ow-tabs" name="createReqVO">
+        <ul class="ow-tab-nav oa_tabBox">
+<#--            <li z-tabindex="0" class="ow-tab-item on" data-name="lzsq">离职申请表</li>-->
+            <li z-tabindex="1" class="ow-tab-item" data-name="jjqd">离职员工交接清单</li>
+            <#if WORKFLOW.OPINION! !="">
+                <li z-tabindex="2" class="ow-tab-item" data-name="yj">审批意见</li>
+            </#if>
+        </ul>
+
+        <div class="ow-tab-scroll z-tab-content">
+            <div class="ow-tab-content" name="lzsq" style="padding-bottom: 40px;">
+                <div class="z-form-row" style="display: none;">
+                    <input type="text" value="${formEntity.instanceId!}" name="createReqVO$instanceId">
+                    <input type="text" value="${formEntity.id!}" name="createReqVO$id">
+                    <input type="text" value='${unfinishedList!}' id="unfinished">
+                    <input type="text" value='${finishedList!}' id="finished">
+                </div>
+                <div class="form-title" style="margin-top: 0;">
+                    <div class="form-icon">
+                        <img src="/imgs/titleIcon.png" alt="">
+                        <span>离职申请</span>
+                    </div>
+                    <div class="form-btn">
+                    </div>
+                </div>
+                <div class="jbxx-box jbxx-box-flex">
+                    <table class="jbxx-table-info">
+
+                        <tr>
+
+                            <td class="th">
+                                <div class="form-label">姓名:</div>
+                            </td>
+                            <td>
+                                <div class="form-group">
+                                    <div class="z-comp-input z-readonly" name="nickname">
+                                        <input type="text" name="createReqVO$nickname"
+                                               value="${formEntity.nickname!}">
+                                        <input type="hidden" name="createReqVO$userId" value="${formEntity.userId!}">
+                                    </div>
+                                </div>
+                            </td>
+
+                            <td class="th">
+                                <div class="form-label">部门:</div>
+                            </td>
+                            <td>
+                                <div class="form-group">
+                                    <div class="z-comp-input z-readonly" name="createReqVO$deptName">
+                                        <input type="text" value="${formEntity.deptName!}">
+                                        <input type="hidden" name="createReqVO$deptId" value="${formEntity.deptId!}">
+                                    </div>
+                                </div>
+                            </td>
+
+
+                            <td class="th">
+                                <div class="form-label ">岗位:</div>
+                            </td>
+                            <td>
+                                <div class="form-group">
+                                    <div class="form-item">
+                                        <div class="z-comp-select z-readonly" name="createReqVO$drzw"
+                                             data='${post_type!}' value="${formEntity.drzw!}">
+                                            <div class="z-inputselect-bar">
+                                                <span></span><i></i>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </td>
+
+
+                        </tr>
+
+
+                        <tr>
+
+                            <td class="th">
+                                <div class="form-label">入职时间:</div>
+                            </td>
+                            <td>
+                                <div class="form-group">
+                                    <div class="form-item">
+                                        <div class="z-comp-date z-readonly" name="createReqVO$rgssj">
+                                            <input type="text" value="${(formEntity.rgssj?date)!}">
+                                        </div>
+                                    </div>
+                                </div>
+
+                            </td>
+
+                            <td class="th">
+                                <div class="form-label">合同期限:</div>
+                            </td>
+                            <td>
+                                <div class="form-group">
+                                    <div class="form-item">
+                                        <div class="z-comp-date z-readonly" name="createReqVO$htdqs">
+                                            <input type="text" value="${(formEntity.htdqs?date)!}">
+                                        </div>
+                                    </div>
+                                </div>
+                            </td>
+
+                            <td class="th">
+                                <div class="form-label ">员工所在地:</div>
+                            </td>
+                            <td>
+                                <div class="form-group">
+                                    <div class="form-item">
+                                        <div class="z-comp-select" name="createReqVO$lzygszd"
+                                             data='${location_type!}' value="${formEntity.lzygszd!}">
+                                            <div class="z-inputselect-bar">
+                                                <span></span><i></i>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </td>
+
+
+                        </tr>
+
+                        <tr>
+
+                            <td class="th">
+                                <div class="form-label">最后上班日期:</div>
+                            </td>
+                            <td>
+                                <div class="form-group">
+                                    <div class="form-item">
+                                        <div class="z-comp-date" name="createReqVO$zhsbrq">
+                                            <input type="text" value="${(formEntity.zhsbrq?date)!}">
+                                        </div>
+                                    </div>
+                                </div>
+
+                            </td>
+
+                            <td class="th">
+                                <div class="form-label">离职生效日期:</div>
+                            </td>
+                            <td>
+                                <div class="form-group">
+                                    <div class="form-item">
+                                        <div class="z-comp-date" name="createReqVO$lzsxrq">
+                                            <input type="text" value="${(formEntity.lzsxrq?date)!}">
+                                        </div>
+                                    </div>
+                                </div>
+                            </td>
+
+
+
+
+                            <td class="th">
+                            </td>
+                            <td>
+                            </td>
+                        </tr>
+
+                    </table>
+                </div>
+
+
+                <div class="form-title" style="margin-top: 0;">
+                    <div class="form-icon">
+                        <img src="/imgs/titleIcon.png" alt="">
+                        <span>离职原因</span>
+                    </div>
+                    <div class="form-btn">
+                    </div>
+                </div>
+                <div class="jbxx-box jbxx-box-flex">
+                    <table class="jbxx-table-info">
+                        <tr>
+                            <td class="th">
+                                <div class="form-label">请进行勾选:</div>
+                            </td>
+
+
+                            <td class="z-checkbox-column">
+                                <div class="z-comp-checkbox" name="createReqVO$v1">
+                                    <div class="z-checkbox-item <#if (formEntity.lzyy!)? contains(",1,")>checked</#if>"
+                                         value="1"><i></i>个人原因
+                                    </div>
+                                </div>
+                                <div class="z-comp-checkbox" name="createReqVO$v2">
+                                    <div class="z-checkbox-item <#if (formEntity.lzyy!)? contains(",2,")>checked</#if>"
+                                         value="2"><i></i>晋升机会
+                                    </div>
+                                </div>
+                                <div class="z-comp-checkbox" name="createReqVO$v3">
+                                    <div class="z-checkbox-item <#if (formEntity.lzyy!)? contains(",3,")>checked</#if>"
+                                         value="3"><i></i>换个行业发展
+                                    </div>
+                                </div>
+                                <div class="z-comp-checkbox" name="createReqVO$v4">
+                                    <div class="z-checkbox-item <#if (formEntity.lzyy!)? contains(",4,")>checked</#if>"
+                                         value="4"><i></i>薪资偏低
+                                    </div>
+                                </div>
+                                <div class="z-comp-checkbox" name="createReqVO$v5">
+                                    <div class="z-checkbox-item <#if (formEntity.lzyy!)? contains(",5,")>checked</#if>"
+                                         value="5"><i></i>福利不佳
+                                    </div>
+                                </div>
+                            </td>
+
+
+                            <td class="z-checkbox-column">
+
+
+                                <div class="z-comp-checkbox" name="createReqVO$v6">
+                                    <div class="z-checkbox-item <#if (formEntity.lzyy!)? contains(",6,")>checked</#if>"
+                                         value="6"><i></i>劳动合同到期
+                                    </div>
+                                </div>
+                                <div class="z-comp-checkbox" name="createReqVO$v7">
+                                    <div class="z-checkbox-item <#if (formEntity.lzyy!)? contains(",7,")>checked</#if>"
+                                         value="7"><i></i>无归属感
+                                    </div>
+                                </div>
+                                <div class="z-comp-checkbox" name="createReqVO$v8">
+                                    <div class="z-checkbox-item <#if (formEntity.lzyy!)? contains(",8,")>checked</#if>"
+                                         value="8"><i></i>健康因素
+                                    </div>
+                                </div>
+                                <div class="z-comp-checkbox" name="createReqVO$v9">
+                                    <div class="z-checkbox-item <#if (formEntity.lzyy!)? contains(",9,")>checked</#if>"
+                                         value="9"><i></i>文化理念不同
+                                    </div>
+                                </div>
+                                <div class="z-comp-checkbox" name="createReqVO$v10">
+                                    <div class="z-checkbox-item <#if (formEntity.lzyy!)? contains(",10,")>checked</#if>"
+                                         value="10"><i></i>求学深造
+                                    </div>
+                                </div>
+                            </td>
+
+                            <td class="z-checkbox-column">
+
+
+                                <div class="z-comp-checkbox" name="createReqVO$v11">
+                                    <div class="z-checkbox-item <#if (formEntity.lzyy!)? contains(",11,")>checked</#if>"
+                                         value="11"><i></i>家庭因素
+                                    </div>
+                                </div>
+                                <div class="z-comp-checkbox" name="createReqVO$v12">
+                                    <div class="z-checkbox-item <#if (formEntity.lzyy!)? contains(",12,")>checked</#if>"
+                                         value="12"><i></i>领导风格不适
+                                    </div>
+                                </div>
+                                <div class="z-comp-checkbox" name="createReqVO$v13">
+                                    <div class="z-checkbox-item <#if (formEntity.lzyy!)? contains(",13,")>checked</#if>"
+                                         value="13"><i></i>工作环境
+                                    </div>
+                                </div>
+                                <div class="z-comp-checkbox" name="createReqVO$v14">
+                                    <div class="z-checkbox-item <#if (formEntity.lzyy!)? contains(",14,")>checked</#if>"
+                                         value="14"><i></i>人际关系
+                                    </div>
+                                </div>
+                                <div class="z-comp-checkbox" name="createReqVO$v15">
+                                    <div class="z-checkbox-item <#if (formEntity.lzyy!)? contains(",15,")>checked</#if>"
+                                         value="15"><i></i>遭受不公平待遇
+                                    </div>
+                                </div>
+                            </td>
+
+
+                            <td class="z-checkbox-column">
+
+                                <div class="z-comp-checkbox" name="createReqVO$v16">
+                                    <div class="z-checkbox-item <#if (formEntity.lzyy!)? contains(",16,")>checked</#if>"
+                                         value="16"><i></i>不能胜任本质工作
+                                    </div>
+                                </div>
+
+                                <div class="z-comp-checkbox" name="createReqVO$v17">
+                                    <div class="z-checkbox-item <#if (formEntity.lzyy!)? contains(",17,")>checked</#if>"
+                                         value="17"><i></i>严重违反公司规章制度
+                                    </div>
+                                </div>
+                            </td>
+
+                        </tr>
+                    </table>
+                </div>
+
+                <div class="form-title" style="margin-top: 0;">
+                    <div class="form-icon">
+                        <img src="/imgs/titleIcon.png" alt="">
+                        <span>对公司的建议</span>
+                    </div>
+                    <div class="form-btn">
+                    </div>
+                </div>
+                <div class="jbxx-box jbxx-box-flex">
+                    <table class="jbxx-table-info">
+
+                        <tr>
+                            <td colspan="3">
+                                <div class="form-group">
+                                    <div class="form-item">
+                                        <div class="z-comp-textarea" name="createReqVO$dgsjy">
+                                            <textarea>${formEntity.dgsjy!}</textarea>
+                                        </div>
+                                    </div>
+                                </div>
+                            </td>
+                        </tr>
+
+
+                    </table>
+                </div>
+
+
+            </div>
+
+            <div class="ow-tab-content" name="jjqd">
+
+                <div class="form-title">
+                    <div class="form-icon">
+                        <img src="/imgs/titleIcon.png" alt="">
+                        <span>未完成工作移交</span>
+                    </div>
+                    <div class="form-btn" name="addButton">
+                        <div id="addDataUnfinished">
+                            <img src="/imgs/addIcon.png" alt="">
+                            <span>新增</span>
+                        </div>
+                    </div>
+
+                </div>
+                <div class="qjsjxx-box">
+                    <table class="form-table-info">
+                        <thead>
+                        <tr>
+                            <td style="width: 2%;"></td>
+                            <td style="width: 60%;">未完成工作</td>
+                            <td style="width: 15%;">接收人</td>
+<#--                            <td style="width: 15%;">审核人</td>-->
+                            <td style="width: 8%;">操作</td>
+                        </tr>
+                        </thead>
+                        <tbody class="tbody tbodyQjsq" name="unfinishedBody"></tbody>
+                    </table>
+                </div>
+
+
+                <div class="form-title">
+                    <div class="form-icon">
+                        <img src="/imgs/titleIcon.png" alt="">
+                        <span>已完成工作成果</span>
+                    </div>
+                    <div class="form-btn" name="addButton">
+                        <div id="addDataFinished">
+                            <img src="/imgs/addIcon.png" alt="">
+                            <span>新增</span>
+                        </div>
+                    </div>
+                </div>
+                <div class="qjsjxx-box">
+                    <table class="form-table-info">
+                        <thead>
+                        <tr>
+                            <td style="width: 2%;"></td>
+                            <td style="width: 60%;">已完成工作成果</td>
+                            <td style="width: 15%;">接收人</td>
+<#--                            <td style="width: 15%;">审核人</td>-->
+                            <td style="width: 8%;">操作</td>
+                        </tr>
+                        </thead>
+                        <tbody class="tbody tbodyQjsq" name="finishedBody"></tbody>
+                    </table>
+                </div>
+
+
+                <div class="form-title">
+
+                </div>
+                <div class="TableTotal">
+                    <div class="Box">
+                        <h2>部门交接清单</h2>
+                        <table class="tables">
+                            <tr>
+
+                                <td class="span2">
+                                    完成当月日志项目工时申报
+                                </td>
+
+                                <td class="span2">
+                                    <div class="z-comp-radio" name="createReqVO$rztb">
+                                        <div class="z-radio-item <#if (formEntity.rztb!)? contains("1")>checked</#if>"
+                                             value="1"><i></i>是
+                                        </div>
+                                        <div class="z-radio-item <#if (formEntity.rztb!)? contains("2")>checked</#if>"
+                                             value="2"><i></i>否
+                                        </div>
+                                    </div>
+                                </td>
+
+                                <td class="span2">
+                                    部门经理确认
+                                </td>
+                            </tr>
+
+
+                            <tr>
+                                <td class="span2">
+                                    完成所有项目成果、客户信息等交接
+                                </td>
+                                <td class="span2">
+                                    <div class="z-comp-radio" name="createReqVO$cgjjqr">
+                                        <div class="z-radio-item <#if (formEntity.cgjjqr!)? contains("1")>checked</#if>"
+                                             value="1"><i></i>是
+                                        </div>
+                                        <div class="z-radio-item <#if (formEntity.cgjjqr!)? contains("2")>checked</#if>"
+                                             value="2"><i></i>否
+                                        </div>
+                                    </div>
+                                </td>
+                                <td class="span2">
+                                    分管领导确认
+                                </td>
+                            </tr>
+                        </table>
+                    </div>
+                </div>
+
+                <div class="TableTotal">
+                    <div class="Box">
+                        <h2>人力中心交接清单</h2>
+                        <table class="tables">
+                            <tr>
+                                <td class="span2">
+                                    设备明细
+                                </td>
+
+                                <td class="span2">
+                                    处理方式
+                                </td>
+                            </tr>
+
+
+                            <tr>
+
+                                <td class="span2">
+                                    手提电脑、台式机
+                                </td>
+
+                                <td class="span2">
+                                    <div class="z-comp-radio" name="createReqVO$clfscb1">
+                                        <div class="z-radio-item <#if (formEntity.clfscb1!)? contains("1")>checked</#if>"
+                                             value="1"><i></i>上交人力资源
+                                        </div>
+                                        <div class="z-radio-item <#if (formEntity.clfscb1!)? contains("2")>checked</#if>"
+                                             value="2"><i></i>部门内部交接
+                                        </div>
+                                    </div>
+                                </td>
+                            </tr>
+
+
+                            <tr>
+                                <td class="span2">
+                                    移动硬盘、U盘
+                                </td>
+                                <td class="span2">
+                                    <div class="z-comp-radio" name="createReqVO$clfscb2">
+                                        <div class="z-radio-item <#if (formEntity.clfscb2!)? contains("1")>checked</#if>"
+                                             value="1"><i></i>上交人力资源
+                                        </div>
+                                        <div class="z-radio-item <#if (formEntity.clfscb2!)? contains("2")>checked</#if>"
+                                             value="2"><i></i>部门内部交接
+                                        </div>
+                                        <div class="z-radio-item <#if (formEntity.clfscb2!)? contains("3")>checked</#if>"
+                                             value="3"><i></i>无
+                                        </div>
+                                    </div>
+                                </td>
+                            </tr>
+
+
+                            <tr>
+                                <td class="span2">
+                                    公司邮箱、OA账号、钉钉账号
+                                </td>
+                                <td class="span2">
+                                    <div class="z-comp-radio" name="createReqVO$clfscb3">
+                                        <div class="z-radio-item <#if (formEntity.clfscb3!)? contains("1")>checked</#if>"
+                                             value="1"><i></i>注销
+                                        </div>
+                                        <div class="z-radio-item <#if (formEntity.clfscb3!)? contains("2")>checked</#if>"
+                                             value="2"><i></i>保留
+                                        </div>
+                                    </div>
+                                </td>
+                            </tr>
+
+                            <tr>
+                                <td class="span2">
+                                    其他
+                                </td>
+
+                                <td class="span2">
+                                    <div class="z-comp-radio" name="createReqVO$clfscb4">
+                                        <div class="z-radio-item <#if (formEntity.clfscb4!)? contains("1")>checked</#if>"
+                                             value="1"><i></i>无
+                                        </div>
+                                        <div class="z-radio-item <#if (formEntity.clfscb4!)? contains("2")>checked</#if>"
+                                             value="2"><i></i>备注
+                                        </div>
+                                    </div>
+                                </td>
+                            </tr>
+
+
+                            <tr>
+                                <td class="span2">
+                                    OA系统更新
+                                </td>
+                                <td class="span2">
+                                    <div class="z-comp-radio" name="createReqVO$clfscb5">
+                                        <div class="z-radio-item <#if (formEntity.clfscb5!)? contains("1")>checked</#if>"
+                                             value="1"><i></i>无
+                                        </div>
+                                        <div class="z-radio-item <#if (formEntity.clfscb5!)? contains("2")>checked</#if>"
+                                             value="2"><i></i>已更新
+                                        </div>
+                                    </div>
+                                </td>
+                            </tr>
+
+                            <tr>
+                                <td class="span2">
+                                    数据中心
+                                </td>
+                                <td class="span2">
+                                    <div class="z-comp-radio" name="createReqVO$clfscb6">
+                                        <div class="z-radio-item <#if (formEntity.clfscb6!)? contains("1")>checked</#if>"
+                                             value="1"><i></i>无
+                                        </div>
+                                        <div class="z-radio-item <#if (formEntity.clfscb6!)? contains("2")>checked</#if>"
+                                             value="2"><i></i>已归还
+                                        </div>
+                                        <div class="z-radio-item <#if (formEntity.clfscb6!)? contains("3")>checked</#if>"
+                                             value="3"><i></i>未归还
+                                        </div>
+                                    </div>
+                                </td>
+                            </tr>
+
+
+                            <tr>
+                                <td class="span2">
+                                    社保
+                                </td>
+
+                                <td class="span2">
+                                    <div class="zdr-table-info" style="display: flex; align-items: center;">
+                                        缴纳至
+                                        <div class="z-comp-input" name="createReqVO$clfscb7"
+                                             style="width: 60px; display: inline-block; margin: 10px;">
+                                            <input type="number" value="${formEntity.clfscb7!}">
+                                        </div>
+                                        月底,
+                                        <div class="z-comp-input" name="createReqVO$clfscb8"
+                                             style="width: 60px; display: inline-block; margin: 10px;">
+                                            <input type="number" value="${formEntity.clfscb8!}">
+                                        </div>
+                                        月初停止缴纳
+                                    </div>
+                                </td>
+
+
+                            </tr>
+
+                            <tr>
+                                <td class="span2">
+                                    公积金
+                                </td>
+                                <td class="span2">
+                                    <div class="zdr-table-info" style="display: flex; align-items: center;">
+                                        缴纳至
+                                        <div class="z-comp-input" name="createReqVO$clfscb9"
+                                             style="width: 60px; display: inline-block; margin: 10px;">
+                                            <input type="number" value="${formEntity.clfscb9!}">
+                                        </div>
+                                        月底,
+                                        <div class="z-comp-input" name="createReqVO$clfscb10"
+                                             style="width: 60px; display: inline-block; margin: 10px;">
+                                            <input type="number" value="${formEntity.clfscb10!}">
+                                        </div>
+                                        月初停止缴纳
+                                    </div>
+                                </td>
+
+                            </tr>
+
+
+                            <tr>
+                                <td class="span2">
+                                    人事档案
+                                </td>
+                                <td class="span2">
+                                    <div class="z-comp-radio" name="createReqVO$clfscb11">
+                                        <div class="z-radio-item <#if (formEntity.clfscb11!)? contains("1")>checked</#if>"
+                                             value="1"><i></i>无
+                                        </div>
+                                        <div class="z-radio-item <#if (formEntity.clfscb11!)? contains("2")>checked</#if>"
+                                             value="2"><i></i>转个人
+                                        </div>
+                                    </div>
+                                </td>
+                            </tr>
+
+                            <tr>
+                                <td class="span2">
+                                    职称证书
+                                </td>
+                                <td class="span2">
+
+                                    <div class="z-comp-radio" name="createReqVO$clfscb12">
+                                        <div class="z-radio-item <#if (formEntity.clfscb12!)? contains("1")>checked</#if>"
+                                             value="1"><i></i>无
+                                        </div>
+                                        <div class="z-radio-item <#if (formEntity.clfscb12!)? contains("2")>checked</#if>"
+                                             value="2"><i></i>已取走
+                                        </div>
+                                    </div>
+
+                                </td>
+                            </tr>
+
+                            <tr>
+                                <td class="span2">
+                                    培训、职称费用结算
+                                </td>
+                                <td class="span2">
+
+                                    <div class="z-comp-radio" name="createReqVO$clfscb14">
+                                        <div class="z-radio-item <#if (formEntity.clfscb14!)? contains("1")>checked</#if>"
+                                             value="1"><i></i>无
+                                        </div>
+                                        <div class="z-radio-item <#if (formEntity.clfscb14!)? contains("2")>checked</#if>"
+                                             value="2"><i></i>
+                                            培训费用:
+                                            <div class="z-comp-input" name="createReqVO$clfscb15"
+                                                 style="width: 60px; display: inline-block; margin: 10px;">
+                                                <input type="number" value="${formEntity.clfscb15!}">
+                                            </div>
+                                            元
+                                        </div>
+                                        <div class="z-radio-item <#if (formEntity.clfscb14!)? contains("3")>checked</#if>"
+                                             value="3"><i></i>
+                                            职称费用:
+                                            <div class="z-comp-input" name="createReqVO$clfscb16"
+                                                 style="width: 60px; display: inline-block; margin: 10px;">
+                                                <input type="number" value="${formEntity.clfscb16!}">
+                                            </div>
+                                            元
+                                        </div>
+                                    </div>
+                                </td>
+                            </tr>
+
+                            <tr>
+                                <td class="span2">
+                                    当月考勤表
+                                </td>
+
+                                <td class="span2">
+                                    <div class="zdr-table-info" style="display: flex; align-items: center;">
+                                        本月出勤考勤:
+                                        <div class="z-comp-input" name="createReqVO$clfscb17"
+                                             style="width: 60px; display: inline-block; margin: 10px;">
+                                            <input type="number" value="${formEntity.clfscb17!}">
+                                        </div>
+                                        天
+                                    </div>
+                                    <div class="zdr-table-info" style="display: flex; align-items: center;">
+                                        本月餐补考勤:
+                                        <div class="z-comp-input" name="createReqVO$clfscb18"
+                                             style="width: 60px; display: inline-block; margin: 10px;">
+                                            <input type="number" value="${formEntity.clfscb18!}">
+                                        </div>
+                                        天
+                                    </div>
+                                </td>
+                            </tr>
+
+                        </table>
+                    </div>
+                </div>
+
+
+                <div class="TableTotal">
+                    <div class="Box">
+                        <h2>财务中心交接清单</h2>
+                        <table class="tables">
+                            <tr>
+                                <td class="span2">
+                                    财务借款及款项结算
+                                </td>
+                                <td class="span2">
+                                    <div class="zdr-table-info" style="display: flex; align-items: center;">
+                                        未发放当月工资:
+                                        <div class="z-comp-input" name="createReqVO$clfscb19"
+                                             style="width: 60px; display: inline-block; margin: 10px;">
+                                            <input type="number" value="${formEntity.clfscb19!}">
+                                        </div>
+                                        元
+                                    </div>
+
+                                    <div class="zdr-table-info" style="display: flex; align-items: center;">
+                                        借款金额:
+                                        <div class="z-comp-input" name="createReqVO$clfscb20"
+                                             style="width: 60px; display: inline-block; margin: 10px;">
+                                            <input type="number" value="${formEntity.clfscb20!}">
+                                        </div>
+                                        元;
+                                    </div>
+
+                                    <div class="zdr-table-info" style="display: flex; align-items: center;">
+                                        已结清:
+                                        <div class="z-comp-input" name="createReqVO$clfscb21"
+                                             style="width: 60px;  display: inline-block; margin: 10px;">
+                                            <input type="number" value="${formEntity.clfscb21!}">
+                                        </div>
+                                        元
+                                    </div>
+                                </td>
+                            </tr>
+                        </table>
+                    </div>
+                </div>
+
+                <div class="qjsjxx-box">
+                    <div class="z-form-row">
+                        <div class="qjsjxx-box">
+                            <div class="z-form-row">
+                                <table class="jbxx-table-info">
+                                    <tr>
+                                        <td>
+
+                                                本人申明:除上述工资未结费用外,本人与公司之间再无任何应结、未结的费用。
+                                        </td>
+                                    </tr>
+
+
+                                    <tr>
+                                        <td>
+                                                1.相关领导未在离职审批表签字确认离职前办理离职交接程序无效;
+                                        </td>
+                                    </tr>
+                                    <tr>
+                                        <td>
+                                                2.离职交接程序必须严格按照本表规定流程办理,在前一责任人未签核前其他责任人签核无效。
+                                        </td>
+                                    </tr>
+                                </table>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+
+
+            </div>
+
+            <#if WORKFLOW.OPINION! !="">
+                <div class="ow-tab-content" name="yj">
+                    <div class="form-title">
+                        <div class="form-icon">
+                            <img src="/imgs/titleIcon.png" alt="">
+                            <span>审批意见</span>
+                        </div>
+                        <div class="form-btn">
+                        </div>
+                    </div>
+                    <div class="qjsjxx-box">
+                        <div class="z-form-wrap" name="opinionsDiv">
+                            <div class="z-form-row"> ${WORKFLOW.OPINION!} </div>
+                        </div>
+                    </div>
+                </div>
+            </#if>
+        </div>
+    </div>
+
+    <script language="javascript">
+        ;
+        (function () {
+        })();
+    </script>
+    <style type="text/css">
+
+        .zdr-table-info {
+            width: calc(100%);
+            border-collapse: collapse;
+            border: none;
+            border-spacing: 0; /* 设置单元格之间的间距为0 */
+            table-layout: fixed; /* 将表格布局设置为固定布局 */
+        }
+
+        .zdr-table-info td {
+            border: 1px solid #000; /* 添加底部边框 */
+            font-size: 14px; /* 设置字体大小为12像素 */
+        }
+
+
+        .z-checkbox-column {
+            display: flex;
+            flex-direction: column;
+            align-items: flex-start;
+            justify-content: flex-start;
+        }
+
+        .z-comp-checkbox {
+            margin-bottom: 20px; /* 每个复选框之间的间距 */
+            width: 100%; /* 确保复选框占据整个容器的宽度 */
+        }
+
+        .short-centered-td {
+            text-align: center; /* 让文本居中 */
+            vertical-align: middle;
+            /* 还可以添加其他样式,比如padding或border */
+            padding: 5px; /* 添加一些内边距,使内容看起来更美观 */
+        }
+
+
+        .span1 {
+            text-align: left;
+            font-size: 15px; /*字体大小*/
+            border: 1px solid #242A32; /*表格的边框*/
+            border-collapse: collapse; /* 确保边框合并为一个单一的边框,而不是双重边框 */
+            width: 50%; /* 设置表格宽度为100%,可以根据需要调整 */
+            padding: 10px; /* 上、下、左、右都添加10像素的内部空间 */
+            border-spacing: 0; /* 设置单元格之间的间距为0 */
+        }
+
+        .span2 {
+            text-align: left;
+            font-size: 15px; /*字体大小*/
+            border: 1px solid #242A32; /*表格的边框*/
+            border-collapse: collapse; /* 确保边框合并为一个单一的边框,而不是双重边框 */
+            width: 50%; /* 设置表格宽度为100%,可以根据需要调整 */
+            padding: 10px; /* 上、下、左、右都添加10像素的内部空间 */
+            border-spacing: 0; /* 设置单元格之间的间距为0 */
+        }
+
+        .TableTotal {
+            width: calc(100% - 40px);
+            height: 100%;
+            background-color: #F9F9F9;
+            display: flex;
+            align-items: center;
+            justify-content: center;
+            padding: 20px 0;
+            margin: 0 20px;
+        }
+
+        .TableTotal .Box {
+            width: 800px;
+            background: #FFFFFF;
+            box-shadow: 0 0 29px 0 rgba(154, 154, 154, 0.21);
+            border-radius: 0 0 0 0;
+            padding: 15px 30px;
+            position: relative;
+            overflow: hidden;
+        }
+
+        .TableTotal .Box h2 {
+            text-align: center;
+            font-size: 20px;
+            font-weight: 600;
+            letter-spacing: 3px;
+            margin: 0 0 10px;
+        }
+
+        .tables {
+            margin: 16px 0;
+            width: 100%;
+        }
+
+
+        .z-radio-item {
+            display: flex; /* 子元素也使用Flexbox布局,以便内部元素可以横向排列 */
+            align-items: center; /* 垂直居中 */
+            margin-right: 10px; /* 如果需要添加间隔 */
+            /* 其他你需要的样式 */
+        }
+
+    </style>
+</@w.workFlow>

+ 17 - 0
zjugis-business/src/main/resources/templates/Resign/js/index.js

@@ -148,6 +148,13 @@
 
     //注册业务保存事件
     function bindEvents() {
+        var lzsq = JSON.parse(window.lzsq.replace(/[\r|\n|\t]/g,""));
+        var html="";
+        if(lzsq&&lzsq.instanceId){
+            html ="<a onclick=goAsset1('"+lzsq.instanceId+"')>"+lzsq.nickname+"("+lzsq.createTime.substring(0,10)+")</a>";
+        }
+
+        $("#lzsqhtml").html(html);
         z.workflow.saveBtn.addListener("onSaveClick", saveForm);
     }
 
@@ -557,5 +564,15 @@
         }
     }
 
+
 }());
 
+function goAsset1(id){
+    z.webcontainer.openTab({
+        id: 'workflow_hangup_' + id,
+        title: "流程查看",
+        url: window.url + "/IFlowInstance/redirectFlowPage?flowInstanceId=" + id ,
+        iconclass: 'fa fa-file'
+    });
+}
+

+ 0 - 489
zjugis-business/src/main/resources/templates/Resign/js/mobileIndex.js

@@ -1,489 +0,0 @@
-(function () {
-    let unfinishedArray = [];
-    let finishedArray = [];
-    let read = z.ui.comm.getUrlParam("read");
-    var addDataUnFinished = null;
-    var addDataFinished = null;
-
-    window.onload = function (ex) {
-        addDataUnFinished = $("#addDataUnfinished")
-        addDataFinished = $("#addDataFinished")
-        unfinishedWork();//未完成工作移交
-        finishedWork();//已完成工作成果
-        bindEvents();
-    }
-
-    function finishedWork() {
-        //未完成工作按钮
-        let un = document.querySelector('#finished')
-        let finished = JSON.parse(un.value)//存在的列表详情
-        $("#addDataFinished").click(function () {
-            addDataFinished.attr('disabled', "true");
-            let obj = {
-                content: "",
-                receiver: "",
-                reviewer: "",
-            }
-
-            finishedArray.push(obj)
-            generateTableTrHtmlFinished(finishedArray.length - 1)
-            buildQjsjSeq();
-        })
-
-
-        if (finished.length > 0) {
-            for (let i = 0; i < finished.length; i++) {
-                let obj = {
-                    content: finished[i].content ? finished[i].content : '',
-                    receiver: finished[i].receiver ? finished[i].receiver : '',
-                    reviewer: finished[i].reviewer ? finished[i].reviewer : '',
-                }
-                finishedArray.push(obj)
-            }
-            for (let i = 0; i < finished.length; i++) {
-                generateTableTrHtmlFinished(i);
-            }
-        }
-    }
-
-    function unfinishedWork() {
-        //未完成工作按钮
-        let un = document.querySelector('#unfinished')
-        let unfinished = JSON.parse(un.value)//存在的列表详情
-        $("#addDataUnfinished").click(function () {
-            addDataUnFinished.attr('disabled', "true");
-            let obj = {
-                content: "",
-                receiver: "",
-                confirmor: "",
-            }
-
-            unfinishedArray.push(obj)
-            generateTableTrHtmlUnfinished(unfinishedArray.length - 1)
-            buildQjsjSeq();
-        })
-
-
-        if (unfinished.length > 0) {
-            for (let i = 0; i < unfinished.length; i++) {
-                let obj = {
-                    content: unfinished[i].content ? unfinished[i].content : '',
-                    receiver: unfinished[i].receiver ? unfinished[i].receiver : '',
-                    confirmor: unfinished[i].confirmor ? unfinished[i].confirmor : '',
-                }
-                unfinishedArray.push(obj)
-            }
-            for (let i = 0; i < unfinished.length; i++) {
-                generateTableTrHtmlUnfinished(i);
-            }
-        }
-    }
-
-
-    //注册业务保存事件
-    function bindEvents() {
-        z.workflowMobile.saveBtn.addListener("onSaveClick", saveForm);
-    }
-
-
-    /*
-  * all 工作流js传递到业务的参数 success执行的方法
-  * istransfer 工作流js传递到业务的参数 是否转件
-  * */
-    function saveForm(all, istransfer) {
-        var postData = z.ui.form.getFormFields($("[name=createReqVO]"));
-        if (postData === false) {
-            all({success: false});
-            return;
-        }
-
-        //将string类型的时间转换成时间戳
-        var detail = []
-        for (let key of Object.keys(postData)) {
-            let mealName = postData[key];
-            if (key.startsWith("createReqVO")) {
-                mealName.rgssj = Date.parse(mealName.rgssj + "");
-                mealName.htdqs = Date.parse(mealName.htdqs + "");
-                mealName.zhsbrq = Date.parse(mealName.zhsbrq + "");
-                mealName.lzsxrq = Date.parse(mealName.lzsxrq + "");
-                mealName.lzyy = appendLZYYResult();
-                postData.createReqVO = mealName;
-            }
-            if (key.startsWith("ResignDetailDO")) {
-                detail.push(z.ui.form.childStringify(mealName));
-            }
-        }
-        postData.createReqVO.unfinishedList = detail;
-
-        z.ui.ajax({
-            type: "post",
-            url: "/resign/update",
-            data: JSON.stringify(postData.createReqVO),
-            contentType: "application/json",
-            success: function (res) {
-                if (res && res.code === 200) {
-                    all({success: true});
-                } else {
-                    all({success: false});
-                    z.ui.alertWarning(res.msg);
-                }
-            },
-
-            error: function () {
-                all({success: false});
-            }
-        })
-    }
-
-    /**
-     * 离职原因结果拼接
-     * @returns {string}
-     */
-    function appendLZYYResult() {
-        var results = ","; // 初始化结果字符串
-
-        // 遍历每个复选框
-        for (var i = 1; i <= 17; i++) {
-            var checkboxName = "createReqVO$v" + i; // 构造复选框名称
-
-            // 使用 jQuery 选择器获取复选框元素
-            var checkbox = $('[name="' + checkboxName + '"] .z-checkbox-item');
-
-            // 检查复选框是否选中
-            if (checkbox.hasClass("checked")) {
-                // 如果选中,将复选框的值拼接到结果字符串中
-                results += checkbox.attr("value") + ",";
-            }
-        }
-
-        return results; // 返回拼接后的结果
-    }
-
-
-    /**
-     * 页面生成并获取map中的数据
-     * @param i
-     * @returns {HTMLTableRowElement}
-     */
-    function generateTableTrHtmlFinished(i) {
-        var trDom = document.createElement("tr");
-        trDom.style.backgroundColor = "#fff";
-        trDom.id = "qjsjF_" + i;
-        trDom.className = 'qjsjClass'
-        trDom.innerHTML = '<td name="qjsj_seq">' + (i + 1) + '</td>'
-            + '<td>'/*内容*/
-            + '<div class="form-item" >'
-            + '<div class="z-comp-input" name="ResignDetailDO1[' + i + ']$content">'
-            + '<input type="text" value="">'
-            + '</div>'
-            + '</div>'
-            + '</td>'
-            + '<input type="hidden" name="ResignDetailDO1[' + i + ']$state" value="2">'
-            + '<td>'
-            + '<div class="form-flex">'
-            + '<div class="form-item" style="width: 100%;margin-right: 5px;">'
-            + '<div class="z-comp-selecttree" name="receive1[' + i + ']">'
-            + '<input type="hidden" name="ResignDetailDO1[' + i + ']$receiver" value="' + finishedArray[i].receiver + '">'
-            + '<div class="z-inputselect-bar">'
-            + '<span></span><i></i>'
-            + '</div>'
-            + '</div>'
-            + '</div>'
-            + '</div>'
-            + '</td>'
-            + '<td>'
-            + '<div class="form-flex">'
-            + '<div class="form-item" style="width: 100%;margin-right: 5px;">'
-            + '<div class="z-comp-selecttree" name="review1[' + i + ']">'
-            + '<input type="hidden" name="ResignDetailDO1[' + i + ']$reviewer" value="' + finishedArray[i].reviewer + '">'
-            + '<div class="z-inputselect-bar">'
-            + '<span></span><i></i>'
-            + '</div>'
-            + '</div>'
-            + '</div>'
-            + '</div>'
-            + '</td>'
-            + '<td style="align-items: center">'
-            + '<div style="display: flex;white-space: nowrap">'
-            + '<div id="editBtnF_' + (i) + '" class="table-btn editBtnF_' + (i) + '" data-index="' + (i) + '">'
-            + '<span>保存</span>'
-            + '</div>'
-            + '<div id="delBtnF_' + (i) + '" class="table-btn delBtnF_' + (i) + '" data-index="' + (i) + '">'
-            + '<span>删除</span>'
-            + '</div>'
-            + '</div>'
-            + '</td>';
-        let trFragment = document.createDocumentFragment();
-        trFragment.appendChild(trDom);
-        $("[name='finishedBody']").append(trFragment)
-
-
-        z.ui.ajax({
-            type: "get",
-            url: "/common/user-tree",
-            data: {},
-            success: function (res) {
-
-                //初始化
-                res.forEach(obj => {
-                    obj.treeName = 'ResignDetailDO1[' + i + ']$receiver';
-                })
-                selecttree("[name='receive1[" + i + "]']", res, clickReceive)
-
-                res.forEach(obj => {
-                    obj.treeName = 'ResignDetailDO1[' + i + ']$reviewer';
-                })
-                selecttree("[name='review1[" + i + "]']", res, clickReview)
-
-
-                //赋值
-                if (!(!finishedArray[i].content || finishedArray[i].content.trim() === '')) {
-                    z.ui.input("[name='ResignDetailDO1[" + i + "]$content']").setValue(finishedArray[i].content);
-                }
-                if (!(!finishedArray[i].receiver || finishedArray[i].receiver.trim() === '')) {
-                    z.ui.selecttree("[name='receive1[" + i + "]']").setValue(finishedArray[i].receiver)
-                }
-                if (!(!finishedArray[i].reviewer || finishedArray[i].reviewer.trim() === '')) {
-                    z.ui.selecttree("[name='review1[" + i + "]']").setValue(finishedArray[i].reviewer)
-                }
-
-
-                if (read !== '1') {
-                    $("#editBtnF_" + i).click(function () {
-                        const span = $(this).find("span");
-                        const html = span.html();
-                        if (html === '编辑') {
-                            span.html('保存')
-                            detailWrite(i);
-                            addDataFinished.attr('disabled', "true");
-                            $("#qjsjF_" + i).removeClass("form-table-disable")
-                            return;
-                        }
-                        if (html === '保存') {
-                            span.html('编辑')
-                            detailReadonly(i);
-                            addDataFinished.removeAttr('disabled')
-                            $("#qjsjF_" + i).addClass("form-table-disable")
-                            return;
-                        }
-                    })
-
-
-                    $("#delBtnF_" + i).click(function () {
-                        z.ui.confirm("compid").init({
-                            content: "确定删除吗?",
-                            onConfirm: function () {
-                                var element = document.getElementById("qjsjF_" + i);
-                                element.remove();
-                                buildQjsjSeq();
-                                //finishedArray.splice(i, 1)
-                            },
-                            onCancel: function () {
-
-                            }
-                        })
-
-                    })
-
-                } else {
-                    detailReadonly(i)
-                }
-
-
-            },
-            error: function () {
-            }
-        })
-
-    }
-
-
-    /**
-     * 页面生成并获取map中的数据
-     * @param i
-     * @returns {HTMLTableRowElement}
-     */
-    function generateTableTrHtmlUnfinished(i) {
-        var trDom = document.createElement("tr");
-        trDom.style.backgroundColor = "#fff";
-        trDom.id = "qjsj_" + i;
-        trDom.className = 'qjsjClass'
-        trDom.innerHTML = '<td name="qjsj_seq">' + (i + 1) + '</td>'
-            + '<td>'/*内容*/
-            + '<div class="form-item" >'
-            + '<div class="z-comp-input" name="ResignDetailDO[' + i + ']$content">'
-            + '<input type="text" value="">'
-            + '</div>'
-            + '</div>'
-            + '</td>'
-            + '<input type="hidden" name="ResignDetailDO[' + i + ']$state" value="1">'
-            + '<td>'
-            + '<div class="form-flex">'
-            + '<div class="form-item" style="width: 100%;margin-right: 5px;">'
-            + '<div class="z-comp-selecttree" name="receive[' + i + ']">'
-            + '<input type="hidden" name="ResignDetailDO[' + i + ']$receiver" value="' + unfinishedArray[i].receiver + '">'
-            + '<div class="z-inputselect-bar">'
-            + '<span></span><i></i>'
-            + '</div>'
-            + '</div>'
-            + '</div>'
-            + '</div>'
-            + '</td>'
-            + '<td>'
-            + '<div class="form-flex">'
-            + '<div class="form-item" style="width: 100%;margin-right: 5px;">'
-            + '<div class="z-comp-selecttree" name="confirm[' + i + ']">'
-            + '<input type="hidden" name="ResignDetailDO[' + i + ']$confirmor" value="' + unfinishedArray[i].confirmor + '">'
-            + '<div class="z-inputselect-bar">'
-            + '<span></span><i></i>'
-            + '</div>'
-            + '</div>'
-            + '</div>'
-            + '</div>'
-            + '</td>'
-            + '<td style="align-items: center">'
-            + '<div style="display: flex;white-space: nowrap">'
-            + '<div id="editBtnU_' + (i) + '" class="table-btn editBtnU_' + (i) + '" data-index="' + (i) + '">'
-            + '<span>保存</span>'
-            + '</div>'
-            + '<div id="delBtnU_' + (i) + '" class="table-btn delBtnU_' + (i) + '" data-index="' + (i) + '">'
-            + '<span>删除</span>'
-            + '</div>'
-            + '</div>'
-            + '</td>';
-        let trFragment = document.createDocumentFragment();
-        trFragment.appendChild(trDom);
-        $("[name='unfinishedBody']").append(trFragment)
-
-
-        z.ui.ajax({
-            type: "get",
-            url: "/common/user-tree",
-            data: {},
-            success: function (res) {
-
-                //字典初始化
-                res.forEach(obj => {
-                    obj.treeName = 'ResignDetailDO[' + i + ']$receiver';
-                })
-                selecttree("[name='receive[" + i + "]']", res, clickReceive)
-
-                res.forEach(obj => {
-                    obj.treeName = 'ResignDetailDO[' + i + ']$confirmor';
-                })
-                selecttree("[name='confirm[" + i + "]']", res, clickConfirm)
-
-
-                //赋值
-                if (!(!unfinishedArray[i].content || unfinishedArray[i].content.trim() === '')) {
-                    z.ui.input("[name='ResignDetailDO[" + i + "]$content']").setValue(unfinishedArray[i].content);
-                }
-                if (!(!unfinishedArray[i].receiver || unfinishedArray[i].receiver.trim() === '')) {
-                    z.ui.selecttree("[name='receive[" + i + "]']").setValue(unfinishedArray[i].receiver)
-                }
-                if (!(!unfinishedArray[i].confirmor || unfinishedArray[i].confirmor.trim() === '')) {
-                    z.ui.selecttree("[name='confirm[" + i + "]']").setValue(unfinishedArray[i].confirmor)
-                }
-
-                if (read !== '1') {
-                    $("#editBtnU_" + i).click(function () {
-                        const span = $(this).find("span");
-                        const html = span.html();
-                        if (html === '编辑') {
-                            span.html('保存')
-                            detailWriteU(i);
-                            addDataUnFinished.attr('disabled', "true");
-                            $("#qjsj_" + i).removeClass("form-table-disable")
-                            return;
-                        }
-                        if (html === '保存') {
-                            span.html('编辑')
-                            detailReadonlyU(i);
-                            addDataUnFinished.removeAttr('disabled')
-                            $("#qjsj_" + i).addClass("form-table-disable")
-                            return;
-                        }
-                    })
-
-
-                    $("#delBtnU_" + i).click(function () {
-                        z.ui.confirm("compid").init({
-                            content: "确定删除吗?",
-                            onConfirm: function () {
-                                var element = document.getElementById("qjsj_" + i);
-                                element.remove();
-                                buildQjsjSeq();
-                                //unfinishedArray.splice(i, 1)
-                            },
-                            onCancel: function () {
-
-                            }
-                        })
-
-                    })
-                } else {
-                    detailReadonlyU(i)
-                }
-
-
-            },
-            error: function () {
-            }
-        })
-    }
-
-
-    function clickReview(even, treeId, treeNode) {
-        $("[name='" + treeNode.treeName + "']").val(treeNode.id);
-    }
-
-    function clickConfirm(even, treeId, treeNode) {
-        $("[name='" + treeNode.treeName + "']").val(treeNode.id);
-    }
-
-    function clickReceive(even, treeId, treeNode) {
-        $("[name='" + treeNode.treeName + "']").val(treeNode.id);
-    }
-
-
-    function detailWrite(i) {
-        $("#delBtn_" + i).css("display", "block");
-        $("[name='receive1[" + i + "]']").removeClass("z-readonly").css("pointer-events", "auto");
-        $("[name='review1[" + i + "]']").removeClass("z-readonly").css("pointer-events", "auto");
-        $("[name='ResignDetailDO1[" + i + "]$content']").removeClass("z-readonly").css("pointer-events", "auto");
-    }
-
-    function detailReadonly(i) {
-        //设置只读属性
-        $("#delBtn_" + i).css("display", "none");
-        $("[name='receive1[" + i + "]']").addClass("z-readonly").css("pointer-events", "none");
-        $("[name='review1[" + i + "]']").addClass("z-readonly").css("pointer-events", "none");
-        $("[name='ResignDetailDO1[" + i + "]$content']").addClass("z-readonly").css("pointer-events", "none");
-    }
-
-
-    function detailWriteU(i) {
-        $("#delBtn_" + i).css("display", "block");
-        $("[name='receive[" + i + "]']").removeClass("z-readonly").css("pointer-events", "auto");
-        $("[name='confirm[" + i + "]']").removeClass("z-readonly").css("pointer-events", "auto");
-        $("[name='ResignDetailDO[" + i + "]$content']").removeClass("z-readonly").css("pointer-events", "auto");
-    }
-
-    //手动列表添加只读效果
-    function detailReadonlyU(i) {
-        $("#delBtn_" + i).css("display", "none");
-        $("[name='receive[" + i + "]']").addClass("z-readonly").css("pointer-events", "none");
-        $("[name='confirm[" + i + "]']").addClass("z-readonly").css("pointer-events", "none");
-        $("[name='ResignDetailDO[" + i + "]$content']").addClass("z-readonly").css("pointer-events", "none");
-    }
-
-    function buildQjsjSeq() {
-        let elementsByName = document.getElementsByName("qjsj_seq");
-        for (let i = 0; i < elementsByName.length; i++) {
-            const seqElement = elementsByName[i];
-            seqElement.innerHTML = i + 1;
-        }
-    }
-
-}());
-

+ 0 - 469
zjugis-business/src/main/resources/templates/Resign/mobileIndex.ftl

@@ -1,469 +0,0 @@
-<@wm.workFlowMobile javascripts=['/WorkFlow/js/flowMobile.js','/Resign/js/mobileIndex.js']>
-    <style>
-        /**flowMobileCSS样式文件容器**/
-        .flowMobile {
-            overflow: hidden;
-            overflow-y: auto;
-            height: 100%;
-        }
-
-        .z-comp-radio {
-            display: inline-block;
-            height: auto;
-            line-height: 28px;
-        }
-
-
-    </style>
-    <div class="flowMobile">
-        <div class="z-comp-tab" name="tab">
-            <ul class="z-tab-bar">
-                <li z-tabindex="0" class="on"><a>离职申请表</a></li>
-                <li z-tabindex="1"><a>离职员工交接清单</a></li>
-                <#if WORKFLOW.MATERIALS! !="">
-                    <li z-tabindex="2"><a>收件材料</a></li>
-                </#if>
-
-                <#if WORKFLOW.OPINION! !="">
-                    <li z-tabindex="3" class=""><a>审批意见</a></li>
-                </#if>
-            </ul>
-            <div class="z-tab-scroll">
-                <div class="z-tab-content on">
-                    <div class="z-form-wrap" name="createReqVO">
-                        <div class="z-form-row" style="display: none;">
-                            <input type="text" value="${formEntity.instanceId!}" name="createReqVO$instanceId">
-                            <input type="text" value="${formEntity.id!}" name="createReqVO$id">
-                            <input type="text" value='${unfinishedList!}' id="unfinished">
-                            <input type="text" value='${finishedList!}' id="finished">
-                        </div>
-
-
-                        <div style="font-size: 15px;">
-                            <div class="form-icon">
-                                <img src="/imgs/titleIcon.png" alt="">
-                                <span>基本信息</span>
-                            </div>
-                        </div>
-                        <br>
-
-                        <div class="z-form-row">
-                            <div class="z-form-label z-col-30">姓名</div>
-                            <div class="z-form-control z-col-70">
-                                <div class="z-comp-input z-readonly" name="nickname">
-                                    <input type="text" name="createReqVO$nickname"
-                                           value="${formEntity.nickname!}">
-                                </div>
-                                <input type="hidden" name="createReqVO$userId" value="${formEntity.userId!}">
-                            </div>
-                        </div>
-
-
-                        <div class="z-form-row">
-                            <div class="z-form-label z-col-30">部门</div>
-                            <div class="z-form-control z-col-70">
-                                <div class="z-comp-input z-readonly" name="createReqVO$deptName">
-                                    <input type="text" value="${formEntity.deptName!}">
-                                </div>
-                                <input type="hidden" name="createReqVO$deptId" value="${formEntity.deptId!}">
-                            </div>
-                        </div>
-
-
-                        <div class="z-form-row">
-                            <div class="z-form-label z-col-30">岗位</div>
-                            <div class="z-form-control z-col-70">
-                                <div class="z-comp-select z-readonly" name="createReqVO$drzw"
-                                     data='${post_type!}' value="${formEntity.drzw!}">
-                                    <div class="z-inputselect-bar">
-                                        <span></span><i></i>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-
-
-                        <div class="z-form-row">
-                            <div class="z-form-label z-col-30">入职时间</div>
-                            <div class="z-form-control z-col-70">
-                                <div class="z-comp-date z-readonly" name="createReqVO$rgssj">
-                                    <input type="text" value="${(formEntity.rgssj?date)!}">
-                                </div>
-                            </div>
-                        </div>
-
-                        <div class="z-form-row">
-                            <div class="z-form-label z-col-30">合同期限</div>
-                            <div class="z-form-control z-col-70">
-                                <div class="z-comp-date z-readonly" name="createReqVO$htdqs">
-                                    <input type="text" value="${(formEntity.htdqs?date)!}">
-                                </div>
-                            </div>
-                        </div>
-
-                        <div class="z-form-row">
-                            <div class="z-form-label z-col-30">最后上班日期</div>
-                            <div class="z-form-control z-col-70">
-                                <div class="z-comp-date z-readonly" name="createReqVO$zhsbrq">
-                                    <input type="text" value="${(formEntity.zhsbrq?date)!}">
-                                </div>
-                            </div>
-                        </div>
-
-                        <div class="z-form-row">
-                            <div class="z-form-label z-col-30">离职生效日期</div>
-                            <div class="z-form-control z-col-70">
-                                <div class="z-comp-date z-readonly" name="createReqVO$lzsxrq">
-                                    <input type="text" value="${(formEntity.lzsxrq?date)!}">
-                                </div>
-                            </div>
-                        </div>
-
-
-                        <br>
-                        <br>
-                        <div style="font-size: 15px;">
-                            <div class="form-icon">
-                                <img src="/imgs/titleIcon.png" alt="">
-                                <span>离职原因</span>
-                            </div>
-                        </div>
-                        <br>
-
-                        <div class="z-form-row">
-                            <div class="z-form-label">
-                                <div class="z-comp-checkbox z-readonly" name="createReqVO$v1">
-                                    <div class="z-checkbox-item <#if (formEntity.lzyy!)? contains(",1,")>checked</#if>"
-                                         value="1"><i></i>个人原因
-                                    </div>
-                                </div>
-                                <div class="z-comp-checkbox z-readonly" name="createReqVO$v2">
-                                    <div class="z-checkbox-item <#if (formEntity.lzyy!)? contains(",2,")>checked</#if>"
-                                         value="2"><i></i>晋升机会
-                                    </div>
-                                </div>
-                                <div class="z-comp-checkbox z-readonly" name="createReqVO$v3">
-                                    <div class="z-checkbox-item <#if (formEntity.lzyy!)? contains(",3,")>checked</#if>"
-                                         value="3"><i></i>换个行业发展
-                                    </div>
-                                </div>
-                                <div class="z-comp-checkbox z-readonly" name="createReqVO$v4">
-                                    <div class="z-checkbox-item <#if (formEntity.lzyy!)? contains(",4,")>checked</#if>"
-                                         value="4"><i></i>薪资偏低
-                                    </div>
-                                </div>
-                                <div class="z-comp-checkbox z-readonly" name="createReqVO$v5">
-                                    <div class="z-checkbox-item <#if (formEntity.lzyy!)? contains(",5,")>checked</#if>"
-                                         value="5"><i></i>福利不佳
-                                    </div>
-                                </div>
-                                <div class="z-comp-checkbox z-readonly" name="createReqVO$v6">
-                                    <div class="z-checkbox-item <#if (formEntity.lzyy!)? contains(",6,")>checked</#if>"
-                                         value="6"><i></i>劳动合同到期
-                                    </div>
-                                </div>
-                                <div class="z-comp-checkbox z-readonly" name="createReqVO$v7">
-                                    <div class="z-checkbox-item <#if (formEntity.lzyy!)? contains(",7,")>checked</#if>"
-                                         value="7"><i></i>无归属感
-                                    </div>
-                                </div>
-                                <div class="z-comp-checkbox z-readonly" name="createReqVO$v8">
-                                    <div class="z-checkbox-item <#if (formEntity.lzyy!)? contains(",8,")>checked</#if>"
-                                         value="8"><i></i>健康因素
-                                    </div>
-                                </div>
-                                <div class="z-comp-checkbox z-readonly" name="createReqVO$v9">
-                                    <div class="z-checkbox-item <#if (formEntity.lzyy!)? contains(",9,")>checked</#if>"
-                                         value="9"><i></i>文化理念不同
-                                    </div>
-                                </div>
-                                <div class="z-comp-checkbox z-readonly" name="createReqVO$v10">
-                                    <div class="z-checkbox-item <#if (formEntity.lzyy!)? contains(",10,")>checked</#if>"
-                                         value="10"><i></i>求学深造
-                                    </div>
-                                </div>
-                                <div class="z-comp-checkbox z-readonly" name="createReqVO$v11">
-                                    <div class="z-checkbox-item <#if (formEntity.lzyy!)? contains(",11,")>checked</#if>"
-                                         value="11"><i></i>家庭因素
-                                    </div>
-                                </div>
-                                <div class="z-comp-checkbox z-readonly" name="createReqVO$v12">
-                                    <div class="z-checkbox-item <#if (formEntity.lzyy!)? contains(",12,")>checked</#if>"
-                                         value="12"><i></i>领导风格不适
-                                    </div>
-                                </div>
-                                <div class="z-comp-checkbox z-readonly" name="createReqVO$v13">
-                                    <div class="z-checkbox-item <#if (formEntity.lzyy!)? contains(",13,")>checked</#if>"
-                                         value="13"><i></i>工作环境
-                                    </div>
-                                </div>
-                                <div class="z-comp-checkbox z-readonly" name="createReqVO$v14">
-                                    <div class="z-checkbox-item <#if (formEntity.lzyy!)? contains(",14,")>checked</#if>"
-                                         value="14"><i></i>人际关系
-                                    </div>
-                                </div>
-                                <div class="z-comp-checkbox z-readonly" name="createReqVO$v15">
-                                    <div class="z-checkbox-item <#if (formEntity.lzyy!)? contains(",15,")>checked</#if>"
-                                         value="15"><i></i>遭受不公平待遇
-                                    </div>
-                                </div>
-
-                                <div class="z-comp-checkbox z-readonly" name="createReqVO$v16">
-                                    <div class="z-checkbox-item <#if (formEntity.lzyy!)? contains(",16,")>checked</#if>"
-                                         value="16"><i></i>不能胜任本质工作
-                                    </div>
-                                </div>
-
-                                <div class="z-comp-checkbox z-readonly" name="createReqVO$v17">
-                                    <div class="z-checkbox-item <#if (formEntity.lzyy!)? contains(",17,")>checked</#if>"
-                                         value="17"><i></i>严重违反公司规章制度
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                        <br>
-                        <br>
-
-                        <div style="font-size: 15px;">
-                            <div class="form-icon">
-                                <img src="/imgs/titleIcon.png" alt="">
-                                <span>对公司的建议</span>
-                            </div>
-                        </div>
-                        <br>
-                        <div class="z-form-row">
-                            <div class="z-form-label" style="width: 100%">
-                                <div class="z-comp-textarea z-readonly" name="createReqVO$dgsjy">
-                                    <textarea>${formEntity.dgsjy!}</textarea>
-                                </div>
-                            </div>
-                        </div>
-
-
-                    </div>
-                </div>
-
-                <div class="z-tab-content">
-                    <div class="z-form-wrap" name="createReqVO">
-
-                        <div style="font-size: 15px;">
-                            <div class="form-icon">
-                                <img src="/imgs/titleIcon.png" alt="">
-                                <span>人力中心交接清单</span>
-                            </div>
-                        </div>
-                        <br>
-
-                        <div class="z-form-row">
-                            <div class="z-form-label">
-                                手提电脑、台式机
-                            </div>
-
-                            <div class="z-form-label">
-                                <div class="z-comp-radio z-readonly" name="createReqVO$clfscb1">
-                                    <div class="z-radio-item <#if (formEntity.clfscb1!)? contains("1")>checked</#if>"
-                                         value="1"><i></i>上交人力资源
-                                    </div>
-                                    <div class="z-radio-item <#if (formEntity.clfscb1!)? contains("2")>checked</#if>"
-                                         value="2"><i></i>部门内部交接
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-
-                        <div class="z-form-row">
-                            <div class="z-form-label">
-                                移动硬盘、U盘
-                            </div>
-                            <div class="z-form-label">
-                                <div class="z-comp-radio z-readonly" name="createReqVO$clfscb2">
-                                    <div class="z-radio-item <#if (formEntity.clfscb2!)? contains("1")>checked</#if>"
-                                         value="1"><i></i>上交人力资源
-                                    </div>
-                                    <div class="z-radio-item <#if (formEntity.clfscb2!)? contains("2")>checked</#if>"
-                                         value="2"><i></i>部门内部交接
-                                    </div>
-                                    <div class="z-radio-item <#if (formEntity.clfscb2!)? contains("3")>checked</#if>"
-                                         value="3"><i></i>无
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-
-
-                        <div class="z-form-row">
-                            <div class="z-form-label">
-                                公司邮箱、OA账号、钉钉账号
-                            </div>
-                            <div class="z-form-label">
-                                <div class="z-comp-radio z-readonly" name="createReqVO$clfscb3">
-                                    <div class="z-radio-item <#if (formEntity.clfscb3!)? contains("1")>checked</#if>"
-                                         value="1"><i></i>注销
-                                    </div>
-                                    <div class="z-radio-item <#if (formEntity.clfscb3!)? contains("2")>checked</#if>"
-                                         value="2"><i></i>保留
-                                    </div>
-                                </div>
-                            </div>
-
-                        </div>
-
-
-                        <div class="z-form-row">
-                            <div class="z-form-label">
-                                其他
-                            </div>
-                            <div class="z-form-label">
-                                <div class="z-comp-radio z-readonly" name="createReqVO$clfscb4">
-                                    <div class="z-radio-item <#if (formEntity.clfscb4!)? contains("1")>checked</#if>"
-                                         value="1"><i></i>无
-                                    </div>
-                                    <div class="z-radio-item <#if (formEntity.clfscb4!)? contains("2")>checked</#if>"
-                                         value="2"><i></i>备注
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-
-
-                        <div class="z-form-row">
-                            <div class="z-form-label">
-                                OA系统更新
-                            </div>
-                            <div class="z-form-label">
-                                <div class="z-comp-radio z-readonly" name="createReqVO$clfscb5">
-                                    <div class="z-radio-item <#if (formEntity.clfscb5!)? contains("1")>checked</#if>"
-                                         value="1"><i></i>无
-                                    </div>
-                                    <div class="z-radio-item <#if (formEntity.clfscb5!)? contains("2")>checked</#if>"
-                                         value="2"><i></i>已更新
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-
-
-                        <div class="z-form-row">
-                            <div class="z-form-label">
-                                数据中心
-                            </div>
-                            <div class="z-form-label">
-                                <div class="z-comp-radio z-readonly" name="createReqVO$clfscb6">
-                                    <div class="z-radio-item <#if (formEntity.clfscb6!)? contains("1")>checked</#if>"
-                                         value="1"><i></i>无
-                                    </div>
-                                    <div class="z-radio-item <#if (formEntity.clfscb6!)? contains("2")>checked</#if>"
-                                         value="2"><i></i>已归还
-                                    </div>
-                                    <div class="z-radio-item <#if (formEntity.clfscb6!)? contains("3")>checked</#if>"
-                                         value="3"><i></i>未归还
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-
-
-                        <div class="z-form-row">
-                            <div class="z-form-label">
-                                社保缴纳至
-                                <div class="z-comp-input z-readonly" name="createReqVO$clfscb7">
-                                    <input type="number" value="${formEntity.clfscb7!}">
-                                </div>
-                                月底,
-                                <div class="z-comp-input z-readonly" name="createReqVO$clfscb8">
-                                    <input type="number" value="${formEntity.clfscb8!}">
-                                </div>
-                                月初停止缴纳
-                            </div>
-
-                        </div>
-
-
-                        <div class="z-form-row">
-                            <div class="z-form-label">
-                                试用期结束后指导人是否按期填写并提交新员工转正材料
-                            </div>
-                            <div class="z-form-control">
-                                <div class="z-comp-radio z-readonly" name="createReqVO$khtj">
-                                    <div class="z-radio-item <#if (formEntity.khtj!)? contains("1")>checked</#if>"
-                                         value="1"><i></i>主动按期填写并提交
-                                    </div>
-                                    <div class="z-radio-item <#if (formEntity.khtj!)? contains("2")>checked</#if>"
-                                         value="2"><i></i>主动按期填写但未如期提交
-                                    </div>
-                                    <div class="z-radio-item <#if (formEntity.khtj!)? contains("3")>checked</#if>"
-                                         value="3"><i></i>在新员工本人督促下填写并提交
-                                    </div>
-                                    <div class="z-radio-item <#if (formEntity.khtj!)? contains("4")>checked</#if>"
-                                         value="4"><i></i>未按期填写并提交
-                                    </div>
-                                </div>
-
-                            </div>
-                        </div>
-
-
-                        <div class="z-form-row">
-                            <div class="z-form-label">
-                                新员工对指导人在试用期间指导工作的评价:
-                                (该评价公司会保密,填写要如实·客观,此评价将作为新员工转正时公司对新员工评价的依据之一)
-                            </div>
-                            <div class="z-form-control" style="width: 100%">
-                                <div class="z-comp-textarea z-readonly" name="createReqVO$pj">
-                                    <label>
-                                        <textarea>${formEntity.pj!}</textarea>
-                                    </label>
-                                </div>
-                            </div>
-                        </div>
-
-
-                        <div class="z-form-row">
-                            <div class="z-form-label">
-                                评定等级
-                            </div>
-                            <div class="z-form-control">
-                                <div class="z-comp-radio z-readonly" name="createReqVO$pddj">
-
-                                    <div class="z-radio-item <#if (formEntity.pddj!)? contains("1")>checked</#if>"
-                                         value="1"><i></i>优秀:各项指导工作都非常到位,表现出色
-                                    </div>
-                                    <div class="z-radio-item <#if (formEntity.pddj!)? contains("2")>checked</#if>"
-                                         value="2"><i></i>良好:各项指导工作大部分很到位,表现良好
-                                    </div>
-                                    <div class="z-radio-item <#if (formEntity.pddj!)? contains("3")>checked</#if>"
-                                         value="3"><i></i>一般:基本上进行了指导工作
-                                    </div>
-                                    <div class="z-radio-item <#if (formEntity.pddj!)? contains("4")>checked</#if>"
-                                         value="4"><i></i>有待提高,指导工作有待改进
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-
-                    </div>
-                </div>
-
-                <div class="z-tab-content">
-                    <!--收件材料模板-->
-                    <#if WORKFLOW.MATERIALS??>
-                        ${WORKFLOW.MATERIALS!}
-                    </#if>
-                </div>
-                <div class="z-tab-content">
-                    <!--审批意见模板-->
-                    <#if WORKFLOW.OPINION??>
-                        ${WORKFLOW.OPINION!}
-                    </#if>
-                </div>
-            </div>
-        </div>
-    </div>
-    <script>
-        window.userConfig = {
-            url: '${url!}'
-        }
-    </script>
-    <script type="text/javascript" src="/js/eruda.js"></script>
-    <script>eruda.init()</script>
-</@wm.workFlowMobile>

+ 1 - 1
zjugis-business/src/main/resources/templates/ResignApply/index.ftl

@@ -1,4 +1,4 @@
-<@w.workFlow javascripts=['/Resign/js/index.js','/flow/js/formCommon.js', '/OwCommon/OwCommon.js','/timeSelector/TimeSelector.js','/js/moment.js']
+<@w.workFlow javascripts=['/ResignApply/js/index.js','/flow/js/formCommon.js', '/OwCommon/OwCommon.js','/timeSelector/TimeSelector.js','/js/moment.js']
 styles=[ '/flow/css/formCommon.css', '/OwCommon/OwCommon.css','/timeSelector/TimeSelector.css' ]>
 
     <div class="z-position form-boss ow-tabs" name="createReqVO">