c-zhouhf1/zhgh_hgu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main'

Browse Source
This commit is contained in:
@jyuhsin
2025-11-13 14:41:40 +08:00
parent e9cffbb467 4f8ccd1101
commit dec65e790e
21 changed files with 446 additions and 332 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/budwk/app/sys/controller/SysUnionController.java
+1 -1
View File
@@ -373,7 +373,7 @@ public class SysUnionController {
@SaCheckPermission("sys.manager.union.partUnit")
public Result branchUnionPartUnitTransferData(String unionId) {
// List<Sys_unit> units = dao.query(Sys_unit.class, Cnd.where("unitLevel", "=", 2).asc("unitcode"));
List<Sys_unit> units = dao.query(Sys_unit.class, Cnd.where("unitTypeCode", "=", "1").asc("unitcode"));
List<Sys_unit> units = dao.query(Sys_unit.class, Cnd.where("unitTypeCode", "=", "1").and("LENGTH(unitcode)", "=", 7).asc("unitcode"));
List<String> selectUnitIds = units.stream().filter(unit -> StrUtil.isNotBlank(unit.getUnionId()) && unit.getUnionId().equals(unionId)).map(Sys_unit::getId).toList();
List<Sys_unit> matchUnits = units.stream().filter(unit -> StrUtil.isBlank(unit.getUnionId()) || (StrUtil.isNotBlank(unit.getUnionId()) && unit.getUnionId().equals(unionId))).toList();
NutMap transferData = NutMap.NEW().addv("selectUnitIds", selectUnitIds).addv("allUnits", matchUnits);
src/main/java/com/budwk/app/web/controllers/open/commons/CommonController.java
+1
View File
@@ -136,6 +136,7 @@ public class CommonController {
Cnd cnd = Cnd.NEW();
cnd.andEX("unit.unionId", "=", unionId);
cnd.and("unit.unitTypeCode", "=", "1");
cnd.and("unit.unionId", "is not", null);
cnd.asc("unit.unitcode");
sql.setCondition(cnd);
List<NutMap> unitList = sysUserService.listMap(sql);
src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/config/ProposalConfigUnitController.java
+6 -5
View File
@@ -114,7 +114,8 @@ public class ProposalConfigUnitController {
@SLog(tag = "提案", msg = "承办单位同步系统单位")
public Result syncSysUnit() {
Sql sql = Sqls.create("select code from proposal_undertake");
List<Sys_unit> sysUnits = dao.query(Sys_unit.class, Cnd.where(Sys_unit::getUnitcode, "not in", sql).and(Sys_unit::getUnitTypeCode, "=", 1));
List<Sys_unit> sysUnits = dao.query(Sys_unit.class, Cnd.where(Sys_unit::getUnitcode, "not in", sql)
.and(Sys_unit::getUnitTypeCode, "=", 1).and("unionId", "is not", null));
List<ProposalUndertake> proposalUndertakes = sysUnits.stream().map(unit -> {
ProposalUndertake proposalUndertake = new ProposalUndertake();
proposalUndertake.setId(unit.getId());
@@ -198,10 +199,10 @@ public class ProposalConfigUnitController {
//查询全部的校领导
Sql sql = Sqls.create("select id,username,loginname,unitname,concat(username,'(',loginname,')') label from vw_user where unitId in (@unitId)");
ProposalConfig proposalConfig = dao.fetch(ProposalConfig.class, Cnd.NEW());
if(ObjectUtil.isNull(proposalConfig)){
if (ObjectUtil.isNull(proposalConfig)) {
return Result.error("提案全局配置未配置，请在提案管理-基础配置-提案配置页面进行配置。");
}
if(ObjectUtil.isEmpty(proposalConfig.getSchoolLeaderUnitIds())){
if (ObjectUtil.isEmpty(proposalConfig.getSchoolLeaderUnitIds())) {
return Result.error("校领导单位未配置，请在提案管理-基础配置-提案配置页面进行配置。");
}
@@ -230,8 +231,8 @@ public class ProposalConfigUnitController {
Sql sql = Sqls.create("select id,username,loginname,unitname,concat(username,'(',loginname,')') label from vw_user $condition");
Cnd cnd = Cnd.NEW();
cnd.and("unitCode","=",proposalUndertake.getCode());
cnd.orEX("id","in",selectUserIds);
cnd.and("unitCode", "=", proposalUndertake.getCode());
cnd.orEX("id", "in", selectUserIds);
sql.setCondition(cnd);
// sql.setParam("unitCode", proposalUndertake.getCode());
// sql.setParam("selectUserIds", selectUserIds);
src/main/java/com/budwk/app/zhgh/democratic/teachercongress/delegation/controller/TeacherCongressDelegationController.java
+1 -1
View File
@@ -179,7 +179,7 @@ public class TeacherCongressDelegationController {
seg.orEX("id", "in", selectUnitIds);
// Cnd cnd = Cnd.where("unitLevel", "=", 2);
Cnd cnd = Cnd.where("unitTypeCode", "=", "1");
Cnd cnd = Cnd.where("unitTypeCode", "=", "1").and("unionId","is not",null);
if (!seg.isEmpty()) {
cnd.and(seg);
}
src/main/java/com/budwk/app/zhgh/staffbenefit/condolence/controller/CondolenceMineController.java
+21
View File
@@ -9,11 +9,13 @@ import com.budwk.app.base.constant.RoleConstant;
import com.budwk.app.base.page.Pagination;
import com.budwk.app.base.param.PageForm;
import com.budwk.app.base.result.Result;
import com.budwk.app.base.utils.CommonDownloadUtil;
import com.budwk.app.base.utils.PageUtil;
import com.budwk.app.flow.engine.FlowEngine;
import com.budwk.app.sys.views.View_user;
import com.budwk.app.web.commons.auth.utils.AuthUtil;
import com.budwk.app.web.commons.auth.utils.SecurityUtil;
import com.budwk.app.zhgh.democratic.proposal.models.ProposalInfo;
import com.budwk.app.zhgh.staffbenefit.condolence.model.Condolence;
import com.budwk.app.zhgh.staffbenefit.condolence.model.CondolenceType;
import com.budwk.app.zhgh.staffbenefit.condolence.service.CondolenceService;
@@ -21,8 +23,10 @@ import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.nutz.aop.interceptor.ioc.TransAop;
import org.nutz.dao.Cnd;
import org.nutz.dao.FieldFilter;
import org.nutz.dao.Sqls;
import org.nutz.dao.sql.Sql;
import org.nutz.dao.util.Daos;
import org.nutz.dao.util.cri.SqlExpressionGroup;
import org.nutz.ioc.aop.Aop;
import org.nutz.ioc.loader.annotation.Inject;
@@ -33,6 +37,11 @@ import org.nutz.mvc.annotation.At;
import org.nutz.mvc.annotation.Ok;
import org.nutz.mvc.annotation.Param;
import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
/**
* @ClassName CondolenceApplyController
* @Author JyuHsin
@@ -138,4 +147,16 @@ public class CondolenceMineController {
nutMap.put("typeName", type.getName());
return Result.success(nutMap);
}
@At
@ApiOperation("导出单个慰问申请信息")
@SaCheckPermission("condolence")
public void onExport(@Valid String id, HttpServletResponse response){
Condolence condolence = condolenceService.fetch(id);
String fileName;
}
}
src/main/java/com/budwk/app/zhgh/staffbenefit/condolence/controller/CondolenceSchoolUnionApprovalController.java
+50 -48
View File
@@ -39,29 +39,31 @@ import java.util.List;
@Ok("json:full")
public class CondolenceSchoolUnionApprovalController {
@Inject
private CondolenceService condolenceService;
@Inject
private CondolenceService condolenceService;
@At("/")
@Ok("beetl:/platform/zhgh/staffbenefit/condolence/schoolUnionApproval/index.html")
@SaCheckPermission("condolence.schoolUnionApproval")
public void index() {}
@At("/")
@Ok("beetl:/platform/zhgh/staffbenefit/condolence/schoolUnionApproval/index.html")
@SaCheckPermission("condolence.schoolUnionApproval")
public void index() {
}
@At("/h5")
@Ok("beetl:/platform/zhghh5/staffbenefit/condolence/schoolUnionApproval/index.html")
@SaCheckPermission("h5.condolence.schoolUnionApproval")
public void h5Index() {}
@At("/h5")
@Ok("beetl:/platform/zhghh5/staffbenefit/condolence/schoolUnionApproval/index.html")
@SaCheckPermission("h5.condolence.schoolUnionApproval")
public void h5Index() {
}
@At
@ApiOperation("分页查询")
@SaCheckPermission(value = {"condolence.schoolUnionApproval", "h5.condolence.schoolUnionApproval"}, mode = SaMode.OR)
public Result pageData(PageForm pageForm,
@Param(value = "year") Integer year,
@Param(value = "type") String type,
@Param(value = "unionId") String unionId,
@Param(value = "unitId") String unitId,
@Param(value = "approval") Boolean approval) {
Sql sql = Sqls.create("""
@At
@ApiOperation("分页查询")
@SaCheckPermission(value = {"condolence.schoolUnionApproval", "h5.condolence.schoolUnionApproval"}, mode = SaMode.OR)
public Result pageData(PageForm pageForm,
@Param(value = "year") Integer year,
@Param(value = "type") String type,
@Param(value = "unionId") String unionId,
@Param(value = "unitId") String unitId,
@Param(value = "approval") Boolean approval) {
Sql sql = Sqls.create("""
SELECT
info.*,
type.name as typeName,
@@ -91,35 +93,35 @@ public class CondolenceSchoolUnionApprovalController {
LEFT JOIN wf_process_task rt ON rt.processInstanceId = ins.id AND rt.taskParentId = t.id AND rt.taskState = 10
$condition
""");
Cnd cnd = Cnd.NEW();
if (StrUtil.isNotBlank(pageForm.getSearchKeyword())) {
SqlExpressionGroup seg = new SqlExpressionGroup();
seg.or(Condolence::getHelpUserName, "like", "%" + pageForm.getSearchKeyword() + "%");
seg.or(Condolence::getHelpLoginName, "like", "%" + pageForm.getSearchKeyword() + "%");
cnd.and(seg);
}
cnd.andEX("info.type", "=", type);
cnd.andEX("YEAR(info.createTime)", "=", year);
cnd.andEX("info.applyUnionId", "=", unionId);
cnd.andEX("info.applyUnitId", "=", unitId);
Cnd cnd = Cnd.NEW();
if (StrUtil.isNotBlank(pageForm.getSearchKeyword())) {
SqlExpressionGroup seg = new SqlExpressionGroup();
seg.or(Condolence::getHelpUserName, "like", "%" + pageForm.getSearchKeyword() + "%");
seg.or(Condolence::getHelpLoginName, "like", "%" + pageForm.getSearchKeyword() + "%");
cnd.and(seg);
}
cnd.andEX("info.type", "=", type);
cnd.andEX("YEAR(info.createTime)", "=", year);
cnd.andEX("info.applyUnionId", "=", unionId);
cnd.andEX("info.applyUnitId", "=", unitId);
cnd.and("t.taskName", "=", "ecdaef3b-edf4-4143-9a96-887dd5921711");
cnd.and("ta.actorId", "in", List.of(SecurityUtil.getUserId()));
cnd.and("t.taskName", "=", "ecdaef3b-edf4-4143-9a96-887dd5921711");
cnd.and("ta.actorId", "in", List.of(SecurityUtil.getUserId()));
if (approval) {
cnd.and("t.taskState", "in", List.of(ProcessTaskStateEnum.FINISHED.getCode(), ProcessTaskStateEnum.INTERRUPT.getCode()));
} else {
cnd.and("t.taskState", "=", ProcessTaskStateEnum.DOING.getCode());
}
if (approval) {
cnd.and("t.taskState", "in", List.of(ProcessTaskStateEnum.FINISHED.getCode(), ProcessTaskStateEnum.INTERRUPT.getCode()));
} else {
cnd.and("t.taskState", "=", ProcessTaskStateEnum.DOING.getCode());
}
if (StrUtil.isAllBlank(pageForm.getPageOrderName(), pageForm.getPageOrderBy())) {
cnd.desc("info.createTime");
} else {
cnd.orderBy(pageForm.getPageOrderName(), PageUtil.getOrder(pageForm.getPageOrderBy()));
}
cnd.groupBy("t.id");
sql.setCondition(cnd);
Pagination<NutMap> pageVO = condolenceService.listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), sql);
return Result.success(pageVO);
}
if (StrUtil.isAllBlank(pageForm.getPageOrderName(), pageForm.getPageOrderBy())) {
cnd.desc("info.createTime");
} else {
cnd.orderBy(pageForm.getPageOrderName(), PageUtil.getOrder(pageForm.getPageOrderBy()));
}
cnd.groupBy("t.id");
sql.setCondition(cnd);
Pagination<NutMap> pageVO = condolenceService.listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), sql);
return Result.success(pageVO);
}
}
src/main/java/com/budwk/app/zhgh/staffbenefit/condolence/model/Condolence.java
+6
View File
@@ -8,6 +8,7 @@ import lombok.EqualsAndHashCode;
import org.nutz.dao.entity.annotation.*;
import org.nutz.dao.interceptor.annotation.PrevInsert;
import javax.validation.constraints.Size;
import java.util.List;
/**
@@ -185,4 +186,9 @@ public class Condolence extends BaseModel {
@ColDefine(type = ColType.VARCHAR, width = 30)
private String createTime;
@Column
@Comment("职务")
@ColDefine(type = ColType.VARCHAR, width = 50)
private String position;
}
src/main/resources/views/platform/zhgh/democratic/grassrootscongress/meeting/info.js
+1 -1
View File
@@ -31,7 +31,7 @@ const GRASSROOTS_CONGRESS_MEETING_INFO = {
<el-descriptions-item label="备注" span="2">
{{viewData.meetingRemark}}
</el-descriptions-item>
<el-descriptions-item label="请示附件" span="2">
<el-descriptions-item label="附件" span="2">
<file-preview :files="viewData.files" complete_result></file-preview>
</el-descriptions-item>
</el-descriptions>
src/main/resources/views/platform/zhgh/democratic/proposal/transact/committeeFiling/index.html
+2
View File
@@ -135,6 +135,8 @@ layout("/layouts/platform.html"){
<el-form-item label="协办单位"
v-if="['CONFIRM_FILING','SUGGESTION'].includes(formData.tf_caseFilingResult)"
prop="tf_slaveUnitIds"
:rules="[{required:['CONFIRM_FILING'].includes(formData.tf_caseFilingResult),message:'必填',trigger:['change','blur']}]"
>
<el-select v-model="formData.tf_slaveUnitIds" filterable clearable multiple
style="width: 100%">
src/main/resources/views/platform/zhgh/democratic/teachercongress/delegation/headForm.js
+2 -2
View File
@@ -64,8 +64,8 @@ const HEAD_FORM_TEMPLATE = {
name: [{required: true, message: "必填", trigger: ["change", "blur"]}],
code: [{required: true, message: "必填", trigger: ["change", "blur"]}],
userId: [{required: true, message: "必填", trigger: ["change", "blur"]}],
viceUserId: [{required: true, message: "必填", trigger: ["change", "blur"]}],
contactUserId: [{required: true, message: "必填", trigger: ["change", "blur"]}]
// viceUserId: [{required: true, message: "必填", trigger: ["change", "blur"]}],
// contactUserId: [{required: true, message: "必填", trigger: ["change", "blur"]}]
}
}
},
src/main/resources/views/platform/zhgh/democratic/teachercongress/meetings/index.html
+2 -2
View File
@@ -224,14 +224,14 @@ layout("/layouts/platform.html"){
cancelButtonText: "取消",
type: "warning"
}).then(() => {
this.onDelete(id)
}).catch(() => {
this.$axios.post("/platform/teacherCongress/meetings/delete", { id }).then((res) => {
if (res.code === 0) {
this.$message.success(res.msg)
this.doSearch()
}
})
}).catch(() => {
})
}
},
src/main/resources/views/platform/zhgh/staffbenefit/condolence/apply/index.html
+72 -64
View File
@@ -12,24 +12,30 @@ layout("/layouts/platform.html"){
<el-descriptions-item label="申请人工号">{{formData.applyLoginName}}</el-descriptions-item>
<el-descriptions-item label="申请人单位">{{formData.applyUnitName}}</el-descriptions-item>
<el-descriptions-item label="申请人工会">{{formData.applyUnionName}}</el-descriptions-item>
<el-descriptions-item label="职务">
<el-form-item prop="position" label="职务">
<el-input v-model="formData.position"
placeholder="请填写职务"></el-input>
</el-form-item>
</el-descriptions-item>
<el-descriptions-item label="慰问对象">
<el-form-item prop="helpUserId" label="慰问对象">
<el-select
style="width: 100%"
v-model="formData.helpUserId"
filterable
clearable
remote
reserve-keyword
placeholder="请输入姓名或工号查询"
:remote-method="createRemoteMethod(helpUserOptions)"
@change="helpUserChange">
style="width: 100%"
v-model="formData.helpUserId"
filterable
clearable
remote
reserve-keyword
placeholder="请输入姓名或工号查询"
:remote-method="createRemoteMethod(helpUserOptions)"
@change="helpUserChange">
<el-option
v-for="item in helpUserOptions"
:key="item.id"
:label="item.userName+'（'+item.loginName+'）'+'（'+item.unitName+'）'+'（'+item.sex+'）'"
:value="item.id">
v-for="item in helpUserOptions"
:key="item.id"
:label="item.userName+'（'+item.loginName+'）'+'（'+item.unitName+'）'+'（'+item.sex+'）'"
:value="item.id">
</el-option>
</el-select>
</el-form-item>
@@ -37,20 +43,20 @@ layout("/layouts/platform.html"){
<el-descriptions-item label="收款人">
<el-form-item prop="payUserId" label="慰问对象">
<el-select
style="width: 100%"
v-model="formData.payUserId"
filterable
clearable
remote
reserve-keyword
placeholder="请输入姓名或工号查询"
:remote-method="createRemoteMethod(payUserOptions)"
@change="payUserChange">
style="width: 100%"
v-model="formData.payUserId"
filterable
clearable
remote
reserve-keyword
placeholder="请输入姓名或工号查询"
:remote-method="createRemoteMethod(payUserOptions)"
@change="payUserChange">
<el-option
v-for="item in payUserOptions"
:key="item.id"
:label="item.userName+'（'+item.loginName+'）'+'（'+item.unitName+'）'+'（'+item.sex+'）'"
:value="item.id">
v-for="item in payUserOptions"
:key="item.id"
:label="item.userName+'（'+item.loginName+'）'+'（'+item.unitName+'）'+'（'+item.sex+'）'"
:value="item.id">
</el-option>
</el-select>
</el-form-item>
@@ -65,7 +71,7 @@ layout("/layouts/platform.html"){
:label="item.name"></el-option>
</el-select>
</el-descriptions-item>
<el-descriptions-item label="慰问方式">
<!-- <el-descriptions-item label="慰问方式">
<el-form-item prop="way" label="慰问方式">
<el-select v-model="formData.way"
placeholder="选择慰问类型自动匹配慰问方式"
@@ -77,7 +83,7 @@ layout("/layouts/platform.html"){
<el-option label="慰问品 (C)" value="3"></el-option>
</el-select>
</el-form-item>
</el-descriptions-item>
</el-descriptions-item>-->
<el-descriptions-item label="慰问金额">
<el-form-item prop="money" label="慰问金额">
<el-input style="width: 100%" v-model="formData.money"
@@ -92,12 +98,12 @@ layout("/layouts/platform.html"){
<el-descriptions-item label="慰问时间">
<el-form-item label="慰问时间" prop="occurTime">
<el-date-picker
clearable
style="width: 100%"
v-model="formData.occurTime"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择慰问时间">
clearable
style="width: 100%"
v-model="formData.occurTime"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择慰问时间">
</el-date-picker>
</el-form-item>
</el-descriptions-item>
@@ -156,9 +162,9 @@ layout("/layouts/platform.html"){
</el-descriptions-item>
</template>
<el-descriptions-item label="申请事由" :span="2">
<el-form-item prop="remark" label="申请事由">
<el-input maxlength="500" v-model="formData.remark" placeholder="请填写申请事由"
<el-descriptions-item label="情况说明" :span="2">
<el-form-item prop="remark" label="情况说明">
<el-input maxlength="500" v-model="formData.remark" placeholder="请填写情况说明"
type="textarea" :autosize="{ minRows: 4, maxRows: 8}"></el-input>
</el-form-item>
</el-descriptions-item>
@@ -174,11 +180,11 @@ layout("/layouts/platform.html"){
</template>
<el-form-item prop="files" label="附件">
<file-upload
:value.sync="formData.files"
:upload_number="5"
upload_result_category="array"
complete_result
upload_mode="drag"
:value.sync="formData.files"
:upload_number="5"
upload_result_category="array"
complete_result
upload_mode="drag"
></file-upload>
</el-form-item>
</el-descriptions-item>
@@ -208,21 +214,22 @@ layout("/layouts/platform.html"){
taskId: GetQueryString("taskId"),
formData: {},
formRules: {
helpUserId: [{ required: true, message: "必填", trigger: ["change", "blur"] }],
payUserId: [{ required: true, message: "必填", trigger: ["change", "blur"] }],
type: [{ required: true, message: "必填", trigger: ["change", "blur"] }],
way: [{ required: true, message: "必填", trigger: ["change", "blur"] }],
money: [{ required: true, message: "必填", trigger: ["change", "blur"] }],
occurTime: [{ required: true, message: "必填", trigger: ["change", "blur"] }],
child: [{ required: true, message: "必填", trigger: ["change", "blur"] }],
hospital: [{ required: true, message: "必填", trigger: ["change", "blur"] }],
hospitalHouseNum: [{ required: true, message: "必填", trigger: ["change", "blur"] }],
hospitalHouseBedNum: [{ required: true, message: "必填", trigger: ["change", "blur"] }],
hospitalBy: [{ required: true, message: "必填", trigger: ["change", "blur"] }],
deadImmediateFamily: [{ required: true, message: "必填", trigger: ["change", "blur"] }],
remark: [{ required: true, message: "必填", trigger: ["change", "blur"] }],
files: [{ required: true, message: "必填", trigger: ["change", "blur"] }],
signature: [{ required: true, message: "必填", trigger: ["change", "blur"] }]
helpUserId: [{required: true, message: "必填", trigger: ["change", "blur"]}],
payUserId: [{required: true, message: "必填", trigger: ["change", "blur"]}],
type: [{required: true, message: "必填", trigger: ["change", "blur"]}],
way: [{required: true, message: "必填", trigger: ["change", "blur"]}],
money: [{required: true, message: "必填", trigger: ["change", "blur"]}],
occurTime: [{required: true, message: "必填", trigger: ["change", "blur"]}],
child: [{required: true, message: "必填", trigger: ["change", "blur"]}],
hospital: [{required: true, message: "必填", trigger: ["change", "blur"]}],
hospitalHouseNum: [{required: true, message: "必填", trigger: ["change", "blur"]}],
hospitalHouseBedNum: [{required: true, message: "必填", trigger: ["change", "blur"]}],
hospitalBy: [{required: true, message: "必填", trigger: ["change", "blur"]}],
deadImmediateFamily: [{required: true, message: "必填", trigger: ["change", "blur"]}],
remark: [{required: true, message: "必填", trigger: ["change", "blur"]}],
files: [{required: true, message: "必填", trigger: ["change", "blur"]}],
signature: [{required: true, message: "必填", trigger: ["change", "blur"]}],
position: [{required: true, message: "必填", trigger: ["change", "blur"]}]
},
chooseType: {},
payUserOptions: [],
@@ -238,7 +245,7 @@ layout("/layouts/platform.html"){
},
selectQueryUser(keyword, options) {
options.length = 0
this.$axios.post("/platform/condolence/apply/listUser", { keyword: keyword }).then((res) => {
this.$axios.post("/platform/condolence/apply/listUser", {keyword: keyword}).then((res) => {
if (res.code === 0) {
options.push(...res.data)
}
@@ -247,7 +254,7 @@ layout("/layouts/platform.html"){
helpUserChange(val) {
const user = this.helpUserOptions.find(o => o.id === val)
if (user) {
const { userName, loginName, unitId, unitName, unionId, unionName } = user
const {userName, loginName, unitId, unitName, unionId, unionName} = user
this.$set(this.formData, "helpUserName", userName)
this.$set(this.formData, "helpLoginName", loginName)
this.$set(this.formData, "helpUnitId", unitId)
@@ -259,7 +266,7 @@ layout("/layouts/platform.html"){
payUserChange(val) {
const user = this.payUserOptions.find(o => o.id === val)
if (user) {
const { userName, loginName } = user
const {userName, loginName} = user
this.$set(this.formData, "payUserName", userName)
this.$set(this.formData, "payLoginName", loginName)
}
@@ -277,7 +284,7 @@ layout("/layouts/platform.html"){
cancelButtonText: "取消",
type: "warning"
}).then(() => {
this.$axios.post("/platform/condolence/apply/save", { data: JSON.stringify(this.formData) }).then(res => {
this.$axios.post("/platform/condolence/apply/save", {data: JSON.stringify(this.formData)}).then(res => {
if (res.code === 0) {
this.$message.success(res.msg)
commonUtil.pjaxPush("/platform/condolence/mine")
@@ -328,7 +335,7 @@ layout("/layouts/platform.html"){
},
init() {
if (this.bizId) {
this.$axios.post("/platform/condolence/mine/info", { id: this.bizId }).then((res) => {
this.$axios.post("/platform/condolence/mine/info", {id: this.bizId}).then((res) => {
if (res.code === 0) {
this.formData = res.data
this.selectQueryUser(this.formData.helpLoginName, this.helpUserOptions)
@@ -337,7 +344,7 @@ layout("/layouts/platform.html"){
}
})
} else {
const { username, loginname, id, unit, union, mobile } = this.$store.state.user
const {username, loginname, id, unit, union, mobile,position} = this.$store.state.user
this.formData = {
applyUserName: username,
applyLoginName: loginname,
@@ -345,7 +352,8 @@ layout("/layouts/platform.html"){
applyUnitId: unit?.id,
applyUnitName: unit?.name,
applyUnionId: union?.id,
applyUnionName: union?.name
applyUnionName: union?.name,
position: position
}
}
},
src/main/resources/views/platform/zhgh/staffbenefit/condolence/branchUnionApproval/index.html
+4
View File
@@ -81,6 +81,10 @@ layout("/layouts/platform.html"){
:rules="[{required:true,message:'必填',trigger:['change','blur']}]">
<user-opinion-textarea v-model="formData.tf_opinion"></user-opinion-textarea>
</el-form-item>
<el-form-item label="签字" prop="tf_userSign"
:rules="[{required:true,message:'必填',trigger:['change','blur']}]">
<pc-signature v-model="formData.tf_userSign"></pc-signature>
</el-form-item>
</el-form>
<el-row type="flex" justify="end">
<el-button @click="$refs.guava.index()" size="small">取消</el-button>
src/main/resources/views/platform/zhgh/staffbenefit/condolence/common/info.js
+12 -3
View File
@@ -10,10 +10,11 @@ const condolenceInfo = {
<el-descriptions-item label="申请人工号">{{ viewData.applyLoginName }}</el-descriptions-item>
<el-descriptions-item label="申请人单位">{{ viewData.applyUnitName }}</el-descriptions-item>
<el-descriptions-item label="申请人工会">{{ viewData.applyUnionName }}</el-descriptions-item>
<el-descriptions-item label="职务">{{ viewData.position }}</el-descriptions-item>
<el-descriptions-item label="慰问对象">{{ viewData.helpUserName }}</el-descriptions-item>
<el-descriptions-item label="收款人">{{ viewData.payUserName }}</el-descriptions-item>
<el-descriptions-item label="慰问类型">{{ viewData.typeName }}</el-descriptions-item>
<el-descriptions-item label="慰问方式">{{ viewData.way }}</el-descriptions-item>
<!-- <el-descriptions-item label="慰问方式">{{ viewData.way }}</el-descriptions-item>-->
<el-descriptions-item label="慰问金额">{{ viewData.money }}</el-descriptions-item>
<el-descriptions-item label="慰问时间">{{ viewData.occurTime }}</el-descriptions-item>
<el-descriptions-item v-if="['2'].includes(viewData.type)" label="孩次">{{ viewData.child }}</el-descriptions-item>
@@ -22,7 +23,11 @@ const condolenceInfo = {
<el-descriptions-item v-if="['3','4'].includes(viewData.type)" label="床号">{{ viewData.hospitalHouseBedNum }}</el-descriptions-item>
<el-descriptions-item v-if="['4'].includes(viewData.type)" label="患病病种">{{ viewData.hospitalBy }}</el-descriptions-item>
<el-descriptions-item v-if="['6'].includes(viewData.type)" label="直系亲属">{{ viewData.deadImmediateFamily }}</el-descriptions-item>
<el-descriptions-item label="申请事由" :span="2">{{ viewData.remark }}</el-descriptions-item>
<el-descriptions-item label="情况说明" :span="2">
<div style="white-space: pre-line">
{{ viewData.remark }}
</div>
</el-descriptions-item>
<el-descriptions-item label="附件" :span="2">
<file-preview v-if="viewData.files && viewData.files.length > 0" :files="viewData.files" complete_result></file-preview>
<span v-else>暂无附件</span>
@@ -59,9 +64,13 @@ const condolenceInfo = {
<dict-tag :options="dict.type.PROCESS_TASK_SUBMIT_TYPE"
:value="task.ext.submitType"></dict-tag>
</el-descriptions-item>
<el-descriptions-item label="办理意见" v-if="!task.ext.isFirstTaskNode">{{
<el-descriptions-item label="办理意见" v-if="!task.ext.isFirstTaskNode" :span="3">{{
task.taskFormData.opinion }}
</el-descriptions-item>
<el-descriptions-item label="签字" v-if="!task.ext.isFirstTaskNode" :span="3">
<el-image :src="task.ext.tf_userSign" fit="cover" style="height: 60px"
v-if="task.ext.tf_userSign"></el-image>
</el-descriptions-item>
</el-descriptions>
</div>
</template>
src/main/resources/views/platform/zhgh/staffbenefit/condolence/mine/index.html
+21 -7
View File
@@ -54,17 +54,25 @@ layout("/layouts/platform.html"){
v-for="column in tableColumns"
>
<template v-slot="{ row }" v-if="column.prop === 'instanceState'">
<enum-tag :value="row.instanceState" name="ProcessInstanceStateEnum" label_key="message" size="small"></enum-tag>
<enum-tag :value="row.instanceState" name="ProcessInstanceStateEnum" label_key="message"
size="small"></enum-tag>
</template>
</el-table-column>
<el-table-column label="操作" fixed="right" width="300">
<template slot-scope="{row}">
<el-button @click="onView(row)" size="mini" type="primary">查看</el-button>
<el-button v-if="row.taskKey === 'startTask' || !row.instanceId" @click="onEdit(row)" size="mini" type="primary">编辑</el-button>
<el-button v-if="row.canRevoke" size="mini" type="danger" @click="onRevoke(row)">撤回</el-button>
<el-button v-if="row.taskKey === 'startTask' || !row.instanceId" @click="onDelete(row.id)" size="mini" type="danger">
<el-button v-if="row.taskKey === 'startTask' || !row.instanceId" @click="onEdit(row)"
size="mini" type="primary">编辑
</el-button>
<el-button v-if="row.canRevoke" size="mini" type="danger" @click="onRevoke(row)">撤回
</el-button>
<el-button v-if="row.taskKey === 'startTask' || !row.instanceId" @click="onDelete(row.id)"
size="mini" type="danger">
删除
</el-button>
<el-button v-if="row.instanceState === 20" @click="onExport(row.id)" size="mini" type="primary">
导出
</el-button>
</template>
</el-table-column>
</el-table>
@@ -102,11 +110,17 @@ layout("/layouts/platform.html"){
}
},
methods: {
onExport(id) {
this.$downLoad('/platform/condolence/mine/onExport', {
id: id
})
},
onAdd() {
commonUtil.pjaxPush('/platform/condolence/apply')
},
onView(row) {
this.$refs.guava.view(()=>{
this.$refs.guava.view(() => {
this.$refs.condolenceInfoRef.onOpen(row)
})
},
@@ -119,7 +133,7 @@ layout("/layouts/platform.html"){
cancelButtonText: "取消",
type: "warning"
}).then(() => {
this.$axios.post("/flow/common/revokeTask", { taskId: row.startTaskId }).then((res) => {
this.$axios.post("/flow/common/revokeTask", {taskId: row.startTaskId}).then((res) => {
if (res.code === 0) {
this.$message.success(res.msg)
this.pageData()
@@ -133,7 +147,7 @@ layout("/layouts/platform.html"){
cancelButtonText: "取消",
type: "warning"
}).then(() => {
this.$axios.post("/platform/condolence/mine/delete", { id }).then((res) => {
this.$axios.post("/platform/condolence/mine/delete", {id}).then((res) => {
if (res.code === 0) {
this.$message.success(res.msg)
this.pageData()
src/main/resources/views/platform/zhgh/staffbenefit/condolence/schoolUnionApproval/index.html
+4
View File
@@ -101,6 +101,10 @@ layout("/layouts/platform.html"){
:rules="[{required:true,message:'必填',trigger:['change','blur']}]">
<user-opinion-textarea v-model="formData.tf_opinion"></user-opinion-textarea>
</el-form-item>
<el-form-item label="签字" prop="tf_userSign"
:rules="[{required:true,message:'必填',trigger:['change','blur']}]">
<pc-signature v-model="formData.tf_userSign"></pc-signature>
</el-form-item>
</el-form>
<el-row type="flex" justify="end">
<el-button @click="$refs.guava.index()" size="small">取消</el-button>
src/main/resources/views/platform/zhgh/staffbenefit/maternityLeave/mine/index.html
+1 -1
View File
@@ -36,7 +36,7 @@ layout("/layouts/platform.html"){
<el-button v-if="row.canRevoke" @click="onRevoke(row)" size="mini" type="danger">撤回
</el-button>
<el-button v-if="row.taskKey === 'startTask' || !row.instanceId" @click="onDelete(row.id)" size="mini" type="danger">删除</el-button>
<el-button @click="doExportApply(row)" size="mini" type="primary">申请表导出</el-button>
<el-button @click="doExportApply(row)" size="mini" type="primary"v-if="row.instanceState === 20">申请表导出</el-button>
</template>
</el-table-column>
</el-table>
src/main/resources/views/platform/zhghh5/staffbenefit/condolence/apply/index.html
+173 -159
View File
@@ -10,7 +10,8 @@ layout("/layouts/platform_h5.html"){
<div id="app">
<!-- 导航栏 -->
<van-nav-bar title="职工慰问申请" left-text="返回" left-arrow @click-left="historyBack" fixed placeholder></van-nav-bar>
<van-nav-bar title="职工慰问申请" left-text="返回" left-arrow @click-left="historyBack" fixed
placeholder></van-nav-bar>
<!-- 表单容器 -->
<van-form ref="formRef" class="form-container">
@@ -25,33 +26,43 @@ layout("/layouts/platform_h5.html"){
required name="applyUnitName"></van-field>
<van-field label="申请人工会" :rules="[{ required: true }]" v-model="formData.applyUnionName" readonly
required name="applyUnionName"></van-field>
<van-field
v-model="formData.position"
name="position"
label="职务"
required
:rules="[{ required: true }]"
placeholder="请选择职务"
clickable
></van-field>
<van-field
v-model="formData.helpUserName"
name="helpUserName"
label="慰问对象"
required
readonly
:rules="[{ required: true }]"
placeholder="请点击选择慰问对象"
@click="helpUserSelectShow = true"
is-link
v-model="formData.helpUserName"
name="helpUserName"
label="慰问对象"
required
readonly
:rules="[{ required: true }]"
placeholder="请点击选择慰问对象"
@click="helpUserSelectShow = true"
is-link
></van-field>
<van-action-sheet v-model="helpUserSelectShow" title="慰问对象" class="height100">
<van-search
v-model="searchKeyword"
:show-action="false"
:reverse-color="false"
input-align="left"
placeholder="请输入工号或姓名选择慰问对象"
@input="(val) => {userRemoteMethod(val, 'help')}"
@clear="(val) => {userRemoteMethod(val, 'help')}"
shape="round"
v-model="searchKeyword"
:show-action="false"
:reverse-color="false"
input-align="left"
placeholder="请输入工号或姓名选择慰问对象"
@input="(val) => {userRemoteMethod(val, 'help')}"
@clear="(val) => {userRemoteMethod(val, 'help')}"
shape="round"
></van-search>
<div class="van-action-sheet__content mt5" v-if="userOptions && userOptions.length>0">
<template>
<template v-for="item in userOptions">
<van-button native-type="button" @click="helpUserChange(item)" class="van-action-sheet__item van-hairline--bottom">
<van-button native-type="button" @click="helpUserChange(item)"
class="van-action-sheet__item van-hairline--bottom">
<span class="van-action-sheet__name">{{item.userName}}（{{item.loginName}}）</span>
</van-button>
</template>
@@ -61,30 +72,31 @@ layout("/layouts/platform_h5.html"){
</van-action-sheet>
<van-field
v-model="formData.payUserName"
name="payUserName"
label="收款人"
required
:rules="[{ required: true }]"
placeholder="请点击选择收款人"
@click="payUserSelectShow = true"
is-link
v-model="formData.payUserName"
name="payUserName"
label="收款人"
required
:rules="[{ required: true }]"
placeholder="请点击选择收款人"
@click="payUserSelectShow = true"
is-link
></van-field>
<van-action-sheet v-model="payUserSelectShow" title="收款人" class="height100">
<van-search
v-model="searchKeyword"
:show-action="false"
:reverse-color="false"
input-align="left"
placeholder="请输入工号或姓名选择收款人"
@input="(val) => {userRemoteMethod(val, 'pay')}"
@clear="(val) => {userRemoteMethod(val, 'pay')}"
shape="round"
v-model="searchKeyword"
:show-action="false"
:reverse-color="false"
input-align="left"
placeholder="请输入工号或姓名选择收款人"
@input="(val) => {userRemoteMethod(val, 'pay')}"
@clear="(val) => {userRemoteMethod(val, 'pay')}"
shape="round"
></van-search>
<div class="van-action-sheet__content mt5" v-if="userOptions && userOptions.length>0">
<template>
<template v-for="item in userOptions">
<van-button native-type="button" @click="payUserChange(item)" class="van-action-sheet__item van-hairline--bottom">
<van-button native-type="button" @click="payUserChange(item)"
class="van-action-sheet__item van-hairline--bottom">
<span class="van-action-sheet__name">{{item.userName}}（{{item.loginName}}）</span>
</van-button>
</template>
@@ -94,157 +106,158 @@ layout("/layouts/platform_h5.html"){
</van-action-sheet>
<van-field
v-model="formData.typeName"
name="typeName"
label="慰问类型"
required
readonly
:rules="[{ required: true }]"
placeholder="请点击选择慰问类型"
@click="showTypePicker = true"
clickable
is-link
v-model="formData.typeName"
name="typeName"
label="慰问类型"
required
readonly
:rules="[{ required: true }]"
placeholder="请点击选择慰问类型"
@click="showTypePicker = true"
clickable
is-link
></van-field>
<van-popup position="bottom" round v-model:show="showTypePicker">
<van-picker :columns="typeColumns" @cancel="showTypePicker = false" @confirm="onTypeConfirm" show-toolbar></van-picker>
<van-picker :columns="typeColumns" @cancel="showTypePicker = false" @confirm="onTypeConfirm"
show-toolbar></van-picker>
</van-popup>
<!-- <van-field
v-model="formData.way"
name="way"
label="慰问方式"
required
readonly
:rules="[{ required: true }]"
placeholder="请选择慰问类型"
clickable
></van-field>-->
<van-field
v-model="formData.way"
name="way"
label="慰问方式"
required
readonly
:rules="[{ required: true }]"
placeholder="请选择慰问类型"
clickable
></van-field>
<van-field
v-model="formData.money"
name="money"
label="慰问金额"
required
:rules="[{ required: true }]"
placeholder="选择慰问类型自动匹配金额"
clickable
type="number"
v-model="formData.money"
name="money"
label="慰问金额"
required
:rules="[{ required: true }]"
placeholder="选择慰问类型自动匹配金额"
clickable
type="number"
></van-field>
<van-field
v-model="formData.occurTime"
name="occurTime"
label="慰问时间"
required
:rules="[{ required: true }]"
placeholder="请点击选择慰问时间"
clickable
is-link
readonly
@click="showTimePicker = true"
v-model="formData.occurTime"
name="occurTime"
label="慰问时间"
required
:rules="[{ required: true }]"
placeholder="请点击选择慰问时间"
clickable
is-link
readonly
@click="showTimePicker = true"
></van-field>
<van-popup position="bottom" round v-model:show="showTimePicker">
<van-datetime-picker
v-model="formData.occurTime"
type="date"
title="请选择慰问时间"
@confirm="(val) => {formData.occurTime = $moment(val).format('YYYY-MM-DD'); showTimePicker = false}"
@cancel="showTimePicker = false"
v-model="formData.occurTime"
type="date"
title="请选择慰问时间"
@confirm="(val) => {formData.occurTime = $moment(val).format('YYYY-MM-DD'); showTimePicker = false}"
@cancel="showTimePicker = false"
></van-datetime-picker>
</van-popup>
<van-field
v-if="['2'].includes(formData.type)"
v-model="formData.child"
name="child"
label="孩次"
required
:rules="[{ required: true }]"
placeholder="请点击选择孩次"
clickable
is-link
readonly
@click="showChildPicker = true"
v-if="['2'].includes(formData.type)"
v-model="formData.child"
name="child"
label="孩次"
required
:rules="[{ required: true }]"
placeholder="请点击选择孩次"
clickable
is-link
readonly
@click="showChildPicker = true"
></van-field>
<van-popup position="bottom" round v-model:show="showChildPicker">
<van-picker
title="请选择孩次"
show-toolbar
:columns="['一孩', '二孩', '三孩']"
@confirm="(val) => {formData.child = val; showChildPicker = false}"
@cancel="showChildPicker = false"
title="请选择孩次"
show-toolbar
:columns="['一孩', '二孩', '三孩']"
@confirm="(val) => {formData.child = val; showChildPicker = false}"
@cancel="showChildPicker = false"
></van-picker>
</van-popup>
<template v-if="['3','4'].includes(formData.type)">
<van-field
v-model="formData.hospital"
name="hospital"
label="治疗医院"
required
:rules="[{ required: true }]"
placeholder="请输入治疗医院"
v-model="formData.hospital"
name="hospital"
label="治疗医院"
required
:rules="[{ required: true }]"
placeholder="请输入治疗医院"
></van-field>
<van-field
v-model="formData.hospitalHouseNum"
name="hospitalHouseNum"
label="病房号"
required
:rules="[{ required: true }]"
placeholder="请输入病房号"
v-model="formData.hospitalHouseNum"
name="hospitalHouseNum"
label="病房号"
required
:rules="[{ required: true }]"
placeholder="请输入病房号"
></van-field>
<van-field
v-model="formData.hospitalHouseBedNum"
name="hospitalHouseBedNum"
label="床号"
required
:rules="[{ required: true }]"
placeholder="请输入床号"
v-model="formData.hospitalHouseBedNum"
name="hospitalHouseBedNum"
label="床号"
required
:rules="[{ required: true }]"
placeholder="请输入床号"
></van-field>
</template>
<van-field
v-if="['4'].includes(formData.type)"
v-model="formData.hospitalBy"
name="hospitalBy"
label="患病病种"
required
:rules="[{ required: true }]"
placeholder="请输入患病病种"
v-if="['4'].includes(formData.type)"
v-model="formData.hospitalBy"
name="hospitalBy"
label="患病病种"
required
:rules="[{ required: true }]"
placeholder="请输入患病病种"
></van-field>
<van-field
v-if="['6'].includes(formData.type)"
v-model="formData.deadImmediateFamily"
name="deadImmediateFamily"
label="直系亲属"
required
:rules="[{ required: true }]"
placeholder="请点击选择直系亲属"
clickable
is-link
readonly
@click="showFamilyPicker = true"
v-if="['6'].includes(formData.type)"
v-model="formData.deadImmediateFamily"
name="deadImmediateFamily"
label="直系亲属"
required
:rules="[{ required: true }]"
placeholder="请点击选择直系亲属"
clickable
is-link
readonly
@click="showFamilyPicker = true"
></van-field>
<van-popup position="bottom" round v-model:show="showFamilyPicker">
<van-picker
title="请选择直系亲属"
show-toolbar
:columns="['配偶', '父亲', '母亲', '子女']"
@confirm="(val) => {formData.deadImmediateFamily = val; showFamilyPicker = false}"
@cancel="showFamilyPicker = false"
title="请选择直系亲属"
show-toolbar
:columns="['配偶', '父亲', '母亲', '子女']"
@confirm="(val) => {formData.deadImmediateFamily = val; showFamilyPicker = false}"
@cancel="showFamilyPicker = false"
></van-picker>
</van-popup>
<van-field
v-model="formData.remark"
name="remark"
label="申请事由"
type="textarea"
rows="4"
autosize
placeholder="请输入申请事由"
:rules="[{ required: true }]"
required
v-model="formData.remark"
name="remark"
label="情况说明"
type="textarea"
rows="4"
autosize
placeholder="请输入情况说明"
:rules="[{ required: true }]"
required
></van-field>
</van-cell-group>
@@ -258,11 +271,11 @@ layout("/layouts/platform_h5.html"){
<van-field class="direction-column-field" name="avatar" label="">
<template #input>
<h5-file-upload
slot="input"
:value.sync="formData.files"
:upload_number="5"
upload_result_category="array"
complete_result
slot="input"
:value.sync="formData.files"
:upload_number="5"
upload_result_category="array"
complete_result
></h5-file-upload>
</template>
</van-field>
@@ -319,11 +332,11 @@ layout("/layouts/platform_h5.html"){
}
},
async selectQueryUser(keyword) {
const res = await this.$axios.post("/platform/condolence/apply/listUser", { keyword: keyword })
const res = await this.$axios.post("/platform/condolence/apply/listUser", {keyword: keyword})
return res.data
},
helpUserChange(user) {
const { id, userName, loginName, unitId, unitName, unionId, unionName } = user
const {id, userName, loginName, unitId, unitName, unionId, unionName} = user
this.$set(this.formData, "helpUserId", id)
this.$set(this.formData, "helpUserName", userName)
this.$set(this.formData, "helpLoginName", loginName)
@@ -336,7 +349,7 @@ layout("/layouts/platform_h5.html"){
this.userOptions = []
},
payUserChange(user) {
const { id, userName, loginName } = user
const {id, userName, loginName} = user
this.$set(this.formData, "payUserId", id)
this.$set(this.formData, "payUserName", userName)
this.$set(this.formData, "payLoginName", loginName)
@@ -362,7 +375,7 @@ layout("/layouts/platform_h5.html"){
title: "提示",
message: "您确定保存吗？"
}).then(() => {
this.$axios.post("/platform/condolence/apply/save", { data: JSON.stringify(this.formData) }).then(res => {
this.$axios.post("/platform/condolence/apply/save", {data: JSON.stringify(this.formData)}).then(res => {
if (res.code === 0) {
this.$toast(res.msg)
this.$pjaxReplace("/platform/condolence/mine/h5")
@@ -376,7 +389,7 @@ layout("/layouts/platform_h5.html"){
title: "提示",
message: "您确定要提交申请吗？"
}).then(() => {
this.$axios.post("/platform/condolence/apply/submit", { data: JSON.stringify(this.formData) }).then(res => {
this.$axios.post("/platform/condolence/apply/submit", {data: JSON.stringify(this.formData)}).then(res => {
if (res.code === 0) {
this.$toast(res.msg)
this.$pjaxReplace("/platform/condolence/mine/h5")
@@ -405,7 +418,7 @@ layout("/layouts/platform_h5.html"){
},
init() {
if (this.bizId) {
this.$axios.post("/platform/condolence/mine/info", { id: this.bizId }).then((res) => {
this.$axios.post("/platform/condolence/mine/info", {id: this.bizId}).then((res) => {
if (res.code === 0) {
this.formData = res.data
this.selectQueryUser(this.formData.helpLoginName, this.helpUserOptions)
@@ -414,7 +427,7 @@ layout("/layouts/platform_h5.html"){
}
})
} else {
const { username, loginname, id, unit, union, mobile } = this.$store.state.user
const {username, loginname, id, unit, union, mobile, position} = this.$store.state.user
this.formData = {
applyUserName: username,
applyLoginName: loginname,
@@ -423,6 +436,7 @@ layout("/layouts/platform_h5.html"){
applyUnitName: unit?.name,
applyUnionId: union?.id,
applyUnionName: union?.name,
position: position,
}
}
},
@@ -431,7 +445,7 @@ layout("/layouts/platform_h5.html"){
.then((res) => {
this.typeOptions = JSON.parse(JSON.stringify(res.data))
res.data.forEach((v) => {
this.typeColumns.push({ value: v.id, text: v.name + "(" + v.code + ")" })
this.typeColumns.push({value: v.id, text: v.name + "(" + v.code + ")"})
})
})
},
src/main/resources/views/platform/zhghh5/staffbenefit/condolence/branchUnionApproval/index.html
+29 -18
View File
@@ -7,16 +7,17 @@ layout("/layouts/platform_h5.html"){
</style>
<div id="app">
<van-nav-bar title="分工会审核" left-text="返回" left-arrow @click-left="historyBack" fixed placeholder></van-nav-bar>
<van-nav-bar title="分工会审核" left-text="返回" left-arrow @click-left="historyBack" fixed
placeholder></van-nav-bar>
<van-sticky offset-top="46px">
<van-search
v-model="pageForm.searchKeyword"
:show-action="false"
:reverse-color="false"
input-align="left"
placeholder="请输入姓名或者工号搜索"
@search="doSearch"
v-model="pageForm.searchKeyword"
:show-action="false"
:reverse-color="false"
input-align="left"
placeholder="请输入姓名或者工号搜索"
@search="doSearch"
></van-search>
<van-dropdown-menu :close-on-click-outside="false" :close-on-click-overlay="false">
<year-van-dropdown-item :num="5" @change="doSearch" v-model="pageForm.year"></year-van-dropdown-item>
@@ -30,7 +31,8 @@ layout("/layouts/platform_h5.html"){
</van-tabs>
</van-sticky>
<table-list api="/platform/condolence/branchUnionApproval/pageData" :page_form.sync="pageForm" ref="tableListRef" @ready="onReady">
<table-list api="/platform/condolence/branchUnionApproval/pageData" :page_form.sync="pageForm" ref="tableListRef"
@ready="onReady">
<template v-slot="{index,row}">
<table-column label="慰问对象">{{row.helpUserName}}</table-column>
<table-column label="慰问对象工号">{{row.helpLoginName}}</table-column>
@@ -61,15 +63,20 @@ layout("/layouts/platform_h5.html"){
<div class="process-title">{{formData.taskName}}</div>
<van-form ref="formRef">
<van-field
v-model="formData.tf_opinion"
name="tf_opinion"
label="审批意见"
placeholder="请输入审批意见"
:rules="[{ required: true, message: '请填写审批意见' }]"
required
maxlength="100"
show-word-limit
v-model="formData.tf_opinion"
name="tf_opinion"
label="审批意见"
placeholder="请输入审批意见"
:rules="[{ required: true, message: '请填写审批意见' }]"
required
maxlength="100"
show-word-limit
></van-field>
<van-field class="direction-column-field" name="tf_userSign" label="签字" required>
<template #input>
<h5-signature v-model="formData.tf_userSign" slot="input"></h5-signature>
</template>
</van-field>
</van-form>
<div style="display: flex; justify-content: space-between; column-gap: 10px; padding: 10px">
<van-button type="danger" block @click="handleTaskAction(6)">退回</van-button>
@@ -113,7 +120,7 @@ layout("/layouts/platform_h5.html"){
text: "全部慰问类型",
value: null
}
].concat(typeList.map((v) => ({ text: v.name, value: v.id })))
].concat(typeList.map((v) => ({text: v.name, value: v.id})))
if (this.typeOptions.length > 0) {
this.pageForm.type = this.typeOptions[0].value
this.doSearch()
@@ -134,6 +141,10 @@ layout("/layouts/platform_h5.html"){
async handleTaskAction(val) {
try {
await this.$refs.formRef.validate();
if (!this.formData.tf_userSign){
this.$toast.fail("请填写签字")
return
}
this.$dialog.confirm({
title: "提示",
message: "您确定要提交吗？"
@@ -157,7 +168,7 @@ layout("/layouts/platform_h5.html"){
}
},
onRevoke(row){
onRevoke(row) {
this.$dialog.confirm({
title: "提示",
message: "您确定要撤回吗？"
src/main/resources/views/platform/zhghh5/staffbenefit/condolence/common/info.js
+8 -2
View File
@@ -21,8 +21,10 @@ const condolenceInfo = {
<van-cell v-if="['3','4'].includes(viewData.type)" title="床号">{{ viewData.hospitalHouseBedNum }}</van-cell>
<van-cell v-if="['4'].includes(viewData.type)" title="患病病种">{{ viewData.hospitalBy }}</van-cell>
<van-cell v-if="['6'].includes(viewData.type)" title="直系亲属">{{ viewData.deadImmediateFamily }}</van-cell>
<van-cell class="direction-column-cell" title="申请事由">
{{ viewData.remark || '暂无' }}
<van-cell class="direction-column-cell" title="情况说明">
<div style="white-space: pre-line">
{{ viewData.remark || '暂无' }}
</div>
</van-cell>
<van-cell class="direction-column-cell" title="附件">
<file-preview :files="viewData.files" complete_result></file-preview>
@@ -53,6 +55,10 @@ const condolenceInfo = {
<van-cell title="办理意见" v-if="!task.ext.isFirstTaskNode" class="direction-column-cell">
<div v-html="task.taskFormData.tf_opinion"></div>
</van-cell>
<van-cell class="direction-column-cell" title="签字">
<van-image :src="task.ext.tf_userSign" v-if="task.ext.tf_userSign" class="signature-image"></van-image>
<span v-else>暂无签字</span>
</van-cell>
</van-cell-group>
</template>
</div>
src/main/resources/views/platform/zhghh5/staffbenefit/condolence/schoolUnionApproval/index.html
+29 -18
View File
@@ -7,16 +7,17 @@ layout("/layouts/platform_h5.html"){
</style>
<div id="app">
<van-nav-bar title="校工会审核" left-text="返回" left-arrow @click-left="historyBack" fixed placeholder></van-nav-bar>
<van-nav-bar title="校工会审核" left-text="返回" left-arrow @click-left="historyBack" fixed
placeholder></van-nav-bar>
<van-sticky offset-top="46px">
<van-search
v-model="pageForm.searchKeyword"
:show-action="false"
:reverse-color="false"
input-align="left"
placeholder="请输入姓名或者工号搜索"
@search="doSearch"
v-model="pageForm.searchKeyword"
:show-action="false"
:reverse-color="false"
input-align="left"
placeholder="请输入姓名或者工号搜索"
@search="doSearch"
></van-search>
<van-dropdown-menu :close-on-click-outside="false" :close-on-click-overlay="false">
<year-van-dropdown-item :num="5" @change="doSearch" v-model="pageForm.year"></year-van-dropdown-item>
@@ -30,7 +31,8 @@ layout("/layouts/platform_h5.html"){
</van-tabs>
</van-sticky>
<table-list api="/platform/condolence/schoolUnionApproval/pageData" :page_form.sync="pageForm" ref="tableListRef" @ready="onReady">
<table-list api="/platform/condolence/schoolUnionApproval/pageData" :page_form.sync="pageForm" ref="tableListRef"
@ready="onReady">
<template v-slot="{index,row}">
<table-column label="慰问对象">{{row.helpUserName}}</table-column>
<table-column label="慰问对象工号">{{row.helpLoginName}}</table-column>
@@ -61,15 +63,20 @@ layout("/layouts/platform_h5.html"){
<div class="process-title">{{formData.taskName}}</div>
<van-form ref="formRef">
<van-field
v-model="formData.tf_opinion"
name="tf_opinion"
label="审批意见"
placeholder="请输入审批意见"
:rules="[{ required: true, message: '请填写审批意见' }]"
required
maxlength="100"
show-word-limit
v-model="formData.tf_opinion"
name="tf_opinion"
label="审批意见"
placeholder="请输入审批意见"
:rules="[{ required: true, message: '请填写审批意见' }]"
required
maxlength="100"
show-word-limit
></van-field>
<van-field class="direction-column-field" name="tf_userSign" label="签字" required>
<template #input>
<h5-signature v-model="formData.tf_userSign" slot="input"></h5-signature>
</template>
</van-field>
</van-form>
<div style="display: flex; justify-content: space-between; column-gap: 10px; padding: 10px">
<van-button type="danger" block @click="handleTaskAction(6)">退回</van-button>
@@ -113,7 +120,7 @@ layout("/layouts/platform_h5.html"){
text: "全部慰问类型",
value: null
}
].concat(typeList.map((v) => ({ text: v.name, value: v.id })))
].concat(typeList.map((v) => ({text: v.name, value: v.id})))
if (this.typeOptions.length > 0) {
this.pageForm.type = this.typeOptions[0].value
this.doSearch()
@@ -134,6 +141,10 @@ layout("/layouts/platform_h5.html"){
async handleTaskAction(val) {
try {
await this.$refs.formRef.validate();
if (!this.formData.tf_userSign) {
this.$toast.fail("请填写签字")
return
}
this.$dialog.confirm({
title: "提示",
message: "您确定要提交吗？"
@@ -157,7 +168,7 @@ layout("/layouts/platform_h5.html"){
}
},
onRevoke(row){
onRevoke(row) {
this.$dialog.confirm({
title: "提示",
message: "您确定要撤回吗？"