福利管理添加温馨提示,选择福利可以显示

This commit is contained in:
2026-09-02 16:18:20 +08:00
parent bda40f00ae
commit 2fd7876d9a
6 changed files with 40 additions and 26 deletions
@@ -68,7 +68,7 @@ public class NutShiroProcessor extends AbstractProcessor {
//不需要认证授权的url //不需要认证授权的url
String[] authIgnoreUrlArr = Lang.array("/", String[] authIgnoreUrlArr = Lang.array("/",
"/sso/login", "/sso/login",
// "/platform/login", "/platform/login",
"/platform/login(/doLogin|/logout|/captcha)", "/platform/login(/doLogin|/logout|/captcha)",
"/platform/qywechat/.*", "/platform/qywechat/.*",
"/platform/home/(500|403|404|UnknownAccountError|LockedAccountError)", "/platform/home/(500|403|404|UnknownAccountError|LockedAccountError)",
@@ -119,6 +119,7 @@ public class WelfareProjectMangeController {
@At @At
@ViReturn @ViReturn
@Aop(TransAop.READ_COMMITTED)
@RequiresPermissions("welfare.project.mange") @RequiresPermissions("welfare.project.mange")
public Object save(WelfareProject project) { public Object save(WelfareProject project) {
@@ -152,6 +152,14 @@ public class WelfareProject extends BaseModel implements Serializable, SysHomeCo
@ColDefine(type = ColType.VARCHAR, width = 100) @ColDefine(type = ColType.VARCHAR, width = 100)
private String gift; private String gift;
/**
* 职工选择福利时展示的项目提示内容,支持多行文本。
*/
@Column
@Comment("温馨提示")
@ColDefine(type = ColType.TEXT)
private String warmTip;
@Column @Column
@Comment("弹性礼品") @Comment("弹性礼品")
@ColDefine(type = ColType.MYSQL_JSON) @ColDefine(type = ColType.MYSQL_JSON)
@@ -146,6 +146,10 @@ layout("/mobile/platform.html"){
.van-submit-bar__button { .van-submit-bar__button {
width: 150px; width: 150px;
} }
.warm-tip .van-notice-bar__content {
white-space: pre-line;
}
</style> </style>
<div id="app" v-cloak> <div id="app" v-cloak>
@@ -160,18 +164,15 @@ layout("/mobile/platform.html"){
fit="cover"></van-image> fit="cover"></van-image>
</div> </div>
<van-cell-group class="van-cell-group--inset"> <van-notice-bar class="warm-tip"
<van-cell> background="#fdf6ec"
<div style="font-weight: bold;font-size: 15px;"> color="#e6a23c"
温馨提醒 mode="closeable"
</div> style="margin: 10px 16px 0"
<div> v-if="projectInfo.warmTip"
<div>1.本次慰问品共2种套餐,教职工可任选其中1种套餐快递(1个快递发货),快递地址仅限江浙沪(江苏,浙江,上海)。</div> wrapable>
<div>2.快递预计于2026年6月18日前投递完成,请各位老师保持联系电话畅通并及时接听。</div> * {{projectInfo.warmTip}}
<div>3.填写截止时间:5月26日13点,没有在规定时间内选套餐的默认套餐1,并统一快递至瓯江囗校区自取。</div> </van-notice-bar>
</div>
</van-cell>
</van-cell-group>
<!--基本信息--> <!--基本信息-->
<van-cell-group class="van-cell-group--inset"> <van-cell-group class="van-cell-group--inset">
@@ -389,6 +389,15 @@ layout("/layouts/platform.html"){
ref="questionNaire" ref="questionNaire"
></question-naire> ></question-naire>
</el-form-item> </el-form-item>
<el-form-item label="温馨提示">
<el-input :rows="4"
maxlength="1000"
placeholder="请输入职工选择福利时需要展示的温馨提示"
show-word-limit
type="textarea"
v-model="formData.warmTip"></el-input>
</el-form-item>
</template> </template>
@@ -757,6 +766,7 @@ layout("/layouts/platform.html"){
defaultFlexibleGifts: 0, defaultFlexibleGifts: 0,
flexible: false, flexible: false,
noticePushMode: 1, noticePushMode: 1,
warmTip: '',
welfareProjectSubjects: [], welfareProjectSubjects: [],
flexibleGifts: [{}] flexibleGifts: [{}]
} }
@@ -4,13 +4,6 @@ layout("/layouts/platform.html"){
<style> <style>
.el-alert {
padding: 4px 16px;
margin-bottom: 6px;
}
.el-alert__title {
font-size: 16px;
}
.optionImg { .optionImg {
display: grid; display: grid;
place-items: center; place-items: center;
@@ -156,14 +149,15 @@ layout("/layouts/platform.html"){
</template> </template>
<template #edit> <template #edit>
<vi-title title="温馨提醒"></vi-title> <el-alert closable
<el-alert title="1.本次慰问品共2种套餐,教职工可任选其中1种套餐快递(1个快递发货),快递地址仅限江浙沪(江苏,浙江,上海)。" type="warning" effect="dark"></el-alert> style="margin-bottom: 10px"
<el-alert type="warning" effect="dark"> type="warning"
<template #title> v-if="projectInfo.warmTip">
<span>2.快递预计于2026年6月18日前投递完成,请各位老师保持联系电话畅通并及时接听。</span> <template slot="title">
<span style="white-space: pre-line">* {{projectInfo.warmTip}}</span>
</template> </template>
</el-alert> </el-alert>
<el-alert title="3.填写截止时间:5月26日13点,没有在规定时间内选套餐的默认套餐1,并统一快递至瓯江囗校区自取。" type="warning" effect="dark"></el-alert>
<el-card shadow="never"> <el-card shadow="never">
<el-form :model="formData" label-width="120px" ref="addForm"> <el-form :model="formData" label-width="120px" ref="addForm">
<el-form-item label="福利名称"> <el-form-item label="福利名称">