Merge branch 'master' of http://114.55.67.98:8070/Natural_p1/zjugis_OA

zjugis-business/src/main/java/com/zjugis/business/bean/entity/ContractInvoiceRelation.java

@@ -1,8 +1,9 @@
 package com.zjugis.business.bean.entity;
 
-import com.baomidou.mybatisplus.annotation.*;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.zjugis.business.mybatis.entity.BaseEntity;
 import lombok.Data;
-import org.apache.ibatis.type.JdbcType;
 
 import java.math.BigDecimal;
 
@@ -12,7 +13,7 @@ import java.math.BigDecimal;
  * @date 2024/3/7 11:20
  */
 @Data
-public class ContractInvoiceRelation {
+public class ContractInvoiceRelation extends BaseEntity {
 
     @TableId(type = IdType.ASSIGN_UUID)
     private String id;
@@ -25,9 +26,5 @@ public class ContractInvoiceRelation {
 
     private BigDecimal returnAmount;
 
-    @TableLogic(value = "1",delval = "0")
-    @TableField(fill = FieldFill.INSERT, jdbcType = JdbcType.NUMERIC)
-    private Integer isvalid;
-
     private Integer contractType;
 }

zjugis-business/src/main/java/com/zjugis/business/bean/response/ContractResponse.java

@@ -202,6 +202,8 @@ public class ContractResponse {
 
     private Integer isSign;
 
+    private Integer signWay;
+
     private Integer isBusinessUnit;
 
     private List<ContractChildResponse> children;

zjugis-business/src/main/java/com/zjugis/business/flow/contractinvoice/event/ContractInvoiceEvent.java

@@ -1,8 +1,6 @@
 package com.zjugis.business.flow.contractinvoice.event;
 
-import com.zjugis.business.bean.entity.Contract;
 import com.zjugis.business.bean.entity.ContractInvoice;
-import com.zjugis.business.bean.entity.ContractInvoiceRelation;
 import com.zjugis.business.constants.FlowStatusConstants;
 import com.zjugis.business.flow.contractinvoice.service.FlowContractInvoiceService;
 import com.zjugis.business.service.ContractInvoiceRelationService;
@@ -24,7 +22,6 @@ import org.springframework.web.bind.annotation.RestController;
 import javax.annotation.Resource;
 import java.time.LocalDateTime;
 import java.util.Arrays;
-import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 
@@ -97,7 +94,6 @@ public class ContractInvoiceEvent extends BaseController {
                 entity.setFlowStatus(FlowStatusConstants.FLOW_FINISHED);
                 entity.setFlowFinishtime(LocalDateTime.now());
                 flowContractInvoiceService.updateById(entity);
-                insertContractInvoiceRelation(entity);
                 return ok("true");
             } else {
                 throw new BusinessException("执行事件出错，请联系管理员！");
@@ -108,18 +104,6 @@ public class ContractInvoiceEvent extends BaseController {
         }
     }
 
-    private void insertContractInvoiceRelation(ContractInvoice contractInvoice) {
-        List<Contract> contracts = contractService.selectVirtualList(contractInvoice.getContractId());
-        contracts.forEach(item -> {
-            ContractInvoiceRelation relation = new ContractInvoiceRelation();
-            relation.setContractId(contractInvoice.getContractId());
-            relation.setContractInvoiceId(contractInvoice.getId());
-            relation.setContractType(item.getContractType());
-            contractInvoiceRelationService.insert(relation);
-        });
-
-    }
-
 
     /**
      * 作废事件

zjugis-business/src/main/java/com/zjugis/business/service/impl/ContractInvoiceServiceImpl.java

@@ -6,15 +6,13 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.zjugis.business.bean.dto.ContractInvoiceDto;
 import com.zjugis.business.bean.entity.Contract;
 import com.zjugis.business.bean.entity.ContractInvoice;
+import com.zjugis.business.bean.entity.ContractInvoiceRelation;
 import com.zjugis.business.bean.entity.Customer;
 import com.zjugis.business.bean.response.ContractInvoiceResponse;
 import com.zjugis.business.bean.response.ContractInvoiceStaticsRespense;
 import com.zjugis.business.constants.FlowStatusConstants;
 import com.zjugis.business.mapper.ContractInvoiceMapper;
-import com.zjugis.business.service.ContractInvoiceService;
-import com.zjugis.business.service.ContractMilestoneService;
-import com.zjugis.business.service.ContractService;
-import com.zjugis.business.service.CustomerService;
+import com.zjugis.business.service.*;
 import com.zjugis.framework.common.exception.ServiceException;
 import com.zjugis.framework.common.pojo.CommonResult;
 import com.zjugis.framework.security.core.util.SecurityFrameworkUtils;
@@ -25,6 +23,7 @@ import com.zjugis.module.system.api.user.AdminUserApi;
 import com.zjugis.module.system.api.user.dto.AdminUserRespDTO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.time.LocalDate;
 import java.util.List;
@@ -53,6 +52,9 @@ public class ContractInvoiceServiceImpl implements ContractInvoiceService {
     @Autowired
     ContractMilestoneService contractMilestoneService;
 
+    @Autowired
+    ContractInvoiceRelationService contractInvoiceRelationService;
+
     @Autowired
     AdminUserApi adminUserApi;
 
@@ -105,6 +107,7 @@ public class ContractInvoiceServiceImpl implements ContractInvoiceService {
      * @return
      */
     @Override
+    @Transactional
     public String process(String contractId) {
         Contract contract = contractService.selectByPrimaryKey(contractId);
         if(contract == null){
@@ -142,9 +145,21 @@ public class ContractInvoiceServiceImpl implements ContractInvoiceService {
         invoice.setApplyDate(LocalDate.now());
         contract.setFlowStatus(FlowStatusConstants.FLOW_NOT_START);
         insert(invoice);
+        insertContractInvoiceRelation(invoice);
         return returnUrl;
     }
 
+    private void insertContractInvoiceRelation(ContractInvoice contractInvoice) {
+        List<Contract> contracts = contractService.selectVirtualList(contractInvoice.getContractId());
+        contracts.forEach(item -> {
+            ContractInvoiceRelation relation = new ContractInvoiceRelation();
+            relation.setContractId(item.getId());
+            relation.setContractInvoiceId(contractInvoice.getId());
+            relation.setContractType(item.getContractType());
+            contractInvoiceRelationService.insert(relation);
+        });
+    }
+
     /**
      * @param id
      * @return

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

@@ -6,551 +6,579 @@ styles=[ '/flow/css/formCommon.css' ]>
             <input type="text" value="${formEntity.id!}" name="createReqVO$id">
             <input type="text" value="${formEntity.loginName!}" name="createReqVO$loginName">
         </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="z-form-control">
-                            <div class="z-comp-inputsearch" name="createReqVO$nickname" data='${resign!}'>
-                                <div class="z-inputselect-bar">
-                                    <input type="text" placeholder="姓名或工号" value="${formEntity.nickname!}"><i></i>
-                                </div>
-                                <input type="hidden" name="createReqVO$userId" value="${formEntity.userId!}"><i></i>
-                            </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$mssj">
-                                    <input type="text" value="${(formEntity.mssj?date)!}">
+        <ul class="ow-tab-nav oa_tabBox">
+            <li z-tabindex="0" class="ow-tab-item on" data-name="jbxx">基础信息</li>
+            <#if WORKFLOW.OPINION! !="">
+                <li z-tabindex="1" class="ow-tab-item" data-name="yj">审批意见</li>
+            </#if>
+        </ul>
+
+        <div class="ow-tab-scroll">
+            <div class="ow-tab-content on" name="jbxx">
+                <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="z-form-control">
+                                    <div class="z-comp-inputsearch" name="createReqVO$nickname" data='${resign!}'>
+                                        <div class="z-inputselect-bar">
+                                            <input type="text" placeholder="姓名或工号" value="${formEntity.nickname!}"><i></i>
+                                        </div>
+                                        <input type="hidden" name="createReqVO$userId" value="${formEntity.userId!}"><i></i>
+                                    </div>
                                 </div>
-                            </div>
-                        </div>
-                    </td>
+                            </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-select" name="createReqVO$sex" data='${sex_type!}'
-                                     value="${formEntity.sex!}">
-                                    <div class="z-inputselect-bar">
-                                        <span></span><i></i>
+                            <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$mssj">
+                                            <input type="text" value="${(formEntity.mssj?date)!}">
+                                        </div>
                                     </div>
                                 </div>
-                            </div>
-                        </div>
-                    </td>
+                            </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-select" name="createReqVO$sex" data='${sex_type!}'
+                                             value="${formEntity.sex!}">
+                                            <div class="z-inputselect-bar">
+                                                <span></span><i></i>
+                                            </div>
+                                        </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-input" name="createReqVO$sfzh">
-                                    <input type="text" value="${formEntity.sfzh!}">
+                            <td class="th">
+                                <div class="form-label">身份证号：</div>
+                            </td>
+                            <td>
+                                <div class="form-group">
+                                    <div class="form-item">
+                                        <div class="z-comp-input" name="createReqVO$sfzh">
+                                            <input type="text" value="${formEntity.sfzh!}">
+                                        </div>
+                                    </div>
                                 </div>
-                            </div>
-                        </div>
-                    </td>
+                            </td>
 
-                </tr>
+                        </tr>
 
 
-                <tr>
-                    <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$ypgw"
-                                     data='${post_type!}' value="${formEntity.ypgw!}">
-                                    <div class="z-inputselect-bar">
-                                        <span></span><i></i>
+                        <tr>
+                            <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$ypgw"
+                                             data='${post_type!}' value="${formEntity.ypgw!}">
+                                            <div class="z-inputselect-bar">
+                                                <span></span><i></i>
+                                            </div>
+                                        </div>
                                     </div>
                                 </div>
-                            </div>
-                        </div>
-                    </td>
+                            </td>
 
 
-                    <td class="th">
-                        <div class="form-label">应聘部门：</div>
-                    </td>
-                    <td>
-                        <div class="form-group">
-                            <div class="z-comp-selecttree" name="deptName">
-                                <input type="hidden" name="createReqVO$deptName" value="${formEntity.deptName!}">
-                                <input type="hidden" name="createReqVO$deptId" value="${formEntity.deptId!}">
-                                <div class="z-inputselect-bar">
-                                    <span>${formEntity.deptName!}</span><i></i>
+                            <td class="th">
+                                <div class="form-label">应聘部门：</div>
+                            </td>
+                            <td>
+                                <div class="form-group">
+                                    <div class="z-comp-selecttree" name="deptName">
+                                        <input type="hidden" name="createReqVO$deptName" value="${formEntity.deptName!}">
+                                        <input type="hidden" name="createReqVO$deptId" value="${formEntity.deptId!}">
+                                        <div class="z-inputselect-bar">
+                                            <span>${formEntity.deptName!}</span><i></i>
+                                        </div>
+                                    </div>
                                 </div>
-                            </div>
-                        </div>
-                    </td>
+                            </td>
 
-                </tr>
+                        </tr>
 
 
-                <tr>
-                    <td class="th">
-                        <div class="form-label">证件交验情况：</div>
-                    </td>
+                        <tr>
+                            <td class="th">
+                                <div class="form-label">证件交验情况：</div>
+                            </td>
 
 
-                    <td class="z-checkbox-column">
-                        <div class="z-form-control">
-                            <div class="z-comp-checkbox" name="createReqVO$v1">
-                                <div class="z-checkbox-item <#if (formEntity.zjjy!)? contains(",1,")>checked</#if>"
-                                     value="1"><i></i>学历证书
+                            <td class="z-checkbox-column">
+                                <div class="z-form-control">
+                                    <div class="z-comp-checkbox" name="createReqVO$v1">
+                                        <div class="z-checkbox-item <#if (formEntity.zjjy!)? 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.zjjy!)? 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.zjjy!)? contains(",3,")>checked</#if>"
+                                             value="3"><i></i>资格证书
+                                        </div>
+                                    </div>
                                 </div>
-                            </div>
-                            <div class="z-comp-checkbox" name="createReqVO$v2">
-                                <div class="z-checkbox-item <#if (formEntity.zjjy!)? contains(",2,")>checked</#if>"
-                                     value="2"><i></i>学位证书
+                                <div class="z-comp-checkbox" name="createReqVO$v4">
+                                    <div class="z-checkbox-item <#if (formEntity.zjjy!)? contains(",4,")>checked</#if>"
+                                         value="4"><i></i>身份证
+                                    </div>
                                 </div>
-                            </div>
-                            <div class="z-comp-checkbox" name="createReqVO$v3">
-                                <div class="z-checkbox-item <#if (formEntity.zjjy!)? contains(",3,")>checked</#if>"
-                                     value="3"><i></i>资格证书
+                                <div class="z-comp-checkbox" name="createReqVO$v5">
+                                    <div class="z-checkbox-item <#if (formEntity.zjjy!)? contains(",5,")>checked</#if>"
+                                         value="5"><i></i>个人简历
+                                    </div>
                                 </div>
-                            </div>
-                        </div>
-                        <div class="z-comp-checkbox" name="createReqVO$v4">
-                            <div class="z-checkbox-item <#if (formEntity.zjjy!)? 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.zjjy!)? contains(",5,")>checked</#if>"
-                                 value="5"><i></i>个人简历
-                            </div>
-                        </div>
-                        <div class="z-comp-checkbox" name="createReqVO$v6">
-                            <div class="z-checkbox-item <#if (formEntity.zjjy!)? 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.zjjy!)? contains(",7,")>checked</#if>"
-                                 value="7"><i></i>其他材料
-                            </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="th">
-                        <div class="form-label">仪容仪表：</div>
-                    </td>
-                    <td>
-                        <div class="form-group">
-                            <div class="form-item">
-                                <div class="z-comp-select" name="createReqVO$yrybf"
-                                     data='${point_standard!}' value="${formEntity.yrybf!}" style="width: 80px;">
-                                    <div class="z-inputselect-bar">
-                                        <span></span><i></i>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                    </td>
-                    <td>
-                        <div class="form-group">
-                            <div class="form-item">
-                                <div class="z-comp-input" name="createReqVO$yrybp" style="width: 250px;">
-                                    <input type="text" placeholder="评语" value="${formEntity.yrybp!}">
-                                </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$sflf"
-                                     data='${point_standard!}' value="${formEntity.sflf!}" style="width: 80px;">
-                                    <div class="z-inputselect-bar">
-                                        <span></span><i></i>
+                                <div class="z-comp-checkbox" name="createReqVO$v6">
+                                    <div class="z-checkbox-item <#if (formEntity.zjjy!)? contains(",6,")>checked</#if>"
+                                         value="6"><i></i>学生证原/复印件
                                     </div>
                                 </div>
-                            </div>
-                        </div>
-                    </td>
-                    <td>
-                        <div class="form-group">
-                            <div class="form-item">
-                                <div class="z-comp-input" name="createReqVO$sflp" style="width: 250px; ">
-                                    <input type="text" placeholder="评语" value="${formEntity.sflp!}">
-                                </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-select" name="createReqVO$swlyf"
-                                     data='${point_standard!}' value="${formEntity.swlyf!}" style="width: 80px;">
-                                    <div class="z-inputselect-bar">
-                                        <span></span><i></i>
+                                <div class="z-comp-checkbox" name="createReqVO$v7">
+                                    <div class="z-checkbox-item <#if (formEntity.zjjy!)? contains(",7,")>checked</#if>"
+                                         value="7"><i></i>其他材料
                                     </div>
                                 </div>
-                            </div>
-                        </div>
-                    </td>
-                    <td>
-                        <div class="form-group">
-                            <div class="form-item">
-                                <div class="z-comp-input" name="createReqVO$swlyp" style="width: 250px; ">
-                                    <input type="text" placeholder="评语" value="${formEntity.swlyp!}">
-                                </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$kyxf"
-                                     data='${point_standard!}' value="${formEntity.kyxf!}" style="width: 80px;">
-                                    <div class="z-inputselect-bar">
-                                        <span></span><i></i>
+                            </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="th">
+                                <div class="form-label">仪容仪表：</div>
+                            </td>
+                            <td>
+                                <div class="form-group">
+                                    <div class="form-item">
+                                        <div class="z-comp-select" name="createReqVO$yrybf"
+                                             data='${point_standard!}' value="${formEntity.yrybf!}" style="width: 80px;">
+                                            <div class="z-inputselect-bar">
+                                                <span></span><i></i>
+                                            </div>
+                                        </div>
                                     </div>
                                 </div>
-                            </div>
-                        </div>
-                    </td>
-                    <td>
-                        <div class="form-group">
-                            <div class="form-item">
-                                <div class="z-comp-input" name="createReqVO$kyxp" style="width: 250px; ">
-                                    <input type="text" placeholder="评语" value="${formEntity.kyxp!}">
-                                </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-select" name="createReqVO$gtf"
-                                     data='${point_standard!}' value="${formEntity.gtf!}" style="width: 80px;">
-                                    <div class="z-inputselect-bar">
-                                        <span></span><i></i>
+                            </td>
+                            <td>
+                                <div class="form-group">
+                                    <div class="form-item">
+                                        <div class="z-comp-input" name="createReqVO$yrybp" style="width: 250px;">
+                                            <input type="text" placeholder="评语" value="${formEntity.yrybp!}">
+                                        </div>
                                     </div>
                                 </div>
-                            </div>
-                        </div>
-                    </td>
-                    <td>
-                        <div class="form-group">
-                            <div class="form-item">
-                                <div class="z-comp-input" name="createReqVO$gtp" style="width: 250px; ">
-                                    <input type="text" placeholder="评语" value="${formEntity.gtp!}">
-                                </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$ccf"
-                                     data='${point_standard!}' value="${formEntity.ccf!}" style="width: 80px;">
-                                    <div class="z-inputselect-bar">
-                                        <span></span><i></i>
+                            </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$sflf"
+                                             data='${point_standard!}' value="${formEntity.sflf!}" style="width: 80px;">
+                                            <div class="z-inputselect-bar">
+                                                <span></span><i></i>
+                                            </div>
+                                        </div>
                                     </div>
                                 </div>
-                            </div>
-                        </div>
-                    </td>
-                    <td>
-                        <div class="form-group">
-                            <div class="form-item">
-                                <div class="z-comp-input" name="createReqVO$ccp" style="width: 250px; ">
-                                    <input type="text" placeholder="评语" value="${formEntity.ccp!}">
-                                </div>
-                            </div>
-                        </div>
-                    </td>
-                </tr>
+                            </td>
+                            <td>
+                                <div class="form-group">
+                                    <div class="form-item">
+                                        <div class="z-comp-input" name="createReqVO$sflp" style="width: 250px; ">
+                                            <input type="text" placeholder="评语" value="${formEntity.sflp!}">
+                                        </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-select" name="createReqVO$swlyf"
+                                             data='${point_standard!}' value="${formEntity.swlyf!}" style="width: 80px;">
+                                            <div class="z-inputselect-bar">
+                                                <span></span><i></i>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </td>
+                            <td>
+                                <div class="form-group">
+                                    <div class="form-item">
+                                        <div class="z-comp-input" name="createReqVO$swlyp" style="width: 250px; ">
+                                            <input type="text" placeholder="评语" value="${formEntity.swlyp!}">
+                                        </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$kyxf"
+                                             data='${point_standard!}' value="${formEntity.kyxf!}" style="width: 80px;">
+                                            <div class="z-inputselect-bar">
+                                                <span></span><i></i>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </td>
+                            <td>
+                                <div class="form-group">
+                                    <div class="form-item">
+                                        <div class="z-comp-input" name="createReqVO$kyxp" style="width: 250px; ">
+                                            <input type="text" placeholder="评语" value="${formEntity.kyxp!}">
+                                        </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-select" name="createReqVO$gtf"
+                                             data='${point_standard!}' value="${formEntity.gtf!}" style="width: 80px;">
+                                            <div class="z-inputselect-bar">
+                                                <span></span><i></i>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </td>
+                            <td>
+                                <div class="form-group">
+                                    <div class="form-item">
+                                        <div class="z-comp-input" name="createReqVO$gtp" style="width: 250px; ">
+                                            <input type="text" placeholder="评语" value="${formEntity.gtp!}">
+                                        </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$ccf"
+                                             data='${point_standard!}' value="${formEntity.ccf!}" style="width: 80px;">
+                                            <div class="z-inputselect-bar">
+                                                <span></span><i></i>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </td>
+                            <td>
+                                <div class="form-group">
+                                    <div class="form-item">
+                                        <div class="z-comp-input" name="createReqVO$ccp" style="width: 250px; ">
+                                            <input type="text" placeholder="评语" value="${formEntity.ccp!}">
+                                        </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-select" name="createReqVO$tdf"
+                                             data='${point_standard!}' value="${formEntity.tdf!}" style="width: 80px;">
+                                            <div class="z-inputselect-bar">
+                                                <span></span><i></i>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </td>
+                            <td>
+                                <div class="form-group">
+                                    <div class="form-item">
+                                        <div class="z-comp-input" name="createReqVO$tdp" style="width: 250px; ">
+                                            <input type="text" placeholder="评语" value="${formEntity.tdp!}">
+                                        </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$xxlf"
+                                             data='${point_standard!}' value="${formEntity.xxlf!}" style="width: 80px;">
+                                            <div class="z-inputselect-bar">
+                                                <span></span><i></i>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </td>
+                            <td>
+                                <div class="form-group">
+                                    <div class="form-item">
+                                        <div class="z-comp-input" name="createReqVO$xxlp" style="width: 250px; ">
+                                            <input type="text" placeholder="评语" value="${formEntity.xxlp!}">
+                                        </div>
+                                    </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="th">
+                                <div class="form-label">用工性质：</div>
+                            </td>
+                            <td>
+                                <div class="form-group">
+                                    <div class="form-item">
+                                        <div class="z-comp-input" name="createReqVO$ygxz">
+                                            <input type="text" value="${formEntity.ygxz!}">
+                                        </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$djcd"
+                                             data='${ABILITY_LEVEL!}' value="${formEntity.djcd!}">
+                                            <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-input" name="createReqVO$syjbyx">
+                                            <input type="text" value="${formEntity.syjbyx!}">
+                                        </div>
 
-                <tr>
-                    <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$tdf"
-                                     data='${point_standard!}' value="${formEntity.tdf!}" style="width: 80px;">
-                                    <div class="z-inputselect-bar">
-                                        <span></span><i></i>
                                     </div>
                                 </div>
-                            </div>
-                        </div>
-                    </td>
-                    <td>
-                        <div class="form-group">
-                            <div class="form-item">
-                                <div class="z-comp-input" name="createReqVO$tdp" style="width: 250px; ">
-                                    <input type="text" placeholder="评语" value="${formEntity.tdp!}">
-                                </div>
-                            </div>
-                        </div>
-                    </td>
+                            </td>
 
+                            <td class="th">
+                                <div class="form-label">试用绩效工资（元）：</div>
+                            </td>
+                            <td>
+                                <div class="form-group">
+                                    <div class="form-item">
+                                        <div class="z-comp-input" name="createReqVO$syjx">
+                                            <input type="text" value="${formEntity.syjx!}">
+                                        </div>
 
-                    <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$xxlf"
-                                     data='${point_standard!}' value="${formEntity.xxlf!}" style="width: 80px;">
-                                    <div class="z-inputselect-bar">
-                                        <span></span><i></i>
                                     </div>
                                 </div>
-                            </div>
-                        </div>
-                    </td>
-                    <td>
-                        <div class="form-group">
-                            <div class="form-item">
-                                <div class="z-comp-input" name="createReqVO$xxlp" style="width: 250px; ">
-                                    <input type="text" placeholder="评语" value="${formEntity.xxlp!}">
-                                </div>
-                            </div>
-                        </div>
-                    </td>
-                </tr>
-            </table>
-        </div>
+                            </td>
+                        </tr>
 
 
-        <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="th">
-                        <div class="form-label">用工性质：</div>
-                    </td>
-                    <td>
-                        <div class="form-group">
-                            <div class="form-item">
-                                <div class="z-comp-input" name="createReqVO$ygxz">
-                                    <input type="text" value="${formEntity.ygxz!}">
-                                </div>
-                            </div>
-                        </div>
-                    </td>
+                        <tr>
+                            <td class="th">
+                                <div class="form-label">转正基本工资（元）：</div>
+                            </td>
+                            <td>
+                                <div class="form-group">
+                                    <div class="form-item">
+                                        <div class="z-comp-input" name="createReqVO$zzjbyx">
+                                            <input type="text" value="${formEntity.zzjbyx!}">
+                                        </div>
 
-                    <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$djcd"
-                                     data='${ABILITY_LEVEL!}' value="${formEntity.djcd!}">
-                                    <div class="z-inputselect-bar">
-                                        <span></span><i></i>
                                     </div>
                                 </div>
-                            </div>
-                        </div>
-                    </td>
-                </tr>
+                            </td>
 
-                <tr>
+                            <td class="th">
+                                <div class="form-label">转正绩效工资（元）：</div>
+                            </td>
+                            <td>
+                                <div class="form-group">
+                                    <div class="form-item">
+                                        <div class="z-comp-input" name="createReqVO$zzjx">
+                                            <input type="text" value="${formEntity.zzjx!}">
+                                        </div>
 
-                    <td class="th">
-                        <div class="form-label">试用基本工资（元）：</div>
-                    </td>
-                    <td>
-                        <div class="form-group">
-                            <div class="form-item">
-                                <div class="z-comp-input" name="createReqVO$syjbyx">
-                                    <input type="text" value="${formEntity.syjbyx!}">
+                                    </div>
                                 </div>
+                            </td>
+                        </tr>
 
-                            </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-input" name="createReqVO$syjx">
-                                    <input type="text" value="${formEntity.syjx!}">
+                        <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$bdrq">
+                                            <input type="text" value="${(formEntity.bdrq?date)!}">
+                                        </div>
+                                    </div>
                                 </div>
 
-                            </div>
-                        </div>
-                    </td>
-                </tr>
+                            </td>
 
+                            <td class="th">
+                                <div class="form-label">试用期（月）：</div>
+                            </td>
+                            <td>
+                                <div class="form-group">
+                                    <div class="form-item">
+                                        <div class="z-comp-input" name="createReqVO$syq">
+                                            <input type="number" value="${formEntity.syq!}">
+                                        </div>
 
-                <tr>
-                    <td class="th">
-                        <div class="form-label">转正基本工资（元）：</div>
-                    </td>
-                    <td>
-                        <div class="form-group">
-                            <div class="form-item">
-                                <div class="z-comp-input" name="createReqVO$zzjbyx">
-                                    <input type="text" value="${formEntity.zzjbyx!}">
+                                    </div>
                                 </div>
+                            </td>
+                        </tr>
 
-                            </div>
-                        </div>
-                    </td>
+                        <tr>
+                            <td class="th">
+                                <div class="form-label">拟定劳务期（年）：</div>
+                            </td>
+                            <td>
+                                <div class="form-group">
+                                    <div class="form-item">
+                                        <div class="z-comp-input" name="createReqVO$lwq">
+                                            <input type="number" value="${formEntity.lwq!}">
+                                        </div>
 
-                    <td class="th">
-                        <div class="form-label">转正绩效工资（元）：</div>
-                    </td>
-                    <td>
-                        <div class="form-group">
-                            <div class="form-item">
-                                <div class="z-comp-input" name="createReqVO$zzjx">
-                                    <input type="text" value="${formEntity.zzjx!}">
+                                    </div>
                                 </div>
+                            </td>
 
-                            </div>
-                        </div>
-                    </td>
-                </tr>
+                            <td  class="th">
 
+                            </td>
+                            <td>
+                            </td>
+                        </tr>
+                    </table>
+                </div>
+            </div>
 
-                <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$bdrq">
-                                    <input type="text" value="${(formEntity.bdrq?date)!}">
-                                </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>
 
-                    </td>
 
-                    <td class="th">
-                        <div class="form-label">试用期（月）：</div>
-                    </td>
-                    <td>
-                        <div class="form-group">
-                            <div class="form-item">
-                                <div class="z-comp-input" name="createReqVO$syq">
-                                    <input type="number" value="${formEntity.syq!}">
-                                </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-input" name="createReqVO$lwq">
-                                    <input type="number" value="${formEntity.lwq!}">
-                                </div>
 
-                            </div>
-                        </div>
-                    </td>
 
-                    <td  class="th">
 
-                    </td>
-                    <td>
-                    </td>
-                </tr>
-            </table>
-        </div>
     </div>
     <script language="javascript">
         ;

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

@@ -5,142 +5,170 @@ styles=[ '/flow/css/formCommon.css' ]>
             <input type="text" value="${formEntity.instanceId!}" name="createReqVO$instanceId">
             <input type="text" value="${formEntity.id!}" name="createReqVO$id">
         </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="form-item">
-                                <div class="z-comp-input z-readonly" name="createReqVO$nickname">
-                                    <label>
-                                        <input type="text" value="${formEntity.nickname!}">
-                                    </label>
-                                </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$dgsj">
-                                    <input type="text" value="${(formEntity.dgsj?date)!}">
+
+        <ul class="ow-tab-nav oa_tabBox">
+            <li z-tabindex="0" class="ow-tab-item on" data-name="jbxx">基础信息</li>
+            <#if WORKFLOW.OPINION! !="">
+                <li z-tabindex="1" class="ow-tab-item" data-name="yj">审批意见</li>
+            </#if>
+        </ul>
+
+
+
+        <div class="ow-tab-scroll">
+            <div class="ow-tab-content on" name="jbxx">
+                <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="form-item">
+                                        <div class="z-comp-input z-readonly" name="createReqVO$nickname">
+                                            <label>
+                                                <input type="text" value="${formEntity.nickname!}">
+                                            </label>
+                                        </div>
+                                    </div>
                                 </div>
-                            </div>
-                        </div>
-                    </td>
-
-                </tr>
-
-
-                <tr>
-                    <td class="th">
-                        <div class="form-label">申请部门：</div>
-                    </td>
-                    <td>
-                        <div class="form-group">
-                            <div class="z-comp-selecttree z-readonly" name="deptName">
-                                <input type="hidden" name="createReqVO$deptName" value="${formEntity.deptName!}">
-                                <input type="hidden" name="createReqVO$deptId" value="${formEntity.deptId!}">
-                                <div class="z-inputselect-bar">
-                                    <span>${formEntity.deptName!}</span><i></i>
+                            </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$dgsj">
+                                            <input type="text" value="${(formEntity.dgsj?date)!}">
+                                        </div>
+                                    </div>
                                 </div>
-                            </div>
-                        </div>
-                    </td>
-
-
-                    <td class="th">
-                        <div class="form-label">调任部门：</div>
-                    </td>
-                    <td>
-                        <div class="form-group">
-                            <div class="z-comp-selecttree" name="deptTransferName">
-                                <input type="hidden" name="createReqVO$deptTransferName" value="${formEntity.deptTransferName!}">
-                                <input type="hidden" name="createReqVO$deptTransferId" value="${formEntity.deptTransferId!}">
-                                <div class="z-inputselect-bar">
-                                    <span>${formEntity.deptTransferName!}</span><i></i>
+                            </td>
+
+                        </tr>
+
+
+                        <tr>
+                            <td class="th">
+                                <div class="form-label">申请部门：</div>
+                            </td>
+                            <td>
+                                <div class="form-group">
+                                    <div class="z-comp-selecttree z-readonly" name="deptName">
+                                        <input type="hidden" name="createReqVO$deptName" value="${formEntity.deptName!}">
+                                        <input type="hidden" name="createReqVO$deptId" value="${formEntity.deptId!}">
+                                        <div class="z-inputselect-bar">
+                                            <span>${formEntity.deptName!}</span><i></i>
+                                        </div>
+                                    </div>
                                 </div>
-                            </div>
-                        </div>
-                    </td>
+                            </td>
+
+
+                            <td class="th">
+                                <div class="form-label">调任部门：</div>
+                            </td>
+                            <td>
+                                <div class="form-group">
+                                    <div class="z-comp-selecttree" name="deptTransferName">
+                                        <input type="hidden" name="createReqVO$deptTransferName" value="${formEntity.deptTransferName!}">
+                                        <input type="hidden" name="createReqVO$deptTransferId" value="${formEntity.deptTransferId!}">
+                                        <div class="z-inputselect-bar">
+                                            <span>${formEntity.deptTransferName!}</span><i></i>
+                                        </div>
+                                    </div>
+                                </div>
+                            </td>
 
 
-                </tr>
+                        </tr>
 
-                <tr>
+                        <tr>
 
-                    <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$post"
-                                     data='${post_type!}' value="${formEntity.post!}">
-                                    <div class="z-inputselect-bar">
-                                        <span></span><i></i>
+                            <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$post"
+                                             data='${post_type!}' value="${formEntity.post!}">
+                                            <div class="z-inputselect-bar">
+                                                <span></span><i></i>
+                                            </div>
+                                        </div>
                                     </div>
                                 </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$transferPost"
-                                     data='${post_type!}' value="${formEntity.transferPost!}">
-                                    <div class="z-inputselect-bar">
-                                        <span></span><i></i>
+                            </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$transferPost"
+                                             data='${post_type!}' value="${formEntity.transferPost!}">
+                                            <div class="z-inputselect-bar">
+                                                <span></span><i></i>
+                                            </div>
+                                        </div>
                                     </div>
                                 </div>
-                            </div>
-                        </div>
-                    </td>
-                </tr>
-
-
-                <tr>
-                    <td class="th">
-                        <div class="form-label">申请理由：</div>
-                    </td>
-                    <td colspan="3">
-                        <div class="form-group">
-                            <div class="form-item">
-                                <div class="z-comp-textarea" name="createReqVO$sqly">
-                                    <label>
-                                        <textarea>${formEntity.sqly!}</textarea>
-                                    </label>
+                            </td>
+                        </tr>
+
+
+                        <tr>
+                            <td class="th">
+                                <div class="form-label">申请理由：</div>
+                            </td>
+                            <td colspan="3">
+                                <div class="form-group">
+                                    <div class="form-item">
+                                        <div class="z-comp-textarea" name="createReqVO$sqly">
+                                            <label>
+                                                <textarea>${formEntity.sqly!}</textarea>
+                                            </label>
+                                        </div>
+                                    </div>
                                 </div>
-                            </div>
-                        </div>
-                    </td>
-                </tr>
+                            </td>
+                        </tr>
 
 
-            </table>
+                    </table>
+                </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">
         ;

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

@@ -8,74 +8,97 @@ styles=[ '/flow/css/formCommon.css' ]>
             <input type="text" value='${dictJson1!}' id="dictJson1">
             <input type="text" value='${dictJson2!}' id="dictJson2">
         </div>
-        <div class="form-title" style="margin-top: 0px;">
-            <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="form-item">
-                                <div class="z-comp-input z-readonly" name="createReqVO$userNickname">
-                                    <input type="text" value="${formEntity.userNickname!}">
+        <ul class="ow-tab-nav oa_tabBox">
+            <li z-tabindex="0" class="ow-tab-item on" data-name="jbxx">基础信息</li>
+            <#if WORKFLOW.OPINION! !="">
+                <li z-tabindex="1" class="ow-tab-item" data-name="yj">审批意见</li>
+            </#if>
+        </ul>
+
+        <div class="ow-tab-scroll">
+            <div class="ow-tab-content on" name="jbxx">
+                <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="form-item">
+                                        <div class="z-comp-input z-readonly" name="createReqVO$userNickname">
+                                            <input type="text" value="${formEntity.userNickname!}">
+                                        </div>
+                                    </div>
                                 </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-input z-readonly" name="createReqVO$deptName">
-                                    <input type="text" value="${formEntity.deptName!}">
+                            </td>
+                            <td class="th">
+                                <div class="form-label">所在部门：</div>
+                            </td>
+                            <td>
+                                <div class="form-group">
+                                    <div class="form-item">
+                                        <div class="z-comp-input z-readonly" name="createReqVO$deptName">
+                                            <input type="text" value="${formEntity.deptName!}">
+                                        </div>
+                                    </div>
                                 </div>
-                            </div>
+                            </td>
+                        </tr>
+                    </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="addData">
+                            <img src="/imgs/addIcon.png" alt="">
+                            <span>新增</span>
                         </div>
-                    </td>
-                </tr>
-            </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="addData">
-                    <img src="/imgs/addIcon.png" alt="">
-                    <span>新增</span>
+                    </div>
+                </div>
+                <div class="qjsjxx-box">
+                    <table class="form-table-info">
+                        <thead>
+                        <tr>
+                            <td style="width: 2%;"></td>
+                            <td style="width: 12%;">岗位</td>
+                            <td style="width: 8%;">需求人数</td>
+                            <td style="width: 8%;">已招人数</td>
+                            <td style="width: 15%;">任职要求</td>
+                            <td style="width: 15%;">岗位职责</td>
+                            <td style="width: 15%;">落实情况</td>
+                            <td style="width: 15%;">所属类别</td>
+                            <td style="width: 10%;">操作</td>
+                        </tr>
+                        </thead>
+                        <tbody class="tbody tbodyQjsq"></tbody>
+                    </table>
                 </div>
             </div>
         </div>
-        <div class="qjsjxx-box">
-            <table class="form-table-info">
-                <thead>
-                <tr>
-                    <td style="width: 2%;"></td>
-                    <td style="width: 12%;">岗位</td>
-                    <td style="width: 8%;">需求人数</td>
-                    <td style="width: 8%;">已招人数</td>
-                    <td style="width: 15%;">任职要求</td>
-                    <td style="width: 15%;">岗位职责</td>
-                    <td style="width: 15%;">落实情况</td>
-                    <td style="width: 15%;">所属类别</td>
-                    <td style="width: 10%;">操作</td>
-                </tr>
-                </thead>
-                <tbody class="tbody tbodyQjsq"></tbody>
-            </table>
-        </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>
 <#--    <script language="javascript" src="/timeSelector/TimeSelector.js"></script>-->
     <script language="javascript">

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

@@ -92,8 +92,8 @@
     }
 
 
-    function detailWrite(i){
-       $ ("#delBtn_" + i).css("display", "block");
+    function detailWrite(i) {
+        $("#delBtn_" + i).css("display", "block");
         //设置只读属性
         $("[name='RecruitDetailDO\\[" + i + "\\]\\$post']").removeClass("z-readonly");
         $("[name='RecruitDetailDO\\[" + i + "\\]\\$type']").removeClass("z-readonly");
@@ -174,14 +174,14 @@
             + '<td>'/*需求人数*/
             + '<div class="form-item">'
             + '<div class="z-comp-input" name="RecruitDetailDO[' + index + ']$requireNum">'
-            + '<input type="number" value="">'
+            + '<input type="number" value="' + isTimes[index].requireNum + '">'
             + '</div>'
             + '</div>'
             + '</td>'
             + '<td>'/*已招人数*/
             + '<div class="form-item">'
             + '<div class="z-comp-input" name="RecruitDetailDO[' + index + ']$recruitNum">'
-            + '<input type="number" value="">'
+            + '<input type="number" value="' + isTimes[index].recruitNum + '">'
             + '</div>'
             + '</div>'
             + '</td>'
@@ -229,9 +229,14 @@
         trFragment.appendChild(trDom);
         $(".tbody").append(trFragment)
         z.ui.select("[name='RecruitDetailDO[" + index + "]$post']").init();
-        z.ui.select("[name='RecruitDetailDO[" + index + "]$post']").setValue(isTimes[index].post);
+        z.ui.select("[name='RecruitDetailDO[" + index + "]$post']").setValue(isTimes[index].post + "");
         z.ui.select("[name='RecruitDetailDO[" + index + "]$type']").init();
-        z.ui.select("[name='RecruitDetailDO[" + index + "]$type']").setValue(isTimes[index].type);
+        z.ui.select("[name='RecruitDetailDO[" + index + "]$type']").setValue(isTimes[index].type + "");
+
+
+        z.ui.textarea("[name='RecruitDetailDO[" + index + "]$jobRequest']").setValue(isTimes[index].jobRequest);
+        z.ui.textarea("[name='RecruitDetailDO[" + index + "]$postDuty']").setValue(isTimes[index].postDuty);
+        z.ui.textarea("[name='RecruitDetailDO[" + index + "]$remark']").setValue(isTimes[index].remark);
 
 
         $("#editBtn_" + index).click(function () {

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

@@ -7,6 +7,9 @@ styles=[ '/flow/css/formCommon.css', '/OwCommon/OwCommon.css','/timeSelector/Tim
             <li z-tabindex="1" class="ow-tab-item" data-name="kp">指导人考评表</li>
             <li z-tabindex="2" class="ow-tab-item" data-name="mt">新员工试用(见习)期面谈表</li>
             <li z-tabindex="3" class="ow-tab-item" data-name="kh">新员工试用(见习)期考核表</li>
+            <#if WORKFLOW.OPINION! !="">
+                <li z-tabindex="4" class="ow-tab-item" data-name="yj">审批意见</li>
+            </#if>
         </ul>
 
         <div class="ow-tab-scroll">
@@ -852,6 +855,24 @@ styles=[ '/flow/css/formCommon.css', '/OwCommon/OwCommon.css','/timeSelector/Tim
                     </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>
 

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

@@ -5,6 +5,9 @@ styles=[ '/flow/css/formCommon.css', '/OwCommon/OwCommon.css','/timeSelector/Tim
         <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">
@@ -693,6 +696,24 @@ styles=[ '/flow/css/formCommon.css', '/OwCommon/OwCommon.css','/timeSelector/Tim
 
 
             </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>
 

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

@@ -6,576 +6,599 @@ styles=[ '/flow/css/formCommon.css' ]>
             <input type="text" value="${formEntity.id!}" name="createReqVO$id">
             <input type="text" value="${formEntity.userId!}" name="createReqVO$userId">
         </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>
+        <ul class="ow-tab-nav oa_tabBox">
+            <li z-tabindex="0" class="ow-tab-item on" data-name="jbxx">基础信息</li>
+            <#if WORKFLOW.OPINION! !="">
+                <li z-tabindex="1" class="ow-tab-item" data-name="yj">审批意见</li>
+            </#if>
+        </ul>
+
+        <div class="ow-tab-scroll">
+            <div class="ow-tab-content on" name="jbxx">
+                <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="z-form-control">
+                                    <div class="z-comp-selectsearch" name="createReqVO$nickname" value="${formEntity.nickname!}" data='${resign!}'>
+                                        <div class="z-inputselect-bar">
+                                            <span>${formEntity.nickname!}</span><i></i>
+                                        </div>
+                                    </div>
 
-                    <td>
-                        <div class="z-form-control">
-                            <div class="z-comp-selectsearch" name="createReqVO$nickname" value="${formEntity.nickname!}" data='${resign!}'>
-                                <div class="z-inputselect-bar">
-                                    <span>${formEntity.nickname!}</span><i></i>
                                 </div>
-                            </div>
-
-                        </div>
-                    </td>
+                            </td>
 
 
-                    <td class="th">
-                        <div class="form-label">身份证号：</div>
-                    </td>
-                    <td>
-                        <div class="form-group">
-                            <div class="form-item">
-                                <div class="z-comp-input" name="createReqVO$cardid">
-                                    <input type="text" value="${formEntity.cardid!}">
+                            <td class="th">
+                                <div class="form-label">身份证号：</div>
+                            </td>
+                            <td>
+                                <div class="form-group">
+                                    <div class="form-item">
+                                        <div class="z-comp-input" name="createReqVO$cardid">
+                                            <input type="text" value="${formEntity.cardid!}">
+                                        </div>
+                                    </div>
                                 </div>
-                            </div>
-                        </div>
-                    </td>
+                            </td>
 
 
-                    <td class="th">
-                        <div class="form-label">手机：</div>
-                    </td>
-                    <td>
-                        <div class="form-group">
-                            <div class="form-item">
-                                <div class="z-comp-input" name="createReqVO$mobilePhone">
-                                    <input type="text" value="${formEntity.mobilePhone!}">
+                            <td class="th">
+                                <div class="form-label">手机：</div>
+                            </td>
+                            <td>
+                                <div class="form-group">
+                                    <div class="form-item">
+                                        <div class="z-comp-input" name="createReqVO$mobilePhone">
+                                            <input type="text" value="${formEntity.mobilePhone!}">
+                                        </div>
+                                    </div>
                                 </div>
-                            </div>
-                        </div>
-                    </td>
+                            </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-select" name="createReqVO$sex" data='${sex_type!}'
-                                     value="${formEntity.sex!}">
-                                    <div class="z-inputselect-bar">
-                                        <span></span><i></i>
+                            <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$sex" data='${sex_type!}'
+                                             value="${formEntity.sex!}">
+                                            <div class="z-inputselect-bar">
+                                                <span></span><i></i>
+                                            </div>
+                                        </div>
                                     </div>
                                 </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$nation"
-                                     data='${nation_type!}' value="${formEntity.nation!}">
-                                    <div class="z-inputselect-bar">
-                                        <span></span><i></i>
+                            </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$nation"
+                                             data='${nation_type!}' value="${formEntity.nation!}">
+                                            <div class="z-inputselect-bar">
+                                                <span></span><i></i>
+                                            </div>
+                                        </div>
                                     </div>
                                 </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$birthday">
-                                    <input type="text" value="${(formEntity.birthday?date)!}">
-                                </div>
-                            </div>
-                        </div>
-                    </td>
-                </tr>
+                            </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$birthday">
+                                            <input type="text" value="${(formEntity.birthday?date)!}">
+                                        </div>
+                                    </div>
+                                </div>
+                            </td>
+                        </tr>
 
-                <tr>
+                        <tr>
 
 
-                    <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$hyzk"
-                                     data='${hy_type!}' value="${formEntity.hyzk!}">
-                                    <div class="z-inputselect-bar">
-                                        <span></span><i></i>
+                            <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$hyzk"
+                                             data='${hy_type!}' value="${formEntity.hyzk!}">
+                                            <div class="z-inputselect-bar">
+                                                <span></span><i></i>
+                                            </div>
+                                        </div>
                                     </div>
                                 </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$hkxz"
-                                     data='${hk_type!}' value="${formEntity.hkxz!}">
-                                    <div class="z-inputselect-bar">
-                                        <span></span><i></i>
+                            </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$hkxz"
+                                             data='${hk_type!}' value="${formEntity.hkxz!}">
+                                            <div class="z-inputselect-bar">
+                                                <span></span><i></i>
+                                            </div>
+                                        </div>
                                     </div>
                                 </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$zzmm"
-                                     data='${polity_type!}' value="${formEntity.zzmm!}">
-                                    <div class="z-inputselect-bar">
-                                        <span></span><i></i>
+                            </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$zzmm"
+                                             data='${polity_type!}' value="${formEntity.zzmm!}">
+                                            <div class="z-inputselect-bar">
+                                                <span></span><i></i>
+                                            </div>
+                                        </div>
                                     </div>
                                 </div>
-                            </div>
-                        </div>
-                    </td>
+                            </td>
 
-                </tr>
+                        </tr>
 
 
 
-                <tr>
+                        <tr>
 
-                    <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$drzw"
-                                     data='${post_type!}' value="${formEntity.drzw!}">
-                                    <div class="z-inputselect-bar">
-                                        <span></span><i></i>
+                            <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$drzw"
+                                             data='${post_type!}' value="${formEntity.drzw!}">
+                                            <div class="z-inputselect-bar">
+                                                <span></span><i></i>
+                                            </div>
+                                        </div>
                                     </div>
                                 </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$state" data='${staff_state_type!}'
-                                     value="${formEntity.state!}">
-                                    <div class="z-inputselect-bar">
-                                        <span></span><i></i>
+                            </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$state" data='${staff_state_type!}'
+                                             value="${formEntity.state!}">
+                                            <div class="z-inputselect-bar">
+                                                <span></span><i></i>
+                                            </div>
+                                        </div>
                                     </div>
                                 </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$sfytd"
-                                     data='${td_type!}' value="${formEntity.sfytd!}">
-                                    <div class="z-inputselect-bar">
-                                        <span></span><i></i>
+                            </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$sfytd"
+                                             data='${td_type!}' value="${formEntity.sfytd!}">
+                                            <div class="z-inputselect-bar">
+                                                <span></span><i></i>
+                                            </div>
+                                        </div>
                                     </div>
                                 </div>
-                            </div>
-                        </div>
-                    </td>
-                </tr>
+                            </td>
+                        </tr>
 
 
-                <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$cjgzsj">
-                                    <input type="text" value="${(formEntity.cjgzsj?date)!}">
+                            <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$cjgzsj">
+                                            <input type="text" value="${(formEntity.cjgzsj?date)!}">
+                                        </div>
+                                    </div>
                                 </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$htqdsj">
-                                    <input type="text" value="${(formEntity.htqdsj?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$htdqs">
-                                    <input type="text" value="${(formEntity.htdqs?date)!}">
-                                </div>
-                            </div>
-                        </div>
-                    </td>
+                            </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$htqdsj">
+                                            <input type="text" value="${(formEntity.htqdsj?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$htdqs">
+                                            <input type="text" value="${(formEntity.htdqs?date)!}">
+                                        </div>
+                                    </div>
+                                </div>
+                            </td>
 
 
-                </tr>
+                        </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$rgssj">
-                                    <input type="text" value="${(formEntity.rgssj?date)!}">
+                        <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$rgssj">
+                                            <input type="text" value="${(formEntity.rgssj?date)!}">
+                                        </div>
+                                    </div>
                                 </div>
-                            </div>
-                        </div>
-                    </td>
+                            </td>
 
 
-                    <td class="th">
-                        <div class="form-label">初始司龄（年）：</div>
-                    </td>
-                    <td>
-                        <div class="form-group">
-                            <div class="form-item">
-                                <div class="z-comp-input" name="createReqVO$cssl">
-                                    <input type="number" value="${formEntity.cssl!}">
+                            <td class="th">
+                                <div class="form-label">初始司龄（年）：</div>
+                            </td>
+                            <td>
+                                <div class="form-group">
+                                    <div class="form-item">
+                                        <div class="z-comp-input" name="createReqVO$cssl">
+                                            <input type="number" value="${formEntity.cssl!}">
+                                        </div>
+                                    </div>
                                 </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-input" name="createReqVO$nj">
-                                    <input type="number" value="${formEntity.nj!}">
-                                </div>
-                            </div>
-                        </div>
-                    </td>
-                </tr>
+                            </td>
+
+                            <td class="th">
+                                <div class="form-label">年假（天）：</div>
+                            </td>
+                            <td>
+                                <div class="form-group">
+                                    <div class="form-item">
+                                        <div class="z-comp-input" name="createReqVO$nj">
+                                            <input type="number" value="${formEntity.nj!}">
+                                        </div>
+                                    </div>
+                                </div>
+                            </td>
+                        </tr>
 
 
-                <tr>
+                        <tr>
 
-                    <td class="th">
-                        <div class="form-label">户口所在地：</div>
-                    </td>
-                    <td>
-                        <div class="form-group">
-                            <div class="form-item">
-                                <div class="z-comp-input" name="createReqVO$hkszd">
-                                    <input type="text" value="${formEntity.hkszd!}">
+                            <td class="th">
+                                <div class="form-label">户口所在地：</div>
+                            </td>
+                            <td>
+                                <div class="form-group">
+                                    <div class="form-item">
+                                        <div class="z-comp-input" name="createReqVO$hkszd">
+                                            <input type="text" value="${formEntity.hkszd!}">
+                                        </div>
+                                    </div>
                                 </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-input" name="createReqVO$xjzdz">
-                                    <input type="text" value="${formEntity.xjzdz!}">
-                                </div>
-                            </div>
-                        </div>
-                    </td>
+                            </td>
+
+                            <td class="th">
+                                <div class="form-label">现居住地址：</div>
+                            </td>
+                            <td>
+                                <div class="form-group">
+                                    <div class="form-item">
+                                        <div class="z-comp-input" name="createReqVO$xjzdz">
+                                            <input type="text" value="${formEntity.xjzdz!}">
+                                        </div>
+                                    </div>
+                                </div>
+                            </td>
 
 
-                </tr>
+                        </tr>
 
-                <tr>
+                        <tr>
 
-                    <td class="th">
-                        <div class="form-label">签订公司：</div>
-                    </td>
-                    <td>
-                        <div class="form-group">
-                            <div class="z-comp-selecttree" name="qdgs">
-                                <input type="hidden" name="createReqVO$qdgsid" value="${formEntity.qdgsid!}">
-                                <input type="hidden" name="createReqVO$qdgs" value="${formEntity.qdgs!}">
-                                <div class="z-inputselect-bar">
-                                    <span> ${formEntity.qdgs!} </span><i></i>
+                            <td class="th">
+                                <div class="form-label">签订公司：</div>
+                            </td>
+                            <td>
+                                <div class="form-group">
+                                    <div class="z-comp-selecttree" name="qdgs">
+                                        <input type="hidden" name="createReqVO$qdgsid" value="${formEntity.qdgsid!}">
+                                        <input type="hidden" name="createReqVO$qdgs" value="${formEntity.qdgs!}">
+                                        <div class="z-inputselect-bar">
+                                            <span> ${formEntity.qdgs!} </span><i></i>
+                                        </div>
+                                    </div>
                                 </div>
-                            </div>
-                        </div>
-                    </td>
+                            </td>
 
 
-                    <td class="th">
-                        <div class="form-label">所属部门：</div>
-                    </td>
-                    <td>
-                        <div class="form-group">
-                            <div class="z-comp-selecttree" name="deptName">
-                                <input type="hidden" name="createReqVO$deptName" value="${formEntity.deptName!}">
-                                <input type="hidden" name="createReqVO$deptId" value="${formEntity.deptId!}">
-                                <div class="z-inputselect-bar">
-                                    <span> ${formEntity.deptName!}</span><i></i>
+                            <td class="th">
+                                <div class="form-label">所属部门：</div>
+                            </td>
+                            <td>
+                                <div class="form-group">
+                                    <div class="z-comp-selecttree" name="deptName">
+                                        <input type="hidden" name="createReqVO$deptName" value="${formEntity.deptName!}">
+                                        <input type="hidden" name="createReqVO$deptId" value="${formEntity.deptId!}">
+                                        <div class="z-inputselect-bar">
+                                            <span> ${formEntity.deptName!}</span><i></i>
+                                        </div>
+                                    </div>
                                 </div>
-                            </div>
-                        </div>
-                    </td>
+                            </td>
 
-                </tr>
+                        </tr>
 
 
-                <tr>
-                    <td class="th">
-                        <div class="form-label">指导人：</div>
-                    </td>
-                    <td>
-                        <div class="form-group ">
-                            <div class="z-comp-selecttree" name="zdr">
-                                <input type="hidden" name="createReqVO$zdr" value="${formEntity.zdr!}">
-                                <input type="hidden" name="createReqVO$zdrmc" value="${formEntity.zdrmc!}">
-                                <div class="z-inputselect-bar">
-                                    <span>${formEntity.zdrmc!}</span><i></i>
+                        <tr>
+                            <td class="th">
+                                <div class="form-label">指导人：</div>
+                            </td>
+                            <td>
+                                <div class="form-group ">
+                                    <div class="z-comp-selecttree" name="zdr">
+                                        <input type="hidden" name="createReqVO$zdr" value="${formEntity.zdr!}">
+                                        <input type="hidden" name="createReqVO$zdrmc" value="${formEntity.zdrmc!}">
+                                        <div class="z-inputselect-bar">
+                                            <span>${formEntity.zdrmc!}</span><i></i>
+                                        </div>
+                                    </div>
                                 </div>
-                            </div>
-                        </div>
-                    </td>
+                            </td>
 
 
 
-                    <td class="th">
-                        <div class="form-label">试用期（月）：</div>
-                    </td>
-                    <td>
-                        <div class="form-group">
-                            <div class="form-item">
-                                <div class="z-comp-input" name="createReqVO$syq">
-                                    <input type="number" value="${formEntity.syq!}">
+                            <td class="th">
+                                <div class="form-label">试用期（月）：</div>
+                            </td>
+                            <td>
+                                <div class="form-group">
+                                    <div class="form-item">
+                                        <div class="z-comp-input" name="createReqVO$syq">
+                                            <input type="number" value="${formEntity.syq!}">
+                                        </div>
+                                    </div>
                                 </div>
-                            </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="th">
-                        <div class="form-label">开户银行：</div>
-                    </td>
-                    <td>
-                        <div class="form-group">
-                            <div class="form-item">
-                                <div class="z-comp-input" name="createReqVO$khyh">
-                                    <input type="text" value="${formEntity.khyh!}">
-                                </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-input" name="createReqVO$yhzh">
-                                    <input type="text" value="${formEntity.yhzh!}">
-                                </div>
-                            </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="th">
-                        <div class="form-label">毕业院校：</div>
-                    </td>
-                    <td>
-                        <div class="form-group">
-                            <div class="form-item">
-                                <div class="z-comp-input" name="createReqVO$byxx">
-                                    <input type="text" value="${formEntity.byxx!}">
+                            </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="th">
+                                <div class="form-label">开户银行：</div>
+                            </td>
+                            <td>
+                                <div class="form-group">
+                                    <div class="form-item">
+                                        <div class="z-comp-input" name="createReqVO$khyh">
+                                            <input type="text" value="${formEntity.khyh!}">
+                                        </div>
+                                    </div>
                                 </div>
-                            </div>
-                        </div>
-                    </td>
+                            </td>
+                            <td class="th">
+                                <div class="form-label">银行卡号：</div>
+                            </td>
+                            <td>
+                                <div class="form-group">
+                                    <div class="form-item">
+                                        <div class="z-comp-input" name="createReqVO$yhzh">
+                                            <input type="text" value="${formEntity.yhzh!}">
+                                        </div>
+                                    </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="th">
+                                <div class="form-label">毕业院校：</div>
+                            </td>
+                            <td>
+                                <div class="form-group">
+                                    <div class="form-item">
+                                        <div class="z-comp-input" name="createReqVO$byxx">
+                                            <input type="text" value="${formEntity.byxx!}">
+                                        </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$bysj">
-                                    <input type="text" value="${(formEntity.bysj?date)!}">
+                            <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$bysj">
+                                            <input type="text" value="${(formEntity.bysj?date)!}">
+                                        </div>
+                                    </div>
                                 </div>
-                            </div>
-                        </div>
-                    </td>
+                            </td>
 
-                </tr>
+                        </tr>
 
-                <tr>
+                        <tr>
 
-                    <td class="th">
-                        <div class="form-label">专业：</div>
-                    </td>
-                    <td>
-                        <div class="form-group">
-                            <div class="form-item">
-                                <div class="z-comp-input" name="createReqVO$major">
-                                    <input type="text" value="${formEntity.major!}">
+                            <td class="th">
+                                <div class="form-label">专业：</div>
+                            </td>
+                            <td>
+                                <div class="form-group">
+                                    <div class="form-item">
+                                        <div class="z-comp-input" name="createReqVO$major">
+                                            <input type="text" value="${formEntity.major!}">
+                                        </div>
+                                    </div>
                                 </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$zgxl"
-                                     data='${xl_type!}' value="${formEntity.zgxl!}">
-                                    <div class="z-inputselect-bar">
-                                        <span></span><i></i>
+                            </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$zgxl"
+                                             data='${xl_type!}' value="${formEntity.zgxl!}">
+                                            <div class="z-inputselect-bar">
+                                                <span></span><i></i>
+                                            </div>
+                                        </div>
                                     </div>
                                 </div>
-                            </div>
-                        </div>
-                    </td>
-
-                </tr>
-
-            </table>
-        </div>
-        <div class="form-title">
-            <div class="form-icon">
-                <img src="/imgs/titleIcon.png" alt="">
-                <span>紧急联系人信息</span>
+                            </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="th">
+                                <div class="form-label">紧急联系人姓名：</div>
+                            </td>
+                            <td>
+                                <div class="form-group">
+                                    <div class="form-item">
+                                        <div class="z-comp-input" name="createReqVO$jjlxrxm">
+                                            <input type="text" value="${formEntity.jjlxrxm!}">
+                                        </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-input" name="createReqVO$jjlxrhm">
+                                            <input type="text" value="${formEntity.jjlxrhm!}">
+                                        </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$jjlxrgx"
+                                             data='${contact_type!}' value="${formEntity.jjlxrgx!}">
+                                            <div class="z-inputselect-bar">
+                                                <span></span><i></i>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </td>
+                        </tr>
+                    </table>
+                </div>
             </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="form-item">
-                                <div class="z-comp-input" name="createReqVO$jjlxrxm">
-                                    <input type="text" value="${formEntity.jjlxrxm!}">
-                                </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>
-                    </td>
-                    <td class="th">
-                        <div class="form-label">紧急联系人电话：</div>
-                    </td>
-                    <td>
-                        <div class="form-group">
-                            <div class="form-item">
-                                <div class="z-comp-input" name="createReqVO$jjlxrhm">
-                                    <input type="text" value="${formEntity.jjlxrhm!}">
-                                </div>
-                            </div>
+                        <div class="form-btn">
                         </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$jjlxrgx"
-                                     data='${contact_type!}' value="${formEntity.jjlxrgx!}">
-                                    <div class="z-inputselect-bar">
-                                        <span></span><i></i>
-                                    </div>
-                                </div>
-                            </div>
+                    </div>
+                    <div class="qjsjxx-box">
+                        <div class="z-form-wrap" name="opinionsDiv">
+                            <div class="z-form-row"> ${WORKFLOW.OPINION!} </div>
                         </div>
-                    </td>
-                </tr>
-            </table>
+                    </div>
+                </div>
+            </#if>
         </div>
+
+
+
     </div>
     <script language="javascript">
         ;