Author SHA1 Message Date
c-chengc1 26db19198d feat:增加分工会临时报销人审批流程 2026-09-11 15:36:54 +08:00
c-chengc1 cba3add65f feat:分工会临时报销人功能 2026-09-10 17:40:35 +08:00
6 changed files with 1149 additions and 1 deletions
@@ -106,6 +106,7 @@ RoleConstant {
LEGAL_DOCTOR("法律顾问"),
UNION_REIMBURSEMENT_MANAGER("分工会报销负责人"),
UNION_TEMP_REIMBURSEMENT_APPLICANT("分工会临时报销人"),
CLUB_REIMBURSEMENT_MANAGER("协会报销负责人"),
SCHOOL_REIMBURSEMENT_MANAGER("校工会报销负责人"),
@@ -6,6 +6,7 @@ import cn.hutool.core.date.DateUtil;
import cn.hutool.core.lang.Dict;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import cn.hutool.json.JSONUtil;
import com.budwk.app.base.annotation.SLog;
import com.budwk.app.base.constant.RoleConstant;
import com.budwk.app.base.page.Pagination;
@@ -23,6 +24,7 @@ import com.budwk.app.zhgh.activity.declarereimbursement.declare.models.ActivityD
import com.budwk.app.zhgh.activity.declarereimbursement.vo.CommonPageParam;
import com.budwk.app.zhgh.activity.declarereimbursement.reimbursement.models.ActivityReimbursementInfo;
import com.budwk.app.zhgh.activity.declarereimbursement.reimbursement.service.ActivityReimbursementService;
import com.budwk.app.zhgh.dayofficework.outlay.activityBudget.models.ActivityBudget;
import com.budwk.app.zhgh.dayofficework.outlay.outlayReimburse.service.OutlayReimburseApplyService;
import io.swagger.annotations.ApiOperation;
import org.nutz.aop.interceptor.ioc.TransAop;
@@ -94,6 +96,10 @@ public class ActivityReimbursementApplyController {
@SaCheckPermission(value = {"activityReimbursement.apply", "h5.activityReimbursement.apply"}, mode = SaMode.OR)
@SLog(tag = "活动申报", msg = "保存申请,申请人: ${args[0].username}")
public Result save(@Param("data") ActivityReimbursementInfo activityReimbursementInfo) {
Result scopeResult = validateTemporaryUnionReimbursement(activityReimbursementInfo);
if (scopeResult != null) {
return scopeResult;
}
activityReimbursementInfo.setUserId(SecurityUtil.getUserId());
activityReimbursementInfo.setLoginName(SecurityUtil.getUserLoginname());
activityReimbursementInfo.setUserName(SecurityUtil.getUserUsername());
@@ -123,6 +129,10 @@ public class ActivityReimbursementApplyController {
@SaCheckPermission(value = {"activityReimbursement.apply", "h5.activityReimbursement.apply"}, mode = SaMode.OR)
@SLog(tag = "活动申报", msg = "提交申请,申请人: ${args[0].username}")
public Result submit(@Param("data") ActivityReimbursementInfo activityReimbursementInfo) {
Result scopeResult = validateTemporaryUnionReimbursement(activityReimbursementInfo);
if (scopeResult != null) {
return scopeResult;
}
activityReimbursementInfo.setUserId(SecurityUtil.getUserId());
activityReimbursementInfo.setLoginName(SecurityUtil.getUserLoginname());
activityReimbursementInfo.setUserName(SecurityUtil.getUserUsername());
@@ -151,7 +161,9 @@ public class ActivityReimbursementApplyController {
args.set(FlowConst.FORM_DATA, activityReimbursementInfo);
args.set("outlayManageSource", activityReimbursementInfo.getOutlayManageSource());
args.set("actualMoney", activityReimbursementInfo.getActualMoney());
args.set("next", activityReimbursementInfo.getReimbursementIdentity());
// 临时报销人通过流程图中的“分工会代报销”独立分支进入财务审核,保留表单的分工会身份。
args.set("next", AuthUtil.hasRole(RoleConstant.UNION_TEMP_REIMBURSEMENT_APPLICANT.name())
? "unionTemp" : activityReimbursementInfo.getReimbursementIdentity());
args.set("clubId",activityReimbursementInfo.getClubId());
ProcessInstance instance = flowEngine.startProcessInstanceByKey("HDBX", activityReimbursementInfo.getId(), SecurityUtil.getUserId(), args);
@@ -170,6 +182,10 @@ public class ActivityReimbursementApplyController {
@SaCheckPermission(value = {"activityReimbursement.apply", "h5.activityReimbursement.apply"}, mode = SaMode.OR)
@SLog(tag = "活动申报", msg = "重新提交申请,申请人: ${args[0].username}")
public Result submitAgain(@Param("data") ActivityReimbursementInfo activityReimbursementInfo, @Param("taskId") Long taskId) {
Result scopeResult = validateTemporaryUnionReimbursement(activityReimbursementInfo);
if (scopeResult != null) {
return scopeResult;
}
if (StrUtil.isBlank(activityReimbursementInfo.getDeclareId())) {
activityReimbursementInfo.setDeclareId(activityReimbursementInfo.getDeclareId());
}
@@ -191,18 +207,90 @@ public class ActivityReimbursementApplyController {
Dict dict = Dict.create();
dict.set(FlowConst.PROCESS_TASK_ID_KEY, taskId);
dict.set(FlowConst.SUBMIT_TYPE, ProcessSubmitTypeEnum.RE_APPLY.getCode());
if (AuthUtil.hasRole(RoleConstant.UNION_TEMP_REIMBURSEMENT_APPLICANT.name())) {
ProcessTask processTask = flowEngine.processTaskService().getById(taskId);
ProcessInstance processInstance = flowEngine.processInstanceService().getById(processTask.getProcessInstanceId());
String originalNext = JSONUtil.parseObj(processInstance.getVariable()).getStr("next");
// 新申请重提沿用独立分支;旧实例仍绑定旧定义,继续使用其已有的财务分支。
dict.set("next", Objects.equals(originalNext, "unionTemp") ? "unionTemp" : "school");
}
flowCommonService.executeTask(dict);
return Result.success();
}
/**
* 临时报销人按本分工会校验申请及实际扣款预算,防止篡改身份、经费类型或预算ID绕过限制。
*/
private Result validateTemporaryUnionReimbursement(ActivityReimbursementInfo info) {
if (!AuthUtil.hasRole(RoleConstant.UNION_TEMP_REIMBURSEMENT_APPLICANT.name())) {
return null;
}
if (info == null || !Objects.equals(info.getReimbursementIdentity(), "union")
|| !Objects.equals(info.getOutlayManageSource(), "ACTIVITY_BUDGET_TYPE_TWO")
|| StrUtil.isNotBlank(info.getClubId())) {
return Result.error("分工会临时报销人仅可使用分工会身份申请分工会经费报销");
}
String unionId = SecurityUtil.getUnionId();
if (StrUtil.isBlank(unionId)) {
return Result.error("当前用户未关联分工会,无法申请报销");
}
if (StrUtil.isNotBlank(info.getId())) {
ActivityReimbursementInfo savedInfo = dao.fetch(ActivityReimbursementInfo.class, info.getId());
if (savedInfo == null || !Objects.equals(savedInfo.getUserId(), SecurityUtil.getUserId())
|| !Objects.equals(savedInfo.getUnionId(), unionId)
|| !Objects.equals(savedInfo.getReimbursementIdentity(), "union")
|| !Objects.equals(savedInfo.getOutlayManageSource(), "ACTIVITY_BUDGET_TYPE_TWO")) {
return Result.error("仅可修改本人所在分工会的分工会经费报销申请");
}
}
if (StrUtil.isBlank(info.getDeductionBudgetId())) {
return Result.error("请选择本分工会的扣款预算");
}
ActivityBudget budget = dao.fetch(ActivityBudget.class, info.getDeductionBudgetId());
if (budget == null || !Objects.equals(budget.getOutlayManageSource(), "ACTIVITY_BUDGET_TYPE_TWO")
|| !Objects.equals(budget.getUnionId(), unionId)) {
return Result.error("扣款预算必须属于本分工会的分工会经费");
}
if (Objects.equals(info.getActivityReimbursementMode(), "activity")) {
if (StrUtil.isBlank(info.getDeclareId())) {
return Result.error("请选择本分工会的申报活动");
}
// 申报通过活动类型区分工会,实际扣款经费类型及归属已由上方预算校验约束。
ActivityDeclareInfo declareInfo = dao.fetch(ActivityDeclareInfo.class, info.getDeclareId());
if (declareInfo == null || !Objects.equals(declareInfo.getUnionId(), unionId)
|| !Objects.equals(declareInfo.getActivityType(), "BRANCH_UNION")) {
return Result.error("仅可报销本分工会使用分工会经费的活动");
}
} else if (Objects.equals(info.getActivityReimbursementMode(), "daily")) {
info.setDeclareId(null);
} else {
return Result.error("请选择报销模式");
}
// 分工会归属以登录用户为准,供后续审批流程使用。
info.setUnionId(unionId);
info.setActivityType("BRANCH_UNION");
return null;
}
@At
@ApiOperation("获取当前用户活动报销")
@SaCheckPermission(value = {"activityReimbursement.apply", "h5.activityReimbursement.apply"}, mode = SaMode.OR)
public Result getActivityReimbursementByUser(String id, String outlayManageSource, String clubId) {
String activityType = "";
boolean temporaryUnionApplicant = AuthUtil.hasRole(RoleConstant.UNION_TEMP_REIMBURSEMENT_APPLICANT.name());
if (temporaryUnionApplicant && (!Objects.equals(outlayManageSource, "ACTIVITY_BUDGET_TYPE_TWO")
|| StrUtil.isBlank(SecurityUtil.getUnionId()))) {
return Result.error("分工会临时报销人仅可申请本分工会经费报销");
}
if (StrUtil.isNotBlank(id)) {
ActivityReimbursementInfo reimbursementInfo = dao.fetch(ActivityReimbursementInfo.class, id);
if (temporaryUnionApplicant && (reimbursementInfo == null
|| !Objects.equals(reimbursementInfo.getUserId(), SecurityUtil.getUserId())
|| !Objects.equals(reimbursementInfo.getUnionId(), SecurityUtil.getUnionId())
|| !Objects.equals(reimbursementInfo.getOutlayManageSource(), "ACTIVITY_BUDGET_TYPE_TWO"))) {
return Result.error("无权访问该报销申请");
}
if (Objects.equals(reimbursementInfo.getActivityReimbursementMode(), "daily")) {
return Result.success();
}
@@ -324,7 +412,20 @@ public class ActivityReimbursementApplyController {
@ApiOperation("获取申报的记录")
@SaCheckPermission(value = {"activityReimbursement.apply", "h5.activityReimbursement.apply"}, mode = SaMode.OR)
public Result getBudgetByYear(String outlayManageSource, String clubId) {
boolean temporaryUnionApplicant = AuthUtil.hasRole(RoleConstant.UNION_TEMP_REIMBURSEMENT_APPLICANT.name());
if (temporaryUnionApplicant && (!Objects.equals(outlayManageSource, "ACTIVITY_BUDGET_TYPE_TWO")
|| StrUtil.isBlank(SecurityUtil.getUnionId()))) {
return Result.error("分工会临时报销人仅可申请本分工会经费报销");
}
List<NutMap> budgetMoney = activityReimbursementService.getBudgetMoney(outlayManageSource, clubId);
if (temporaryUnionApplicant) {
// 兼有系统管理员角色时也必须限制为本分工会预算,不改变原预算金额展示规则。
List<String> unionBudgetIds = dao.query(ActivityBudget.class,
Cnd.where("unionId", "=", SecurityUtil.getUnionId())
.and("outlayManageSource", "=", "ACTIVITY_BUDGET_TYPE_TWO"))
.stream().map(ActivityBudget::getId).toList();
budgetMoney = budgetMoney.stream().filter(v -> unionBudgetIds.contains(v.getString("id"))).toList();
}
return Result.success(budgetMoney);
}
@@ -0,0 +1,67 @@
-- 分工会临时报销人:复用现有报销菜单;经费范围由申请页面及后端按角色编码共同限制。
-- 适用于已配置费用报销菜单的 MySQL 数据库,可重复执行,不关联具体用户。
START TRANSACTION;
INSERT INTO sys_role
(id, name, code, aliasName, disabled, unitid, note, sort, createdBy, createdAt, updatedBy, updatedAt, delFlag)
SELECT REPLACE(UUID(), '-', ''), '分工会临时报销人', 'UNION_TEMP_REIMBURSEMENT_APPLICANT',
'分工会临时报销人', 0, '', '仅可使用分工会身份申请本分工会经费报销', 0,
'', FLOOR(UNIX_TIMESTAMP(CURRENT_TIMESTAMP(3)) * 1000),
'', FLOOR(UNIX_TIMESTAMP(CURRENT_TIMESTAMP(3)) * 1000), 0
WHERE NOT EXISTS (
SELECT 1 FROM sys_role WHERE code = 'UNION_TEMP_REIMBURSEMENT_APPLICANT'
);
-- 只授权报销申请、我的报销及其导航父级,不复制原报销角色的审批等权限。
-- activityDeclare 用于报销选取活动后读取申报详情,不授权活动申报、预算申报或审核子菜单。
-- 同时关联已有的手机端报销菜单;通过路径前缀补齐导航父级,不授权同级菜单。
INSERT INTO sys_role_menu (roleId, menuId)
SELECT DISTINCT role.id, menu.id
FROM sys_role role
JOIN sys_menu entry ON entry.permission IN (
'activityReimbursement.apply',
'activityReimbursement.mine',
'h5.activityReimbursement.apply',
'h5.activityReimbursement.mine',
'activityDeclare'
)
JOIN sys_menu menu ON menu.id = entry.id OR (
menu.type = 'menu'
AND menu.path IS NOT NULL
AND menu.path <> ''
AND entry.path LIKE CONCAT(menu.path, '%')
)
WHERE role.code = 'UNION_TEMP_REIMBURSEMENT_APPLICANT'
AND entry.disabled = 0
AND menu.disabled = 0
AND NOT EXISTS (
SELECT 1 FROM sys_role_menu assigned
WHERE assigned.roleId = role.id AND assigned.menuId = menu.id
);
-- 工会管理的角色下拉框及人员列表均读取 BRANCH_UNION_ROLES 字典,角色表记录不会自动成为选项。
-- 沿用字典每级四位的路径规则,将新角色追加到已有子项之后,并按父级与角色编码避免重复插入。
INSERT INTO sys_dict
(id, parentId, path, name, remark, code, disabled, location, hasChildren,
createdBy, createdAt, updatedBy, updatedAt, delFlag)
SELECT REPLACE(UUID(), '-', ''), parent.id,
CONCAT(parent.path, LPAD(COALESCE(siblings.maxSuffix, 0) + 1, 4, '0')),
'分工会临时报销人', '仅可申请本分工会经费报销', 'UNION_TEMP_REIMBURSEMENT_APPLICANT',
0, COALESCE(siblings.maxLocation, 0) + 1, 0,
'', FLOOR(UNIX_TIMESTAMP(CURRENT_TIMESTAMP(3)) * 1000),
'', FLOOR(UNIX_TIMESTAMP(CURRENT_TIMESTAMP(3)) * 1000), 0
FROM sys_dict parent
LEFT JOIN (
SELECT parentId, MAX(CAST(RIGHT(path, 4) AS UNSIGNED)) AS maxSuffix,
MAX(location) AS maxLocation
FROM sys_dict
GROUP BY parentId
) siblings ON siblings.parentId = parent.id
WHERE parent.code = 'BRANCH_UNION_ROLES'
AND NOT EXISTS (
SELECT 1 FROM sys_dict existing
WHERE existing.parentId = parent.id
AND existing.code = 'UNION_TEMP_REIMBURSEMENT_APPLICANT'
);
COMMIT;
+929
View File
@@ -0,0 +1,929 @@
{
"name": "HDBX",
"category": "3",
"displayName": "费用报销管理",
"instanceUrl": "/platform/activityReimbursement/apply",
"h5InstanceUrl": "/platform/activityReimbursement/apply/h5",
"nodes": [
{
"id": "686d23b6-707f-40d4-ab7c-1987616e4ae0",
"type": "snaker:start",
"x": 220,
"y": 240,
"properties": {
"postInterceptors": ""
},
"text": {
"x": 220,
"y": 280,
"value": "开始"
}
},
{
"id": "startTask",
"type": "snaker:task",
"x": 360,
"y": 240,
"properties": {
"form": "/platform/activityReimbursement/mine",
"h5form": "/platform/activityReimbursement/mine/h5",
"assignee": "initiator",
"assigneeMode": "initiator",
"assigneeText": "流程发起人",
"buttonConfig": [
{
"value": 0,
"visible": true,
"disabled": false,
"originalText": "提交"
}
],
"postInterceptors": ""
},
"text": {
"x": 360,
"y": 240,
"value": "提交申请"
}
},
{
"id": "5afcf810-7a8b-4896-9aa7-c99995e0856b",
"type": "snaker:task",
"x": 700,
"y": 240,
"properties": {
"form": "/platform/activityReimbursement/clubPrincipal",
"h5form": "/platform/activityReimbursement/clubPrincipal/h5",
"assignee": "",
"assigneeMode": "manual",
"assigneeText": "",
"buttonConfig": [
{
"value": 0,
"originalText": "发起申请"
},
{
"theme": "primary",
"value": 1,
"visible": true,
"originalText": "同意申请"
},
{
"theme": "danger",
"value": 2,
"visible": true,
"originalText": "拒绝申请"
},
{
"value": 3,
"originalText": "退回上一步"
},
{
"value": 4,
"originalText": "跳转"
},
{
"value": 5,
"originalText": "重新提交"
},
{
"theme": "danger",
"value": 6,
"visible": true,
"originalText": "退回发起人"
},
{
"value": 20,
"originalText": "会签拒绝申请"
}
],
"assignmentHandler": "com.budwk.app.flow.handler.FlowClubPresidentByArgsAssignmentHandler"
},
"text": {
"x": 700,
"y": 240,
"value": "协会负责人审核"
}
},
{
"id": "182768cf-ff70-4b59-8f5d-8523831380e8",
"type": "snaker:decision",
"x": 520,
"y": 240,
"properties": {}
},
{
"id": "1e4cc473-beae-427d-b9dc-c1c4d0eb07c8",
"type": "snaker:task",
"x": 700,
"y": 100,
"properties": {
"form": "/platform/activityReimbursement/branchUnion",
"h5form": "/platform/activityReimbursement/branchUnion/h5",
"assignee": "",
"assigneeMode": "manual",
"assigneeText": "",
"buttonConfig": [
{
"value": 0,
"originalText": "发起申请"
},
{
"theme": "primary",
"value": 1,
"visible": true,
"originalText": "同意申请"
},
{
"theme": "danger",
"value": 2,
"visible": true,
"originalText": "拒绝申请"
},
{
"value": 3,
"originalText": "退回上一步"
},
{
"value": 4,
"originalText": "跳转"
},
{
"value": 5,
"originalText": "重新提交"
},
{
"theme": "danger",
"value": 6,
"visible": true,
"originalText": "退回发起人"
},
{
"value": 20,
"originalText": "会签拒绝申请"
}
],
"assignmentHandler": "com.budwk.app.flow.handler.FlowFghzxAssignmentHandler"
},
"text": {
"x": 700,
"y": 100,
"value": "分工会审核"
}
},
{
"id": "6dd2e8b3-fd0d-4b35-bb2a-1eef227cba96",
"type": "snaker:task",
"x": 1120,
"y": 240,
"properties": {
"form": "/platform/activityReimbursement/schoolPrincipal",
"h5form": "/platform/activityReimbursement/schoolPrincipal/h5",
"assignee": "2c8b9143b5cd491ba49dd4b52a844b10",
"assigneeMode": "select",
"assigneeText": "陈曦",
"buttonConfig": [
{
"value": 0,
"originalText": "发起申请"
},
{
"theme": "primary",
"value": 1,
"visible": true,
"originalText": "同意申请"
},
{
"theme": "danger",
"value": 2,
"visible": true,
"originalText": "拒绝申请"
},
{
"theme": "danger",
"value": 3,
"visible": true,
"originalText": "退回上一步"
},
{
"value": 4,
"originalText": "跳转"
},
{
"value": 5,
"originalText": "重新提交"
},
{
"theme": "danger",
"value": 6,
"visible": true,
"originalText": "退回发起人"
},
{
"value": 20,
"originalText": "会签拒绝申请"
}
]
},
"text": {
"x": 1120,
"y": 240,
"value": "校工会预审"
}
},
{
"id": "47bfdf53-288c-4352-a403-0653483b54eb",
"type": "snaker:task",
"x": 1540,
"y": 240,
"properties": {
"form": "/platform/activityReimbursement/schoolUnion",
"h5form": "/platform/activityReimbursement/schoolUnion/h5",
"assignee": "fd76781c09c04147b5170179be127240",
"assigneeMode": "select",
"assigneeText": "张红萍",
"buttonConfig": [
{
"value": 0,
"originalText": "发起申请"
},
{
"theme": "primary",
"value": 1,
"visible": true,
"originalText": "同意申请"
},
{
"theme": "danger",
"value": 2,
"visible": true,
"originalText": "拒绝申请"
},
{
"theme": "danger",
"value": 3,
"visible": true,
"originalText": "退回上一步"
},
{
"value": 4,
"originalText": "跳转"
},
{
"value": 5,
"originalText": "重新提交"
},
{
"theme": "danger",
"value": 6,
"visible": true,
"originalText": "退回发起人"
},
{
"value": 20,
"originalText": "会签拒绝申请"
}
]
},
"text": {
"x": 1540,
"y": 240,
"value": "校工会主席审核"
}
},
{
"id": "776311f1-b016-4090-9112-1b4a11fb0d4a",
"type": "snaker:end",
"x": 1920,
"y": 240,
"properties": {},
"text": {
"x": 1920,
"y": 280,
"value": "结束"
}
},
{
"id": "ba496ac7-abb3-4e6d-8c8e-212863a0d6ee",
"type": "snaker:task",
"x": 900,
"y": 240,
"properties": {
"form": "/platform/activityReimbursement/schoolFinance",
"h5form": "/platform/activityReimbursement/schoolFinance/h5",
"assignee": "5b8880eeee384eb4be20084735aac6e6",
"assigneeMode": "select",
"assigneeText": "丁彩华",
"buttonConfig": [
{
"value": 0,
"originalText": "发起申请"
},
{
"value": 1,
"originalText": "同意申请"
},
{
"value": 2,
"originalText": "拒绝申请"
},
{
"value": 3,
"originalText": "退回上一步"
},
{
"value": 4,
"originalText": "跳转"
},
{
"value": 5,
"originalText": "重新提交"
},
{
"value": 6,
"originalText": "退回发起人"
},
{
"value": 20,
"originalText": "会签拒绝申请"
}
]
},
"text": {
"x": 900,
"y": 240,
"value": "校工会财务审核"
}
},
{
"id": "f9b8379f-f348-4985-ba58-b6ba28deb9af",
"type": "snaker:task",
"x": 1320,
"y": 240,
"properties": {
"form": "/platform/activityReimbursement/deputySchoolUnion",
"h5form": "/platform/activityReimbursement/deputySchoolUnion/h5",
"assignee": "b472656183e6408697b8ada687cad442",
"assigneeMode": "select",
"assigneeText": "张蕴梅",
"buttonConfig": [
{
"value": 0,
"originalText": "发起申请"
},
{
"value": 1,
"originalText": "同意申请"
},
{
"value": 2,
"originalText": "拒绝申请"
},
{
"value": 3,
"originalText": "退回上一步"
},
{
"value": 4,
"originalText": "跳转"
},
{
"value": 5,
"originalText": "重新提交"
},
{
"value": 6,
"originalText": "退回发起人"
},
{
"value": 20,
"originalText": "会签拒绝申请"
}
]
},
"text": {
"x": 1320,
"y": 240,
"value": "校工会副主席审核"
}
},
{
"id": "409e8fad-6bd5-485a-8b3e-e1d58688e05a",
"type": "snaker:decision",
"x": 1320,
"y": 420,
"properties": {}
},
{
"id": "e283f33f-4ac7-4c66-9b16-e0653e8dc452",
"type": "snaker:task",
"x": 1760,
"y": 240,
"properties": {
"form": "/platform/activityReimbursement/cashier",
"h5form": "/platform/activityReimbursement/cashier/h5",
"assignee": "762206d35f7041178e66956d859b823d",
"assigneeMode": "select",
"assigneeText": "嵇蓉静",
"buttonConfig": [
{
"value": 0,
"originalText": "发起申请"
},
{
"value": 1,
"originalText": "同意申请"
},
{
"value": 2,
"originalText": "拒绝申请"
},
{
"value": 3,
"originalText": "退回上一步"
},
{
"value": 4,
"originalText": "跳转"
},
{
"value": 5,
"originalText": "重新提交"
},
{
"value": 6,
"originalText": "退回发起人"
},
{
"value": 20,
"originalText": "会签拒绝申请"
}
]
},
"text": {
"x": 1760,
"y": 240,
"value": "出纳支付"
}
}
],
"edges": [
{
"id": "7eab997d-639c-49a8-bb1a-f6a0a9983eb7",
"type": "snaker:transition",
"sourceNodeId": "182768cf-ff70-4b59-8f5d-8523831380e8",
"targetNodeId": "ba496ac7-abb3-4e6d-8c8e-212863a0d6ee",
"startPoint": {
"x": 508,
"y": 253
},
"endPoint": {
"x": 940,
"y": 280
},
"properties": {
"expr": "{next=='unionTemp'}"
},
"text": {
"x": 700,
"y": 480,
"value": "分工会代报销"
},
"pointsList": [
{
"x": 508,
"y": 253
},
{
"x": 460,
"y": 253
},
{
"x": 460,
"y": 480
},
{
"x": 940,
"y": 480
},
{
"x": 940,
"y": 280
}
]
},
{
"id": "876385a3-18eb-4022-864b-068053ec9e06",
"type": "snaker:transition",
"sourceNodeId": "182768cf-ff70-4b59-8f5d-8523831380e8",
"targetNodeId": "1e4cc473-beae-427d-b9dc-c1c4d0eb07c8",
"startPoint": {
"x": 520,
"y": 215
},
"endPoint": {
"x": 640,
"y": 100
},
"properties": {
"expr": "{next=='union'}"
},
"text": {
"x": 520,
"y": 157.5,
"value": "分工会"
},
"pointsList": [
{
"x": 520,
"y": 215
},
{
"x": 520,
"y": 100
},
{
"x": 640,
"y": 100
}
]
},
{
"id": "add1a8a8-1bb5-4bb3-adf7-ef4868d4972c",
"type": "snaker:transition",
"sourceNodeId": "182768cf-ff70-4b59-8f5d-8523831380e8",
"targetNodeId": "5afcf810-7a8b-4896-9aa7-c99995e0856b",
"startPoint": {
"x": 545,
"y": 240
},
"endPoint": {
"x": 640,
"y": 240
},
"properties": {
"expr": "{next=='club'}"
},
"text": {
"x": 592.5,
"y": 240,
"value": "协会"
},
"pointsList": [
{
"x": 545,
"y": 240
},
{
"x": 640,
"y": 240
}
]
},
{
"id": "4c288069-d042-4070-9afd-4902baf148b0",
"type": "snaker:transition",
"sourceNodeId": "startTask",
"targetNodeId": "182768cf-ff70-4b59-8f5d-8523831380e8",
"startPoint": {
"x": 420,
"y": 240
},
"endPoint": {
"x": 495,
"y": 240
},
"properties": {},
"pointsList": [
{
"x": 420,
"y": 240
},
{
"x": 495,
"y": 240
}
]
},
{
"id": "de8ae26f-8660-4cd2-9507-ef573bdbef6c",
"type": "snaker:transition",
"sourceNodeId": "686d23b6-707f-40d4-ab7c-1987616e4ae0",
"targetNodeId": "startTask",
"startPoint": {
"x": 238,
"y": 240
},
"endPoint": {
"x": 300,
"y": 240
},
"properties": {},
"pointsList": [
{
"x": 238,
"y": 240
},
{
"x": 300,
"y": 240
}
]
},
{
"id": "b36a46d0-05ff-486c-9cbf-b6f9e4e50217",
"type": "snaker:transition",
"sourceNodeId": "182768cf-ff70-4b59-8f5d-8523831380e8",
"targetNodeId": "ba496ac7-abb3-4e6d-8c8e-212863a0d6ee",
"startPoint": {
"x": 519,
"y": 265
},
"endPoint": {
"x": 902,
"y": 280
},
"properties": {
"expr": "{next=='school'}"
},
"text": {
"x": 710.5,
"y": 376,
"value": "校工会"
},
"pointsList": [
{
"x": 519,
"y": 265
},
{
"x": 519,
"y": 376
},
{
"x": 902,
"y": 376
},
{
"x": 902,
"y": 280
}
]
},
{
"id": "bfb971df-c94b-46f5-9dc2-e0e0624b1f0f",
"type": "snaker:transition",
"sourceNodeId": "ba496ac7-abb3-4e6d-8c8e-212863a0d6ee",
"targetNodeId": "6dd2e8b3-fd0d-4b35-bb2a-1eef227cba96",
"startPoint": {
"x": 960,
"y": 240
},
"endPoint": {
"x": 1060,
"y": 240
},
"properties": {},
"pointsList": [
{
"x": 960,
"y": 240
},
{
"x": 1060,
"y": 240
}
]
},
{
"id": "aae8eac1-3613-49f9-8bdf-5e054de9a78d",
"type": "snaker:transition",
"sourceNodeId": "5afcf810-7a8b-4896-9aa7-c99995e0856b",
"targetNodeId": "ba496ac7-abb3-4e6d-8c8e-212863a0d6ee",
"startPoint": {
"x": 760,
"y": 240
},
"endPoint": {
"x": 840,
"y": 240
},
"properties": {},
"pointsList": [
{
"x": 760,
"y": 240
},
{
"x": 840,
"y": 240
}
]
},
{
"id": "ae58c15a-1a76-4201-9633-cfbdb47b3b2f",
"type": "snaker:transition",
"sourceNodeId": "1e4cc473-beae-427d-b9dc-c1c4d0eb07c8",
"targetNodeId": "ba496ac7-abb3-4e6d-8c8e-212863a0d6ee",
"startPoint": {
"x": 760,
"y": 100
},
"endPoint": {
"x": 900,
"y": 200
},
"properties": {},
"pointsList": [
{
"x": 760,
"y": 100
},
{
"x": 900,
"y": 100
},
{
"x": 900,
"y": 200
}
]
},
{
"id": "b3549e56-d9d4-4a40-ae41-f49f57b20fd4",
"type": "snaker:transition",
"sourceNodeId": "6dd2e8b3-fd0d-4b35-bb2a-1eef227cba96",
"targetNodeId": "f9b8379f-f348-4985-ba58-b6ba28deb9af",
"startPoint": {
"x": 1180,
"y": 240
},
"endPoint": {
"x": 1260,
"y": 240
},
"properties": {},
"pointsList": [
{
"x": 1180,
"y": 240
},
{
"x": 1260,
"y": 240
}
]
},
{
"id": "809cebae-3520-42b9-b781-a4e99f8e8493",
"type": "snaker:transition",
"sourceNodeId": "f9b8379f-f348-4985-ba58-b6ba28deb9af",
"targetNodeId": "409e8fad-6bd5-485a-8b3e-e1d58688e05a",
"startPoint": {
"x": 1315,
"y": 280
},
"endPoint": {
"x": 1315,
"y": 395
},
"properties": {},
"pointsList": [
{
"x": 1315,
"y": 280
},
{
"x": 1315,
"y": 395
}
]
},
{
"id": "d6c1ad28-0a92-463d-b8eb-3566cb996748",
"type": "snaker:transition",
"sourceNodeId": "409e8fad-6bd5-485a-8b3e-e1d58688e05a",
"targetNodeId": "47bfdf53-288c-4352-a403-0653483b54eb",
"startPoint": {
"x": 1345,
"y": 420
},
"endPoint": {
"x": 1574,
"y": 280
},
"properties": {
"expr": "{actualMoney>=10000}"
},
"text": {
"x": 1459.5,
"y": 420,
"value": "金额超过一万"
},
"pointsList": [
{
"x": 1345,
"y": 420
},
{
"x": 1574,
"y": 420
},
{
"x": 1574,
"y": 280
}
]
},
{
"id": "4749adda-4a3a-4fd4-a655-94007ce9eec6",
"type": "snaker:transition",
"sourceNodeId": "47bfdf53-288c-4352-a403-0653483b54eb",
"targetNodeId": "e283f33f-4ac7-4c66-9b16-e0653e8dc452",
"startPoint": {
"x": 1600,
"y": 240
},
"endPoint": {
"x": 1700,
"y": 240
},
"properties": {},
"pointsList": [
{
"x": 1600,
"y": 240
},
{
"x": 1700,
"y": 240
}
]
},
{
"id": "c68c6814-bd8f-4f4d-9dcb-0b79bf9af5c1",
"type": "snaker:transition",
"sourceNodeId": "e283f33f-4ac7-4c66-9b16-e0653e8dc452",
"targetNodeId": "776311f1-b016-4090-9112-1b4a11fb0d4a",
"startPoint": {
"x": 1820,
"y": 240
},
"endPoint": {
"x": 1902,
"y": 240
},
"properties": {},
"pointsList": [
{
"x": 1820,
"y": 240
},
{
"x": 1902,
"y": 240
}
]
},
{
"id": "218593d1-f31b-4c05-bf21-6da6110dc9dd",
"type": "snaker:transition",
"sourceNodeId": "409e8fad-6bd5-485a-8b3e-e1d58688e05a",
"targetNodeId": "e283f33f-4ac7-4c66-9b16-e0653e8dc452",
"startPoint": {
"x": 1320,
"y": 445
},
"endPoint": {
"x": 1760,
"y": 280
},
"properties": {
"expr": "{actualMoney<10000}"
},
"text": {
"x": 1540,
"y": 541,
"value": "金额没有超过一万"
},
"pointsList": [
{
"x": 1320,
"y": 445
},
{
"x": 1320,
"y": 541
},
{
"x": 1760,
"y": 541
},
{
"x": 1760,
"y": 280
}
]
}
]
}
@@ -380,6 +380,9 @@ layout("/layouts/platform.html"){
}
},
methods: {
isTemporaryUnionApplicant() {
return this.$auth.hasRole('UNION_TEMP_REIMBURSEMENT_APPLICANT')
},
hasUnionRole() {
return this.$auth.hasPermission('activityReimbursement.apply.unionHas')
},
@@ -565,6 +568,10 @@ layout("/layouts/platform.html"){
}
this.formData.id = this.bizId ? this.bizId : null
if (this.isTemporaryUnionApplicant()) {
// 申报记录的ID不能作为报销主键,单独保留关联活动以供后端校验。
this.$set(this.formData, 'declareId', id)
}
if (data.planStartTime && data.planEndTime) {
this.formData.planDate = [data.planStartTime, data.planEndTime]
@@ -602,6 +609,15 @@ layout("/layouts/platform.html"){
},
initBudgetType() {
this.$businessTool.getDictOptions("ACTIVITY_BUDGET_TYPE").then(resp => {
// 临时报销人即使兼有其他角色,也只能使用分工会经费。
if (this.isTemporaryUnionApplicant()) {
this.budgetTypeOption = resp.filter(v => v.code === "ACTIVITY_BUDGET_TYPE_TWO")
if (!this.bizId) {
this.$set(this.formData, 'outlayManageSource', 'ACTIVITY_BUDGET_TYPE_TWO')
this.outlayManageSourceChange('ACTIVITY_BUDGET_TYPE_TWO')
}
return
}
this.budgetTypeOption = resp
const budgetTypeCloseOption = []
const typeOneOption = resp.find(v => v.code === "ACTIVITY_BUDGET_TYPE_ONE")
@@ -636,6 +652,16 @@ layout("/layouts/platform.html"){
})
},
initReimbursementIdentity() {
if (this.isTemporaryUnionApplicant()) {
this.reimbursementIdentityOption = [{name: "分工会", code: "union"}]
if (!this.bizId) {
this.$set(this.formData, 'reimbursementIdentity', 'union')
if (this.$store.state.user.union) {
this.reimbursementIdentityChange('union')
}
}
return
}
if (this.$auth.hasPermission('activityReimbursement.apply.schoolHas')) {
this.reimbursementIdentityOption.push({name: "校工会", code: "school"})
}
@@ -276,6 +276,9 @@ layout("/layouts/platform_h5.html"){
}
},
methods: {
isTemporaryUnionApplicant() {
return this.$auth.hasRole('UNION_TEMP_REIMBURSEMENT_APPLICANT')
},
hasUnionRole() {
return this.$auth.hasPermission('activityReimbursement.apply.unionHas')
},
@@ -786,6 +789,16 @@ layout("/layouts/platform_h5.html"){
},
initBudgetType() {
return this.$businessTool.getDictOptions('ACTIVITY_BUDGET_TYPE').then((resp) => {
// 与电脑端保持一致,临时报销人的经费范围不叠加其他角色权限。
if (this.isTemporaryUnionApplicant()) {
this.budgetTypeOption = resp.filter((item) => item.code === 'ACTIVITY_BUDGET_TYPE_TWO')
if (!this.bizId) {
this.$set(this.formData, 'outlayManageSource', 'ACTIVITY_BUDGET_TYPE_TWO')
this.$set(this.formData, 'outlayManageSourceName', '分工会经费')
this.outlayManageSourceChange('ACTIVITY_BUDGET_TYPE_TWO')
}
return
}
const result = []
const typeOne = resp.find((item) => item.code === 'ACTIVITY_BUDGET_TYPE_ONE')
if (typeOne) {
@@ -815,6 +828,17 @@ layout("/layouts/platform_h5.html"){
})
},
initReimbursementIdentity() {
if (this.isTemporaryUnionApplicant()) {
this.reimbursementIdentityOption = [{name: '分工会', code: 'union'}]
if (!this.bizId) {
this.$set(this.formData, 'reimbursementIdentity', 'union')
this.$set(this.formData, 'reimbursementIdentityName', '分工会')
if (this.$store.state.user.union) {
this.reimbursementIdentityChange('union')
}
}
return
}
if (this.hasSchoolLevelRole()) {
this.reimbursementIdentityOption.push({name: '校工会', code: 'school'})
}