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

commit

Browse Source
This commit is contained in:
@jyuhsin
2025-09-25 21:34:09 +08:00
parent 7630890799
commit a61e800017
10 changed files with 121 additions and 144 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/budwk/app/zhgh/activity/family/models/FamilyActivity.java
+1 -1
View File
@@ -138,7 +138,7 @@ public class FamilyActivity extends BaseModel implements Serializable, SysHomeCo
sysHomeActivity.setId(this.getId());
sysHomeActivity.setName(this.getActivityName());
sysHomeActivity.setCover(this.getCover());
sysHomeActivity.setUrl("/platform/family/apply");
sysHomeActivity.setUrl("/platform/family/apply?id=" + this.getId());
sysHomeActivity.setH5Url("/platform/family/apply/h5?id=" + this.getId());
if (Lang.isNotEmpty(this.getActivitySignUpStartTime())) {
sysHomeActivity.setStartDate(this.getActivitySignUpStartTime());
src/main/java/com/budwk/app/zhgh/activity/trainSignUp/models/TrainSignUpActivity.java
+1 -1
View File
@@ -120,7 +120,7 @@ public class TrainSignUpActivity extends BaseModel implements Serializable, SysH
sysHomeActivity.setId(this.getId());
sysHomeActivity.setName(this.getActivityName());
sysHomeActivity.setCover(this.getCover());
sysHomeActivity.setUrl("/platform/trainSignUp/apply");
sysHomeActivity.setUrl("/platform/trainSignUp/apply?id=" + this.getId());
sysHomeActivity.setH5Url("/platform/trainSignUp/apply/h5?id=" + this.getId());
if (Lang.isNotEmpty(this.getActivitySignUpStartTime())) {
sysHomeActivity.setStartDate(this.getActivitySignUpStartTime());
src/main/java/com/budwk/app/zhgh/dayofficework/literacy/models/LiteracyActivity.java
+1 -1
View File
@@ -120,7 +120,7 @@ public class LiteracyActivity extends BaseModel implements Serializable, SysHome
sysHomeActivity.setId(this.getId());
sysHomeActivity.setName(this.getActivityName());
sysHomeActivity.setCover(this.getCover());
sysHomeActivity.setUrl("/platform/literacy/apply");
sysHomeActivity.setUrl("/platform/literacy/apply?id=" + this.getId());
sysHomeActivity.setH5Url("/platform/literacy/apply/h5?id=" + this.getId());
if (Lang.isNotEmpty(this.getActivitySignUpStartTime())) {
sysHomeActivity.setStartDate(this.getActivitySignUpStartTime());
src/main/resources/views/layouts/platform.html
+7 -44
View File
@@ -324,48 +324,12 @@ layout("/layouts/v4/baseLayout.html"){
this.menus = res.data
window.sessionStorage.setItem("zhgh_sub_app_menus", JSON.stringify(res.data))
this.echoMenus()
// this.matchUrlToMenu()
} else {
this.menus = []
}
})
},
// 按 URL 精准激活
matchUrlToMenu() {
// 跳转带过来的地址
const pathname = window.location.pathname
const find = (list, parentIds = []) => {
for (const m of list) {
if (m.href && pathname.includes(m.href.split('?')[0])) {
return {menu: m, parentIds}
}
if (m.children?.length) {
const hit = find(m.children, [...parentIds, m.id])
if (hit) return hit
}
}
return null
}
const hit = find(this.menus)
if (hit) {
// 激活跳转菜单
this.activeMenuIndex = hit.menu.id
this.openedMenus = hit.parentIds
const app = JSON.parse(window.sessionStorage.getItem("zhgh_sub_app"))
$("#sub-app-container #sidebar-menu .menu-header .menu-title").text(app?.name)
this.$nextTick(() => {
this.menuSelect(hit.menu.id, hit.parentIds)
// 保证内容区对应
commonUtil.pjaxPush(hit.menu.href)
})
} else if (!this.activeMenuIndex) {
// 没命中且缓存也没有 → 再降级到第一个
this.defaultSelect()
}
},
// 设置应用信息
setAppInfo(app) {
if (app) {
@@ -389,7 +353,6 @@ layout("/layouts/v4/baseLayout.html"){
if (!this.activeMenuIndex && '/platform/v4/subApp' === window.location.pathname) {
this.defaultSelect()
} else {
this.hrefSelect()
}
@@ -419,14 +382,14 @@ layout("/layouts/v4/baseLayout.html"){
const result = findMenuPath(this.menus, window.location.pathname)
this.activeMenuIndex = result[result.length-1]
this.openedMenus = result.map(v=>v.id)
if(result){
this.activeMenuIndex = result[result.length-1]['id']
this.openedMenus = result.map(v=>v.id)
this.$nextTick(() => {
this.menuSelect(this.activeMenuIndex, this.openedMenus)
// 使用pjax跳转
commonUtil.pjaxPush(self.href)
})
this.$nextTick(() => {
this.menuSelect(this.activeMenuIndex, this.openedMenus)
})
}
},
src/main/resources/views/layouts/platform_h5.html
+1
View File
@@ -85,6 +85,7 @@
// 禁用vant的表单验证行内错误信息显示
vant.Form.props.showErrorMessage.default = false
vant.ActionSheet.props.lazyRender.default = false
function toggleShowBar() {
if (["/platform/h5/home", "/platform/home"].includes(window.location.pathname)) {
src/main/resources/views/platform/zhgh/activity/family/apply/index.html
+7 -1
View File
@@ -175,6 +175,8 @@ layout("/layouts/platform.html"){
time: 0,
infoRow: {},
infoVisible: false,
id: GetQueryString("id"),
}
},
methods: {
@@ -201,11 +203,15 @@ layout("/layouts/platform.html"){
if (res.code === 0) {
this.tableData = res.data.list
this.pageForm.totalCount = res.data.totalCount
if(this.id) {
const activity = this.tableData.find(o => o.id === this.id)
this.onOpen(activity)
}
}
})
},
},
async created() {
async mounted() {
this.pageData()
}
})
src/main/resources/views/platform/zhgh/activity/trainSignUp/apply/index.html
+11 -3
View File
@@ -126,6 +126,8 @@ layout("/layouts/platform.html"){
time: 0,
infoRow: {},
infoVisible: false,
id: GetQueryString("id"),
}
},
methods: {
@@ -143,8 +145,10 @@ layout("/layouts/platform.html"){
return
}
this.infoVisible = false
this.$refs.guava.view(() => {
this.$refs.courseListRef.onOpen(row)
this.$nextTick(() => {
this.$refs.guava.view(() => {
this.$refs.courseListRef.onOpen(row)
})
})
},
pageData() {
@@ -152,11 +156,15 @@ layout("/layouts/platform.html"){
if (res.code === 0) {
this.tableData = res.data.list
this.pageForm.totalCount = res.data.totalCount
if(this.id) {
const activity = this.tableData.find(o => o.id === this.id)
this.onOpen(activity)
}
}
})
},
},
async created() {
mounted() {
this.pageData()
}
})
src/main/resources/views/platform/zhghh5/staffbenefit/difficulthelp/apply/index.html
+51 -40
View File
@@ -3,7 +3,7 @@ layout("/layouts/platform_h5.html"){
#-->
<div id="app">
<van-nav-bar title="帮扶申请" left-text="返回" left-arrow @click-left="historyBack" placeholder fixed></van-nav-bar>
<div class="form-container">
<van-form ref="formRef">
<van-cell-group title="申请人信息" class="form-section">
@@ -21,7 +21,7 @@ layout("/layouts/platform_h5.html"){
</template>
</van-field>
</van-cell-group>
<van-cell-group title="受助人信息" class="form-section">
<template v-if="formData.mode == 2">
<van-field label="受助人" :rules="[{ required: true }]" v-model="formData.userName"
@@ -31,7 +31,7 @@ layout("/layouts/platform_h5.html"){
size="small" type="primary">查询</van-button>
</template>
</van-field>
<van-action-sheet
:actions="subsidizedList"
:close-on-click-overlay="false"
@@ -40,13 +40,13 @@ layout("/layouts/platform_h5.html"){
cancel-text="重新输入姓名或工号查询"
v-model="userSheetShow">
</van-action-sheet>
</template>
<template v-else>
<van-field label="受助人" :rules="[{ required: true }]" v-model="formData.userName" readonly
required name="userName"></van-field>
</template>
<van-field
v-model="formData.sex"
label="性别"
@@ -54,6 +54,7 @@ layout("/layouts/platform_h5.html"){
is-link
placeholder="请选择性别"
readonly
name="sex"
:rules="[{ required: true }]"
@click="showSexPicker = true"
></van-field>
@@ -72,6 +73,7 @@ layout("/layouts/platform_h5.html"){
placeholder="请填写出生年月"
@click="showDatePicker = true"
required
name="birthday"
:rules="[{ required: true }]"
></van-field>
<van-popup v-model="showDatePicker" position="bottom">
@@ -83,12 +85,13 @@ layout("/layouts/platform_h5.html"){
@cancel="showDatePicker=false"
></van-datetime-picker>
</van-popup>
<van-field
v-model="formData.unionName"
label="所在工会"
placeholder="请选择所在工会"
readonly
name="unionName"
:rules="[{ required: true }]"
required
></van-field>
@@ -97,6 +100,7 @@ layout("/layouts/platform_h5.html"){
label="所在单位"
placeholder="请选择所在单位"
readonly
name="unitName"
:rules="[{ required: true }]"
required
></van-field>
@@ -107,9 +111,10 @@ layout("/layouts/platform_h5.html"){
maxlength="50"
clearable
required
name="officialCapacity"
:rules="[{ required: true }]"
></van-field>
<van-field
v-model="formData.mobile"
label="手机号码"
@@ -117,6 +122,7 @@ layout("/layouts/platform_h5.html"){
maxlength="11"
clearable
required
name="mobile"
:rules="[{ required: true }]"
></van-field>
<van-field
@@ -126,9 +132,10 @@ layout("/layouts/platform_h5.html"){
maxlength="18"
clearable
required
name="idCard"
:rules="[{ required: true }]"
></van-field>
<van-field
v-model="formData.monthlyIncome"
label="本人月收入"
@@ -136,9 +143,10 @@ layout("/layouts/platform_h5.html"){
placeholder="请填写本人月收入"
:rules="[{ required: true }]"
required
name="monthlyIncome"
></van-field>
</van-cell-group>
<van-cell-group title="困难类型及材料" class="form-section">
<van-field
v-model="formData.subsidyStandards"
@@ -147,6 +155,7 @@ layout("/layouts/platform_h5.html"){
is-link
@click="showSubsidyPicker = true"
required
name="subsidyStandards"
:rules="[{ required: true, message: '请选择款项' }]"
></van-field>
<van-popup v-model="showSubsidyPicker" position="bottom">
@@ -157,12 +166,13 @@ layout("/layouts/platform_h5.html"){
@cancel="showSubsidyPicker=false"
></van-picker>
</van-popup>
<van-field
v-model="formData.bankCardNum"
label="银行卡号"
maxlength="20"
clearable
name="bankCardNum"
placeholder="请填写华夏银行工资卡号"
:rules="[{ required: true }]"
required
@@ -170,7 +180,7 @@ layout("/layouts/platform_h5.html"){
<div style="margin-left: 10px">
<span style="color: #bc2a25">据学校要求，请您填写【<span style="color: red;font-weight: bolder">华夏银行工资卡号</span>】为收款账户</span>
</div>
<van-field
v-model="formData.reason"
label="申请原因"
@@ -178,9 +188,10 @@ layout("/layouts/platform_h5.html"){
placeholder="请简述申请原因"
maxlength="500"
required
name="reason"
:rules="[{ required: true, message: '请简述申请原因' }]"
></van-field>
<van-field name="familyList" label="家庭成员经济收入" @click="showDialog = true" required is-link
label-width="60%"
clickable
@@ -201,9 +212,9 @@ layout("/layouts/platform_h5.html"){
</van-cell>
</van-list>
</van-cell-group>
<van-cell-group title="附件信息" class="form-section">
<van-field class="more-text" name="avatar" label="">
<van-field class="more-text" name="files" label="">
<template #input>
<h5-file-upload
slot="input"
@@ -217,23 +228,23 @@ layout("/layouts/platform_h5.html"){
</template>
</van-field>
</van-cell-group>
<van-cell-group title="签字" class="form-section">
<van-field class="more-text" name="signature" label="">
<van-field class="more-text" name="sign" label="">
<template #input>
<h5-signature v-model="formData.sign" slot="input"></h5-signature>
</template>
</van-field>
</van-cell-group>
<div class="form-actions">
<van-button plain type="info" @click="onSave">保存</van-button>
<van-button native-type="button" plain type="info" @click="onSave">保存</van-button>
<van-button type="primary" @click="onSubmit" v-if="!taskId">提交</van-button>
<van-button type="primary" @click="onFinishTask" v-else>提交</van-button>
</div>
</van-form>
</div>
<van-dialog v-model="showDialog" class="family-dialog" title="添加家庭成员" show-cancel-button
:before-close="handleBeforeClose">
<van-cell-group>
@@ -265,7 +276,7 @@ layout("/layouts/platform_h5.html"){
></van-field>
</van-cell-group>
</van-dialog>
</div>
<script>
@@ -299,7 +310,7 @@ layout("/layouts/platform_h5.html"){
showDialog: false,
isEditing: false,
editingIndex: null,
// 替他人申请相关
userSheetShow: false,
subsidizedList: []
@@ -307,7 +318,7 @@ layout("/layouts/platform_h5.html"){
},
methods: {
historyBack,
// 保存
onSave() {
this.$dialog.confirm({
@@ -316,13 +327,13 @@ layout("/layouts/platform_h5.html"){
}).then(() => {
this.$axios.post('/platform/difficultHelp/apply/save', {data: JSON.stringify(this.formData)}).then(res => {
if (res.code === 0) {
this.$message.success("保存成功")
this.$toast('保存成功')
this.$pjaxReplace('/platform/difficultHelp/mine/h5')
}
})
})
},
// 提交
onSubmit() {
this.$refs.formRef.validate().then(() => {
@@ -340,19 +351,19 @@ layout("/layouts/platform_h5.html"){
this.$toast(bankRes.msg)
return;
}
this.$axios.post('/platform/difficultHelp/apply/submit', {
data: JSON.stringify(this.formData)
}).then(res => {
if (res.code === 0) {
this.$message.success("提交成功")
this.$toast('提交成功')
this.$pjaxReplace('/platform/difficultHelp/mine/h5')
}
})
})
})
},
onFinishTask() {
this.$refs.formRef.validate().then(() => {
this.$dialog.confirm({
@@ -369,20 +380,20 @@ layout("/layouts/platform_h5.html"){
this.$toast(bankRes.msg)
return;
}
this.$axios.post('/platform/difficultHelp/apply/submitAgain', {
data: JSON.stringify(this.formData),
taskId: GetQueryString("taskId")
}).then(res => {
if (res.code === 0) {
this.$message.success("提交成功")
this.$toast('提交成功')
this.$pjaxReplace('/platform/difficultHelp/mine/h5')
}
})
})
})
},
// 查询受助人
async queryRecipients(key) {
if (this.formData.mode !== '2') {
@@ -398,7 +409,7 @@ layout("/layouts/platform_h5.html"){
this.userSheetShow = true;
}
},
onUserSelect(val) {
const user = this.subsidizedList.find((item) => item.id === val.id)
if (user) {
@@ -426,7 +437,7 @@ layout("/layouts/platform_h5.html"){
}
this.userSheetShow = false;
},
onSexConfirm(value) {
this.formData.sex = value;
this.showSexPicker = false;
@@ -457,12 +468,12 @@ layout("/layouts/platform_h5.html"){
done()
}
},
addMember() {
this.formData.familyList.push({...this.newMember});
this.resetNewMember();
},
editMember(index) {
this.newMember = {...this.formData.familyList[index]};
this.editingIndex = index;
@@ -481,7 +492,7 @@ layout("/layouts/platform_h5.html"){
this.isEditing = false;
this.editingIndex = null;
},
findOne(id) {
this.$axios.post('/platform/difficultHelp/mine/findOne', { id }).then(res => {
if (res.code === 0) {
@@ -537,12 +548,12 @@ layout("/layouts/platform_h5.html"){
const format15 = /^\d{15}$/;
// 校验外国人永久居留身份证号
const format15Foreign = /^[a-zA-Z]{3}[0-9]{4}[0-9]{2}((01|03|05|07|08|10|12)(0[1-9]|[1-2][0-9]|3[0-1])|(04|06|09|11)(0[1-9]|[1-2][0-9]|30)|02(0[1-9]|[1-2][0-9]))[0-9]{2}$/;
// 校验格式
if (!(format18.test(idCard) || format15.test(idCard) || format15Foreign.test(idCard))) {
return { status: 0, msg: '身份证号码格式不正确' };
}
// 校验出生日期
let year, month, day;
if (idCard.length === 18) {
@@ -556,12 +567,12 @@ layout("/layouts/platform_h5.html"){
} else {
return { status: 0, msg: '身份证号码格式不正确' };
}
const date = new Date(year, month - 1, day);
if (date.getFullYear() !== parseInt(year, 10) || date.getMonth() + 1 !== parseInt(month, 10) || date.getDate() !== parseInt(day, 10)) {
return { status: 0, msg: '身份证出生日期不正确' };
}
// 校验18位身份证号的校验码
if (idCard.length === 18) {
const coefficients = [7, 9, 10, 5, 8, 4, 2, 1, 6, 3, 7, 9, 10, 5, 8, 4, 2];
@@ -575,7 +586,7 @@ layout("/layouts/platform_h5.html"){
return { status: 0, msg: '身份证校验码不正确' };
}
}
return { status: 1, msg: '校验通过' };
},
/**
src/main/resources/views/platform/zhghh5/staffbenefit/difficulthelp/common/info.js
+40 -52
View File
@@ -23,33 +23,8 @@ const INFO = {
<van-cell title="困难类型">{{viewData.subsidyStandards}}</van-cell>
<van-cell title="申请原因">{{viewData.reason}}</van-cell>
<van-cell title="家庭成员经济收入" class="column-cell">
<table class="family-table">
<thead>
<tr>
<th class="table-header">序号</th>
<th class="table-header">姓名</th>
<th class="table-header">年龄</th>
<th class="table-header">关系</th>
<th class="table-header">月收入(元)</th>
</tr>
</thead>
<tbody>
<tr class="table-row" v-for="(item, index) in viewData.families" :key="index">
<td class="table-cell">{{ index + 1 }}</td>
<td class="table-cell">{{ item.name }}</td>
<td class="table-cell">{{ item.age }}</td>
<td class="table-cell">{{ item.relation }}</td>
<td class="table-cell">{{ item.monthlyIncome }}</td>
</tr>
</tbody>
</table>
</van-cell>
<van-cell title="附件">
<div slot="label">
{{ viewData.files }}
</div>
<van-cell class="direction-column-cell" title="附件">
<file-preview :files="viewData.files" complete_result></file-preview>
</van-cell>
<van-cell title="签字">
<van-image v-if="viewData.sign" :src="viewData.sign"
@@ -57,6 +32,29 @@ const INFO = {
<span v-else>暂无</span>
</van-cell>
</van-cell-group>
<van-cell-group title="家庭成员经济收入" v-if="viewData.familyList && viewData.familyList.length > 0">
<table class="table-class">
<thead>
<tr>
<th>序号</th>
<th>姓名</th>
<th>年龄</th>
<th>关系</th>
<th>月收入(元)</th>
</tr>
</thead>
<tbody>
<tr v-for="(item,index) in viewData.familyList" :key="index">
<td>{{ index + 1 }}</td>
<td>{{ item.name }}</td>
<td>{{ item.age }}</td>
<td>{{ item.relation }}</td>
<td>{{ item.monthlyIncome }}</td>
</tr>
</tbody>
</table>
</van-cell-group>
<template v-for="task in doneTasks">
<van-cell-group :title="task.displayName" v-if="task.ext.isFirstTaskNode">
@@ -128,35 +126,25 @@ const INFO = {
},
},
style: /*language=CSS*/ `
.column-cell {
flex-direction: column;
}
.family-table {
/deep/ .table-class{
width: 100%;
max-width: 100%;
border-radius: 5px;
overflow: hidden;
line-height: 1.5rem;
font-size: 13px;
table-layout: fixed;
border-collapse: collapse;
table-layout: auto;
}
/deep/ .table-class th {
background-color: #f2f2f2;
border: 1px solid #dddddd;
}
/deep/ .table-class tr {
text-align: center;
font-family: 'Arial', sans-serif;
margin: 20px 0;
border-bottom: 1px solid #dddddd;
}
.table-header {
background-color: gray;
color: white;
font-weight: bold;
text-transform: uppercase;
}
.table-row {
background-color: #f9f9f9;
transition: background-color 0.3s;
}
.table-row:hover {
background-color: #f1f1f1;
}
.table-cell {
padding: 10px 20px;
border: 1px solid #ddd;
text-align: center;
/deep/ .table-class td {
border: 1px solid #dddddd;
}
`
}
src/main/resources/views/platform/zhghh5/staffbenefit/difficulthelp/mine/index.html
+1 -1
View File
@@ -32,7 +32,7 @@ layout("/layouts/platform_h5.html"){
<table-column label="工作单位">{{row.unitName}}</table-column>
<table-column label="困难类型">{{row.subsidyStandards}}</table-column>
<table-column label="填报时间">{{row.applyTime}}</table-column>
<table-column label="当前节点">{{row.curTaskName}}</table-column>
<table-column label="当前节点">{{row.taskName}}</table-column>
</template>
<template #actions="{index,row}">
<div class="action-btn" @click="onView(row)">