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

Merge branch 'main' of https://dd3skj.picp.vip/JyuHsin/zhgh_cug_v4

Browse Source
This commit is contained in:
zhouhefeng
2026-04-27 08:39:59 +08:00
parent 08ee03f802 17bc74a014
commit dcbb1904c2
118 changed files with 2078 additions and 806 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/resources/views/platform/zhghh5/staffbenefit/difficulthelp/apply/index.html
+1 -1
View File
@@ -71,7 +71,7 @@ layout("/layouts/platform_h5.html"){
<van-popup v-model="showSexPicker" position="bottom">
<van-picker
show-toolbar
:columns="['男性', '女性']"
:columns="['男', '女']"
@confirm="onSexConfirm"
@cancel="showSexPicker=false"
></van-picker>
src/main/resources/views/platform/zhghh5/staffbenefit/maternityLeave/apply/index.html
+17 -17
View File
@@ -257,13 +257,13 @@ layout("/layouts/platform_h5.html"){
this.$set(this.formData, 'leaveDays', total);
return total;
},
// 是否为男性
// 是否为男
isMale() {
return this.formData.sex === '男性' || this.formData.sex === '男';
return this.formData.sex === '男';
},
// 是否为女性
// 是否为女
isFemale() {
return this.formData.sex === '女性' || this.formData.sex === '女';
return this.formData.sex === '女';
}
},
watch: {
@@ -279,7 +279,7 @@ layout("/layouts/platform_h5.html"){
// 监听性别变化，设置默认值
isMale(newVal) {
if (newVal) {
// 男性默认设置
// 男默认设置
this.$set(this.formData, 'loverSex', '女');
this.$set(this.formData, 'withLeave', 15);
this.$set(this.formData, 'parentalLeave', 10);
@@ -287,7 +287,7 @@ layout("/layouts/platform_h5.html"){
},
isFemale(newVal) {
if (newVal) {
// 女性默认设置
// 女默认设置
this.$set(this.formData, 'loverSex', '男');
this.$set(this.formData, 'maternityLeave', 98);
this.$set(this.formData, 'extendLeave', 60);
@@ -322,7 +322,7 @@ layout("/layouts/platform_h5.html"){
},
// 计算休假时间止
calculateEndTime() {
// 如果是男性，则不自动计算结束时间
// 如果是男，则不自动计算结束时间
if (this.isMale) {
return;
}
@@ -363,8 +363,8 @@ layout("/layouts/platform_h5.html"){
const errors = [];
// 根据性别确定需要验证的字段
const isMale = this.formData.sex === '男性' || this.formData.sex === '男';
const isFemale = this.formData.sex === '女性' || this.formData.sex === '女';
const isMale = this.formData.sex === '男';
const isFemale = this.formData.sex === '女';
// 必填字段验证
if (!this.formData.loverName) {
@@ -562,17 +562,17 @@ layout("/layouts/platform_h5.html"){
// 根据性别设置默认值
if (this.isMale) {
// 男性默认设置
// 男默认设置
if (!this.formData.withLeave) this.$set(this.formData, 'withLeave', 15);
if (!this.formData.parentalLeave) this.$set(this.formData, 'parentalLeave', 10);
// 男性默认产假和延长假为0
// 男默认产假和延长假为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
// 女默认陪产假和育儿假为0
if (!this.formData.withLeave) this.$set(this.formData, 'withLeave', 0);
if (!this.formData.parentalLeave) this.$set(this.formData, 'parentalLeave', 0);
}
@@ -594,19 +594,19 @@ layout("/layouts/platform_h5.html"){
// 根据性别设置默认值
if (this.isMale) {
// 男性默认设置
// 男默认设置
this.$set(this.formData, 'loverSex', '女');
this.$set(this.formData, 'withLeave', 15);
this.$set(this.formData, 'parentalLeave', 10);
// 男性默认产假和延长假为0
// 男默认产假和延长假为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
// 女默认陪产假和育儿假为0
this.$set(this.formData, 'withLeave', 0);
this.$set(this.formData, 'parentalLeave', 0);
}
src/main/resources/views/platform/zhghh5/staffbenefit/maternityLeave/common/info.js
+6 -6
View File
@@ -18,12 +18,12 @@ const MATERNITY_LEAVE_INFO = {
</van-cell-group>
<van-cell-group title="假期类型">
<van-cell title="陪产假" v-if="viewData.sex === '男性' || viewData.sex === '男'">{{ viewData.withLeave }}</van-cell>
<van-cell title="育儿假" v-if="viewData.sex === '男性' || viewData.sex === '男'">{{ viewData.parentalLeave }}</van-cell>
<van-cell title="产假" v-if="viewData.sex === '女性' || viewData.sex === '女'">{{ viewData.maternityLeave }}</van-cell>
<van-cell title="延长假" v-if="viewData.sex === '女性' || viewData.sex === '女'">{{ viewData.extendLeave }}</van-cell>
<van-cell title="多胞胎" v-if="viewData.sex === '女性' || viewData.sex === '女'">{{ viewData.birthsLeave }}</van-cell>
<van-cell title="难产假" v-if="viewData.sex === '女性' || viewData.sex === '女'">{{ viewData.difficultLeave }}</van-cell>
<van-cell title="陪产假" v-if="viewData.sex === '男'">{{ viewData.withLeave }}</van-cell>
<van-cell title="育儿假" v-if="viewData.sex === '男'">{{ viewData.parentalLeave }}</van-cell>
<van-cell title="产假" v-if="viewData.sex === '女'">{{ viewData.maternityLeave }}</van-cell>
<van-cell title="延长假" v-if="viewData.sex === '女'">{{ viewData.extendLeave }}</van-cell>
<van-cell title="多胞胎" v-if="viewData.sex === '女'">{{ viewData.birthsLeave }}</van-cell>
<van-cell title="难产假" v-if="viewData.sex === '女'">{{ viewData.difficultLeave }}</van-cell>
<van-cell title="寒假">{{ viewData.winterLeave }}</van-cell>
<van-cell title="暑假">{{ viewData.summerLeave }}</van-cell>
<van-cell title="合计">{{ viewData.leaveDays }}</van-cell>
src/main/resources/views/platform/zhghh5/staffmanage/member/apply/common/info.js
-1
View File
@@ -23,7 +23,6 @@ const INFO = {
<van-cell title="入职时间">{{ viewData.arrivalAtSchoolDate }}</van-cell>
<van-cell title="在职状态">{{ viewData.userState }}</van-cell>
<van-cell title="编制类别">{{ viewData.preparedBy || '暂无' }}</van-cell>
<van-cell title="婚姻状况">{{ viewData.marriage || '暂无' }}</van-cell>
<van-cell title="家庭住址">
<template #label>
src/main/resources/views/platform/zhghh5/staffmanage/member/apply/submit/index.html
+2 -9
View File
@@ -142,19 +142,11 @@ layout("/layouts/platform_h5.html"){
<van-field
v-model="formData.personType"
name="personType"
label="教职工类别"
label="人员类型"
readonly
placeholder="请填写人员类型"
clickable
></van-field>
<van-field
v-model="formData.preparedBy"
name="preparedBy"
label="编制类别"
readonly
placeholder="请填写编制类别"
clickable
></van-field>
<van-field
v-model="formData.marriage"
name="marriage"
@@ -610,3 +602,4 @@ layout("/layouts/platform_h5.html"){
<!--#
}
#-->
src/main/resources/views/platform/zhghh5/staffmanage/member/common/mobileMemberChangeInfo.js
+2 -2
View File
@@ -13,8 +13,7 @@ const MOBILE_MEMBER_CHANGE_INFO = {
<van-cell title="所属工会">{{ viewData.unionName }}</van-cell>
<van-cell title="所属单位">{{ viewData.unitName }}</van-cell>
<van-cell title="在职状态">{{ viewData.userState }}</van-cell>
<van-cell title="编制类别">{{ viewData.preparedBy }}</van-cell>
<van-cell title="教职工类别">{{ viewData.personType }}</van-cell>
<van-cell title="人员类型">{{ viewData.personType }}</van-cell>
<van-cell title="出生日期">{{ $moment(viewData.birthday).format('YYYY-MM-DD') }}</van-cell>
<van-cell title="学历">{{ viewData.education }}</van-cell>
<van-cell title="政治面貌">{{ viewData.political }}</van-cell>
@@ -89,3 +88,4 @@ const MOBILE_MEMBER_CHANGE_INFO = {
}
}
}
src/main/resources/views/platform/zhghh5/staffmanage/member/common/mobileMemberInfo.js
+3 -2
View File
@@ -1,4 +1,4 @@
const MOBILE_MEMBER_INFO = {
const MOBILE_MEMBER_INFO = {
template: /*language=HTML*/ `
<div class="detail-container">
<van-cell-group title="基本信息">
@@ -23,7 +23,7 @@ const MOBILE_MEMBER_INFO = {
<van-cell title="电子邮箱">{{ viewData.email }}</van-cell>
<van-cell title="在职状态">{{ viewData.userState }}</van-cell>
<van-cell title="教职工类别">{{ viewData.personType }}</van-cell>
<van-cell title="人员类型">{{ viewData.personType }}</van-cell>
<van-cell title="人员性质">{{ viewData.preparedBy || '暂无' }}</van-cell>
<template v-if="viewData.loginname === $store.state.user.loginnmae">
@@ -89,3 +89,4 @@ const MOBILE_MEMBER_INFO = {
}
}
}
src/main/resources/views/platform/zhghh5/staffmanage/memberCost/summary.html
+3 -2
View File
@@ -1,4 +1,4 @@
<!--#
<!--#
layout("/layouts/platform_h5.html"){
#-->
<div id="app" v-cloak>
@@ -33,7 +33,7 @@ layout("/layouts/platform_h5.html"){
<van-tag :type="item.isPayment?'primary':'danger'">{{item.isPayment?'已缴':'未缴'}}</van-tag>
</template>
<template #label>
<div class="custom-title">教职工类别：{{item.personType}}</div>
<div class="custom-title">人员类型：{{item.personType}}</div>
<div class="custom-title">在职状态：{{item.userState}}</div>
<div class="custom-title">所属工会：{{item.unionname}}</div>
<div class="custom-title">所属单位：{{item.unitname}}</div>
@@ -196,3 +196,4 @@ layout("/layouts/platform_h5.html"){
<!--#
}
#-->
src/main/resources/views/platform/zhghh5/sys/home/mine.js
+2 -6
View File
@@ -35,7 +35,7 @@ const mine = {
<div class="info-list">
<!-- <div class="info-item">
<van-icon name="user-o"></van-icon>
<span class="item-label">教职工类别</span>
<span class="item-label">人员类型</span>
<span class="info-value">{{ $store.state.user.personType }}</span>
</div>-->
<div class="info-item">
@@ -43,11 +43,6 @@ const mine = {
<span class="item-label">在职状态</span>
<span class="info-value">{{ $store.state.user.userState }}</span>
</div>
<div class="info-item">
<van-icon name="user-o"></van-icon>
<span class="item-label">编制类别</span>
<span class="info-value">{{ $store.state.user.preparedBy }}</span>
</div>
<div class="info-item">
<van-icon name="wap-home-o"></van-icon>
<span class="item-label">所属单位</span>
@@ -374,3 +369,4 @@ const mine = {
`
}
}