c-zhouhf1/zhgh_ncu
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:
那些花儿
2025-09-23 16:18:56 +08:00
parent b3d641d1f2 033ceba110
commit e2e5de203a
43 changed files with 3072 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/resources/static/components/plugins/sysDict/DictSelect.vue
+1 -1
View File
@@ -24,7 +24,7 @@
<script>
module.exports = {
props: {
value: { type: String },
value: { type: [String, Array] },
code: {
type: [String, Array],
default: ""
src/main/resources/views/platform/zhgh/dayofficework/cadreTraining/activity/formEdit.js
+462
View File
@@ -0,0 +1,462 @@
const formEdit = {
template: /*language=HTML*/ `
<el-dialog :title="formData.id ? '编辑' : '新增'" :visible="visible" width="70%" :close-on-click-modal="false">
<el-steps :active="activeStep" finish-status="success" simple>
<el-step title="基础信息"></el-step>
<el-step title="名额设置"></el-step>
</el-steps>
<!-- Step 1: 基础信息 -->
<div v-show="activeStep === 0">
<el-form :model="formData" ref="form" :rules="formRules" label-width="120px" class="form-container">
<el-form-item label="活动名称" prop="name">
<el-input v-model="formData.name" placeholder="请输入活动名称" maxlength="50"
show-word-limit>
</el-input>
</el-form-item>
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="报名开始时间" prop="signUpStartTime">
<el-date-picker v-model="formData.signUpStartTime" type="datetime"
placeholder="请选择报名开始时间"
value-format="yyyy-MM-dd HH:mm:ss" style="width: 100%">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="报名结束时间" prop="signUpEndTime">
<el-date-picker v-model="formData.signUpEndTime" type="datetime"
placeholder="请选择报名结束时间"
value-format="yyyy-MM-dd HH:mm:ss" style="width: 100%">
</el-date-picker>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="活动开始时间" prop="startTime">
<el-date-picker v-model="formData.startTime" type="datetime"
placeholder="请选择活动开始时间"
value-format="yyyy-MM-dd HH:mm:ss" style="width: 100%">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="活动结束时间" prop="endTime">
<el-date-picker v-model="formData.endTime" type="datetime"
placeholder="请选择活动结束时间"
value-format="yyyy-MM-dd HH:mm:ss" style="width: 100%">
</el-date-picker>
</el-form-item>
</el-col>
</el-row>
<el-form-item label="通知内容" prop="notice">
<text-editor v-model="formData.notice"></text-editor>
</el-form-item>
</el-form>
</div>
<!-- Step 2: 名额设置 -->
<div v-show="activeStep === 1">
<el-form :model="formData" ref="quotaForm" :rules="formRules" label-width="120px"
class="form-container">
<el-form-item label="名额分配" prop="quotas">
<div class="quota-summary" v-if="formData.quotas.length > 0">
<span>总名额：<span class="quota-count"
style="margin-right: 0;">{{ totalQuota }}</span></span>
<span>已设置：<span class="quota-count" style="margin-right: 0;">{{ allocatedQuota }}</span> / {{ formData.quotas.length }}</span>
<span>未设置：<span class="quota-count quota-unset">{{ formData.quotas.length - allocatedQuota }}</span></span>
</div>
<el-table :data="formData.quotas"
border
style="width: 100%"
max-height="450px"
>
<el-table-column label="序号" width="80" align="center" type="index"></el-table-column>
<el-table-column label="工会名称" prop="name"></el-table-column>
<el-table-column label="名额数量" width="200" align="center">
<template slot-scope="scope">
<el-input-number v-model="scope.row.num" :min="0" :controls="false"
placeholder="请输入名额数量"
style="width: 100%"
@change="handleQuotaChange(scope.row)">
</el-input-number>
</template>
</el-table-column>
</el-table>
<div class="quota-actions">
<el-button type="primary" size="mini" @click="setAllQuotas">批量设置名额</el-button>
<el-button size="mini" @click="clearAllQuotas">清除全部名额</el-button>
</div>
</el-form-item>
</el-form>
</div>
<div slot="footer" class="dialog-footer">
<el-button @click="visible = false">取 消</el-button>
<el-button @click="prevStep" v-if="activeStep > 0">
<i class="el-icon-arrow-left"></i> 上一步
</el-button>
<el-button type="primary" @click="nextStep" v-if="activeStep < 1">
下一步 <i class="el-icon-arrow-right"></i>
</el-button>
<el-button type="primary" @click="submitForm" :loading="submitting" v-if="activeStep === 1">
{{ submitting ? '提交中...' : '确定' }}
</el-button>
</div>
</el-dialog>
`,
data() {
// 日期验证器
const validateDateRange = (rule, value, callback) => {
const { signUpStartTime, signUpEndTime, startTime, endTime } = this.formData
if (rule.field === "signUpEndTime" && signUpStartTime && signUpEndTime) {
if (new Date(signUpEndTime) <= new Date(signUpStartTime)) {
callback(new Error("报名结束时间必须晚于报名开始时间"))
return
}
}
if (rule.field === "startTime" && signUpEndTime && startTime) {
if (new Date(startTime) <= new Date(signUpEndTime)) {
callback(new Error("活动开始时间必须晚于报名结束时间"))
return
}
}
if (rule.field === "endTime" && startTime && endTime) {
if (new Date(endTime) <= new Date(startTime)) {
callback(new Error("活动结束时间必须晚于活动开始时间"))
return
}
}
callback()
}
return {
visible: false,
activeStep: 0,
submitting: false,
formData: {
quotas: []
},
batchQuotaDialogVisible: false,
batchQuotaValue: 0,
formRules: {
name: [
{ required: true, message: "请输入活动名称", trigger: "blur" },
{ min: 1, max: 50, message: "长度在 1 到 50 个字符", trigger: "blur" }
],
signUpStartTime: [{ required: false, message: "请选择报名开始时间", trigger: "blur" }],
signUpEndTime: [
{ required: false, message: "请选择报名结束时间", trigger: "blur" },
{ validator: validateDateRange, trigger: "blur" }
],
startTime: [
{ required: false, message: "请选择活动开始时间", trigger: "blur" },
{ validator: validateDateRange, trigger: "blur" }
],
endTime: [
{ required: false, message: "请选择活动结束时间", trigger: "blur" },
{ validator: validateDateRange, trigger: "blur" }
],
notice: [{ required: true, message: "请输入通知内容", trigger: "blur" }],
quotas: [{ required: true, type: "array", message: "请设置名额分配", trigger: "change" }]
},
unionOptions: []
}
},
computed: {
// 计算总名额
totalQuota() {
return this.formData.quotas.reduce((sum, quota) => {
// 只计算已明确设置了数值的项
if (quota.num !== null && quota.num !== undefined) {
return sum + parseInt(quota.num || 0)
}
return sum
}, 0)
},
// 已分配名额数量（不包括未设置的）
allocatedQuota() {
return this.formData.quotas.filter((q) => q.num !== null && q.num !== undefined).length
}
},
methods: {
// 检查名额是否未设置
isQuotaUnset(value) {
return value === null || value === undefined
},
// 处理名额变更
handleQuotaChange(row) {
// 确保值转换为数字或null
if (row.num === "" || row.num === undefined) {
row.num = null
} else {
row.num = parseInt(row.num)
}
this.validateQuotas()
},
// 批量设置名额
setAllQuotas() {
this.$prompt("请输入要批量设置的名额数量", "批量设置", {
confirmButtonText: "确定",
cancelButtonText: "取消",
inputType: "number",
inputValidator: (value) => {
if (value === "") return "名额不能为空"
if (parseInt(value) < 0) return "名额不能为负数"
return true
}
})
.then(({ value }) => {
const num = parseInt(value)
this.formData.quotas.forEach((q) => {
q.num = num
})
this.validateQuotas()
this.$message.success("已将所有工会名额设置为" + num)
})
.catch(() => {})
},
// 清除所有名额
clearAllQuotas() {
this.$confirm("确定要清除所有名额设置吗？", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
})
.then(() => {
this.formData.quotas.forEach((q) => {
q.num = undefined
})
this.validateQuotas()
this.$message.success("已清除所有名额设置")
})
.catch(() => {})
},
// 打开表单
onOpen(id) {
this.visible = true
this.activeStep = 0
this.formData = {
quotas: []
}
if (id) {
// 如果是编辑模式，加载数据
this.$axios.post("/platform/cadreTraining/activity/get", { id: id }).then((res) => {
if (res.code === 0) {
this.formData = res.data
}
})
} else {
this.$businessTool.listUnion().then((res) => {
this.unionOptions = res
this.formData.quotas = res.map((item) => ({
id: item.id,
name: item.name,
code: item.code,
num: undefined // 默认名额为null（未设置）
}))
})
}
},
// 上一步
prevStep() {
if (this.activeStep > 0) {
this.activeStep--
}
},
// 下一步
nextStep() {
const formRefs = [this.$refs.form, this.$refs.quotaForm]
const currentForm = formRefs[this.activeStep]
currentForm.validate((valid) => {
if (valid) {
if (this.activeStep < 1) {
this.activeStep++
}
} else {
this.$message.warning("请完成必填项")
}
})
},
// 验证名额
validateQuotas() {
this.$refs.quotaForm && this.$refs.quotaForm.validateField("quotas")
},
// 提交表单
submitForm() {
// 验证所有表单
Promise.all([
new Promise((resolve) => this.$refs.form.validate((valid) => resolve(valid))),
new Promise((resolve) => this.$refs.quotaForm.validate((valid) => resolve(valid)))
]).then((results) => {
if (results.every((valid) => valid)) {
const invalidQuota = this.formData.quotas.some((q) => {
// 只检查已设置了值的，未设置的不检查
if (q.num !== null && q.num !== undefined) {
return q.num < 0 || !Number.isInteger(parseInt(q.num))
}
return false
})
if (invalidQuota) {
this.$message.error("请填写有效的名额数量（非负整数）")
return
}
// 检查是否所有名额都未设置
if (this.allocatedQuota === 0) {
this.$confirm("当前所有工会名额均未设置，是否继续提交？", "提示", {
confirmButtonText: "继续提交",
cancelButtonText: "返回修改",
type: "warning"
})
.then(() => {
this.doSubmit()
})
.catch(() => {})
return
}
this.doSubmit()
} else {
// 切换到第一个验证失败的步骤
if (!results[0]) this.activeStep = 0
else if (!results[1]) this.activeStep = 1
}
})
},
// 执行提交操作
doSubmit() {
this.submitting = true
this.$axios
.post("/platform/cadreTraining/activity/" + (this.formData.id ? "update" : "insert"), { cadreTrainingAct: JSON.stringify(this.formData) })
.then((res) => {
if (res.code === 0) {
this.visible = false
this.$message.success(res.msg)
this.$emit("refresh")
}
})
.finally(() => {
this.submitting = false
})
}
},
style: /*language=CSS*/ `
.form-container {
padding: 0 50px;
margin-top: 20px;
margin-bottom: 20px;
}
.batch-container {
background-color: #fff;
border-radius: 4px;
width: 100%;
}
.empty-batch {
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
padding: 40px 0;
background-color: #fafafa;
border: 1px dashed #d9d9d9;
border-radius: 4px;
}
.empty-icon {
font-size: 48px;
color: #909399;
margin-bottom: 15px;
}
.empty-text {
color: #909399;
font-size: 16px;
margin-bottom: 15px;
}
.empty-action {
margin-top: 5px;
}
.no-data {
text-align: center;
color: #909399;
padding: 20px 0;
}
.quota-summary {
display: flex;
margin-bottom: 15px;
background: #f8f8f8;
padding: 10px 15px;
border-radius: 4px;
}
.quota-summary span {
margin-right: 20px;
color: #606266;
}
.quota-count {
font-weight: bold;
color: #409EFF;
padding: 0 5px;
}
.quota-unset {
color: #E6A23C;
}
.quota-status {
font-size: 12px;
margin-top: 5px;
text-align: center;
}
.quota-unset-tip {
color: #E6A23C;
}
.quota-zero-tip {
color: #F56C6C;
}
.quota-set-tip {
color: #67C23A;
}
.quota-actions {
margin-top: 15px;
text-align: right;
}
/* 按钮样式优化 */
.el-button [class*="el-icon-"] + span {
margin-left: 5px;
}
`
}
src/main/resources/views/platform/zhgh/dayofficework/cadreTraining/activity/index.html
+84
View File
@@ -0,0 +1,84 @@
<!--#
layout("/layouts/platform.html"){
#-->
<div id="app" v-cloak>
<el-card shadow="never">
<search @search="doSearch">
<search-item label="年度：">
<el-date-picker placeholder="选择年度" type="year" style="width: 100%" v-model="pageForm.year" value-format="yyyy"></el-date-picker>
</search-item>
<search-item label="活动名称：">
<el-input placeholder="请输入活动名称查询" clearable v-model="pageForm.searchKeyword"></el-input>
</search-item>
</search>
</el-card>
<el-card shadow="never">
<table-tool>
<el-button size="mini" type="primary" icon="el-icon-plus" @click="openAdd">新增</el-button>
</table-tool>
<el-table :data="tableData">
<el-table-column type="index" width="50px" label="序号" :index="indexMethod"></el-table-column>
<el-table-column prop="name" label="名称" show-overflow-tooltip></el-table-column>
<el-table-column prop="signUpStartTime" label="报名开始时间"></el-table-column>
<el-table-column prop="signUpEndTime" label="报名结束时间"></el-table-column>
<el-table-column prop="startTime" label="开始时间"></el-table-column>
<el-table-column prop="endTime" label="结束时间"></el-table-column>
<el-table-column label="操作" width="200px" fixed="right">
<template slot-scope="{row}">
<el-button size="mini" type="primary" @click="openEdit(row)">编辑</el-button>
<el-button size="mini" type="danger" @click="onDelete(row.id)">删除</el-button>
</template>
</el-table-column>
</el-table>
<!--#include("/layouts/pagination.html"){}#-->
</el-card>
<form-edit ref="formEditRef" @refresh="doSearch"></form-edit>
</div>
<script>
<!--#include('formEdit.js'){}#-->
new Vue({
el: "#app",
mixins: [initTableMixins],
components: {
"form-edit": formEdit
},
data() {
return {}
},
methods: {
openAdd() {
this.$refs.formEditRef.onOpen()
},
openEdit(row) {
this.$refs.formEditRef.onOpen(row.id)
},
onDelete(id) {
this.$confirm("您确定要删除吗?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
})
.then(async () => {
const { code, msg } = await this.$axios.post("/platform/cadreTraining/activity/delete", { id: id })
if (code === 0) {
this.$message.success(msg)
this.doSearch()
}
})
.catch(() => {})
}
},
created() {
this.pageData()
}
})
</script>
<!--#
}
#-->
src/main/resources/views/platform/zhgh/dayofficework/cadreTraining/collect/index.html
+176
View File
@@ -0,0 +1,176 @@
<!--#
layout("/layouts/platform.html"){
#-->
<div id="app">
<guava ref="guava">
<el-card shadow="never">
<search @search="doSearch">
<search-item label="年度">
<el-date-picker
v-model="pageForm.year"
type="year"
:clearable="false"
value-format="yyyy"
placeholder="年度"
style="width: 100%"
@change="getActivityByYear">
</el-date-picker>
</search-item>
<search-item label="活动名称">
<el-select v-model="pageForm.activityId" placeholder="请选择活动名称" clearable style="width: 100%" @change="doSearch">
<el-option v-for="item in activityList"
:value="item.id"
:key="item.id"
:label="item.name"
></el-option>
</el-select>
</search-item>
<search-item label="姓名">
<el-input placeholder="请输入姓名" clearable v-model="pageForm.userName" @keyup.enter.native="doSearch"></el-input>
</search-item>
<search-item label="性别">
<el-select v-model="pageForm.sex" placeholder="请选择性别" clearable style="width: 100%">
<el-option label="男性" value="男性"></el-option>
<el-option label="女性" value="女性"></el-option>
</el-select>
</search-item>
<search-item label="工会名称">
<el-select v-model="pageForm.unionId" @change="doSearch" style="width: 100%"
placeholder="请选择工会名称" clearable>
<el-option v-for="item in unionOptions"
:value="item.id"
:key="item.id"
:label="item.name"
></el-option>
</el-select>
</search-item>
<search-item label="单位名称">
<el-select v-model="pageForm.unitId" @change="doSearch" style="width: 100%"
placeholder="请选择单位名称" clearable>
<el-option v-for="item in unitOptions"
:value="item.id"
:key="item.id"
:label="item.name"
></el-option>
</el-select>
</search-item>
</search>
</el-card>
<el-card shadow="never">
<table-tool>
<el-button @click="onExport" icon="el-icon-s-promotion" type="primary" size="small">导出</el-button>
</table-tool>
<el-table :data="tableData" @sort-change="pageOrder" style="width: 100%">
<el-table-column type="index" width="50px" label="序号" :index="indexMethod"></el-table-column>
<el-table-column prop="userName" label="姓名"></el-table-column>
<el-table-column prop="sex" label="性别"></el-table-column>
<el-table-column prop="unionName" label="所属工会"></el-table-column>
<el-table-column prop="unitName" label="所属单位"></el-table-column>
<el-table-column prop="name" label="活动名称"></el-table-column>
<el-table-column prop="applyTime" label="报名时间"></el-table-column>
<el-table-column prop="taskName" label="当前节点"></el-table-column>
<el-table-column prop="instanceState" label="流程状态">
<template slot-scope="{row}">
<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="300px">
<template slot-scope="{row}">
<el-button @click="onView(row)" size="mini" type="primary">查看</el-button>
<el-button v-if="$auth.hasRole('SYSADMIN')" @click="onDelete(row.id)" size="mini" type="danger">删除</el-button>
</template>
</el-table-column>
</el-table>
<!--#include("/layouts/pagination.html"){}#-->
</el-card>
<template #view>
<cadre-training-info ref="cadreTrainingInfoRef"></cadre-training-info>
</template>
</guava>
</div>
<script>
<!--#include('../common/info.js'){}#-->
new Vue({
el: "#app",
store,
//分页数据
mixins: [initTableMixins],
components: {
"cadre-training-info": cadreTrainingInfo,
},
data() {
return {
pageDataUrl: "/platform/cadreTraining/collect/pageData",
unionOptions: [],
unitOptions: [],
userOptions: [],
activityList: [],
currentYear: new Date().getFullYear(),
pageForm: {
year: new Date().getFullYear() + "",
activityId: "",
userName: "",
sex: "",
unionId: "",
unitId: ""
}
}
},
methods: {
onView(row) {
this.$refs.guava.view(()=>{
this.$refs.cadreTrainingInfoRef.onOpen(row)
})
},
onDelete(id) {
this.$confirm("您确定要删除吗？", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
}).then(() => {
this.$axios.post("/platform/cadreTraining/collect/delete", {id}).then((res) => {
if (res.code === 0) {
this.$message.success(res.msg)
this.pageData()
}
})
})
},
onExport() {
this.$downLoad('/platform/cadreTraining/collect/onExport', this.pageForm)
},
// 根据年度获取活动列表
async getActivityByYear() {
const res = await this.$axios.post("/platform/cadreTraining/collect/getActivityList", {
year: this.pageForm.year
});
if (res.code === 0) {
this.activityList = res.data;
// 默认选中最新的活动（第一个）
if (res.data && res.data.length > 0) {
this.pageForm.activityId = res.data[0].id;
this.pageData()
} else {
this.pageForm.activityId = ""; // 数据为空时设为空字符串
}
}
}
},
async created() {
// 获取当前年度的活动列表
await this.getActivityByYear();
// 获取工会和单位列表
this.$businessTool.listUnion().then((res) => (this.unionOptions = res));
this.$businessTool.listUnit().then((res) => (this.unitOptions = res));
}
})
</script>
<!--#
}
#-->
src/main/resources/views/platform/zhgh/dayofficework/cadreTraining/common/info.js
+114
View File
@@ -0,0 +1,114 @@
const cadreTrainingInfo = {
template: /*language=HTML*/ `
<div>
<div class="process-title">
报名信息
<el-link type="primary" @click="openChart">点击查看流程图</el-link>
</div>
<table-tool label="活动信息"></table-tool>
<el-descriptions :column="2" border class="flow-task-form">
<el-descriptions-item label="活动名称" :span="2">{{viewData.name}}</el-descriptions-item>
<el-descriptions-item label="报名开始时间">{{viewData.signUpStartTime}}</el-descriptions-item>
<el-descriptions-item label="报名结束时间">{{viewData.signUpEndTime}}</el-descriptions-item>
<el-descriptions-item label="活动开始时间">{{viewData.startTime}}</el-descriptions-item>
<el-descriptions-item label="活动结束时间" >{{viewData.endTime}}</el-descriptions-item>
<el-descriptions-item label="活动内容" > <div v-html="viewData.notice"></div></el-descriptions-item>
</el-descriptions>
<table-tool label="人员信息"></table-tool>
<el-descriptions :column="2" border class="flow-task-form">
<el-descriptions-item label="姓名">{{viewData.userName}}</el-descriptions-item>
<el-descriptions-item label="分工会">{{viewData.unionName}}</el-descriptions-item>
<el-descriptions-item label="单位">{{viewData.unitName}}</el-descriptions-item>
<el-descriptions-item label="性别">{{viewData.sex}}</el-descriptions-item>
<el-descriptions-item label="手机号">{{viewData.mobile}}</el-descriptions-item>
<el-descriptions-item label="备注">{{viewData.remark}}</el-descriptions-item>
</el-descriptions>
<template v-for="task in doneTasks">
<div class="mt10">
<div class="process-title">{{ task.displayName }}</div>
<el-descriptions border class="flow-task-form" :column="3" :key="task.id"
v-if="task.ext.isFirstTaskNode">
<el-descriptions-item label="申请用户">{{ task.ext.initiatorName
}}({{task.ext.initiatorAccount}})
</el-descriptions-item>
<el-descriptions-item label="申请时间">{{ task.finishTime }}</el-descriptions-item>
<el-descriptions-item label="办理结果">
<dict-tag :options="dict.type.PROCESS_TASK_SUBMIT_TYPE"
:value="task.ext.submitType"></dict-tag>
</el-descriptions-item>
</el-descriptions>
<el-descriptions border class="flow-task-form" :column="3" :key="task.id" v-else>
<el-descriptions-item label="办理用户">{{ task.taskFormData.userName
}}({{task.taskFormData.loginName}})
</el-descriptions-item>
<el-descriptions-item label="办理时间">{{ task.finishTime }}</el-descriptions-item>
<el-descriptions-item label="办理结果">
<dict-tag :options="dict.type.PROCESS_TASK_SUBMIT_TYPE"
:value="task.ext.submitType"></dict-tag>
</el-descriptions-item>
<el-descriptions-item label="办理意见" :span="3" v-if="!task.ext.isFirstTaskNode">{{
task.taskFormData.opinion }}
</el-descriptions-item>
<el-descriptions-item label="签字" :span="3" v-if="!task.ext.isFirstTaskNode">
<el-image :src="task.ext.tf_userSign"
v-if="task.ext.tf_userSign"
class="signature-image"></el-image>
<span v-else>暂无</span>
</el-descriptions-item>
</el-descriptions>
</div>
</template>
<slot></slot>
<snaker-chart ref="snakerChartRef"></snaker-chart>
</div>
`,
store,
dicts: ["PROCESS_TASK_SUBMIT_TYPE"],
data() {
return {
visible: false,
viewData: {},
doneTasks: [],
row: null
}
},
methods: {
// 打开
onOpen(row) {
this.row = row
this.visible = true
this.getInfo()
this.getDoneTasks()
},
// 获取申请信息
getInfo() {
this.viewData = { ...this.row };
// this.$axios.post('/platform/cadreTraining/activity/get', {id: this.row.id}).then((res) => {
// if (res.code === 0) {
// this.viewData = res.data
// }
// })
},
// 获取已办任务审批记录
getDoneTasks() {
this.$axios.post("/flow/common/doneTasks", {bizId: this.row.id}).then((res) => {
if (res.code === 0) {
this.doneTasks = res.data
}
})
},
// 查看流程图
openChart(){
this.$refs.snakerChartRef.onOpenFull(this.row.instanceProcessDefineId,this.row.instanceId)
}
}
}
src/main/resources/views/platform/zhgh/dayofficework/cadreTraining/mine/index.html
+114
View File
@@ -0,0 +1,114 @@
<!--#
layout("/layouts/platform.html"){
#-->
<div id="app">
<guava ref="guava">
<el-card shadow="never">
<search @search="doSearch">
<search-item label="年度：">
<el-date-picker placeholder="选择年度" type="year" style="width: 100%" v-model="pageForm.year" value-format="yyyy"></el-date-picker>
</search-item>
<search-item label="活动名称：">
<el-input placeholder="请输入活动名称查询" clearable v-model="pageForm.searchKeyword"></el-input>
</search-item>
</search>
</el-card>
<el-card shadow="never">
<table-tool></table-tool>
<el-table :data="tableData" @sort-change="pageOrder" style="width: 100%">
<el-table-column type="index" width="50px" label="序号" :index="indexMethod"></el-table-column>
<el-table-column prop="userName" label="姓名"></el-table-column>
<el-table-column prop="unionName" label="所属工会"></el-table-column>
<el-table-column prop="unitName" label="所属单位"></el-table-column>
<el-table-column prop="name" label="活动名称"></el-table-column>
<el-table-column prop="applyTime" label="报名时间"></el-table-column>
<el-table-column prop="taskName" label="当前节点"></el-table-column>
<el-table-column prop="instanceState" label="流程状态">
<template slot-scope="{row}">
<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="300px">
<template slot-scope="{row}">
<el-button @click="onView(row)" size="mini" type="primary">查看</el-button>
<el-button v-if="row.canRevoke" @click="onCancelSignUp(row)" size="mini" type="danger">取消报名
</el-button>
</template>
</el-table-column>
</el-table>
<!--#include("/layouts/pagination.html"){}#-->
</el-card>
<template #view>
<cadre-training-info ref="cadreTrainingInfoRef"></cadre-training-info>
</template>
</guava>
</div>
<script>
<!--#include('/platform/zhgh/dayofficework/cadreTraining/common/info.js'){}#-->
new Vue({
el: "#app",
store,
//分页数据
mixins: [initTableMixins],
components: {
"cadre-training-info": cadreTrainingInfo,
},
data() {
return {
pageDataUrl: "/platform/cadreTraining/mine/pageData",
unionOptions: [],
unitOptions: [],
userOptions: [],
}
},
methods: {
onView(row) {
this.$refs.guava.view(()=>{
this.$refs.cadreTrainingInfoRef.onOpen(row)
})
},
// 取消报名（原撤回功能）
onCancelSignUp(row) {
this.$confirm("您确定要取消报名吗？", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
}).then(async () => {
try {
// 执行撤回操作
if (row.startTaskId) {
const revokeRes = await this.$axios.post("/flow/common/revokeTask", {taskId: row.startTaskId});
if (revokeRes.code !== 0) {
this.$message.error(revokeRes.msg || "撤回失败");
return;
}
}
// 执行删除操作
const deleteRes = await this.$axios.post("/platform/cadreTraining/mine/delete", {id: row.id});
if (deleteRes.code === 0) {
this.$message.success("取消报名成功");
this.pageData();
} else {
this.$message.error(deleteRes.msg || "取消报名失败");
}
} catch (error) {
this.$message.error("操作失败");
}
})
},
},
created() {
this.pageData()
}
})
</script>
<!--#
}
#-->
src/main/resources/views/platform/zhgh/dayofficework/cadreTraining/schoolAudit/index.html
+246
View File
@@ -0,0 +1,246 @@
<!--#
layout("/layouts/platform.html"){
#-->
<div id="app">
<guava ref="guava">
<el-card shadow="never">
<search @search="doSearch">
<search-item label="年度">
<el-date-picker
v-model="pageForm.year"
type="year"
value-format="yyyy"
placeholder="年度"
style="width: 100%"
@change="getActivityByYear">
</el-date-picker>
</search-item>
<search-item label="活动名称">
<el-select v-model="pageForm.activityId" placeholder="请选择活动名称" clearable style="width: 100%" @change="doSearch">
<el-option v-for="item in activityList"
:value="item.id"
:key="item.id"
:label="item.name"
></el-option>
</el-select>
</search-item>
<search-item label="姓名">
<el-input placeholder="请输入姓名" clearable v-model="pageForm.userName" @keyup.enter.native="doSearch"></el-input>
</search-item>
<search-item label="性别">
<el-select v-model="pageForm.sex" placeholder="请选择性别" clearable style="width: 100%">
<el-option label="男性" value="男性"></el-option>
<el-option label="女性" value="女性"></el-option>
</el-select>
</search-item>
<search-item label="工会名称">
<el-select v-model="pageForm.unionId" @change="doSearch" style="width: 100%"
placeholder="请选择工会名称" clearable>
<el-option v-for="item in unionOptions"
:value="item.id"
:key="item.id"
:label="item.name"
></el-option>
</el-select>
</search-item>
<search-item label="单位名称">
<el-select v-model="pageForm.unitId" @change="doSearch" style="width: 100%"
placeholder="请选择单位名称" clearable>
<el-option v-for="item in unitOptions"
:value="item.id"
:key="item.id"
:label="item.name"
></el-option>
</el-select>
</search-item>
</search>
</el-card>
<el-card shadow="never">
<table-tool>
<el-radio-group v-model="pageForm.approval" size="small" @change="doSearch">
<el-radio-button :label="true">已审核</el-radio-button>
<el-radio-button :label="false">未审核</el-radio-button>
</el-radio-group>
</table-tool>
<el-table :data="tableData" @sort-change="pageOrder" style="width: 100%">
<el-table-column type="index" width="50px" label="序号" :index="indexMethod"></el-table-column>
<el-table-column prop="userName" label="姓名"></el-table-column>
<el-table-column prop="sex" label="性别"></el-table-column>
<el-table-column prop="unionName" label="所属工会"></el-table-column>
<el-table-column prop="unitName" label="所属单位"></el-table-column>
<el-table-column prop="name" label="活动名称"></el-table-column>
<el-table-column prop="applyTime" label="报名时间"></el-table-column>
<el-table-column prop="curTaskName" label="当前节点"></el-table-column>
<el-table-column prop="instanceState" label="流程状态">
<template slot-scope="{row}">
<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="300px">
<template slot-scope="{row}">
<el-button @click="onView(row)" size="mini" type="primary">查看</el-button>
<el-button v-if="row.taskState === 10" @click="openAudit(row)" size="mini" type="primary">审核
</el-button>
<el-button v-if="row.canRevoke" @click="onRevoke(row)" size="mini" type="danger">撤回
</el-button>
</template>
</el-table-column>
</el-table>
<!--#include("/layouts/pagination.html"){}#-->
</el-card>
<template #view>
<cadre-training-info ref="cadreTrainingInfoRef">
<div v-if="showApprovalForm">
<div class="process-title">
{{formData.taskName}}
</div>
<el-form :model="formData" ref="formRef" :rules="formRules" label-width="0" label-suffix="："
class="flow-task-form">
<el-form-item label="审批意见" prop="tf_opinion"
: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>
<el-button @click="handleTaskAction(6)" size="small" type="info">退回到发起人</el-button>
<el-button @click="handleTaskAction(2)" size="small" type="danger">拒绝申请</el-button>
<el-button @click="handleTaskAction(1)" size="small" type="primary">同意申请</el-button>
</el-row>
</div>
</cadre-training-info>
</template>
</guava>
</div>
<script>
<!--#include('../common/info.js'){}#-->
new Vue({
el: "#app",
store,
//分页数据
mixins: [initTableMixins],
components: {
"cadre-training-info": cadreTrainingInfo
},
data() {
return {
pageDataUrl: "/platform/cadreTraining/schoolAudit/pageData",
pageForm: {
approval: false,
year: new Date().getFullYear() + "", // 添加年份默认值
activityId: "", // 添加活动ID
userName: "",
sex: "",
unionId: "",
unitId: ""
},
formData: {},
showApprovalForm: false,
unionOptions: [],
unitOptions: [],
userOptions: [],
activityList: [] // 添加活动列表
}
},
methods: {
onView(row) {
this.$refs.guava.view(()=>{
this.$refs.cadreTrainingInfoRef.onOpen(row)
})
},
openAudit(row) {
this.$refs.guava.view(()=>{
this.showApprovalForm = true
this.formData = {
processTaskId: row.taskId,
taskName: row.curTaskName
}
this.$refs.cadreTrainingInfoRef.onOpen(row)
})
},
onRevoke(row) {
this.$confirm("您确定要撤回吗？", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
}).then(() => {
this.$axios.post("/flow/common/revokeTask", {taskId: row.startTaskId}).then((res) => {
if (res.code === 0) {
this.$message.success(res.msg)
this.pageData()
}
})
})
},
handleTaskAction(val) {
this.$confirm("您确定要提交吗？", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
}).then(() => {
this.$axios.post("/flow/common/executeTask", {
data: JSON.stringify({
...this.formData,
submitType: val
})
}).then((res) => {
if (res.code === 0) {
this.$refs.guava.index()
this.$message.success(res.msg)
this.doSearch()
}
})
})
},
// 根据年度获取活动列表
async getActivityByYear() {
if (!this.pageForm.year) {
this.activityList = [];
this.pageForm.activityId = "";
return;
}
try {
const res = await this.$axios.post("/platform/cadreTraining/collect/getActivityList", {
year: parseInt(this.pageForm.year)
});
if (res.code === 0) {
this.activityList = res.data;
// 如果当前选中的活动不在新列表中，清空选择
if (this.pageForm.activityId && !res.data.some(item => item.id === this.pageForm.activityId)) {
this.pageForm.activityId = "";
}
this.doSearch();
}
} catch (error) {
console.error("获取活动列表失败:", error);
this.activityList = [];
this.pageForm.activityId = "";
}
},
// 添加搜索方法
doSearch() {
this.pageData();
}
},
created() {
// 初始化获取活动列表
this.getActivityByYear();
//工会查询
this.$businessTool.listUnion().then((res) => (this.unionOptions = res))
//单位查询
this.$businessTool.listUnit().then((res) => (this.unitOptions = res))
}
})
</script>
<!--#
}
#-->
src/main/resources/views/platform/zhgh/dayofficework/cadreTraining/signUp/index.html
+135
View File
@@ -0,0 +1,135 @@
<!--#
layout("/layouts/platform.html"){
#-->
<div id="app" v-cloak>
<el-card shadow="never">
<search @search="doSearch">
<search-item label="年度：">
<el-date-picker placeholder="选择年度" type="year" style="width: 100%" v-model="pageForm.year" value-format="yyyy"></el-date-picker>
</search-item>
<search-item label="活动名称：">
<el-input placeholder="请输入活动名称查询" clearable v-model="pageForm.searchKeyword"></el-input>
</search-item>
</search>
</el-card>
<el-card shadow="never">
<table-tool></table-tool>
<el-table :data="tableData">
<el-table-column type="index" width="50px" label="序号" :index="indexMethod"></el-table-column>
<el-table-column prop="name" label="名称" show-overflow-tooltip></el-table-column>
<el-table-column prop="signUpStartTime" label="报名开始时间">
<template slot-scope="{row}">{{ formatDate(row.signUpStartTime) }}</template>
</el-table-column>
<el-table-column prop="signUpEndTime" label="报名结束时间">
<template slot-scope="{row}">{{ formatDate(row.signUpEndTime) }}</template>
</el-table-column>
<el-table-column prop="startTime" label="开始时间">
<template slot-scope="{row}">{{ formatDate(row.startTime) }}</template>
</el-table-column>
<el-table-column prop="endTime" label="结束时间">
<template slot-scope="{row}">{{ formatDate(row.endTime) }}</template>
</el-table-column>
<el-table-column prop="status" label="状态" width="100">
<template slot-scope="{row}">
<el-tag :type="getStatusType(row)" size="mini">{{ getStatusText(row) }}</el-tag>
</template>
</el-table-column>
<el-table-column label="操作" width="200px" fixed="right">
<template slot-scope="{row}">
<el-button
size="mini"
type="primary"
@click="openSign(row)"
:disabled="getStatusText(row) !== '报名中'">
报名
</el-button>
</template>
</el-table-column>
</el-table>
<!--#include("/layouts/pagination.html"){}#-->
</el-card>
<sign-form ref="signFormRef" @refresh="doSearch"></sign-form>
</div>
<script>
<!--#include("signForm.js"){}#-->
new Vue({
el: "#app",
mixins: [initTableMixins],
components: {
"sign-form": signForm
},
data() {
return {
pageForm: {
year: new Date().getFullYear().toString(),
searchKeyword: ""
},
now: new Date().getTime()
}
},
methods: {
doSearch() {
this.now = new Date().getTime()
this.pageData()
},
openSign(row) {
this.$refs.signFormRef.onOpen(row)
},
viewDetail(row) {},
// 格式化时间
formatDate(dateStr) {
if (!dateStr) return "-"
return dateStr.substring(0, 16).replace("T", " ")
},
// 获取活动状态
getStatusText(row) {
const now = this.now
const signUpStartTime = row.signUpStartTime ? new Date(row.signUpStartTime).getTime() : 0
const signUpEndTime = row.signUpEndTime ? new Date(row.signUpEndTime).getTime() : 0
const startTime = row.startTime ? new Date(row.startTime).getTime() : 0
const endTime = row.endTime ? new Date(row.endTime).getTime() : 0
if (now < signUpStartTime) {
return "未开始"
} else if (now >= signUpStartTime && now <= signUpEndTime) {
return "报名中"
} else if (now > signUpEndTime && now < startTime) {
return "报名结束"
} else if (now >= startTime && now <= endTime) {
return "活动中"
} else {
return "已结束"
}
},
// 获取状态标签类型
getStatusType(row) {
const status = this.getStatusText(row)
switch (status) {
case "未开始":
return "info"
case "报名中":
return "success"
case "报名结束":
return "warning"
case "活动中":
return "primary"
case "已结束":
return ""
default:
return ""
}
}
},
created() {
this.pageData()
}
})
</script>
<!--#
}
#-->
src/main/resources/views/platform/zhgh/dayofficework/cadreTraining/signUp/signForm.js
+226
View File
@@ -0,0 +1,226 @@
const signForm = {
template: /*language=HTML*/ `
<el-dialog title="活动报名" :visible.sync="dialogVisible" width="70%" @open="handleDialogOpen">
<div class="process-title">
<snaker-start slot="header" define_key="GBPX" label="活动报名"></snaker-start>
</div>
<el-descriptions :column="2" border class="margin-top" style="margin: 10px" title="">
<el-descriptions-item label="活动名称" span="2">
<span class="item-center"> {{ viewData.name }}</span>
</el-descriptions-item>
<el-descriptions-item label="报名开始时间">
{{ viewData.signUpStartTime }}
</el-descriptions-item>
<el-descriptions-item label="报名结束时间">
{{ viewData.signUpEndTime }}
</el-descriptions-item>
<el-descriptions-item label="开始时间">
{{ viewData.startTime }}
</el-descriptions-item>
<el-descriptions-item label="结束时间">
{{ viewData.endTime }}
</el-descriptions-item>
<el-descriptions-item label="分工会名额">
{{ quota }}人 / 剩余: {{ remainingQuota }}人
</el-descriptions-item>
<el-descriptions-item label="活动内容" span="2">
<div v-html="viewData.notice"></div>
</el-descriptions-item>
</el-descriptions>
<!-- 个人报名信息 -->
<div class="process-title">个人报名信息</div>
<el-table :data="teamUsers" class="mt10">
<el-table-column label="序号" type="index" width="60px"></el-table-column>
<el-table-column prop="userName" label="姓名"></el-table-column>
<el-table-column prop="sex" label="性别"></el-table-column>
<el-table-column prop="unionName" label="分工会"></el-table-column>
<el-table-column prop="unitName" label="单位"></el-table-column>
<el-table-column prop="mobile" label="手机号"></el-table-column>
<el-table-column prop="remark" label="备注">
<template slot-scope="scope">
<el-input v-model="scope.row.remark" placeholder="请输入备注"></el-input>
</template>
</el-table-column>
</el-table>
<el-row type="flex" justify="end" class="mt20">
<el-button @click="dialogVisible = false">取消</el-button>
<el-button type="primary" @click="onConfirm" :loading="submitLoading"
:disabled="isSignUp || remainingQuota === 0">确认报名</el-button>
</el-row>
</el-dialog>
`,
store,
data() {
return {
dialogVisible: false,
viewData: {},
formData: {}, // 将 signUpData 改为 formData
id: null,
//表格用户（实际上只包含当前用户）
teamUsers: [],
quota: 0, // 报名名额限制
signedUsers: [], // 已报名人员列表
submitLoading: false, // 提交按钮加载状态
isSignUp: false // 是否已报名
}
},
computed: {
remainingQuota() {
// 如果 quota 为 null 或 undefined，显示"不限"
if (this.quota == null) return "不限"
// 如果 quota 为具体数值（包括0），则计算剩余名额
const remaining = Math.max(0, this.quota - this.signedUsers.length)
return remaining
},
},
methods: {
onOpen(row) {
this.row = row
this.dialogVisible = true
this.id = row.id;
},
handleDialogOpen() {
this.getActivityInfo()
this.getQuota(this.id)
this.loadUserData()
},
// 加载用户数据
async loadUserData() {
try {
// 获取已报名人员
const signedResponse = await this.$axios.post("/platform/cadreTraining/branchUnionSignUp/listSignUser", { activityId: this.id })
if (signedResponse.code === 0) {
this.signedUsers = Array.isArray(signedResponse.data) ? signedResponse.data : []
// 检查当前用户是否已报名
const currentUser = this.signedUsers.find(user => user.userId === this.$store.state.user.id)
this.isSignUp = !!currentUser
// 显示当前用户信息
if (currentUser) {
this.teamUsers = [currentUser]
} else {
// 如果当前用户未报名，显示当前用户信息用于报名
this.teamUsers = [{
userId: this.$store.state.user.id,
userName: this.$store.state.user.username,
loginName: this.$store.state.user.loginname,
unitId: this.$store.state.user?.unit?.id,
unitName: this.$store.state.user?.unit?.name,
unionId: this.$store.state.user?.union?.id,
unionName: this.$store.state.user?.union?.name,
sex: this.$store.state.user.sex,
mobile: this.$store.state.user.mobile,
remark: ''
}]
}
// 初始化表单数据
this.initFormData();
}
} catch (error) {
this.$message.error("获取用户数据失败")
}
},
// 初始化表单数据
initFormData() {
if (this.teamUsers.length > 0) {
const user = this.teamUsers[0];
this.formData = {
cadreTrainingActId: this.id,
userId: user.userId,
userName: user.userName,
loginName: user.loginName,
unitId: user.unitId,
unitName: user.unitName,
unionId: user.unionId,
unionName: user.unionName,
sex: user.sex,
mobile: user.mobile,
remark: user.remark || ''
};
}
},
// 获取名额限制
async getQuota(id) {
try {
const { code, data } = await this.$axios.post("/platform/cadreTraining/branchUnionSignUp/quota", { activityId: id })
if (code === 0) {
this.quota = data
}
} catch (error) {
this.$message.error("获取名额限制失败")
}
},
//活动信息
getActivityInfo() {
this.$axios.post("/platform/cadreTraining/activity/get", {id: this.id}).then((res) => {
if (res.code === 0) {
this.viewData = res.data
}
})
},
//提交报名
async onConfirm() {
// 检查是否已报名
if (this.isSignUp) {
this.$message.warning("您已报名该活动！")
return
}
// 检查名额限制
if (this.quota > 0 && this.signedUsers.length >= this.quota) {
this.$message.warning("该活动报名名额已满！")
return
}
// 更新表单数据中的备注信息
if (this.teamUsers.length > 0) {
this.formData.remark = this.teamUsers[0].remark || '';
}
try {
this.submitLoading = true;
this.$confirm("您确定要提交吗？", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
}).then(async () => {
try {
const { code, msg } = await this.$axios.post('/platform/cadreTraining/branchUnionSignUp/submit', {
data: JSON.stringify(this.formData)
})
if (code === 0) {
this.$message.success("报名成功")
this.isSignUp = true
this.dialogVisible = false
this.$emit("refresh", null)
} else {
this.$message.error(msg || "报名失败")
}
} catch (error) {
this.$message.error("操作失败")
} finally {
this.submitLoading = false;
}
}).catch(() => {
this.submitLoading = false;
})
} catch (error) {
this.$message.error("操作失败")
this.submitLoading = false;
}
},
}
}
src/main/resources/views/platform/zhgh/staffbenefit/maternityLeave/apply/index.html
+118 -17
View File
@@ -12,7 +12,8 @@ layout("/layouts/platform.html"){
<el-descriptions-item label="职工姓名">{{formData.userName}}</el-descriptions-item>
<el-descriptions-item label="性别">{{formData.sex}}</el-descriptions-item>
<el-descriptions-item label="民族">{{formData.nation}}</el-descriptions-item>
<el-descriptions-item label="出生年月" >{{formData.birthday}}</el-descriptions-item>
<!-- 修改出生年月的显示方式 -->
<el-descriptions-item label="出生年月">{{formatDate(formData.birthday)}}</el-descriptions-item>
<el-descriptions-item label="工作单位" >{{formData.unitName}}</el-descriptions-item>
<el-descriptions-item label="电话" >{{formData.mobile}}</el-descriptions-item>
@@ -60,41 +61,45 @@ layout("/layouts/platform.html"){
<table-tool label="假期类别"></table-tool>
<el-descriptions :column="2" border>
<el-descriptions-item label="陪产假" v-if="formData.sex === '男性' || formData.sex === '男'">
<el-descriptions-item label="陪产假" v-if="isMale">
<el-form-item label="陪产假" prop="withLeave">
<el-input v-model="formData.withLeave" placeholder="请输入陪产天数"
type="number"></el-input>
type="number" :disabled="true"></el-input>
</el-form-item>
</el-descriptions-item>
<el-descriptions-item label="育儿假" v-if="formData.sex === '男性' || formData.sex === '男'">
<el-descriptions-item label="育儿假" v-if="isMale">
<el-form-item label="育儿假" prop="parentalLeave">
<el-input v-model="formData.parentalLeave" placeholder="请输入育儿假天数"
type="number"></el-input>
type="number" :disabled="true"></el-input>
</el-form-item>
</el-descriptions-item>
<el-descriptions-item label="产假" v-if="formData.sex === '女性' || formData.sex === '女'">
<el-descriptions-item label="产假" v-if="isFemale">
<el-form-item label="产假" prop="maternityLeave">
<el-input v-model="formData.maternityLeave" placeholder="请输入产假天数"
type="number"></el-input>
type="number" :disabled="true"></el-input>
</el-form-item>
</el-descriptions-item>
<el-descriptions-item label="延长假" v-if="formData.sex === '女性' || formData.sex === '女'">
<el-descriptions-item label="延长假" v-if="isFemale">
<el-form-item label="延长假" prop="extendLeave">
<el-input v-model="formData.extendLeave" placeholder="请输入延长假天数"
type="number"></el-input>
type="number" :disabled="true"></el-input>
</el-form-item>
</el-descriptions-item>
<el-descriptions-item label="多胞胎" v-if="formData.sex === '女性' || formData.sex === '女'">
<el-descriptions-item label="多胞胎" v-if="isFemale">
<el-form-item label="多胞胎" prop="birthsLeave">
<el-input v-model="formData.birthsLeave" placeholder="请输入多胞胎天数"
type="number"></el-input>
<el-select v-model="formData.birthsLeave" placeholder="请选择多胞胎天数"
clearable style="width: 100%">
<el-option label="15" :value="15"></el-option>
</el-select>
</el-form-item>
</el-descriptions-item>
<el-descriptions-item label="难产假" v-if="formData.sex === '女性' || formData.sex === '女'">
<el-descriptions-item label="难产假" v-if="isFemale">
<el-form-item label="难产假" prop="difficultLeave">
<el-input v-model="formData.difficultLeave" placeholder="请输入难产假天数"
type="number"></el-input>
<el-select v-model="formData.difficultLeave" placeholder="请选择难产假天数"
clearable style="width: 100%">
<el-option label="15" :value="15"></el-option>
</el-select>
</el-form-item>
</el-descriptions-item>
@@ -198,14 +203,92 @@ layout("/layouts/platform.html"){
});
return total;
}
},
// 是否为男性
isMale() {
return this.formData.sex === '男性' || this.formData.sex === '男';
},
// 是否为女性
isFemale() {
return this.formData.sex === '女性' || this.formData.sex === '女';
},
},
watch: {
totalLeaveDays(newVal) {
this.$set(this.formData, 'leaveDays', newVal);
// 当合计天数或开始时间变化时，自动计算结束时间
this.calculateEndTime();
},
'formData.startTime'() {
// 当开始时间变化时，自动计算结束时间
this.calculateEndTime();
},
// 监听性别变化，设置默认值
isMale(newVal) {
if (newVal) {
// 男性默认设置
this.$set(this.formData, 'loverSex', '女性');
this.$set(this.formData, 'withLeave', 15);
this.$set(this.formData, 'parentalLeave', 10);
}
},
isFemale(newVal) {
if (newVal) {
// 女性默认设置
this.$set(this.formData, 'loverSex', '男性');
this.$set(this.formData, 'maternityLeave', 98);
this.$set(this.formData, 'extendLeave', 60);
}
}
},
methods: {
// 添加日期格式化方法
formatDate(date) {
if (!date) return '';
// 如果已经是 yyyy-MM-dd 格式，直接返回
if (typeof date === 'string' && /^\d{4}-\d{2}-\d{2}/.test(date)) {
// 如果包含时间，只取日期部分
if (date.length > 10) {
return date.substring(0, 10);
}
return date;
}
// 否则转换为 yyyy-MM-dd 格式
try {
const d = new Date(date);
if (isNaN(d.getTime())) {
return date;
}
const year = d.getFullYear();
const month = String(d.getMonth() + 1).padStart(2, '0');
const day = String(d.getDate()).padStart(2, '0');
return year + '-' + month + '-' + day;
} catch (e) {
return date;
}
},
// 计算休假时间止
calculateEndTime() {
// 如果是男性，则不自动计算结束时间
if (this.isMale) {
return;
}
if (this.formData.startTime && this.formData.leaveDays) {
const startDate = new Date(this.formData.startTime);
if (!isNaN(startDate.getTime())) {
// 创建新的日期对象，避免修改原始日期
const endDate = new Date(startDate);
// 添加天数（leaveDays - 1，因为包含开始日期）
endDate.setDate(endDate.getDate() + this.formData.leaveDays - 1);
// 格式化为 yyyy-MM-dd
const year = endDate.getFullYear();
const month = String(endDate.getMonth() + 1).padStart(2, '0');
const day = String(endDate.getDate()).padStart(2, '0');
// 使用字符串拼接代替模板字符串，避免与Beetl冲突
this.$set(this.formData, 'endTime', year + '-' + month + '-' + day);
}
}
},
// 保存
onSave() {
this.$confirm("您确定保存吗？", "提示", {
@@ -301,9 +384,27 @@ layout("/layouts/platform.html"){
birthday: birthday,
mobile:mobile
}
console.log('FormData birthday:', this.formData.birthday);
// 根据性别设置默认值
if (this.isMale) {
// 男性默认设置
this.$set(this.formData, 'loverSex', '女性');
this.$set(this.formData, 'withLeave', 15);
this.$set(this.formData, 'parentalLeave', 10);
// 男性默认产假和延长假为0，因为男性不休产假
this.$set(this.formData, 'maternityLeave', 0);
this.$set(this.formData, 'extendLeave', 0);
} else if (this.isFemale) {
// 女性默认设置
this.$set(this.formData, 'loverSex', '男性');
this.$set(this.formData, 'maternityLeave', 98);
this.$set(this.formData, 'extendLeave', 60);
// 女性默认陪产假和育儿假为0
this.$set(this.formData, 'withLeave', 0);
this.$set(this.formData, 'parentalLeave', 0);
}
}
}
},
created() {
src/main/resources/views/platform/zhgh/staffbenefit/maternityLeave/common/info.js
+31 -8
View File
@@ -10,15 +10,13 @@ const maternityLeaveInfo = {
<el-descriptions-item label="职工姓名">{{viewData.userName}}</el-descriptions-item>
<el-descriptions-item label="性别">{{viewData.sex}}</el-descriptions-item>
<el-descriptions-item label="民族">{{viewData.nation}}</el-descriptions-item>
<el-descriptions-item label="出生年月">{{viewData.birthday}}</el-descriptions-item>
<el-descriptions-item label="单位">{{viewData.unitName}}</el-descriptions-item>
<el-descriptions-item label="出生年月">{{formatDate(viewData.birthday)}}</el-descriptions-item> <el-descriptions-item label="单位">{{viewData.unitName}}</el-descriptions-item>
<el-descriptions-item label="电话">{{viewData.mobile}}</el-descriptions-item>
<el-descriptions-item label="爱人姓名">{{viewData.loverName}}</el-descriptions-item>
<el-descriptions-item label="性别">{{viewData.loverSex}}</el-descriptions-item>
<el-descriptions-item label="民族">{{viewData.loverNation}}</el-descriptions-item>
<el-descriptions-item label="出生年月">{{viewData.loverBirthday}}</el-descriptions-item>
<el-descriptions-item label="单位" span="2">{{viewData.loverUnitName}}</el-descriptions-item>
<el-descriptions-item label="出生年月">{{formatDate(viewData.loverBirthday)}}</el-descriptions-item> <el-descriptions-item label="单位" span="2">{{viewData.loverUnitName}}</el-descriptions-item>
</el-descriptions>
<table-tool label="假期类型"></table-tool>
<el-descriptions :column="2" border class="flow-task-form">
@@ -43,10 +41,10 @@ const maternityLeaveInfo = {
<el-descriptions-item label="寒假">{{viewData.winterLeave}}</el-descriptions-item>
<el-descriptions-item label="暑假">{{viewData.summerLeave}}</el-descriptions-item>
<el-descriptions-item label="合计" :span="2">{{viewData.leaveDays}}</el-descriptions-item>
<el-descriptions-item label="休假时间起">{{viewData.startTime}}</el-descriptions-item>
<el-descriptions-item label="休假时间止">{{viewData.endTime}}</el-descriptions-item>
<el-descriptions-item label="子女出生日">{{viewData.childrenBirthday}}</el-descriptions-item>
<el-descriptions-item label="休假时间起">{{formatDate(viewData.startTime)}}</el-descriptions-item>
<el-descriptions-item label="休假时间止">{{formatDate(viewData.endTime)}}</el-descriptions-item>
<el-descriptions-item label="子女出生日">{{formatDate(viewData.childrenBirthday)}}</el-descriptions-item>
</el-descriptions>
<template v-for="task in doneTasks">
@@ -101,6 +99,31 @@ const maternityLeaveInfo = {
}
},
methods: {
// 添加日期格式化方法
formatDate(date) {
if (!date) return '';
// 如果已经是 yyyy-MM-dd 格式，直接返回
if (typeof date === 'string' && /^\d{4}-\d{2}-\d{2}/.test(date)) {
// 如果包含时间，只取日期部分
if (date.length > 10) {
return date.substring(0, 10);
}
return date;
}
// 否则转换为 yyyy-MM-dd 格式
try {
const d = new Date(date);
if (isNaN(d.getTime())) {
return date;
}
const year = d.getFullYear();
const month = String(d.getMonth() + 1).padStart(2, '0');
const day = String(d.getDate()).padStart(2, '0');
return year + '-' + month + '-' + day;
} catch (e) {
return date;
}
},
// 打开
onOpen(row) {
this.row = row
src/main/resources/views/platform/zhgh/staffbenefit/maternityLeave/mine/index.html
+5
View File
@@ -35,6 +35,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>
</template>
</el-table-column>
</el-table>
@@ -69,6 +70,10 @@ layout("/layouts/platform.html"){
}
,
methods: {
// 导出示例
doExportApply(row){
this.$downLoad('/platform/maternityLeave/mine/doExportApply?id=' + row.id)
},
onView(row) {
this.$refs.guava.view(()=>{
this.$refs.maternityLeaveInfoRef.onOpen(row)
src/main/resources/views/platform/zhgh/staffmanage/member/apply/common/commonQuery.js
+15 -7
View File
@@ -24,13 +24,16 @@ const COMMON_QUERY = {
</el-select>
</search-item>
<search-item label="在职状态">
<dict-select v-model="pageForm.userState" placeholder="在职状态" @change="doSearch" code="USER_STATE"></dict-select>
<dict-select v-model="pageForm.userStates" placeholder="在职状态" @change="doSearch"
code="USER_STATE" multiple collapse-tags></dict-select>
</search-item>
<search-item label="聘用方式">
<dict-select v-model="pageForm.preparedBy" placeholder="聘用方式" @change="doSearch" code="PREPARED_BY"></dict-select>
<search-item label="人事编制">
<dict-select v-model="pageForm.preparedBys" placeholder="人事编制" @change="doSearch"
code="USER_PREPARED_BY_TYPE" multiple collapse-tags></dict-select>
</search-item>
<search-item label="人员类型">
<dict-select v-model="pageForm.personType" placeholder="人员类型" @change="doSearch" code="USER_PERSON_TYPE"></dict-select>
<dict-select v-model="pageForm.personTypes" placeholder="人员类型" @change="doSearch"
code="USER_PERSON_TYPE" multiple collapse-tags></dict-select>
</search-item>
</template>
</search>
@@ -45,14 +48,19 @@ const COMMON_QUERY = {
searchKeyword: '',
unionId: '',
unitId: '',
userState: '',
personType: ''
userStates: [],
personTypes: [],
preparedBys: [],
}
}
},
methods: {
doSearch(){
this.$emit('search', this.pageForm)
const pageForm = clone(this.pageForm)
pageForm.userStates = JSON.stringify(this.pageForm.userStates)
pageForm.personTypes = JSON.stringify(this.pageForm.personTypes)
pageForm.preparedBys = JSON.stringify(this.pageForm.preparedBys)
this.$emit('search', pageForm)
},
async initData(){
if (this.$auth.hasRoleOr(["SYSADMIN", "SCHOOL_UNION_ADMIN"])) {
src/main/resources/views/platform/zhgh/staffmanage/member/apply/submit/index.html
+2 -2
View File
@@ -19,8 +19,8 @@ layout("/layouts/platform.html"){
<el-descriptions-item label="性别">
<el-form-item prop="sex">
<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-form-item>
</el-descriptions-item>
src/main/resources/views/platform/zhgh/staffmanage/member/branch/verification/check/index.html
+1 -1
View File
@@ -43,7 +43,7 @@ layout("/layouts/platform.html"){
<dict-select v-model="pageForm.userState" placeholder="在职状态" @change="doSearch" code="USER_STATE"></dict-select>
</search-item>
<search-item label="聘用方式">
<dict-select v-model="pageForm.preparedBy" placeholder="聘用方式" @change="doSearch" code="PREPARED_BY"></dict-select>
<dict-select v-model="pageForm.preparedBy" placeholder="聘用方式" @change="doSearch" code="USER_PREPARED_BY_TYPE"></dict-select>
</search-item>
<search-item label="人员类型">
<dict-select v-model="pageForm.personType" placeholder="人员类型" @change="doSearch" code="USER_PERSON_TYPE"></dict-select>
src/main/resources/views/platform/zhgh/staffmanage/member/change/common/commonQuery.js
+14 -13
View File
@@ -19,20 +19,16 @@ const COMMON_QUERY = {
</el-select>
</search-item>
<search-item label="在职状态">
<dict-select v-model="pageForm.userState" placeholder="在职状态" @change="doSearch"
code="USER_STATE"></dict-select>
<dict-select v-model="pageForm.userStates" placeholder="在职状态" @change="doSearch"
code="USER_STATE" multiple collapse-tags></dict-select>
</search-item>
<search-item label="人事编制">
<dict-select v-model="pageForm.preparedBy" placeholder="人事编制" @change="doSearch"
code="PREPARED_BY"></dict-select>
<dict-select v-model="pageForm.preparedBys" placeholder="人事编制" @change="doSearch"
code="USER_PREPARED_BY_TYPE" multiple collapse-tags></dict-select>
</search-item>
<search-item label="人员类型">
<dict-select v-model="pageForm.personType" placeholder="人员类型" @change="doSearch"
code="USER_PERSON_TYPE"></dict-select>
</search-item>
<search-item label="变更类型">
<dict-select v-model="pageForm.changeType" placeholder="人员类型" @change="doSearch"
code="MEMBER_CHANGE_TYPE"></dict-select>
<dict-select v-model="pageForm.personTypes" placeholder="人员类型" @change="doSearch"
code="USER_PERSON_TYPE" multiple collapse-tags></dict-select>
</search-item>
</search>
`,
@@ -45,14 +41,19 @@ const COMMON_QUERY = {
searchKeyword: '',
unionId: '',
unitId: '',
userState: '',
personType: ''
userStates: [],
personTypes: [],
preparedBys: [],
}
}
},
methods: {
doSearch(){
this.$emit('search', this.pageForm)
const pageForm = clone(this.pageForm)
pageForm.userStates = JSON.stringify(this.pageForm.userStates)
pageForm.personTypes = JSON.stringify(this.pageForm.personTypes)
pageForm.preparedBys = JSON.stringify(this.pageForm.preparedBys)
this.$emit('search', pageForm)
},
async initData(){
if (this.$auth.hasRoleOr("SYSADMIN, SCHOOL_UNION_ADMIN, SCHOOL_UNION_MEMBER_ADMIN")) {
src/main/resources/views/platform/zhgh/staffmanage/member/change/common/memberChange.js
+2 -2
View File
@@ -18,8 +18,8 @@ const MEMBER_CHANGE = {
<el-descriptions-item label="性别">
<el-form-item prop="sex">
<el-radio-group :disabled="allowFields('sex')" 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-form-item>
</el-descriptions-item>
src/main/resources/views/platform/zhgh/staffmanage/member/change/submit/form.html
+2 -2
View File
@@ -14,8 +14,8 @@
<el-descriptions-item label="性别">
<el-form-item prop="sex">
<el-radio-group :disabled="allowFields('sex')" 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-form-item>
</el-descriptions-item>
src/main/resources/views/platform/zhgh/staffmanage/member/change/submit/index.html
+2 -2
View File
@@ -19,8 +19,8 @@ layout("/layouts/platform.html"){
<el-descriptions-item label="性别">
<el-form-item prop="sex">
<el-radio-group :disabled="allowFields('sex')" 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-form-item>
</el-descriptions-item>
src/main/resources/views/platform/zhgh/staffmanage/member/school/verification/check/schoolViewAndHandle.js
+1 -1
View File
@@ -21,7 +21,7 @@ const SCHOOL_VIEW_AND_HANDLE = {
</search-item>
<search-item label="聘用方式">
<dict-select v-model="pageForm.preparedBy" placeholder="聘用方式" @change="doSearch"
code="PREPARED_BY"></dict-select>
code="USER_PREPARED_BY_TYPE"></dict-select>
</search-item>
<search-item label="人员类型">
<dict-select v-model="pageForm.personType" placeholder="人员类型" @change="doSearch"
src/main/resources/views/platform/zhgh/staffmanage/member/school/verification/check/viewChangeTypeUser.js
+1 -1
View File
@@ -19,7 +19,7 @@ const VIEW_CHANGE_TYPE_USER = {
</search-item>
<search-item label="聘用方式">
<dict-select v-model="pageForm.preparedBy" placeholder="聘用方式" @change="doSearch"
code="PREPARED_BY"></dict-select>
code="USER_PREPARED_BY_TYPE"></dict-select>
</search-item>
<search-item label="人员类型">
<dict-select v-model="pageForm.personType" placeholder="人员类型" @change="doSearch"
src/main/resources/views/platform/zhgh/staffmanage/member/school/verification/manage/verificationSetUserList.js
+1 -1
View File
@@ -34,7 +34,7 @@ const VERIFICATION_SET_USER_LIST = {
</search-item>
<search-item label="聘用方式">
<dict-select v-model="pageForm.preparedBy" placeholder="聘用方式" @change="doSearch"
code="PREPARED_BY"></dict-select>
code="USER_PREPARED_BY_TYPE"></dict-select>
</search-item>
<search-item label="变更类型">
<dict-select v-model="pageForm.changeType" placeholder="变更类型" @change="doSearch"
src/main/resources/views/platform/zhgh/staffmanage/member/school/verification/manage/verificationShowSelectionUsers.js
+1 -1
View File
@@ -28,7 +28,7 @@ const VERIFICATION_SHOW_SELECTION_USERS = {
</search-item>
<search-item label="聘用方式">
<dict-select v-model="pageForm.preparedBy" placeholder="聘用方式" @change="doSearch"
code="PREPARED_BY"></dict-select>
code="USER_PREPARED_BY_TYPE"></dict-select>
</search-item>
<search-item label="人员类型">
<dict-select v-model="pageForm.personType" placeholder="人员类型" @change="doSearch"
src/main/resources/views/platform/zhgh/staffmanage/sourcechange/manage/index.html
+1 -1
View File
@@ -29,7 +29,7 @@ layout("/layouts/platform.html"){
</search-item>
<search-item label="人事编制">
<dict-select v-model="pageForm.preparedBy" placeholder="人事编制" @change="doSearch"
code="PREPARED_BY"></dict-select>
code="USER_PREPARED_BY_TYPE"></dict-select>
</search-item>
<search-item label="人员类型">
<dict-select v-model="pageForm.personType" placeholder="人员类型" @change="doSearch"
src/main/resources/views/platform/zhghh5/staffbenefit/maternityLeave/apply/index.html
+144 -18
View File
@@ -74,17 +74,17 @@ layout("/layouts/platform_h5.html"){
<van-cell-group title="假期类型" class="form-section">
<van-field label="陪产假" v-model="formData.withLeave" placeholder="请输入天数" type="number"
v-if="formData.sex === '男性' || formData.sex === '男'" required></van-field>
v-if="isMale" required></van-field>
<van-field label="育儿假" v-model="formData.parentalLeave" placeholder="请输入天数" type="number"
v-if="formData.sex === '男性' || formData.sex === '男'" required></van-field>
v-if="isMale" required></van-field>
<van-field label="产假" v-model="formData.maternityLeave" placeholder="请输入天数" type="number"
v-if="formData.sex === '女性' || formData.sex === '女'" required></van-field>
v-if="isFemale" required></van-field>
<van-field label="延长假" v-model="formData.extendLeave" placeholder="请输入天数" type="number"
v-if="formData.sex === '女性' || formData.sex === '女'" required></van-field>
v-if="isFemale" required></van-field>
<van-field label="多胞胎" v-model="formData.birthsLeave" placeholder="请输入天数" type="number"
v-if="formData.sex === '女性' || formData.sex === '女'" required></van-field>
v-if="isFemale" required></van-field>
<van-field label="难产假" v-model="formData.difficultLeave" placeholder="请输入天数" type="number"
v-if="formData.sex === '女性' || formData.sex === '女'" required></van-field>
v-if="isFemale" required></van-field>
<van-field label="寒假" v-model="formData.winterLeave" placeholder="请输入天数"
type="number" required></van-field>
<van-field label="暑假" v-model="formData.summerLeave" placeholder="请输入天数"
@@ -180,8 +180,8 @@ layout("/layouts/platform_h5.html"){
showStartTimePicker: false,
showEndTimePicker: false,
showChildrenBirthdayPicker: false,
minDate: new Date(1950, 0, 1), // 设置最小日期为2000年1月1日
maxDate: new Date(2040, 12, 31), // 设置最大日期为2030年12月31日
minDate: new Date(1950, 0, 1), // 设置最小日期为1950年1月1日
maxDate: new Date(2040, 12, 31), // 设置最大日期为2040年12月31日
// 表单验证规则
formRules: {
loverName: [{ required: true, message: '请输入爱人姓名' }],
@@ -225,9 +225,91 @@ layout("/layouts/platform_h5.html"){
// 同时更新 formData.leaveDays，以便保存到后端
this.$set(this.formData, 'leaveDays', total);
return total;
},
// 是否为男性
isMale() {
return this.formData.sex === '男性' || this.formData.sex === '男';
},
// 是否为女性
isFemale() {
return this.formData.sex === '女性' || this.formData.sex === '女';
}
},
watch: {
totalLeaveDays(newVal) {
this.$set(this.formData, 'leaveDays', newVal);
// 当合计天数或开始时间变化时，自动计算结束时间
this.calculateEndTime();
},
'formData.startTime'() {
// 当开始时间变化时，自动计算结束时间
this.calculateEndTime();
},
// 监听性别变化，设置默认值
isMale(newVal) {
if (newVal) {
// 男性默认设置
this.$set(this.formData, 'loverSex', '女性');
this.$set(this.formData, 'withLeave', 15);
this.$set(this.formData, 'parentalLeave', 10);
}
},
isFemale(newVal) {
if (newVal) {
// 女性默认设置
this.$set(this.formData, 'loverSex', '男性');
this.$set(this.formData, 'maternityLeave', 98);
this.$set(this.formData, 'extendLeave', 60);
}
}
},
methods: {
// 格式化日期为 yyyy-MM-dd 格式
formatDate(date) {
if (!date) return '';
// 如果已经是 yyyy-MM-dd 格式，直接返回
if (typeof date === 'string' && /^\d{4}-\d{2}-\d{2}/.test(date)) {
// 如果包含时间，只取日期部分
if (date.length > 10) {
return date.substring(0, 10);
}
return date;
}
// 否则转换为 yyyy-MM-dd 格式
try {
const d = new Date(date);
if (isNaN(d.getTime())) {
return date;
}
const year = d.getFullYear();
const month = String(d.getMonth() + 1).padStart(2, '0');
const day = String(d.getDate()).padStart(2, '0');
return year + '-' + month + '-' + day;
} catch (e) {
return date;
}
},
// 计算休假时间止
calculateEndTime() {
// 如果是男性，则不自动计算结束时间
if (this.isMale) {
return;
}
if (this.formData.startTime && this.formData.leaveDays) {
const startDate = new Date(this.formData.startTime);
if (!isNaN(startDate.getTime())) {
// 创建新的日期对象，避免修改原始日期
const endDate = new Date(startDate);
// 添加天数（leaveDays - 1，因为包含开始日期）
endDate.setDate(endDate.getDate() + this.formData.leaveDays - 1);
// 格式化为 yyyy-MM-dd
const year = endDate.getFullYear();
const month = String(endDate.getMonth() + 1).padStart(2, '0');
const day = String(endDate.getDate()).padStart(2, '0');
this.$set(this.formData, 'endTime', year + '-' + month + '-' + day);
}
}
},
async onSave() {
// 保存时不需要验证，直接提交数据
this.$axios.post("/platform/maternityLeave/apply/save", {data: JSON.stringify(this.formData)})
@@ -298,7 +380,7 @@ layout("/layouts/platform_h5.html"){
}
}
// 所人性别都需要填写的字段
// 所有人需要填写的字段
if (!this.formData.winterLeave && this.formData.winterLeave !== 0) {
errors.push('请输入寒假天数');
}
@@ -373,26 +455,26 @@ layout("/layouts/platform_h5.html"){
});
},
// 出生日期确认事件
// 出生日期确认事件 - 格式化为 yyyy-MM-dd
onLoverBirthdayConfirm(value) {
this.$set(this.formData, "loverBirthday", this.$moment(value).format("YYYY-MM-DD"));
this.$set(this.formData, "loverBirthday", this.formatDate(value));
this.showLoverBirthdayPicker = false;
},
// 休假开始时间确认事件
// 休假开始时间确认事件 - 格式化为 yyyy-MM-dd
onStartTimeConfirm(value) {
this.$set(this.formData, "startTime", this.$moment(value).format("YYYY-MM-DD"));
this.$set(this.formData, "startTime", this.formatDate(value));
this.showStartTimePicker = false;
},
// 休假结束时间确认事件
// 休假结束时间确认事件 - 格式化为 yyyy-MM-dd
onEndTimeConfirm(value) {
this.$set(this.formData, "endTime", this.$moment(value).format("YYYY-MM-DD"));
this.$set(this.formData, "endTime", this.formatDate(value));
this.showEndTimePicker = false;
},
// 子女出生日期确认事件
// 子女出生日期确认事件 - 格式化为 yyyy-MM-dd
onChildrenBirthdayConfirm(value) {
this.$set(this.formData, "childrenBirthday", this.$moment(value).format("YYYY-MM-DD"));
this.$set(this.formData, "childrenBirthday", this.formatDate(value));
this.showChildrenBirthdayPicker = false;
},
@@ -435,6 +517,31 @@ layout("/layouts/platform_h5.html"){
this.$set(this.formData, "loverNation", matched.value)
}
}
// 格式化所有日期字段，确保不包含时分秒
const dateFields = ['birthday', 'loverBirthday', 'startTime', 'endTime', 'childrenBirthday'];
dateFields.forEach(field => {
if (this.formData[field]) {
this.$set(this.formData, field, this.formatDate(this.formData[field]));
}
});
// 根据性别设置默认值
if (this.isMale) {
// 男性默认设置
if (!this.formData.withLeave) this.$set(this.formData, 'withLeave', 15);
if (!this.formData.parentalLeave) this.$set(this.formData, 'parentalLeave', 10);
// 男性默认产假和延长假为0
if (!this.formData.maternityLeave) this.$set(this.formData, 'maternityLeave', 0);
if (!this.formData.extendLeave) this.$set(this.formData, 'extendLeave', 0);
} else if (this.isFemale) {
// 女性默认设置
if (!this.formData.maternityLeave) this.$set(this.formData, 'maternityLeave', 98);
if (!this.formData.extendLeave) this.$set(this.formData, 'extendLeave', 60);
// 女性默认陪产假和育儿假为0
if (!this.formData.withLeave) this.$set(this.formData, 'withLeave', 0);
if (!this.formData.parentalLeave) this.$set(this.formData, 'parentalLeave', 0);
}
}
})
} else {
@@ -448,8 +555,27 @@ layout("/layouts/platform_h5.html"){
this.$set(this.formData, "unionName", user.union.name)
this.$set(this.formData, "sex", user.sex)
this.$set(this.formData, "nation", user.nation)
this.$set(this.formData, "birthday", user.birthday)
this.$set(this.formData, "birthday", this.formatDate(user.birthday)) // 格式化日期
this.$set(this.formData, "mobile", user.mobile)
// 根据性别设置默认值
if (this.isMale) {
// 男性默认设置
this.$set(this.formData, 'loverSex', '女性');
this.$set(this.formData, 'withLeave', 15);
this.$set(this.formData, 'parentalLeave', 10);
// 男性默认产假和延长假为0
this.$set(this.formData, 'maternityLeave', 0);
this.$set(this.formData, 'extendLeave', 0);
} else if (this.isFemale) {
// 女性默认设置
this.$set(this.formData, 'loverSex', '男性');
this.$set(this.formData, 'maternityLeave', 98);
this.$set(this.formData, 'extendLeave', 60);
// 女性默认陪产假和育儿假为0
this.$set(this.formData, 'withLeave', 0);
this.$set(this.formData, 'parentalLeave', 0);
}
}
}
},
src/main/resources/views/platform/zhghh5/staffbenefit/maternityLeave/common/info.js
+32 -6
View File
@@ -3,17 +3,17 @@ const MATERNITY_LEAVE_INFO = {
/*language=HTML*/`
<van-action-sheet v-model="visible" title="查看详情">
<div class="detail-container">
<van-cell-group title="人员信息">
<van-cell-group title="人员信息">
<van-cell title="职工姓名">{{ viewData.userName }}</van-cell>
<van-cell title="性别">{{ viewData.sex }}</van-cell>
<van-cell title="民族">{{ viewData.nation }}</van-cell>
<van-cell title="出生年月">{{ viewData.birthday }}</van-cell>
<van-cell title="出生年月">{{ formatDate(viewData.birthday) }}</van-cell>
<van-cell title="单位">{{ viewData.unitName }}</van-cell>
<van-cell title="电话">{{ viewData.mobile }}</van-cell>
<van-cell title="爱人姓名">{{ viewData.loverName }}</van-cell>
<van-cell title="性别">{{ viewData.loverSex }}</van-cell>
<van-cell title="民族">{{ viewData.loverNation }}</van-cell>
<van-cell title="出生年月">{{ viewData.loverBirthday }}</van-cell>
<van-cell title="出生年月">{{ formatDate(viewData.loverBirthday) }}</van-cell>
<van-cell title="单位">{{ viewData.loverUnitName }}</van-cell>
</van-cell-group>
@@ -27,11 +27,12 @@ const MATERNITY_LEAVE_INFO = {
<van-cell title="寒假">{{ viewData.winterLeave }}</van-cell>
<van-cell title="暑假">{{ viewData.summerLeave }}</van-cell>
<van-cell title="合计">{{ viewData.leaveDays }}</van-cell>
<van-cell title="休假时间起">{{ viewData.startTime }}</van-cell>
<van-cell title="休假时间止">{{ viewData.endTime }}</van-cell>
<van-cell title="子女出生日">{{ viewData.childrenBirthday }}</van-cell>
<van-cell title="休假时间起">{{ formatDate(viewData.startTime) }}</van-cell>
<van-cell title="休假时间止">{{ formatDate(viewData.endTime) }}</van-cell>
<van-cell title="子女出生日">{{ formatDate(viewData.childrenBirthday) }}</van-cell>
</van-cell-group>
<template v-for="(task,index) in doneTasks">
<div class="process-title">
{{ task.displayName }}
@@ -88,6 +89,31 @@ const MATERNITY_LEAVE_INFO = {
}
},
methods: {
// 添加日期格式化方法
formatDate(date) {
if (!date) return '';
// 如果已经是 yyyy-MM-dd 格式，直接返回
if (typeof date === 'string' && /^\d{4}-\d{2}-\d{2}/.test(date)) {
// 如果包含时间，只取日期部分
if (date.length > 10) {
return date.substring(0, 10);
}
return date;
}
// 否则转换为 yyyy-MM-dd 格式
try {
const d = new Date(date);
if (isNaN(d.getTime())) {
return date;
}
const year = d.getFullYear();
const month = String(d.getMonth() + 1).padStart(2, '0');
const day = String(d.getDate()).padStart(2, '0');
return year + '-' + month + '-' + day;
} catch (e) {
return date;
}
},
onOpen(row) {
this.row = row
this.visible = true