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

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

@@ -11,8 +11,12 @@
         <div class="z-comp-tab" name="tab">
             <ul class="z-tab-bar">
                 <li z-tabindex="0" class="on"><a>基础信息</a></li>
-                <li z-tabindex="1"><a>收件材料</a></li>
-                <li z-tabindex="2" class=""><a>审批意见</a></li>
+                <#if WORKFLOW.MATERIALS! !="">
+                    <li z-tabindex="1"><a>收件材料</a></li>
+                </#if>
+                <#if WORKFLOW.OPINION! !="">
+                    <li z-tabindex="2" class=""><a>审批意见</a></li>
+                </#if>
             </ul>
             <div class="z-tab-scroll">
                 <div class="z-tab-content on">

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

@@ -11,8 +11,12 @@
         <div class="z-comp-tab" name="tab">
             <ul class="z-tab-bar">
                 <li z-tabindex="0" class="on"><a>基础信息</a></li>
-                <li z-tabindex="1"><a>收件材料</a></li>
-                <li z-tabindex="2" class=""><a>审批意见</a></li>
+                <#if WORKFLOW.MATERIALS! !="">
+                    <li z-tabindex="1"><a>收件材料</a></li>
+                </#if>
+                <#if WORKFLOW.OPINION! !="">
+                    <li z-tabindex="2" class=""><a>审批意见</a></li>
+                </#if>
             </ul>
             <div class="z-tab-scroll">
                 <div class="z-tab-content on">
@@ -66,7 +70,8 @@
                                 <div class="z-comp-input z-readonly" name="createReqVO$deptTransferName">
                                     <input type="hidden" value="${formEntity.deptTransferName!}">
                                 </div>
-                                <input type="hidden" name="createReqVO$deptTransferId" value="${formEntity.deptTransferId!}">
+                                <input type="hidden" name="createReqVO$deptTransferId"
+                                       value="${formEntity.deptTransferId!}">
                             </div>
                         </div>
 

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

@@ -12,8 +12,12 @@
         <div class="z-comp-tab" name="tab">
             <ul class="z-tab-bar">
                 <li z-tabindex="0" class="on"><a>基础信息</a></li>
-                <li z-tabindex="1"><a>收件材料</a></li>
-                <li z-tabindex="2" class=""><a>审批意见</a></li>
+                <#if WORKFLOW.MATERIALS! !="">
+                    <li z-tabindex="1"><a>收件材料</a></li>
+                </#if>
+                <#if WORKFLOW.OPINION! !="">
+                    <li z-tabindex="2" class=""><a>审批意见</a></li>
+                </#if>
             </ul>
             <div class="z-tab-scroll">
                 <div class="z-tab-content on">
@@ -45,23 +49,23 @@
                             </div>
                         </div>
 
-                        <div class="qjsjxx-box">
-                            <table class="z-form-table">
-                                <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>
-                                </tr>
-                                </thead>
-                                <tbody class="tbody tbodyQjsq"></tbody>
-                            </table>
-                        </div>
+                        <#--                        <div class="qjsjxx-box">-->
+                        <#--                            <table class="z-form-table">-->
+                        <#--                                <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>-->
+                        <#--                                </tr>-->
+                        <#--                                </thead>-->
+                        <#--                                <tbody class="tbody tbodyQjsq"></tbody>-->
+                        <#--                            </table>-->
+                        <#--                        </div>-->
 
                     </div>
                 </div>

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

@@ -7,6 +7,11 @@
             height: 100%;
         }
 
+        .z-comp-radio {
+            display: inline-block;
+            height: auto;
+            line-height: 28px;
+        }
 
     </style>
     <div class="flowMobile">
@@ -16,8 +21,12 @@
                 <li z-tabindex="1"><a>指导人考评表</a></li>
                 <li z-tabindex="2"><a>新员工试用(见习)期面谈表</a></li>
                 <li z-tabindex="3"><a>新员工试用(见习)期考核表</a></li>
-                <li z-tabindex="4"><a>收件材料</a></li>
-                <li z-tabindex="5" class=""><a>审批意见</a></li>
+                <#if WORKFLOW.MATERIALS! !="">
+                    <li z-tabindex="4"><a>收件材料</a></li>
+                </#if>
+                <#if WORKFLOW.OPINION! !="">
+                    <li z-tabindex="5" class=""><a>审批意见</a></li>
+                </#if>
             </ul>
             <div class="z-tab-scroll">
                 <div class="z-tab-content on">
@@ -133,7 +142,7 @@
                     </div>
                 </div>
 
-                <div class="z-tab-content on">
+                <div class="z-tab-content ">
                     <div class="z-form-wrap" name="createReqVO">
 
 
@@ -158,12 +167,6 @@
                                 </div>
                             </div>
                         </div>
-                        <br>
-                        <br>
-                        <br>
-                        <br>
-                        <br>
-                        <br>
 
 
                         <div class="z-form-row">
@@ -187,12 +190,6 @@
                                 </div>
                             </div>
                         </div>
-                        <br>
-                        <br>
-                        <br>
-                        <br>
-                        <br>
-                        <br>
 
                         <div class="z-form-row">
                             <div class="z-form-label">
@@ -219,73 +216,6 @@
                             </div>
 
                         </div>
-                        <br>
-                        <br>
-                        <br>
-                        <br>
-                        <br>
-                        <br>
-
-                        <div class="z-form-row">
-                            <div class="z-form-label">
-                                在新员工试用期间指导人是否督促新员工在到岗一年以内参加各种培训的评价
-                            </div>
-                            <div class="z-form-control">
-                                <div class="z-comp-radio" name="createReqVO$khdc">
-                                    <div class="z-radio-item <#if (formEntity.khdc!)? contains("1")>checked</#if>"
-                                         value="1"><i></i>经常督促
-                                    </div>
-                                    <div class="z-radio-item <#if (formEntity.khdc!)? contains("2")>checked</#if>"
-                                         value="2"><i></i>偶尔督促
-                                    </div>
-                                    <div class="z-radio-item <#if (formEntity.khdc!)? contains("3")>checked</#if>"
-                                         value="3"><i></i>从未督促
-                                    </div>
-                                </div>
-
-                            </div>
-                        </div>
-                        <br>
-                        <br>
-                        <br>
-                        <br>
-                        <br>
-                        <br>
-
-
-                        <div class="z-form-row">
-                            <div class="z-form-label">
-                                对新员工工作任务的分配
-                            </div>
-                            <div class="z-form-control">
-                                <div class="z-comp-radio" name="createReqVO$khfp">
-                                    <div class="z-radio-item <#if (formEntity.khfp!)? contains("1")>checked</#if>"
-                                         value="1"><i></i>能明确分配合适的工作目标
-                                    </div>
-
-                                    <div class="z-radio-item <#if (formEntity.khfp!)? contains("2")>checked</#if>"
-                                         value="2"><i></i>能分配工作目标，但不详细明确
-                                    </div>
-
-
-                                    <div class="z-radio-item <#if (formEntity.khfp!)? contains("3")>checked</#if>"
-                                         value="3"><i></i>偶尔分配工作任务
-                                    </div>
-
-
-                                    <div class="z-radio-item <#if (formEntity.khfp!)? contains("4")>checked</#if>"
-                                         value="4"><i></i>几乎没有工作任务分配
-                                    </div>
-                                </div>
-
-                            </div>
-                        </div>
-                        <br>
-                        <br>
-                        <br>
-                        <br>
-                        <br>
-                        <br>
 
 
                         <div class="z-form-row">
@@ -309,15 +239,10 @@
                                 </div>
                             </div>
                         </div>
-                        <br>
-                        <br>
-                        <br>
-                        <br>
-                        <br>
-                        <br>
+
 
                         <div class="z-form-row">
-                            <div class="z-form-label ">
+                            <div class="z-form-label">
                                 在新员工试用期间指导人是否督促新员工在到岗一年以内参加各种培训的评价
                             </div>
                             <div class="z-form-control">
@@ -332,14 +257,10 @@
                                          value="3"><i></i>从未督促
                                     </div>
                                 </div>
+
                             </div>
                         </div>
-                        <br>
-                        <br>
-                        <br>
-                        <br>
-                        <br>
-                        <br>
+
 
                         <div class="z-form-row">
                             <div class="z-form-label">
@@ -363,12 +284,7 @@
 
                             </div>
                         </div>
-                        <br>
-                        <br>
-                        <br>
-                        <br>
-                        <br>
-                        <br>
+
 
                         <div class="z-form-row">
                             <div class="z-form-label">
@@ -383,12 +299,7 @@
                                 </div>
                             </div>
                         </div>
-                        <br>
-                        <br>
-                        <br>
-                        <br>
-                        <br>
-                        <br>
+
 
                         <div class="z-form-row">
                             <div class="z-form-label">
@@ -416,7 +327,7 @@
                     </div>
                 </div>
 
-                <div class="z-tab-content on">
+                <div class="z-tab-content ">
                     <div class="z-form-wrap" name="createReqVO">
 
 
@@ -438,12 +349,6 @@
                                 </div>
                             </div>
                         </div>
-                        <br>
-                        <br>
-                        <br>
-                        <br>
-                        <br>
-                        <br>
 
 
                         <div class="z-form-row">
@@ -464,12 +369,7 @@
                                 </div>
                             </div>
                         </div>
-                        <br>
-                        <br>
-                        <br>
-                        <br>
-                        <br>
-                        <br>
+
 
                         <div class="z-form-row">
                             <div class="z-form-label">
@@ -492,12 +392,7 @@
                             </div>
 
                         </div>
-                        <br>
-                        <br>
-                        <br>
-                        <br>
-                        <br>
-                        <br>
+
 
                         <div class="z-form-row">
                             <div class="z-form-label">
@@ -518,12 +413,6 @@
 
                             </div>
                         </div>
-                        <br>
-                        <br>
-                        <br>
-                        <br>
-                        <br>
-                        <br>
 
 
                         <div class="z-form-row">
@@ -547,12 +436,6 @@
                                 </div>
                             </div>
                         </div>
-                        <br>
-                        <br>
-                        <br>
-                        <br>
-                        <br>
-                        <br>
 
 
                         <div class="z-form-row">
@@ -569,12 +452,7 @@
                                 </div>
                             </div>
                         </div>
-                        <br>
-                        <br>
-                        <br>
-                        <br>
-                        <br>
-                        <br>
+
 
                         <div class="z-form-row">
                             <div class="z-form-label ">
@@ -594,12 +472,7 @@
                                 </div>
                             </div>
                         </div>
-                        <br>
-                        <br>
-                        <br>
-                        <br>
-                        <br>
-                        <br>
+
 
                         <div class="z-form-row">
                             <div class="z-form-label">
@@ -614,12 +487,7 @@
 
                             </div>
                         </div>
-                        <br>
-                        <br>
-                        <br>
-                        <br>
-                        <br>
-                        <br>
+
 
                         <div class="z-form-row">
                             <div class="z-form-label">
@@ -636,12 +504,7 @@
                                 </div>
                             </div>
                         </div>
-                        <br>
-                        <br>
-                        <br>
-                        <br>
-                        <br>
-                        <br>
+
 
                         <div class="z-form-row">
                             <div class="z-form-label">
@@ -657,11 +520,7 @@
                                 </div>
                             </div>
                         </div>
-                        <br>
-                        <br>
-                        <br>
-                        <br>
-                        <br>
+
 
                         <div class="z-form-row">
                             <div class="z-form-label">
@@ -677,11 +536,6 @@
                                 </div>
                             </div>
                         </div>
-                        <br>
-                        <br>
-                        <br>
-                        <br>
-                        <br>
 
 
                         <div class="z-form-row">
@@ -708,11 +562,6 @@
                                 </div>
                             </div>
                         </div>
-                        <br>
-                        <br>
-                        <br>
-                        <br>
-                        <br>
 
 
                         <div class="z-form-row">
@@ -740,13 +589,13 @@
                 </div>
 
 
-                <div class="z-tab-content on">
+                <div class="z-tab-content ">
                     <div class="z-form-wrap" name="createReqVO">
 
 
                         <div class="z-form-row">
-                            <div class="z-form-label z-col-70">责任心(10分)：对自身岗位职责与目标负责，勇于承担责任</div>
-                            <div class="z-form-control z-col-30">
+                            <div class="z-form-label">责任心(10分)：对自身岗位职责与目标负责，勇于承担责任</div>
+                            <div class="z-form-control" style="width: 100%">
                                 <div class="z-comp-input" name="createReqVO$zrx">
                                     <input type="number" value="${formEntity.zrx!}">
                                 </div>
@@ -755,8 +604,8 @@
                         <br>
 
                         <div class="z-form-row">
-                            <div class="z-form-label z-col-70">主动性(10分)：积极推进工作，努力寻求资源，不回避困难</div>
-                            <div class="z-form-control z-col-30">
+                            <div class="z-form-label">主动性(10分)：积极推进工作，努力寻求资源，不回避困难</div>
+                            <div class="z-form-control" style="width: 100%">
                                 <div class="z-comp-input" name="createReqVO$zdx">
                                     <input type="number" value="${formEntity.zdx!}">
                                 </div>
@@ -765,10 +614,10 @@
                         <br>
 
                         <div class="z-form-row">
-                            <div class="z-form-label z-col-70">
+                            <div class="z-form-label">
                                 团队意识(10分)：积极关注团队整体目标，不但能与团队成员共同完成工作目标，还能主动协助、配合团队成员完成非本人职责范围内的工作任务
                             </div>
-                            <div class="z-form-control z-col-30">
+                            <div class="z-form-control" style="width: 100%">
                                 <div class="z-comp-input" name="createReqVO$tdys">
                                     <input type="number" value="${formEntity.tdys!}">
                                 </div>
@@ -777,8 +626,8 @@
                         <br>
 
                         <div class="z-form-row">
-                            <div class="z-form-label z-col-70">客户意识(10分)：积极关注客户需求，主动为客户解决问题</div>
-                            <div class="z-form-control z-col-30">
+                            <div class="z-form-label">客户意识(10分)：积极关注客户需求，主动为客户解决问题</div>
+                            <div class="z-form-control" style="width: 100%">
                                 <div class="z-comp-input" name="createReqVO$khys">
                                     <input type="number" value="${formEntity.khys!}">
                                 </div>
@@ -787,10 +636,10 @@
                         <br>
 
                         <div class="z-form-row">
-                            <div class="z-form-label z-col-70">
+                            <div class="z-form-label">
                                 学习领悟(10分)：善于总结、学习，正确理解工作目标，不出现相同错误
                             </div>
-                            <div class="z-form-control z-col-30">
+                            <div class="z-form-control" style="width: 100%">
                                 <div class="z-comp-input" name="createReqVO$xxlw">
                                     <input type="number" value="${formEntity.xxlw!}">
                                 </div>
@@ -799,9 +648,9 @@
                         <br>
 
                         <div class="z-form-row">
-                            <div class="z-form-label z-col-70">适岗程度(10分)：相关知识、经验、能力和技能与岗位的符合程度
+                            <div class="z-form-label">适岗程度(10分)：相关知识、经验、能力和技能与岗位的符合程度
                             </div>
-                            <div class="z-form-control z-col-30">
+                            <div class="z-form-control" style="width: 100%">
                                 <div class="z-comp-input" name="createReqVO$sgcd">
                                     <input type="number" value="${formEntity.sgcd!}">
                                 </div>
@@ -810,10 +659,10 @@
                         <br>
 
                         <div class="z-form-row">
-                            <div class="z-form-label z-col-70">
+                            <div class="z-form-label">
                                 沟通能力(10分)：能主动与客户、同事、领导进行沟通，工作中遇到困难、障碍能主动寻找解决方法，并能及时将问题反馈给上级，不回避和遮掩问题
                             </div>
-                            <div class="z-form-control z-col-30">
+                            <div class="z-form-control" style="width: 100%">
                                 <div class="z-comp-input" name="createReqVO$gtnl">
                                     <input type="number" value="${formEntity.gtnl!}">
                                 </div>
@@ -822,10 +671,10 @@
                         <br>
 
                         <div class="z-form-row">
-                            <div class="z-form-label z-col-70">
+                            <div class="z-form-label">
                                 工作效率(10分)：在规定时间能否完成任务，遇到问题迅速反应
                             </div>
-                            <div class="z-form-control z-col-30">
+                            <div class="z-form-control" style="width: 100%">
                                 <div class="z-comp-input" name="createReqVO$gzxl">
                                     <input type="number" value="${formEntity.gzxl!}">
                                 </div>
@@ -834,10 +683,10 @@
                         <br>
 
                         <div class="z-form-row">
-                            <div class="z-form-label z-col-70">
+                            <div class="z-form-label">
                                 工作质量(10分)：完成的工作是否符合要求、达到预期效果
                             </div>
-                            <div class="z-form-control z-col-30">
+                            <div class="z-form-control" style="width: 100%">
                                 <div class="z-comp-input" name="createReqVO$gzzl">
                                     <input type="number" value="${formEntity.gzzl!}">
                                 </div>
@@ -846,10 +695,10 @@
                         <br>
 
                         <div class="z-form-row">
-                            <div class="z-form-label z-col-70">
+                            <div class="z-form-label">
                                 参加培训状况 A(8-10分)、B(3-8分)、C(0-3分)
                             </div>
-                            <div class="z-form-control z-col-30">
+                            <div class="z-form-control" style="width: 100%">
                                 <div class="z-comp-input" name="createReqVO$pxqk">
                                     <input type="number" value="${formEntity.pxqk!}">
                                 </div>
@@ -858,10 +707,10 @@
                         <br>
 
                         <div class="z-form-row">
-                            <div class="z-form-label z-col-70">
+                            <div class="z-form-label">
                                 总分
                             </div>
-                            <div class="z-form-control z-col-30">
+                            <div class="z-form-control" style="width: 100%">
                                 <div class="z-comp-input" name="createReqVO$zf">
                                     <input type="number" value="${formEntity.zf!}">
                                 </div>
@@ -870,10 +719,10 @@
                         <br>
 
                         <div class="z-form-row">
-                            <div class="z-form-label z-col-70">
+                            <div class="z-form-label">
                                 等级 A(85-100分)、B(30-85分)、C(0-30分)
                             </div>
-                            <div class="z-form-control z-col-30">
+                            <div class="z-form-control" style="width: 100%">
                                 <div class="z-comp-input" name="createReqVO$dj">
                                     <input type="text" value="${formEntity.dj!}">
                                 </div>

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

@@ -7,6 +7,12 @@
             height: 100%;
         }
 
+        .z-comp-radio {
+            display: inline-block;
+            height: auto;
+            line-height: 28px;
+        }
+
 
     </style>
     <div class="flowMobile">
@@ -14,8 +20,13 @@
             <ul class="z-tab-bar">
                 <li z-tabindex="0" class="on"><a>离职申请表</a></li>
                 <li z-tabindex="1"><a>离职员工交接清单</a></li>
-                <li z-tabindex="2"><a>收件材料</a></li>
-                <li z-tabindex="3" class=""><a>审批意见</a></li>
+                <#if WORKFLOW.MATERIALS! !="">
+                    <li z-tabindex="2"><a>收件材料</a></li>
+                </#if>
+
+                <#if WORKFLOW.OPINION! !="">
+                    <li z-tabindex="3" class=""><a>审批意见</a></li>
+                </#if>
             </ul>
             <div class="z-tab-scroll">
                 <div class="z-tab-content on">
@@ -210,10 +221,9 @@
                                 </div>
                             </div>
                         </div>
-
-
                         <br>
                         <br>
+
                         <div style="font-size: 15px;">
                             <div class="form-icon">
                                 <img src="/imgs/titleIcon.png" alt="">
@@ -297,7 +307,6 @@
                             </div>
 
                         </div>
-                        <br>
 
 
                         <div class="z-form-row">
@@ -315,7 +324,6 @@
                                 </div>
                             </div>
                         </div>
-                        <br>
 
 
                         <div class="z-form-row">
@@ -333,7 +341,7 @@
                                 </div>
                             </div>
                         </div>
-                        <br>
+
 
                         <div class="z-form-row">
                             <div class="z-form-label">
@@ -353,15 +361,11 @@
                                 </div>
                             </div>
                         </div>
-                        <br>
+
 
                         <div class="z-form-row">
                             <div class="z-form-label">
-                                社保
-                            </div>
-                            <div class="z-form-label">
-
-                                缴纳至
+                                社保缴纳至
                                 <div class="z-comp-input" name="createReqVO$clfscb7">
                                     <input type="number" value="${formEntity.clfscb7!}">
                                 </div>
@@ -371,13 +375,9 @@
                                 </div>
                                 月初停止缴纳
                             </div>
+
                         </div>
-                        <br>
-                        <br>
-                        <br>
-                        <br>
-                        <br>
-                        <br>
+
 
                         <div class="z-form-row">
                             <div class="z-form-label">
@@ -401,12 +401,7 @@
 
                             </div>
                         </div>
-                        <br>
-                        <br>
-                        <br>
-                        <br>
-                        <br>
-                        <br>
+
 
                         <div class="z-form-row">
                             <div class="z-form-label">
@@ -421,12 +416,7 @@
                                 </div>
                             </div>
                         </div>
-                        <br>
-                        <br>
-                        <br>
-                        <br>
-                        <br>
-                        <br>
+
 
                         <div class="z-form-row">
                             <div class="z-form-label">

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

@@ -11,8 +11,12 @@
         <div class="z-comp-tab" name="tab">
             <ul class="z-tab-bar">
                 <li z-tabindex="0" class="on"><a>基础信息</a></li>
-                <li z-tabindex="1"><a>收件材料</a></li>
-                <li z-tabindex="2" class=""><a>审批意见</a></li>
+                <#if WORKFLOW.MATERIALS! !="">
+                    <li z-tabindex="1"><a>收件材料</a></li>
+                </#if>
+                <#if WORKFLOW.OPINION! !="">
+                    <li z-tabindex="2" class=""><a>审批意见</a></li>
+                </#if>
             </ul>
             <div class="z-tab-scroll">
                 <div class="z-tab-content on">