diff --git a/src/main/java/com/budwk/app/zhgh/club/controller/infoManage/ClubExitManageController.java b/src/main/java/com/budwk/app/zhgh/club/controller/infoManage/ClubExitManageController.java new file mode 100644 index 00000000..f0d47b69 --- /dev/null +++ b/src/main/java/com/budwk/app/zhgh/club/controller/infoManage/ClubExitManageController.java @@ -0,0 +1,63 @@ +package com.budwk.app.zhgh.club.controller.infoManage; + +import cn.dev33.satoken.annotation.SaCheckPermission; +import com.budwk.app.base.page.Pagination; +import com.budwk.app.base.result.Result; +import com.budwk.app.base.constant.RoleConstant; +import com.budwk.app.web.commons.auth.utils.AuthUtil; +import com.budwk.app.zhgh.club.model.SysClub; +import com.budwk.app.zhgh.club.param.ClubUserPageForm; +import com.budwk.app.zhgh.club.service.SysClubInfoManageService; +import com.budwk.app.zhgh.club.service.SysClubService; +import com.budwk.app.zhgh.club.vo.ClubUserCommonPageVo; +import com.budwk.app.zhgh.club.vo.ClubUserJoinVo; +import org.nutz.ioc.loader.annotation.Inject; +import org.nutz.ioc.loader.annotation.IocBean; +import org.nutz.mvc.annotation.At; +import org.nutz.mvc.annotation.Ok; + +import javax.validation.Valid; +import java.util.List; + +@IocBean +@Ok("json") +@At("/platform/club/infoManage/exitManage") +public class ClubExitManageController { + + @Inject + private SysClubInfoManageService clubInfoManageService; + @Inject + private SysClubService sysClubService; + + @At("") + @Ok("beetl:/platform/zhgh/club/infoManage/exitManage/index.html") + @SaCheckPermission("club.infoManage.exitManage") + public void index() { + } + + @At + @SaCheckPermission("club.infoManage.exitManage") + public Result pageData(@Valid ClubUserPageForm pageForm) { + Pagination pagination = clubInfoManageService.exitManagePageData(pageForm); + return Result.success(pagination); + } + + @At + @SaCheckPermission("club.infoManage.exitManage") + public Result info(@Valid String id) { + ClubUserJoinVo clubUserJoinVo = clubInfoManageService.exitManageInfo(id); + return Result.success(clubUserJoinVo); + } + + @At + @SaCheckPermission("club.infoManage.exitManage") + public Result getClubList() { + List clubList; + if (AuthUtil.hasRoleOr(RoleConstant.SYSADMIN.name(), RoleConstant.SCHOOL_UNION_ADMIN.name(), RoleConstant.SCHOOL_UNION_CLUB_ADMIN.name())) { + clubList = sysClubService.getMyManageClub(); + } else { + clubList = sysClubService.getMyManageClub(); + } + return Result.success(clubList); + } +} diff --git a/src/main/java/com/budwk/app/zhgh/dayofficework/unionReimburse/model/UnionReimburseInvoiceDetail.java b/src/main/java/com/budwk/app/zhgh/dayofficework/unionReimburse/model/UnionReimburseInvoiceDetail.java new file mode 100644 index 00000000..a526f7b7 --- /dev/null +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/unionReimburse/model/UnionReimburseInvoiceDetail.java @@ -0,0 +1,66 @@ +package com.budwk.app.zhgh.dayofficework.unionReimburse.model; + +import cn.hutool.json.JSONObject; +import com.budwk.app.base.model.BaseModel; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.nutz.dao.entity.annotation.ColDefine; +import org.nutz.dao.entity.annotation.ColType; +import org.nutz.dao.entity.annotation.Column; +import org.nutz.dao.entity.annotation.Comment; +import org.nutz.dao.entity.annotation.Name; +import org.nutz.dao.entity.annotation.Table; +import org.nutz.dao.interceptor.annotation.PrevInsert; + +import java.util.List; + +/** + * 工会报销发票明细。 + * 每条明细对应一张发票文件,保存发票号码、金额和销售方等信息。 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@Table("union_reimburse_invoice_detail") +public class UnionReimburseInvoiceDetail extends BaseModel { + + @Name + @Comment("ID") + @ColDefine(type = ColType.VARCHAR, width = 32) + @PrevInsert(uu32 = true) + private String id; + + @Column + @Comment("报销主表ID") + @ColDefine(type = ColType.VARCHAR, width = 32) + private String reimburseId; + + @Column + @Comment("发票文件") + @ColDefine(type = ColType.MYSQL_JSON) + private List invoiceFiles; + + @Column + @Comment("发票号码") + @ColDefine(type = ColType.VARCHAR, width = 100) + private String invoiceNo; + + @Column + @Comment("发票金额") + @ColDefine(type = ColType.FLOAT, width = 10, precision = 2) + private Double invoiceAmount; + + @Column + @Comment("销售方信息名称") + @ColDefine(type = ColType.VARCHAR, width = 200) + private String sellerName; + + @Column + @Comment("项目名称") + @ColDefine(type = ColType.VARCHAR, width = 500) + private String itemName; + + @Column + @Comment("备注") + @ColDefine(type = ColType.VARCHAR, width = 500) + private String remark; +} diff --git a/src/main/resources/views/platform/zhgh/club/infoManage/exitManage/index.html b/src/main/resources/views/platform/zhgh/club/infoManage/exitManage/index.html new file mode 100644 index 00000000..eb0994fd --- /dev/null +++ b/src/main/resources/views/platform/zhgh/club/infoManage/exitManage/index.html @@ -0,0 +1,100 @@ + + + +
+ + + + + +
+ + + diff --git a/src/main/resources/views/platform/zhgh/club/infoManage/exitManage/info.js b/src/main/resources/views/platform/zhgh/club/infoManage/exitManage/info.js new file mode 100644 index 00000000..25c938be --- /dev/null +++ b/src/main/resources/views/platform/zhgh/club/infoManage/exitManage/info.js @@ -0,0 +1,95 @@ +const clubExitInfo = { + template: + /*language=HTML*/ + ` +
+
+ 退会信息 + 点击查看流程图 +
+ + {{viewData.userName}} + {{viewData.loginName}} + {{viewData.sex}} + {{$moment(viewData.birthday).format('YYYY-MM-DD')}} + {{viewData.mobile}} + {{viewData.email}} + {{viewData.unionName}} + {{viewData.unitName}} + {{viewData.position}} + {{viewData.technicalTitle}} + {{viewData.education}} + {{viewData.academicDegree}} + {{viewData.sameTimeJoinOtherClubSituation}} + {{viewData.awardsExperience}} + + + + + + 暂无 + + + + +
+ `, + dicts: ["PROCESS_TASK_SUBMIT_TYPE"], + data() { + return { + viewData: {}, + row: {}, + doneTasks: [], + } + }, + methods: { + onOpen(row) { + this.row = row + this.$axios.post("/platform/club/infoManage/exitManage/info", { id: row.id }).then((res) => { + if (res.code === 0) { + this.viewData = res.data + } + }) + this.getDoneTasks() + }, + getDoneTasks() { + this.$axios.post("/flow/common/doneTasks", {bizId: this.row.id}).then((res) => { + if (res.code === 0) { + this.doneTasks = res.data + } + }) + }, + openChart(){ + this.$refs.snakerChartRef.onOpenFull(this.row.instanceProcessDefineId, this.row.instanceId) + } + }, + style: /*language=CSS*/ ` + .el-descriptions-item__label { + width: 200px; + min-width: 200px; + max-width: 200px; + } + .el-tabs__header { + margin: 0; + } + ` +} diff --git a/src/main/resources/views/platform/zhghh5/staffbenefit/difficulthelp/unionLeaderApproval/index.html b/src/main/resources/views/platform/zhghh5/staffbenefit/difficulthelp/unionLeaderApproval/index.html new file mode 100644 index 00000000..40ade9be --- /dev/null +++ b/src/main/resources/views/platform/zhghh5/staffbenefit/difficulthelp/unionLeaderApproval/index.html @@ -0,0 +1,235 @@ + +
+ + + + + + + + + + + + + + + + + + + + + + +
+
{{formData.taskName}}
+ + + + + + + + + + + + + +
+ 退回 + 拒绝 + 同意 +
+
+
+
+ +