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

commit

Browse Source
This commit is contained in:
c-zhouhf1
2026-03-19 17:58:38 +08:00
parent b07029c57c
commit a9169e4c9e
12 changed files with 292 additions and 242 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/budwk/app/zhgh/staffbenefit/condolence/controller/CondolenceBranchUnionApprovalController.java
+2 -1
View File
@@ -77,6 +77,7 @@ public class CondolenceBranchUnionApprovalController {
t.finishTime,
t.taskParentId,
t.variable taskVariable,
GROUP_CONCAT(DISTINCT ta.actorName, '(', ta.actorAccount, ')' ) AS auditUser,
IFNULL(GROUP_CONCAT(DISTINCT nt.displayName),'结束') curTaskName,
IF(rt.id IS NOT NULL, 1, 0) AS canRevoke
FROM
@@ -113,7 +114,7 @@ public class CondolenceBranchUnionApprovalController {
} else {
cnd.orderBy(pageForm.getPageOrderName(), PageUtil.getOrder(pageForm.getPageOrderBy()));
}
cnd.groupBy("t.id");
cnd.groupBy("info.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/controller/CondolenceMineController.java
+18 -15
View File
@@ -93,12 +93,14 @@ public class CondolenceMineController {
@At("/")
@Ok("beetl:/platform/zhgh/staffbenefit/condolence/mine/index.html")
@SaCheckPermission("condolence.mine")
public void index() {}
public void index() {
}
@At("/h5")
@Ok("beetl:/platform/zhghh5/staffbenefit/condolence/mine/index.html")
@SaCheckPermission("h5.condolence.mine")
public void h5Index() {}
public void h5Index() {
}
@At
@ApiOperation("分页查询")
@@ -124,6 +126,7 @@ public class CondolenceMineController {
t.finishTime,
t.taskParentId,
t.variable taskVariable,
GROUP_CONCAT(DISTINCT ta.actorName, '(', ta.actorAccount, ')' ) AS auditUser,
IF((SELECT taskName FROM wf_process_task tt WHERE tt.id = t.taskParentId) = 'startTask', 1, 0) canRevoke,
(select MAX(id) from wf_process_task where processInstanceId = ins.id and taskName = 'startTask') AS startTaskId
FROM
@@ -150,7 +153,7 @@ public class CondolenceMineController {
} else {
cnd.desc("info.createTime");
}
cnd.groupBy("info.id");
sql.setCondition(cnd);
Pagination<NutMap> pagination = condolenceService.listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), sql);
return Result.success(pagination);
@@ -232,7 +235,7 @@ public class CondolenceMineController {
String type = condolence.getType();
if (("6fb2ae129e674c0dbadc21d9abc22943").equals(type)) {
fileName = "工会会员结婚慰问报销审批单"+ "_" +
fileName = "工会会员结婚慰问报销审批单" + "_" +
DateUtil.format(createTime, "yyyyMMdd") + ".docx";
templateName = "condolence_marry";
@@ -243,8 +246,8 @@ public class CondolenceMineController {
docData2.put("type", "会员结婚慰问");
docData2.put("money", "1000");
docData2.put("money_big", "壹仟元整");
} else if (("cf4ce7af322d464f8f86d818fcc00203").equals(type)){
fileName = "工会会员生病住院慰问报销审批单"+ "_" +
} else if (("cf4ce7af322d464f8f86d818fcc00203").equals(type)) {
fileName = "工会会员生病住院慰问报销审批单" + "_" +
DateUtil.format(createTime, "yyyyMMdd") + ".docx";
templateName = "condolence_hospitalization";
@@ -257,8 +260,8 @@ public class CondolenceMineController {
docData2.put("type", "会员生病慰问");
docData2.put("money", "1000");
docData2.put("money_big", "壹仟元整");
} else if (("c90cb10dce6542e99ae271bee6fe8cc0").equals(type)){
fileName = "工会会员生育慰问报销审批单"+ "_" +
} else if (("c90cb10dce6542e99ae271bee6fe8cc0").equals(type)) {
fileName = "工会会员生育慰问报销审批单" + "_" +
DateUtil.format(createTime, "yyyyMMdd") + ".docx";
templateName = "condolence_birth";
@@ -271,8 +274,8 @@ public class CondolenceMineController {
docData2.put("type", "会员生育慰问");
docData2.put("money", "1000");
docData2.put("money_big", "壹仟元整");
}else if (("4e316737e71047e0b01aea78524c1416").equals(type)){
fileName = "工会会员直系亲属去世报销审批单"+ "_" +
} else if (("4e316737e71047e0b01aea78524c1416").equals(type)) {
fileName = "工会会员直系亲属去世报销审批单" + "_" +
DateUtil.format(createTime, "yyyyMMdd") + ".docx";
templateName = "condolence_relative_died";
@@ -284,8 +287,8 @@ public class CondolenceMineController {
docData2.put("type", "会员直系亲属去世慰问");
docData2.put("money", "1000");
docData2.put("money_big", "壹仟元整");
}else if (("b8ee30faacb2469593dfedb5b52565aa").equals(type)){
fileName = "工会会员职工去世慰问报销审批单"+ "_" +
} else if (("b8ee30faacb2469593dfedb5b52565aa").equals(type)) {
fileName = "工会会员职工去世慰问报销审批单" + "_" +
DateUtil.format(createTime, "yyyyMMdd") + ".docx";
templateName = "condolence_died";
@@ -296,8 +299,8 @@ public class CondolenceMineController {
docData2.put("type", "会员职工去世慰问");
docData2.put("money", "3000");
docData2.put("money_big", "叁仟元整");
}else if (("1a2f7e8decb649a6ba8ca76e2af07779").equals(type)){
fileName = "工会会员退休慰问报销审批单"+ "_" +
} else if (("1a2f7e8decb649a6ba8ca76e2af07779").equals(type)) {
fileName = "工会会员退休慰问报销审批单" + "_" +
DateUtil.format(createTime, "yyyyMMdd") + ".docx";
templateName = "condolence_retirement";
@@ -309,7 +312,7 @@ public class CondolenceMineController {
docData2.put("money", "1000");
docData2.put("money_big", "壹仟元整");
} else {
fileName = "工会会员慰问报销审批单"+ "_" +
fileName = "工会会员慰问报销审批单" + "_" +
DateUtil.format(createTime, "yyyyMMdd") + ".docx";
templateName = "condolence_other";
src/main/java/com/budwk/app/zhgh/staffbenefit/condolence/controller/CondolenceSchoolPrincipalApprovalController.java
+2 -2
View File
@@ -102,7 +102,7 @@ public class CondolenceSchoolPrincipalApprovalController {
cnd.andEX("info.applyUnitId", "=", unitId);
cnd.and("t.taskName", "=", "34f7938e-47a3-4b3a-b4e0-92b7a3f47865");
// cnd.and("ta.actorId", "in", List.of(SecurityUtil.getUserId()));
cnd.and("ta.actorId", "in", List.of(SecurityUtil.getUserId()));
if (approval) {
cnd.and("t.taskState", "in", List.of(ProcessTaskStateEnum.FINISHED.getCode(), ProcessTaskStateEnum.INTERRUPT.getCode()));
@@ -115,7 +115,7 @@ public class CondolenceSchoolPrincipalApprovalController {
} else {
cnd.orderBy(pageForm.getPageOrderName(), PageUtil.getOrder(pageForm.getPageOrderBy()));
}
cnd.groupBy("t.id");
cnd.groupBy("info.id");
sql.setCondition(cnd);
Pagination<NutMap> pageVO = condolenceService.listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), sql);
return Result.success(pageVO);
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
+7 -1
View File
@@ -75,9 +75,15 @@ 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="签字" :span="3" v-if="!task.ext.isFirstTaskNode">
<el-image :src="task.taskFormData.tf_userSign"
v-if="task.taskFormData.tf_userSign"
class="signature-image"></el-image>
<span v-else>暂无签字</span>
</el-descriptions-item>
</el-descriptions>
</div>
</template>
src/main/resources/views/platform/zhgh/staffbenefit/condolence/schoolPrincipalApproval/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/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/zhghh5/staffbenefit/condolence/branchUnionApproval/index.html
+8 -1
View File
@@ -38,7 +38,7 @@ layout("/layouts/platform_h5.html"){
<table-column label="所属工会">{{row.applyUnionName}}</table-column>
<table-column label="所属单位">{{row.applyUnitName}}</table-column>
<table-column label="慰问类型">{{row.typeName}}</table-column>
<table-column label="当前节点">{{row.curTaskName}}</table-column>
<table-column label="当前节点">{{row.curTaskName}}<span v-if="row.auditUser">-{{row.auditUser}}</span></table-column>
</template>
<template #actions="{index,row}">
<div class="action-btn" @click="onView(row)">
@@ -70,6 +70,13 @@ layout("/layouts/platform_h5.html"){
maxlength="100"
show-word-limit
></van-field>
<van-cell-group title="电子签名" class="form-section">
<van-field class="more-text" name="tf_userSign" label="">
<template #input>
<h5-signature v-model="formData.tf_userSign" slot="input"></h5-signature>
</template>
</van-field>
</van-cell-group>
</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>
src/main/resources/views/platform/zhghh5/staffbenefit/condolence/common/info.js
+5
View File
@@ -68,6 +68,11 @@ 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="签字"v-if="!task.ext.isFirstTaskNode">
<van-image :src="task.taskFormData.tf_userSign" v-if="task.taskFormData.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/mine/index.html
+7 -5
View File
@@ -33,7 +33,8 @@ layout("/layouts/platform_h5.html"){
<table-column label="所属工会">{{row.applyUnionName}}</table-column>
<table-column label="所属单位">{{row.applyUnitName}}</table-column>
<table-column label="慰问类型">{{row.typeName}}</table-column>
<table-column label="当前节点">{{row.taskName}}</table-column>
<table-column label="当前节点">{{row.taskName}}<span v-if="row.auditUser">-{{row.auditUser}}</span>
</table-column>
</template>
<template #actions="{index,row}">
<div class="action-btn" @click="onView(row)">
@@ -78,7 +79,7 @@ layout("/layouts/platform_h5.html"){
year: new Date().getFullYear(),
type: null
},
typeOptions: [],
typeOptions: []
}
},
methods: {
@@ -129,10 +130,11 @@ layout("/layouts/platform_h5.html"){
}
})
})
.catch(() => {})
.catch(() => {
})
},
async queryCondolenceType() {
const res = await this.$axios.post('/platform/condolence/type/queryCondolenceType')
const res = await this.$axios.post("/platform/condolence/type/queryCondolenceType")
return res.data
},
doSearch() {
@@ -142,7 +144,7 @@ layout("/layouts/platform_h5.html"){
this.$refs.tableListRef.doSearch()
})
}
},
}
})
</script>
src/main/resources/views/platform/zhghh5/staffbenefit/condolence/schoolPrincipalApproval/index.html
+7
View File
@@ -70,6 +70,13 @@ layout("/layouts/platform_h5.html"){
maxlength="100"
show-word-limit
></van-field>
<van-cell-group title="电子签名" class="form-section">
<van-field class="more-text" name="tf_userSign" label="">
<template #input>
<h5-signature v-model="formData.tf_userSign" slot="input"></h5-signature>
</template>
</van-field>
</van-cell-group>
</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>
src/main/resources/views/platform/zhghh5/staffbenefit/condolence/schoolUnionApproval/index.html
+7
View File
@@ -70,6 +70,13 @@ layout("/layouts/platform_h5.html"){
maxlength="100"
show-word-limit
></van-field>
<van-cell-group title="电子签名" class="form-section">
<van-field class="more-text" name="tf_userSign" label="">
<template #input>
<h5-signature v-model="formData.tf_userSign" slot="input"></h5-signature>
</template>
</van-field>
</van-cell-group>
</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>