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-01-13 15:46:43 +08:00
parent 4132264ebc
commit e3b1dd8ff8
22 changed files with 201 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pom.xml
+1 -1
View File
@@ -2,7 +2,7 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<packaging>jar</packaging> <packaging>jar</packaging>
<groupId>com.budwk</groupId> <groupId>com.budwk</groupId>
<artifactId>zhgh_whcp</artifactId> <artifactId>zhgh-whcp</artifactId>
<version>5.6.0-plus</version> <version>5.6.0-plus</version>
<properties> <properties>
<nutzboot.version>2.6.0-SNAPSHOT</nutzboot.version> <nutzboot.version>2.6.0-SNAPSHOT</nutzboot.version>
src/main/java/com/budwk/app/flow/handler/FlowSchoolUnionViceChairmanHandler.java
+50
View File
@@ -0,0 +1,50 @@
package com.budwk.app.flow.handler;
import com.budwk.app.base.constant.RoleConstant;
import com.budwk.app.flow.engine.AssignmentHandler;
import com.budwk.app.flow.engine.core.Execution;
import com.budwk.app.flow.engine.core.ServiceContext;
import com.budwk.app.flow.engine.model.TaskModel;
import org.nutz.dao.Dao;
import org.nutz.dao.Sqls;
import org.nutz.dao.sql.Sql;
import java.util.List;
/**
* @author zhf
* @date 2026/1/12 17:33
* @description 校工会副主席
*/
public class FlowSchoolUnionViceChairmanHandler implements AssignmentHandler {
@Override
public List<String> assign(TaskModel model, Execution execution) {
Dao dao = ServiceContext.find(Dao.class);
Sql sql = Sqls.create("""
SELECT
userRole.userId
FROM
`sys_user_role` userRole
LEFT JOIN sys_role role ON role.id = userRole.roleId
WHERE
role.`code` = @roleCode
GROUP BY
userRole.userId
""").setParam("roleCode", RoleConstant.SCHOOL_UNION_VICE_CHAIRMAN.name());
sql.setCallback(Sqls.callback.strList());
dao.execute(sql);
return sql.getList(String.class);
}
@Override
public String getMessage() {
return "获取校工会副主席";
}
@Override
public int getOrder() {
return AssignmentHandler.super.getOrder();
}
}
src/main/java/com/budwk/app/zhgh/dayofficework/unionReimburse/controller/UnionReimburseApplyController.java
+3 -2
View File
@@ -171,14 +171,15 @@ public class UnionReimburseApplyController {
seg.or(View_user::getUsername, "like", "%" + keyword + "%"); seg.or(View_user::getUsername, "like", "%" + keyword + "%");
cnd.and(seg); cnd.and(seg);
} }
if (!AuthUtil.hasRoleOr(RoleConstant.SYSADMIN.name(), RoleConstant.SCHOOL_UNION_ADMIN.name())) { cnd.and(View_user::getId, "!=", SecurityUtil.getUserId());
/*if (!AuthUtil.hasRoleOr(RoleConstant.SYSADMIN.name(), RoleConstant.SCHOOL_UNION_ADMIN.name())) {
if (AuthUtil.hasRoleOr(RoleConstant.BRANCH_UNION_ADMIN.name(), RoleConstant.BRANCH_UNION_CHAIRMAN.name())) { if (AuthUtil.hasRoleOr(RoleConstant.BRANCH_UNION_ADMIN.name(), RoleConstant.BRANCH_UNION_CHAIRMAN.name())) {
cnd.and(View_user::getUnionId, "=", SecurityUtil.getUnionId()); cnd.and(View_user::getUnionId, "=", SecurityUtil.getUnionId());
} else { } else {
cnd.and(View_user::getId, "=", SecurityUtil.getUserId()); cnd.and(View_user::getId, "=", SecurityUtil.getUserId());
} }
} }*/
sql.setCondition(cnd); sql.setCondition(cnd);
Pagination pagination = unionReimburseService.listPageMap(1, 50, sql); Pagination pagination = unionReimburseService.listPageMap(1, 50, sql);
return Result.success(pagination.getList()); return Result.success(pagination.getList());
src/main/java/com/budwk/app/zhgh/dayofficework/unionReimburse/vo/UnionReimburseCollectExcelVO.java
-1
View File
@@ -34,7 +34,6 @@ public class UnionReimburseCollectExcelVO implements Serializable {
@Excel(name = "申请时间", width = 30) @Excel(name = "申请时间", width = 30)
private String createTime; private String createTime;
@Excel(name = "经费来源", width = 30)
private String reimburseFundSource; private String reimburseFundSource;
//活动名称 //活动名称
src/main/java/com/budwk/app/zhgh/staffmanage/member/models/MemberApplyRecord.java
+5
View File
@@ -242,4 +242,9 @@ public class MemberApplyRecord extends BaseModel {
@Comment("家庭住址") @Comment("家庭住址")
@ColDefine(type = ColType.VARCHAR, width = 100) @ColDefine(type = ColType.VARCHAR, width = 100)
private String homeAddress; private String homeAddress;
@Column
@Comment("来校时间")
@ColDefine(type = ColType.VARCHAR, width = 10)
private String arrivalAtSchoolDate;
} }
src/main/java/com/budwk/app/zhgh/staffmanage/member/service/impl/MemberStatisticsServiceImpl.java
+1 -1
View File
@@ -265,7 +265,7 @@ public class MemberStatisticsServiceImpl extends BaseServiceImpl<Sys_user> imple
sql.setParam("lastYear", currentYear - 1); sql.setParam("lastYear", currentYear - 1);
sql.setParam("currentYear", currentYear); sql.setParam("currentYear", currentYear);
Cnd cnd = Cnd.NEW(); Cnd cnd = Cnd.NEW();
cnd.and("dw.unitLevel", "=", 2); cnd.and("dw.unitLevel", "=", 3);
if (!AuthUtil.hasRoleOr(RoleConstant.SYSADMIN.name(), RoleConstant.SCHOOL_UNION_ADMIN.name())) { if (!AuthUtil.hasRoleOr(RoleConstant.SYSADMIN.name(), RoleConstant.SCHOOL_UNION_ADMIN.name())) {
cnd.and("dw.unionId", "=", SecurityUtil.getUnionId()); cnd.and("dw.unionId", "=", SecurityUtil.getUnionId());
} else { } else {
src/main/resources/views/platform/zhgh/dayofficework/unionReimburse/apply/index.html
+9 -9
View File
@@ -135,15 +135,15 @@ layout("/layouts/platform.html"){
</el-form-item> </el-form-item>
</el-descriptions-item>--> </el-descriptions-item>-->
<el-descriptions-item label="发票张数"> <!-- <el-descriptions-item label="发票张数">-->
<el-form-item label="发票张数" prop="invoiceNumber"> <!-- <el-form-item label="发票张数" prop="invoiceNumber">-->
<el-input-number v-model="formData.invoiceNumber" <!-- <el-input-number v-model="formData.invoiceNumber"-->
:max="1000" :min="0" controls-position="right" <!-- :max="1000" :min="0" controls-position="right"-->
placeholder="请填写发票张数" <!-- placeholder="请填写发票张数"-->
style="width: 100%"></el-input-number> <!-- style="width: 100%"></el-input-number>-->
</el-form-item> <!-- </el-form-item>-->
</el-descriptions-item> <!-- </el-descriptions-item>-->
<el-descriptions-item></el-descriptions-item> <!-- <el-descriptions-item ></el-descriptions-item>-->
<el-descriptions-item label="支付内容" :span="2"> <el-descriptions-item label="支付内容" :span="2">
<el-form-item prop="paymentNotes" label="支付内容"> <el-form-item prop="paymentNotes" label="支付内容">
src/main/resources/views/platform/zhgh/dayofficework/unionReimburse/info.js
+1 -1
View File
@@ -34,7 +34,7 @@ const unionReimburseInfo = {
<el-descriptions-item label="活动名称">{{viewData.activityName}}</el-descriptions-item> <el-descriptions-item label="活动名称">{{viewData.activityName}}</el-descriptions-item>
<el-descriptions-item label="活动地点">{{viewData.activityPlace||'暂无'}}</el-descriptions-item> <el-descriptions-item label="活动地点">{{viewData.activityPlace||'暂无'}}</el-descriptions-item>
<el-descriptions-item label="报销金额">{{viewData.money}}</el-descriptions-item> <el-descriptions-item label="报销金额">{{viewData.money}}</el-descriptions-item>
<el-descriptions-item label="发票张数">{{viewData.invoiceNumber}}</el-descriptions-item> <!-- <el-descriptions-item label="发票张数">{{viewData.invoiceNumber}}</el-descriptions-item>-->
<el-descriptions-item label="支付内容" :span="2">{{viewData.paymentNotes}}</el-descriptions-item> <el-descriptions-item label="支付内容" :span="2">{{viewData.paymentNotes}}</el-descriptions-item>
<el-descriptions-item label="签字" :span="2"> <el-descriptions-item label="签字" :span="2">
<el-image :src="viewData.userSign" fit="cover" style="height: 60px" <el-image :src="viewData.userSign" fit="cover" style="height: 60px"
src/main/resources/views/platform/zhgh/democratic/proposal/transact/committeeFiling/index.html
+88 -83
View File
@@ -24,24 +24,24 @@ layout("/layouts/platform.html"){
<search-item label="姓名/工号"> <search-item label="姓名/工号">
<el-input placeholder="请输入姓名或工号" clearable v-model="pageForm.createUserKeyword"></el-input> <el-input placeholder="请输入姓名或工号" clearable v-model="pageForm.createUserKeyword"></el-input>
</search-item> </search-item>
<!-- <search-item label="提案人姓名">--> <!-- <search-item label="提案人姓名">-->
<!-- <el-input--> <!-- <el-input-->
<!-- @keyup.enter.native="doSearch"--> <!-- @keyup.enter.native="doSearch"-->
<!-- clearable--> <!-- clearable-->
<!-- placeholder="请输入提案人姓名"--> <!-- placeholder="请输入提案人姓名"-->
<!-- v-model="pageForm.createUserName"--> <!-- v-model="pageForm.createUserName"-->
<!-- style="width: 100%"--> <!-- style="width: 100%"-->
<!-- ></el-input>--> <!-- ></el-input>-->
<!-- </search-item>--> <!-- </search-item>-->
<!-- <search-item label="提案人工号">--> <!-- <search-item label="提案人工号">-->
<!-- <el-input--> <!-- <el-input-->
<!-- @keyup.enter.native="doSearch"--> <!-- @keyup.enter.native="doSearch"-->
<!-- clearable--> <!-- clearable-->
<!-- placeholder="请输入提案人工号"--> <!-- placeholder="请输入提案人工号"-->
<!-- v-model="pageForm.createUserLoginName"--> <!-- v-model="pageForm.createUserLoginName"-->
<!-- style="width: 100%"--> <!-- style="width: 100%"-->
<!-- ></el-input>--> <!-- ></el-input>-->
<!-- </search-item>--> <!-- </search-item>-->
</search> </search>
</el-card> </el-card>
@@ -55,16 +55,17 @@ layout("/layouts/platform.html"){
</table-tool> </table-tool>
<el-table :data="tableData" @sort-change="pageOrder" ref="tableRef" row-key="id" style="width: 100%"> <el-table :data="tableData" @sort-change="pageOrder" ref="tableRef" row-key="id" style="width: 100%">
<el-table-column type="selection" width="50" fixed="left" v-if="!pageForm.approval"></el-table-column> <el-table-column type="selection" width="50" fixed="left" v-if="!pageForm.approval"></el-table-column>
<el-table-column label="序号" width="50" type="index" :index="indexMethod" fixed="left"></el-table-column> <el-table-column label="序号" width="50" type="index" :index="indexMethod"
fixed="left"></el-table-column>
<el-table-column <el-table-column
:label="column.label" :label="column.label"
:prop="column.prop" :prop="column.prop"
:key="column.key" :key="column.key"
:min-width="column.width" :min-width="column.width"
:fixed="column.fixed" :fixed="column.fixed"
show-overflow-tooltip show-overflow-tooltip
v-for="column in tableColumns" v-for="column in tableColumns"
v-if="column.visible !== false" v-if="column.visible !== false"
> >
<template v-if="column.prop === 'caseFilingResult'" scope="{row}"> <template v-if="column.prop === 'caseFilingResult'" scope="{row}">
<dict-tag v-if="row.taskState!==10" <dict-tag v-if="row.taskState!==10"
@@ -117,18 +118,18 @@ layout("/layouts/platform.html"){
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
<el-form-item <el-form-item
label="主办单位" label="主办单位"
v-if="['CONFIRM_FILING','SUGGESTION'].includes(formData.tf_caseFilingResult)" v-if="['CONFIRM_FILING','SUGGESTION'].includes(formData.tf_caseFilingResult)"
:rules="[{required:['CONFIRM_FILING','SUGGESTION'].includes(formData.tf_caseFilingResult),message:'必填',trigger:['change','blur']}]" :rules="[{required:['CONFIRM_FILING','SUGGESTION'].includes(formData.tf_caseFilingResult),message:'必填',trigger:['change','blur']}]"
prop="tf_masterUnitId" prop="tf_masterUnitId"
> >
<el-select v-model="formData.tf_masterUnitId" filterable clearable style="width: 100%"> <el-select v-model="formData.tf_masterUnitId" filterable clearable style="width: 100%">
<el-option <el-option
v-for="item in underTakeOptions" v-for="item in underTakeOptions"
:label="item.name" :label="item.name"
:value="item.id" :value="item.id"
:key="item.id" :key="item.id"
:disabled="formData && formData.tf_slaveUnitIds.includes(item.id)" :disabled="formData && formData.tf_slaveUnitIds.includes(item.id)"
></el-option> ></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
@@ -139,11 +140,11 @@ layout("/layouts/platform.html"){
<el-select v-model="formData.tf_slaveUnitIds" filterable clearable multiple <el-select v-model="formData.tf_slaveUnitIds" filterable clearable multiple
style="width: 100%"> style="width: 100%">
<el-option <el-option
v-for="item in underTakeOptions" v-for="item in underTakeOptions"
:label="item.name" :label="item.name"
:value="item.id" :value="item.id"
:key="item.id" :key="item.id"
:disabled="item.id===formData.tf_masterUnitId" :disabled="item.id===formData.tf_masterUnitId"
></el-option> ></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
@@ -168,7 +169,7 @@ layout("/layouts/platform.html"){
</div> </div>
<script nonce="${cspNonce!}"> <script nonce="${cspNonce!}">
<!--#include('../../common/info.js'){}#--> <!--#include("../../common/info.js"){}#-->
<!--#include('merge.js'){}#--> <!--#include('merge.js'){}#-->
new Vue({ new Vue({
@@ -183,14 +184,14 @@ layout("/layouts/platform.html"){
data() { data() {
return { return {
tableColumns: [ tableColumns: [
{label: "提案编号", prop: "code"}, { label: "提案编号", prop: "code" },
{label: "提案名称", prop: "name", width: "200px"}, { label: "提案名称", prop: "name", width: "200px" },
{label: "提案类别", prop: "typeName"}, { label: "提案类别", prop: "typeName" },
{label: "届次", prop: "sessionName"}, { label: "届次", prop: "sessionName" },
{label: "立案结果", prop: "caseFilingResult"}, { label: "立案结果", prop: "caseFilingResult" },
{label: "代表团", prop: "delegationName"}, { label: "代表团", prop: "delegationName" },
{label: "当前节点", prop: "curTaskName"}, { label: "当前节点", prop: "curTaskName" },
{label: "流程状态", prop: "instanceState"} { label: "流程状态", prop: "instanceState" }
], ],
pageForm: { pageForm: {
approval: false approval: false
@@ -203,7 +204,7 @@ layout("/layouts/platform.html"){
tf_caseFilingResult: [{ required: true, message: "请选择立案结果", trigger: ["blur", "change"] }], tf_caseFilingResult: [{ required: true, message: "请选择立案结果", trigger: ["blur", "change"] }],
tf_caseFilingType: [{ required: true, message: "请选择立案类型", trigger: ["blur", "change"] }], tf_caseFilingType: [{ required: true, message: "请选择立案类型", trigger: ["blur", "change"] }],
tf_masterUnitId: [{ required: true, message: "请选择主办单位", trigger: "blur" }], tf_masterUnitId: [{ required: true, message: "请选择主办单位", trigger: "blur" }],
approvalOpinion: [{ required: true, message: "请填写审核意见", trigger: "blur" }], approvalOpinion: [{ required: true, message: "请填写审核意见", trigger: "blur" }]
}, },
showApprovalForm: false, showApprovalForm: false,
sessionOptions: [], sessionOptions: [],
@@ -232,38 +233,42 @@ layout("/layouts/platform.html"){
}, },
handleTaskAction(val) { handleTaskAction(val) {
this.$confirm("您确定要提交吗？", "提示", { this.$refs.formRef.validate(valid => {
confirmButtonText: "确定", if (valid) {
cancelButtonText: "取消", this.$confirm("您确定要提交吗？", "提示", {
type: "warning" confirmButtonText: "确定",
}).then(() => { cancelButtonText: "取消",
// 是否有协办单位 type: "warning"
let tf_helpunitreply; }).then(() => {
if (this.formData.tf_slaveUnitIds && this.formData.tf_slaveUnitIds.length > 0) { // 是否有协办单位
tf_helpunitreply = 'HAS_HELP_UNIT' let tf_helpunitreply
} else { if (this.formData.tf_slaveUnitIds && this.formData.tf_slaveUnitIds.length > 0) {
tf_helpunitreply = 'NO_HELP_UNIT' tf_helpunitreply = "HAS_HELP_UNIT"
} } else {
tf_helpunitreply = "NO_HELP_UNIT"
}
const loading = createLoading('提交中') const loading = createLoading("提交中")
this.$axios.post("/flow/common/executeTask", { this.$axios.post("/flow/common/executeTask", {
data: JSON.stringify({ data: JSON.stringify({
...this.formData, ...this.formData,
submitType: val, submitType: val,
tf_masterUnitName: this.formData.tf_masterUnitId ? this.underTakeOptions.find(v => v.id === this.formData.tf_masterUnitId)?.name : null, tf_masterUnitName: this.formData.tf_masterUnitId ? this.underTakeOptions.find(v => v.id === this.formData.tf_masterUnitId)?.name : null,
tf_slaveUnitNames: this.formData.tf_slaveUnitIds.map(v => this.underTakeOptions.find(v2 => v2.id === v)?.name), tf_slaveUnitNames: this.formData.tf_slaveUnitIds.map(v => this.underTakeOptions.find(v2 => v2.id === v)?.name),
tf_slaveUnitNameStr: this.formData.tf_slaveUnitIds.map(v => this.underTakeOptions.find(v2 => v2.id === v)?.name).join(','), tf_slaveUnitNameStr: this.formData.tf_slaveUnitIds.map(v => this.underTakeOptions.find(v2 => v2.id === v)?.name).join(","),
tf_helpunitreply: tf_helpunitreply tf_helpunitreply: tf_helpunitreply
})
}).then((res) => {
if (res.code === 0) {
this.$refs.guava.index()
this.$message.success(res.msg)
this.doSearch()
}
}).finally(() => {
loading.close()
})
}) })
}).then((res) => { }
if (res.code === 0) {
this.$refs.guava.index()
this.$message.success(res.msg)
this.doSearch()
}
}).finally(() => {
loading.close()
})
}) })
}, },
@@ -271,7 +276,7 @@ layout("/layouts/platform.html"){
openMerge() { openMerge() {
const selection = this.$refs.tableRef.selection const selection = this.$refs.tableRef.selection
if (selection.length < 2) { if (selection.length < 2) {
this.$message.warning('请先勾选需要并案审核的提案，至少需要两条提案') this.$message.warning("请先勾选需要并案审核的提案，至少需要两条提案")
return return
} }
this.$refs.guava.public(() => { this.$refs.guava.public(() => {
@@ -290,7 +295,7 @@ layout("/layouts/platform.html"){
cancelButtonText: "取消", cancelButtonText: "取消",
type: "info" type: "info"
}).then(() => { }).then(() => {
this.$axios.post("/flow/common/revokeTask", {taskId: row.taskId}).then((res) => { this.$axios.post("/flow/common/revokeTask", { taskId: row.taskId }).then((res) => {
if (res.code === 0) { if (res.code === 0) {
this.$message.success(res.msg) this.$message.success(res.msg)
this.doSearch() this.doSearch()
src/main/resources/views/platform/zhgh/staffbenefit/condolence/apply/index.html
+2 -6
View File
@@ -164,16 +164,12 @@ layout("/layouts/platform.html"){
<el-descriptions-item label="当年第几次住院"> <el-descriptions-item label="当年第几次住院">
<el-form-item prop="thisYearHospitalizationNum" label="当年第几次住院"> <el-form-item prop="thisYearHospitalizationNum" label="当年第几次住院">
<el-input style="width: 100%" v-model="formData.thisYearHospitalizationNum" <el-input-number style="width: 100%" v-model="formData.thisYearHospitalizationNum"
controls-position="right"
:controls="false"
precision="2"
placeholder="请输入当年第几次住院" placeholder="请输入当年第几次住院"
:min="0" :min="0"
:max="10000"></el-input> :max="10000"></el-input-number>
</el-form-item> </el-form-item>
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item :span="2"></el-descriptions-item>
</template> </template>
src/main/resources/views/platform/zhgh/staffmanage/member/apply/branchunionapproval/index.html
+2 -2
View File
@@ -102,11 +102,11 @@ layout("/layouts/platform.html"){
{ prop: "loginName", label: "工号", sortable: true }, { prop: "loginName", label: "工号", sortable: true },
{ prop: "userName", label: "姓名", sortable: true }, { prop: "userName", label: "姓名", sortable: true },
{ prop: "userState", label: "在职状态", sortable: true }, { prop: "userState", label: "在职状态", sortable: true },
{ prop: "personType", label: "教职工类别", sortable: true }, // { prop: "personType", label: "教职工类别", sortable: true },
{ prop: "preparedBy", label: "编制类别", sortable: true }, { prop: "preparedBy", label: "编制类别", sortable: true },
{ prop: "unionName", label: "所属工会", sortable: true }, { prop: "unionName", label: "所属工会", sortable: true },
{ prop: "unitName", label: "所属单位", sortable: true }, { prop: "unitName", label: "所属单位", sortable: true },
{ prop: "sign", label: "签字" }, // { prop: "sign", label: "签字" },
{ prop: "curTaskName", label: "当前节点" }, { prop: "curTaskName", label: "当前节点" },
{ prop: "instanceState", label: "流程状态" } { prop: "instanceState", label: "流程状态" }
], ],
src/main/resources/views/platform/zhgh/staffmanage/member/apply/common/info.js
+2 -2
View File
@@ -26,8 +26,8 @@ const INFO = {
<el-descriptions-item label="联系电话">{{ viewData.mobile }}</el-descriptions-item> <el-descriptions-item label="联系电话">{{ viewData.mobile }}</el-descriptions-item>
<!-- <el-descriptions-item label="电子邮箱">{{ viewData.email }}</el-descriptions-item>--> <!-- <el-descriptions-item label="电子邮箱">{{ viewData.email }}</el-descriptions-item>-->
<!-- <el-descriptions-item label="在职状态">{{ viewData.userState }}</el-descriptions-item>--> <el-descriptions-item label="在职状态">{{ viewData.userState }}</el-descriptions-item>
<el-descriptions-item label="教职工类别">{{ viewData.personType }}</el-descriptions-item> <!-- <el-descriptions-item label="教职工类别">{{ viewData.personType }}</el-descriptions-item>-->
<el-descriptions-item label="编制类别">{{ viewData.preparedBy }}</el-descriptions-item> <el-descriptions-item label="编制类别">{{ viewData.preparedBy }}</el-descriptions-item>
<el-descriptions-item label="婚姻状况">{{ viewData.marriage }}</el-descriptions-item> <el-descriptions-item label="婚姻状况">{{ viewData.marriage }}</el-descriptions-item>
<el-descriptions-item label="入职时间">{{ viewData.arrivalAtSchoolDate }}</el-descriptions-item> <el-descriptions-item label="入职时间">{{ viewData.arrivalAtSchoolDate }}</el-descriptions-item>
src/main/resources/views/platform/zhgh/staffmanage/member/apply/mine/index.html
+1 -1
View File
@@ -85,7 +85,7 @@ layout("/layouts/platform.html"){
{ prop: "loginName", label: "工号", sortable: true }, { prop: "loginName", label: "工号", sortable: true },
{ prop: "userName", label: "姓名", sortable: true }, { prop: "userName", label: "姓名", sortable: true },
{ prop: "userState", label: "在职状态", sortable: true }, { prop: "userState", label: "在职状态", sortable: true },
{ prop: "personType", label: "教职工类别", sortable: true }, // { prop: "personType", label: "教职工类别", sortable: true },
{ prop: "preparedBy", label: "编制类别", sortable: true }, { prop: "preparedBy", label: "编制类别", sortable: true },
{ prop: "unionName", label: "所属工会", sortable: true }, { prop: "unionName", label: "所属工会", sortable: true },
{ prop: "unitName", label: "所属单位", sortable: true }, { prop: "unitName", label: "所属单位", sortable: true },
src/main/resources/views/platform/zhgh/staffmanage/member/apply/schoolunionapproval/index.html
+1 -1
View File
@@ -51,7 +51,7 @@ layout("/layouts/platform.html"){
<el-button v-if="row.taskState === 10" @click="openApproval(row)" size="mini" type="primary"> <el-button v-if="row.taskState === 10" @click="openApproval(row)" size="mini" type="primary">
审核 审核
</el-button> </el-button>
<el-button v-if="row.canRevoke" @click="openRevoke(row)" size="mini" type="danger"> <el-button v-if="row.canRevoke" @click="openRevoke(row.taskId)" size="mini" type="danger">
撤回 撤回
</el-button> </el-button>
</template> </template>
src/main/resources/views/platform/zhgh/staffmanage/member/apply/submit/index.html
+13 -10
View File
@@ -20,8 +20,8 @@ layout("/layouts/platform.html"){
<el-descriptions-item label="性别"> <el-descriptions-item label="性别">
<el-form-item prop="sex"> <el-form-item prop="sex">
<el-radio-group v-model="formData.sex" size="small"> <el-radio-group v-model="formData.sex" size="small">
<el-radio border label="男">男</el-radio> <el-radio border label="男性">男性</el-radio>
<el-radio border label="女">女</el-radio> <el-radio border label="女性">女性</el-radio>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
</el-descriptions-item> </el-descriptions-item>
@@ -90,18 +90,18 @@ layout("/layouts/platform.html"){
</el-descriptions-item>--> </el-descriptions-item>-->
<!--<el-descriptions-item label="在职状态"> <el-descriptions-item label="在职状态">
<el-form-item prop="userState"> <el-form-item prop="userState">
<dict-select v-model="formData.userState" code="USER_STATE" <dict-select v-model="formData.userState" code="USER_STATE"
disabled style="width: 100%"></dict-select> disabled style="width: 100%"></dict-select>
</el-form-item> </el-form-item>
</el-descriptions-item>--> </el-descriptions-item>
<el-descriptions-item label="教职工类别"> <!--<el-descriptions-item label="教职工类别">
<el-form-item prop="personType"> <el-form-item prop="personType">
<dict-select v-model="formData.personType" code="USER_PERSON_TYPE" <dict-select v-model="formData.personType" code="USER_PERSON_TYPE"
disabled style="width: 100%"></dict-select> style="width: 100%"></dict-select>
</el-form-item> </el-form-item>
</el-descriptions-item> </el-descriptions-item>-->
<el-descriptions-item label="编制类别"> <el-descriptions-item label="编制类别">
<el-form-item prop="preparedBy"> <el-form-item prop="preparedBy">
<dict-select v-model="formData.preparedBy" code="USER_PREPARED_BY_TYPE" <dict-select v-model="formData.preparedBy" code="USER_PREPARED_BY_TYPE"
@@ -129,8 +129,8 @@ layout("/layouts/platform.html"){
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="入职时间"> <el-descriptions-item label="入职时间">
<el-form-item prop="arrivalAtSchoolDate"> <el-form-item prop="arrivalAtSchoolDate">
<el-input v-model="formData.arrivalAtSchoolDate" disabled placeholder="请输入入职时间" <el-input v-model="formData.arrivalAtSchoolDate" placeholder="请输入入职时间"
maxlength="50"></el-input> disabled maxlength="50"></el-input>
</el-form-item> </el-form-item>
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item></el-descriptions-item> <el-descriptions-item></el-descriptions-item>
@@ -255,7 +255,8 @@ layout("/layouts/platform.html"){
homeAddress: [{ required: true, message: "必填", trigger: ["change", "blur"] }], homeAddress: [{ required: true, message: "必填", trigger: ["change", "blur"] }],
personalData: [{ required: true, message: "必填", trigger: ["change", "blur"] }], personalData: [{ required: true, message: "必填", trigger: ["change", "blur"] }],
specialty: [{ required: true, message: "必填", trigger: ["change", "blur"] }], specialty: [{ required: true, message: "必填", trigger: ["change", "blur"] }],
marriage: [{ required: true, message: "必填", trigger: ["change", "blur"] }] marriage: [{ required: true, message: "必填", trigger: ["change", "blur"] }],
arrivalAtSchoolDate: [{ required: true, message: "必填", trigger: ["change", "blur"] }]
/*email: [ /*email: [
{ {
validator: (rule, value, callback) => { validator: (rule, value, callback) => {
@@ -410,6 +411,7 @@ layout("/layouts/platform.html"){
political, political,
education, education,
academicDegree, academicDegree,
arrivalAtSchoolDate,
position, position,
unitId, unitId,
unitName, unitName,
@@ -452,6 +454,7 @@ layout("/layouts/platform.html"){
this.$set(this.formData, "email", email) this.$set(this.formData, "email", email)
this.$set(this.formData, "families", families ? families : []) this.$set(this.formData, "families", families ? families : [])
this.$set(this.formData, "personalData", personalData) this.$set(this.formData, "personalData", personalData)
this.$set(this.formData, "arrivalAtSchoolDate", this.$moment(arrivalAtSchoolDate).format('YYYY-MM-DD'))
} }
} }
}, },
src/main/resources/views/platform/zhgh/staffmanage/member/info/common/commonQuery.js
+1
View File
@@ -47,6 +47,7 @@ const COMMON_QUERY = {
</search-item> </search-item>
</search> </search>
`, `,
store,
props: { props: {
query_disable: { query_disable: {
type: Boolean, type: Boolean,
src/main/resources/views/platform/zhghh5/dayofficework/unionReimburse/apply/index.html
+15 -13
View File
@@ -118,7 +118,7 @@ layout("/layouts/platform_h5.html"){
<van-field label="银行账号" <van-field label="银行账号"
v-model="formData.bankCardNumber" v-model="formData.bankCardNumber"
placeholder="请输入银行账号" placeholder="请输入银行账号"
:rules="[{ required: true, message: '请输入银行账号' }]" :rules="[{ pattern:/^([1-9]{1})(\d{15}|\d{18})$/, message: '请输入正确银行账号'}]"
required> required>
</van-field> </van-field>
<van-field label="开户行" <van-field label="开户行"
@@ -146,7 +146,7 @@ layout("/layouts/platform_h5.html"){
</template> </template>
<!-- 发票信息 (当报销类别为发票时显示) --> <!-- 发票信息 (当报销类别为发票时显示) -->
<template> <!-- <template>
<van-field label="发票张数" <van-field label="发票张数"
v-model="formData.invoiceNumber" v-model="formData.invoiceNumber"
placeholder="请输入发票张数" placeholder="请输入发票张数"
@@ -154,7 +154,7 @@ layout("/layouts/platform_h5.html"){
:rules="[{ required: true, message: '请输入发票张数' }]" :rules="[{ required: true, message: '请输入发票张数' }]"
required> required>
</van-field> </van-field>
</template> </template>-->
<!-- 支付内容 --> <!-- 支付内容 -->
<van-field <van-field
@@ -302,7 +302,7 @@ layout("/layouts/platform_h5.html"){
// 监听报销类别发生变化，报销项目联动改变 // 监听报销类别发生变化，报销项目联动改变
// 修复 watch 中的监听器 // 修复 watch 中的监听器
watch: { watch: {
"formData.reimburseType"(newVal) { /* "formData.reimburseType"(newVal) {
// 根据报销类别过滤可选的报销项目 // 根据报销类别过滤可选的报销项目
if (newVal === "UNION_REIMBURSE_TYPE_1") { if (newVal === "UNION_REIMBURSE_TYPE_1") {
// 发票类型的报销项目 // 发票类型的报销项目
@@ -331,7 +331,7 @@ layout("/layouts/platform_h5.html"){
"formData.reimburseFundSource"(newVal) { "formData.reimburseFundSource"(newVal) {
// 经费来源改变时查询余额 // 经费来源改变时查询余额
this.queryFundBalance() this.queryFundBalance()
} }*/
}, },
@@ -378,11 +378,12 @@ layout("/layouts/platform_h5.html"){
}, },
// 提交 // 提交
async onSubmit() { async onSubmit() {
if (!this.formData.userSign) {
this.$toast.fail("请签名")
return
}
this.$refs.formRef.validate().then(() => { this.$refs.formRef.validate().then(() => {
if (!this.formData.userSign) {
this.$toast.fail("请签名")
return
}
this.$dialog.confirm({ this.$dialog.confirm({
title: "温馨提示", title: "温馨提示",
message: "您确定要提交吗？" message: "您确定要提交吗？"
@@ -406,11 +407,12 @@ layout("/layouts/platform_h5.html"){
}, },
// 再次提交 // 再次提交
async onSubmitAgain() { async onSubmitAgain() {
if (!this.formData.userSign) {
this.$toast.fail("请签名")
return
}
this.$refs.formRef.validate().then(() => { this.$refs.formRef.validate().then(() => {
if (!this.formData.userSign) {
this.$toast.fail("请签名")
return
}
this.$dialog.confirm({ this.$dialog.confirm({
title: "温馨提示", title: "温馨提示",
message: "您确定要提交吗？" message: "您确定要提交吗？"
src/main/resources/views/platform/zhghh5/dayofficework/unionReimburse/info.js
+1 -1
View File
@@ -34,7 +34,7 @@ const UNION_REIMBURSE_INFO = {
<van-cell title="活动地点">{{ viewData.activityPlace || '暂无'}}</van-cell> <van-cell title="活动地点">{{ viewData.activityPlace || '暂无'}}</van-cell>
<van-cell title="报销金额（元）">{{ viewData.money }}</van-cell> <van-cell title="报销金额（元）">{{ viewData.money }}</van-cell>
<van-cell title="活动时间">{{$moment(viewData.activityTime).format('YYYY-MM-DD')}}</van-cell> <van-cell title="活动时间">{{$moment(viewData.activityTime).format('YYYY-MM-DD')}}</van-cell>
<van-cell title="发票张数">{{ viewData.invoiceNumber }}</van-cell> <!-- <van-cell title="发票张数">{{ viewData.invoiceNumber }}</van-cell>-->
<van-cell title="支付内容"> <van-cell title="支付内容">
<div style="white-space: pre-line"> <div style="white-space: pre-line">
{{ viewData.paymentNotes }} {{ viewData.paymentNotes }}
src/main/resources/views/platform/zhghh5/staffmanage/member/apply/common/info.js
+1 -1
View File
@@ -22,7 +22,7 @@ const INFO = {
<van-cell title="联系电话">{{ viewData.mobile }}</van-cell> <van-cell title="联系电话">{{ viewData.mobile }}</van-cell>
<van-cell title="入职时间">{{ viewData.arrivalAtSchoolDate }}</van-cell> <van-cell title="入职时间">{{ viewData.arrivalAtSchoolDate }}</van-cell>
<van-cell title="教职工类别">{{ viewData.personType }}</van-cell> <van-cell title="在职状态">{{ viewData.userState }}</van-cell>
<van-cell title="编制类别">{{ viewData.preparedBy || '暂无' }}</van-cell> <van-cell title="编制类别">{{ viewData.preparedBy || '暂无' }}</van-cell>
<van-cell title="婚姻状况">{{ viewData.marriage || '暂无' }}</van-cell> <van-cell title="婚姻状况">{{ viewData.marriage || '暂无' }}</van-cell>
<van-cell title="家庭住址"> <van-cell title="家庭住址">
src/main/resources/views/platform/zhghh5/staffmanage/member/apply/mine/index.html
+1 -1
View File
@@ -32,7 +32,7 @@ layout("/layouts/platform_h5.html"){
<table-column label="所属工会">{{row.unionName}}</table-column> <table-column label="所属工会">{{row.unionName}}</table-column>
<table-column label="工作单位">{{row.unitName}}</table-column> <table-column label="工作单位">{{row.unitName}}</table-column>
<table-column label="填报时间">{{row.applyDateTime}}</table-column> <table-column label="填报时间">{{row.applyDateTime}}</table-column>
<table-column label="当前节点">{{row.curTaskName}}</table-column> <table-column label="当前节点">{{row.taskName}}</table-column>
</template> </template>
<template #actions="{index,row}"> <template #actions="{index,row}">
<div class="action-btn" @click="onView(row)"> <div class="action-btn" @click="onView(row)">
src/main/resources/views/platform/zhghh5/staffmanage/member/apply/schoolunionapproval/index.html
+1 -1
View File
@@ -168,7 +168,7 @@ layout("/layouts/platform_h5.html"){
overlay: true, overlay: true,
duration: 0 duration: 0
}) })
this.$axios.post('/flow/common/revokeTask', {taskId: row.startTaskId}).then(res => { this.$axios.post('/flow/common/revokeTask', {taskId: row.taskId}).then(res => {
if (res.code === 0) { if (res.code === 0) {
this.$toast.success('撤回成功'); this.$toast.success('撤回成功');
this.doSearch(); this.doSearch();
src/main/resources/views/platform/zhghh5/staffmanage/member/apply/submit/index.html
+2
View File
@@ -479,6 +479,7 @@ layout("/layouts/platform_h5.html"){
mobile, mobile,
email, email,
families, families,
arrivalAtSchoolDate,
personalData personalData
} = user } = user
@@ -506,6 +507,7 @@ layout("/layouts/platform_h5.html"){
this.$set(this.formData, "email", email) this.$set(this.formData, "email", email)
this.$set(this.formData, "families", families ? families : []) this.$set(this.formData, "families", families ? families : [])
this.$set(this.formData, "personalData", personalData) this.$set(this.formData, "personalData", personalData)
this.$set(this.formData, "arrivalAtSchoolDate", this.$moment(arrivalAtSchoolDate).format("YYYY-MM-DD"))
// 处理校区信息 // 处理校区信息
if (campus) { if (campus) {