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

client/src/store/modules/tagsView.ts

@@ -71,7 +71,7 @@ export const useTagsViewStore = defineStore('tagsView', () => {
   // 更新某tag
   const updateVisitedView = (view: RouteLocationNormalizedLoaded): void => {
     for (let v of unref(visitedViews)) {
-      if (v.path === view.path) {
+      if (isSameRouteTag(v, view)) {
         v = Object.assign(v, view)
         break
       }
@@ -87,7 +87,7 @@ export const useTagsViewStore = defineStore('tagsView', () => {
   // 删除tag
   const delVisitedView = (view: RouteLocationNormalizedLoaded): void => {
     for (const [i, v] of unref(visitedViews).entries()) {
-      if (v.path === view.path) {
+      if (isSameRouteTag(v, view)) {
         visitedViews.value.splice(i, 1)
         break
       }
@@ -121,9 +121,8 @@ export const useTagsViewStore = defineStore('tagsView', () => {
     view: RouteLocationNormalizedLoaded,
     type: 'other' | 'left' | 'right'
   ): void => {
-    const index = findIndex<RouteLocationNormalizedLoaded>(
-      unref(visitedViews),
-      (v) => v.path === view.path
+    const index = findIndex<RouteLocationNormalizedLoaded>(unref(visitedViews), (v) =>
+      isSameRouteTag(v, view)
     )
     visitedViews.value = visitedViews.value.filter((v, i) => {
       return (

client/src/views/OaSystem/personnelManagement/zpxqspPage/index.vue

@@ -10,22 +10,22 @@
         <DeptSelect v-model="queryParams.deptId" />
       </div>
 
-      <div class="form" v-if="(postDict?.length ?? 0) !== 0">
+      <div class="form">
         <span class="formSpan">申请岗位：</span>
         <el-select v-model="queryParams.post" placeholder="请选择岗位" clearable>
           <el-option
-            v-for="{ label, value } in postDict"
+            v-for="{ label, value } in getIntDictOptions('post_type')"
             :key="value"
             :label="label"
             :value="value"
           />
         </el-select>
       </div>
-      <div class="form" v-if="(recruitType?.length ?? 0) !== 0">
+      <div class="form">
         <span class="formSpan">所属类别：</span>
         <el-select v-model="queryParams.post" placeholder="请选择类别" clearable>
           <el-option
-            v-for="{ label, value } in recruitType"
+            v-for="{ label, value } in getIntDictOptions('RECRUIT_TYPE')"
             :key="value"
             :label="label"
             :value="value"
@@ -56,17 +56,17 @@
         <el-table-column show-overflow-tooltip align="center" prop="deptName" label="部门" />
         <el-table-column align="center" label="岗位">
           <template #default="scope">
-            <span>{{ getDictName(scope.row.post, postDict) }}</span>
+            <span>{{ getDictLabel('post_type', scope.row.post) }}</span>
           </template>
         </el-table-column>
         <el-table-column align="center" label="所属类别">
           <template #default="scope">
-            <span>{{ getDictName(scope.row.type, recruitType) }}</span>
+            <span>{{ getDictLabel('RECRUIT_TYPE', scope.row.post) }}</span>
           </template>
         </el-table-column>
         <el-table-column align="center" label="能力等级">
           <template #default="scope">
-            <span>{{ getDictName(scope.row.abilityLevel, abilityLevel) }}</span>
+            <span>{{ getDictLabel('ABILITY_LEVEL', scope.row.abilityLevel) }}</span>
           </template>
         </el-table-column>
         <el-table-column show-overflow-tooltip align="center" prop="jobRequest" label="任职要求" />
@@ -132,16 +132,13 @@ import { Recruit, RecruitListDTO } from '@/interface/demand'
 import { useMutation, useQuery } from '@tanstack/vue-query'
 import { deleteRecruit, getRecruitList, updateRecruit } from '@/service/demand'
 import DeptSelect from '@/components/DeptSelect/index.vue'
-import { useDict, getDictName } from '@/hooks/web/useDict'
+import { getIntDictOptions, getDictLabel } from '@/utils/dict'
 
 const infoList = [
   { label: '需求总数', value: 'requireSum' },
   { label: '招聘总数', value: 'recruitSum' }
 ]
 defineOptions({ name: 'TravelCost' })
-const [postDict] = useDict('post_type') //职位
-const [recruitType] = useDict('RECRUIT_TYPE') // 需求类别
-const [abilityLevel] = useDict('ABILITY_LEVEL') //能力等级
 
 const pageParams = ref({
   pageNo: 1,

zjugis-business/src/main/java/com/zjugis/business/flow/jobTransfer/controller/JobTransferController.java

@@ -49,6 +49,19 @@ public class JobTransferController extends BaseController {
         return resultPage(map);
     }
 
+    /**
+     * 调岗申请表单生成
+     */
+    @WorkFlow(isReceiveMaterial = true, isReceiveOpinion = true)
+    @ResponseBody
+    @GetMapping("/mobileIndex")
+    @Operation(summary = "调岗申请表单生成")
+    public String mobileIndex(String activityTemplateId, String flowInstanceId, String userId) throws Exception {
+        Map<String, Object> map = jobTransferService.getFormParams(flowInstanceId);
+        return resultPage(map);
+    }
+
+
     /**
      * 调岗申请列表查询
      */

zjugis-business/src/main/java/com/zjugis/business/flow/resign/controller/ResignController.java

@@ -48,6 +48,18 @@ public class ResignController extends BaseController {
         return resultPage(map);
     }
 
+    /**
+     * 离职办理需求表单生成
+     */
+    @WorkFlow(isReceiveMaterial = true, isReceiveOpinion = true)
+    @ResponseBody
+    @GetMapping("/mobileIndex")
+    @Operation(summary = "离职办理表单生成")
+    public String mobileIndex(String activityTemplateId, String flowInstanceId, String userId) throws Exception {
+        Map<String, Object> map = resignService.getFormParams(flowInstanceId);
+        return resultPage(map);
+    }
+
     /**
      * 离职办理申请列表查询
      */

zjugis-business/src/main/java/com/zjugis/business/flow/usemoney/service/UseMoneyServiceImpl.java

@@ -183,11 +183,10 @@ public class UseMoneyServiceImpl implements UseMoneyService {
         Set<String> companyIds = convertSet(records, UseMoneyEarnestRespVO::getPaymentCompanyId);
         Map<String, CompanyRespDTO> companyMap = companyApi.getCompanyMap(companyIds);
         for (UseMoneyEarnestRespVO record : records) {
-            if (1 == record.getIWriteOff()) {
-                record.setStatus("已核销");
-            }
-            if (0 == record.getIWriteOff()) {
+            if (record.getIWriteOff()==null||0 == record.getIWriteOff()) {
                 record.setStatus("未核销");
+            }else if (1 == record.getIWriteOff()) {
+                record.setStatus("已核销");
             }
             CompanyRespDTO companyRespDTO = companyMap.get(record.getPaymentCompanyId());
             if (companyRespDTO != null) {
@@ -434,6 +433,8 @@ public class UseMoneyServiceImpl implements UseMoneyService {
                 detailDO.setUseMoneyId(updateObj.getId());
                 detailDO.setIsvalid(1);
                 detailDO.setCreateTime(LocalDateTime.now());
+                detailDO.setIWriteOff(0);
+                detailDO.setWriteOffAmount(new BigDecimal(0));
             });
             useMoneyDetailDao.insertBatch(detailDOS);
         }

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

@@ -0,0 +1,146 @@
+(function () {
+    window.onload = function (ex) {
+        backPerson();//离职员工重新入职直接返回已有数据
+        bindEvents();
+    }
+
+
+    //注册业务保存事件
+    function bindEvents() {
+        z.workflow.saveBtn.addListener("onSaveClick", saveForm);
+    }
+
+
+    /*
+  * all 工作流js传递到业务的参数 success执行的方法
+  * istransfer 工作流js传递到业务的参数 是否转件
+  * */
+    function saveForm(all, istransfer) {
+
+        var postData = z.ui.form.getFormFields($("[name=createReqVO]"));
+        if (postData === false) {
+            all({success: false});
+            return;
+        }
+
+        //将string类型的时间转换成时间戳
+        for (let key of Object.keys(postData)) {
+            let mealName = postData[key];
+            mealName.mssj = Date.parse(mealName.mssj + "");
+            mealName.bdrq = Date.parse(mealName.bdrq + "");
+            mealName.zjjy = appendZJJYResult();
+            postData.createReqVO = mealName;
+        }
+
+        z.ui.ajax({
+            type: "post",
+            url: "/interview/update",
+            data: JSON.stringify(postData.createReqVO),
+            contentType: "application/json",
+            success: function (res) {
+                if (res && res.code === 200) {
+                    all({success: true});
+                } else {
+                    all({success: false});
+                    z.ui.alertWarning(res.msg);
+                }
+            },
+
+            error: function () {
+                all({success: false});
+            }
+        })
+    }
+
+    /**
+     * 离职员工
+     */
+    function backPerson() {
+
+        z.ui.inputsearch("[name='createReqVO$nickname']").bindEvents({
+            onAfterSelect: function (value, data) {
+                var userId = null;
+                // 遍历 data 列表
+                $.each(data, function (index, item) {
+                    if (item.value === value) {
+                        userId = item.userId;
+                        return false; // 结束循环
+                    }
+                });
+
+                //根据用户id 获取用户的详情 并赋值到前端
+                selectStaffResign(userId, function (staff) {
+
+                    $("[name='createReqVO$loginName']").val(staff.loginName);
+                    $("[name='createReqVO$userId']").val(staff.userId);
+                    z.ui.select("[name='createReqVO$sex']").setValue(staff.sex + "");
+                    z.ui.input("[name='createReqVO$sfzh']").setValue(staff.cardid);
+                    z.ui.selecttree("[name='deptName']").setValue(staff.deptId)
+                    $("[name='createReqVO$deptName']").val(staff.deptName);
+                    $("[name='createReqVO$deptId']").val(staff.deptId);
+
+                });
+            }
+        });
+    }
+
+
+    /**
+     * 证件交验情况结果评价
+     * @returns {string}
+     */
+    function appendZJJYResult() {
+        var results = ","; // 初始化结果字符串
+
+        // 遍历每个复选框
+        for (var i = 1; i <= 7; i++) {
+            var checkboxName = "createReqVO$v" + i; // 构造复选框名称
+
+            // 使用 jQuery 选择器获取复选框元素
+            var checkbox = $('[name="' + checkboxName + '"] .z-checkbox-item');
+
+            // 检查复选框是否选中
+            if (checkbox.hasClass("checked")) {
+                // 如果选中，将复选框的值拼接到结果字符串中
+                results += checkbox.attr("value") + ",";
+            }
+        }
+
+        return results; // 返回拼接后的结果
+    }
+
+
+    function selectStaffResign(userId, callback) {
+        $.ajax({
+            type: "GET",
+            url: "/staff/getStaffDetail",
+            data: {userId: userId}, // 请求参数应该以对象形式传递
+            contentType: "application/json",
+            success: function (res) {
+                // 在这里处理成功获取到的数据，你可以根据需要调用回调函数
+                callback(res.data);
+            },
+            error: function () {
+
+            }
+        });
+    }
+
+    //部门
+    function clickDeptName(even, treeId, treeNode) {
+        $("[name='createReqVO$deptName']").val(treeNode.name);
+        $("[name='createReqVO$deptId']").val(treeNode.id);
+    }
+
+
+    function clickZDR(even, treeId, treeNode) {
+        $("[name='createReqVO$zdr']").val(treeNode.id);
+        $("[name='createReqVO$zdrmc']").val(treeNode.name);
+    }
+
+    function clickCompany(even, treeId, treeNode) {
+        $("[name='createReqVO$qdgsid']").val(treeNode.id);
+        $("[name='createReqVO$qdgs']").val(treeNode.name);
+    }
+}());
+

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

@@ -0,0 +1,129 @@
+<@wm.workFlowMobile javascripts=['/Interview/js/index.js']>
+    <style>
+        /**flowMobileCSS样式文件容器**/
+        .flowMobile {
+            overflow: hidden;
+            overflow-y: auto;
+            height: 100%;
+        }
+    </style>
+    <div class="flowMobile">
+        <div class="z-comp-tab" name="tab">
+            <ul class="z-tab-bar">
+                <li z-tabindex="0" class="on"><a>基础信息</a></li>
+                <li z-tabindex="1"><a>收件材料</a></li>
+                <li z-tabindex="2" class=""><a>审批意见</a></li>
+            </ul>
+            <div class="z-tab-scroll">
+                <div class="z-tab-content on">
+                    <div class="z-form-wrap" name="createReqVO">
+                        <div class="z-form-row" style="display: none;">
+                            <input type="text" value="${formEntity.instanceId!}" name="createReqVO$instanceId">
+                            <input type="text" value="${formEntity.id!}" name="createReqVO$id">
+                            <input type="text" value="${formEntity.userId!}" name="createReqVO$userId">
+                        </div>
+
+                        <div style="font-size: 15px;">
+                            <div class="form-icon">
+                                <img src="/imgs/titleIcon.png" alt="">
+                                <span>基本信息</span>
+                            </div>
+                        </div>
+                        <br>
+
+                        <div class="z-form-row">
+                            <div class="z-form-label z-col-30">申请人</div>
+                            <div class="z-form-control z-col-70">
+                                <div class="z-comp-input z-readonly" name="createReqVO$nickname">
+                                    <input type="text" value="${formEntity.nickname!}">
+                                </div>
+                            </div>
+                        </div>
+
+                        <div class="z-form-row">
+                            <div class="z-form-label z-col-30">申请调岗日期</div>
+                            <div class="z-form-control z-col-70">
+                                <div class="z-comp-date z-readonly" name="createReqVO$dgsj">
+                                    <input type="text" value="${(formEntity.dgsj?date)!}">
+                                </div>
+                            </div>
+                        </div>
+
+                        <div class="z-form-row">
+                            <div class="z-form-label z-col-30">申请部门</div>
+                            <div class="z-form-control z-col-70">
+                                <div class="z-comp-input z-readonly" name="createReqVO$deptName">
+                                    <input type="text" value="${formEntity.deptName!}">
+                                </div>
+                                <input type="hidden" name="createReqVO$deptId" value="${formEntity.deptId!}">
+                            </div>
+                        </div>
+
+
+                        <div class="z-form-row">
+                            <div class="z-form-label z-col-30">调任部门</div>
+                            <div class="z-form-control z-col-70">
+                                <div class="z-comp-input z-readonly" name="createReqVO$deptTransferName">
+                                    <input type="hidden" value="${formEntity.deptTransferName!}">
+                                </div>
+                                <input type="hidden" name="createReqVO$deptTransferId" value="${formEntity.deptTransferId!}">
+                            </div>
+                        </div>
+
+                        <div class="z-form-row">
+                            <div class="z-form-label z-col-30">原岗位</div>
+                            <div class="z-form-control z-col-70">
+                                <div class="z-comp-select z-readonly" name="createReqVO$post"
+                                     data='${post_type!}' value="${formEntity.post!}">
+                                    <div class="z-inputselect-bar">
+                                        <span></span><i></i>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+
+                        <div class="z-form-row">
+                            <div class="z-form-label z-col-30">调任岗位</div>
+                            <div class="z-form-control z-col-70">
+                                <div class="z-comp-select" name="createReqVO$transferPost"
+                                     data='${post_type!}' value="${formEntity.transferPost!}">
+                                    <div class="z-inputselect-bar">
+                                        <span></span><i></i>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+
+                        <div class="z-form-row">
+                            <div class="z-form-label z-col-30">申请理由</div>
+                            <div class="z-form-control z-col-70">
+                                <div class="z-comp-textarea" name="createReqVO$sqly">
+                                    <label>
+                                        <textarea>${formEntity.sqly!}</textarea>
+                                    </label>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="z-tab-content">
+                    <!--收件材料模板-->
+                    <#if WORKFLOW.MATERIALS??>
+                        ${WORKFLOW.MATERIALS!}
+                    </#if>
+                </div>
+                <div class="z-tab-content">
+                    <!--审批意见模板-->
+                    <#if WORKFLOW.OPINION??>
+                        ${WORKFLOW.OPINION!}
+                    </#if>
+                </div>
+            </div>
+        </div>
+    </div>
+    <script>
+        window.userConfig = {
+            url: '${url!}'
+        }
+    </script>
+</@wm.workFlowMobile>

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

@@ -59,9 +59,6 @@ styles=[ '/flow/css/formCommon.css' ,'/timeSelector/TimeSelector.css','/OwCommon
                     <input type="hidden" name="createReqVO$projectId" value="${formEntity.projectId!}">
                     <div class="z-comp-input" name="createReqVO$projectName">
                       <input type="text" value="${projectName!}">
-                      <div id="selectProject" style="width: 50px; float: right;">
-                        <div class="btn btn-sm btn-primary">选择</div>
-                      </div>
                     </div>
                   </div>
                 </div>

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

@@ -752,7 +752,7 @@
                                 </div>
                             </div>
                         </div>
-
+                        <br>
 
                         <div class="z-form-row">
                             <div class="z-form-label z-col-70">主动性(10分)：积极推进工作，努力寻求资源，不回避困难</div>
@@ -762,6 +762,7 @@
                                 </div>
                             </div>
                         </div>
+                        <br>
 
                         <div class="z-form-row">
                             <div class="z-form-label z-col-70">
@@ -773,6 +774,7 @@
                                 </div>
                             </div>
                         </div>
+                        <br>
 
                         <div class="z-form-row">
                             <div class="z-form-label z-col-70">客户意识(10分)：积极关注客户需求，主动为客户解决问题</div>
@@ -782,6 +784,7 @@
                                 </div>
                             </div>
                         </div>
+                        <br>
 
                         <div class="z-form-row">
                             <div class="z-form-label z-col-70">
@@ -793,6 +796,7 @@
                                 </div>
                             </div>
                         </div>
+                        <br>
 
                         <div class="z-form-row">
                             <div class="z-form-label z-col-70">适岗程度(10分)：相关知识、经验、能力和技能与岗位的符合程度
@@ -803,6 +807,7 @@
                                 </div>
                             </div>
                         </div>
+                        <br>
 
                         <div class="z-form-row">
                             <div class="z-form-label z-col-70">
@@ -814,6 +819,7 @@
                                 </div>
                             </div>
                         </div>
+                        <br>
 
                         <div class="z-form-row">
                             <div class="z-form-label z-col-70">
@@ -825,6 +831,7 @@
                                 </div>
                             </div>
                         </div>
+                        <br>
 
                         <div class="z-form-row">
                             <div class="z-form-label z-col-70">
@@ -836,6 +843,7 @@
                                 </div>
                             </div>
                         </div>
+                        <br>
 
                         <div class="z-form-row">
                             <div class="z-form-label z-col-70">
@@ -847,6 +855,7 @@
                                 </div>
                             </div>
                         </div>
+                        <br>
 
                         <div class="z-form-row">
                             <div class="z-form-label z-col-70">
@@ -858,6 +867,7 @@
                                 </div>
                             </div>
                         </div>
+                        <br>
 
                         <div class="z-form-row">
                             <div class="z-form-label z-col-70">

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

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

zjugis-module-system/zjugis-module-system-api/src/main/java/com/zjugis/module/system/api/permission/dto/FlowPermissionRespDTO.java

@@ -2,6 +2,7 @@ package com.zjugis.module.system.api.permission.dto;
 
 import lombok.Data;
 
+import java.util.HashSet;
 import java.util.Set;
 
 /**
@@ -13,8 +14,18 @@ import java.util.Set;
 @Data
 public class FlowPermissionRespDTO {
 
+    /**
+     * 是否可查看全部数据
+     */
+    private Boolean all;
+
     /**
      * 可查看的流程数组
      */
     private Set<String> flowIds;
+
+    public FlowPermissionRespDTO() {
+        this.flowIds = new HashSet<>();
+        this.all = false;
+    }
 }

zjugis-module-system/zjugis-module-system-biz/src/main/java/com/zjugis/module/system/service/permission/PermissionServiceImpl.java

@@ -334,6 +334,12 @@ public class PermissionServiceImpl implements PermissionService {
             result.setFlowIds(Collections.emptySet());
             return result;
         }
+        Set<Long> roleIds = convertSet(roles, RoleDO::getId);
+        //如果拥有超级管理员权限则可以查看所有流程
+        if (roleService.hasAnySuperAdmin(roleIds)) {
+            result.setAll(true);
+            return result;
+        }
         for (RoleDO role : roles) {
             CollUtil.addAll(result.getFlowIds(), role.getFlowIds());
         }

zjugis-workflow/src/main/java/com/zjugis/z_workflow/service/TFlowTemplateService.java

@@ -235,8 +235,11 @@ public class TFlowTemplateService {
 		paramVo.setiFilterRight(iFilterRight);
 		if (iFilterRight) {
             CommonResult<FlowPermissionRespDTO> result = permissionApi.getFlowPermission(Constant.getUserId());
-            if(result.getCheckedData().getFlowIds() != null){
-                rightList =result.getCheckedData().getFlowIds();
+            FlowPermissionRespDTO resp = result.getCheckedData();
+            if(resp.getAll()){
+                paramVo.setiFilterRight(false);
+            } else if(resp.getFlowIds() != null){
+                rightList = resp.getFlowIds();
             }
 
         }