diff --git a/src/main/java/com/budwk/app/zhgh/activity/trainSignUp/service/impl/TrainSignUpActivityStatisticsServiceImpl.java b/src/main/java/com/budwk/app/zhgh/activity/trainSignUp/service/impl/TrainSignUpActivityStatisticsServiceImpl.java
index b9bc8aa4..acda8c41 100644
--- a/src/main/java/com/budwk/app/zhgh/activity/trainSignUp/service/impl/TrainSignUpActivityStatisticsServiceImpl.java
+++ b/src/main/java/com/budwk/app/zhgh/activity/trainSignUp/service/impl/TrainSignUpActivityStatisticsServiceImpl.java
@@ -133,8 +133,8 @@ public class TrainSignUpActivityStatisticsServiceImpl extends BaseServiceImpl
list = fundMemberService.query(cnd);
diff --git a/src/main/java/com/budwk/app/zhgh/dayofficework/fund/member/controller/FundMemberWriteController.java b/src/main/java/com/budwk/app/zhgh/dayofficework/fund/member/controller/FundMemberWriteController.java
index 89830adb..fe1390f3 100644
--- a/src/main/java/com/budwk/app/zhgh/dayofficework/fund/member/controller/FundMemberWriteController.java
+++ b/src/main/java/com/budwk/app/zhgh/dayofficework/fund/member/controller/FundMemberWriteController.java
@@ -2,6 +2,7 @@ package com.budwk.app.zhgh.dayofficework.fund.member.controller;
import cn.dev33.satoken.annotation.SaCheckPermission;
import cn.hutool.core.lang.Dict;
+import cn.hutool.core.util.StrUtil;
import com.budwk.app.base.annotation.SLog;
import com.budwk.app.base.result.Result;
import com.budwk.app.flow.constant.FlowConst;
@@ -12,6 +13,7 @@ import com.budwk.app.flow.enums.ProcessSubmitTypeEnum;
import com.budwk.app.flow.service.FlowCommonService;
import com.budwk.app.web.commons.auth.utils.SecurityUtil;
import com.budwk.app.zhgh.dayofficework.fund.member.models.FundMemberApply;
+import com.budwk.app.zhgh.dayofficework.fund.member.service.FundMemberService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.nutz.aop.interceptor.ioc.TransAop;
@@ -37,6 +39,8 @@ public class FundMemberWriteController {
@Inject
private FlowEngine flowEngine;
@Inject
+ private FundMemberService fundMemberService;
+ @Inject
private FlowCommonService flowCommonService;
@At("")
@@ -51,6 +55,9 @@ public class FundMemberWriteController {
@ApiOperation("保存申请")
@SLog(tag = "建言献策-填写申请", msg = "保存申请")
public Result save(@Param("data") FundMemberApply fundMember) {
+ if (StrUtil.isBlank(fundMember.getId())) {
+ fundMemberService.validateApply();
+ }
dao.insertOrUpdate(fundMember);
return Result.success();
}
@@ -62,6 +69,9 @@ public class FundMemberWriteController {
@Aop(TransAop.READ_COMMITTED)
@SLog(tag = "基金会员-填写申请", msg = "提交申请")
public Result submit(@Param("data") FundMemberApply fundMember) {
+ if (StrUtil.isBlank(fundMember.getId())) {
+ fundMemberService.validateApply();
+ }
fundMember.setSubmitTime(new Date());
fundMember.setIsJoin(true);
dao.insertOrUpdate(fundMember);
@@ -86,6 +96,9 @@ public class FundMemberWriteController {
@Aop(TransAop.READ_COMMITTED)
@SLog(tag = "基金会员-填写申请", msg = "重新提交申请")
public Result submitAgain(@Param("data") FundMemberApply fundMember, @Param("taskId") Long taskId) {
+ if (StrUtil.isBlank(fundMember.getId())) {
+ fundMemberService.validateApply();
+ }
dao.insertOrUpdate(fundMember);
Dict dict = Dict.create();
@@ -103,4 +116,12 @@ public class FundMemberWriteController {
return Result.success(box);
}
+
+ @At
+ @SaCheckPermission("fundMember.write")
+ @ApiOperation("校验是否有申请在流程中")
+ public Result validateApply(){
+ fundMemberService.validateApply();
+ return Result.success();
+ }
}
diff --git a/src/main/java/com/budwk/app/zhgh/dayofficework/fund/member/service/FundMemberService.java b/src/main/java/com/budwk/app/zhgh/dayofficework/fund/member/service/FundMemberService.java
index 2dcaf89b..6254d7a3 100644
--- a/src/main/java/com/budwk/app/zhgh/dayofficework/fund/member/service/FundMemberService.java
+++ b/src/main/java/com/budwk/app/zhgh/dayofficework/fund/member/service/FundMemberService.java
@@ -4,4 +4,9 @@ import com.budwk.app.base.service.BaseService;
import com.budwk.app.zhgh.dayofficework.fund.member.models.FundMemberApply;
public interface FundMemberService extends BaseService {
+
+ /**
+ * 验证是否已经申请了
+ */
+ void validateApply();
}
diff --git a/src/main/java/com/budwk/app/zhgh/dayofficework/fund/member/service/impl/FundMemberServiceImpl.java b/src/main/java/com/budwk/app/zhgh/dayofficework/fund/member/service/impl/FundMemberServiceImpl.java
index 0b83a54d..32e18fa8 100644
--- a/src/main/java/com/budwk/app/zhgh/dayofficework/fund/member/service/impl/FundMemberServiceImpl.java
+++ b/src/main/java/com/budwk/app/zhgh/dayofficework/fund/member/service/impl/FundMemberServiceImpl.java
@@ -1,14 +1,39 @@
package com.budwk.app.zhgh.dayofficework.fund.member.service.impl;
+import cn.hutool.core.util.StrUtil;
import com.budwk.app.base.service.impl.BaseServiceImpl;
+import com.budwk.app.flow.entity.ProcessInstance;
+import com.budwk.app.flow.enums.ProcessTaskStateEnum;
+import com.budwk.app.web.commons.auth.utils.SecurityUtil;
import com.budwk.app.zhgh.dayofficework.fund.member.models.FundMemberApply;
import com.budwk.app.zhgh.dayofficework.fund.member.service.FundMemberService;
+import org.nutz.dao.Cnd;
import org.nutz.dao.Dao;
import org.nutz.ioc.loader.annotation.IocBean;
+import org.nutz.lang.Lang;
@IocBean(args = {"refer:dao"})
public class FundMemberServiceImpl extends BaseServiceImpl implements FundMemberService {
public FundMemberServiceImpl(Dao dao) {
super(dao);
}
+
+
+ @Override
+ public void validateApply() {
+ FundMemberApply apply = dao().fetch(FundMemberApply.class,
+ Cnd.where(FundMemberApply::getLoginName, "=", SecurityUtil.getUserLoginname())
+ .and("isJoin", "=", 1)
+ .desc("submitTime"));
+ if (Lang.isEmpty(apply)) {
+ return;
+ }
+
+ int count = dao().count(ProcessInstance.class, Cnd.where("businessNo", "=", apply.getId())
+ .and(ProcessInstance::getState, "=", ProcessTaskStateEnum.DOING.getCode()));
+
+ if (count > 0) {
+ throw new RuntimeException("您有申请流程正在进行中,请等待流程结束后再次操作");
+ }
+ }
}
diff --git a/src/main/java/com/budwk/app/zhgh/staffmanage/personnelcheck/controller/CheckTaskGroupAuditController.java b/src/main/java/com/budwk/app/zhgh/staffmanage/personnelcheck/controller/CheckTaskGroupAuditController.java
new file mode 100644
index 00000000..5a1f274c
--- /dev/null
+++ b/src/main/java/com/budwk/app/zhgh/staffmanage/personnelcheck/controller/CheckTaskGroupAuditController.java
@@ -0,0 +1,14 @@
+package com.budwk.app.zhgh.staffmanage.personnelcheck.controller;
+
+import org.nutz.ioc.loader.annotation.IocBean;
+
+/**
+ * @version 1.0
+ * @Author FKY
+ * @name:CheckTaskGroupAuditController
+ * @Date 2025/10/17 16:46
+ * @注释
+ */
+@IocBean
+public class CheckTaskGroupAuditController {
+}
diff --git a/src/main/java/com/budwk/app/zhgh/staffmanage/personnelcheck/controller/CheckTaskSingleController.java b/src/main/java/com/budwk/app/zhgh/staffmanage/personnelcheck/controller/CheckTaskSingleController.java
index 0cd0fc98..fb860c73 100644
--- a/src/main/java/com/budwk/app/zhgh/staffmanage/personnelcheck/controller/CheckTaskSingleController.java
+++ b/src/main/java/com/budwk/app/zhgh/staffmanage/personnelcheck/controller/CheckTaskSingleController.java
@@ -1,5 +1,16 @@
package com.budwk.app.zhgh.staffmanage.personnelcheck.controller;
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import com.budwk.app.base.result.Result;
+import com.budwk.app.zhgh.staffmanage.personnelcheck.service.CheckTaskCommonService;
+import io.swagger.annotations.Api;
+import lombok.extern.slf4j.Slf4j;
+import org.nutz.dao.Dao;
+import org.nutz.ioc.loader.annotation.Inject;
+import org.nutz.ioc.loader.annotation.IocBean;
+import org.nutz.mvc.annotation.At;
+import org.nutz.mvc.annotation.Ok;
+
/**
* @version 1.0
* @Author FKY
@@ -7,5 +18,28 @@ package com.budwk.app.zhgh.staffmanage.personnelcheck.controller;
* @Date 2025/10/15 10:48
* @注释
*/
+@Slf4j
+@IocBean
+@Api("个人核对")
+@Ok("json:full")
+@At("/platform/personnel/check/verification/manage")
public class CheckTaskSingleController {
+
+ @Inject
+ private Dao dao;
+ @Inject
+ private CheckTaskCommonService checkTaskCommonService;
+
+ @At("/")
+ @SaCheckPermission("personnel.check.verification.single")
+ @Ok("beetl:/platform/zhgh/staffmanage/personnelcheck/single/index.html")
+ public void index() {
+ }
+
+
+ @At
+ @SaCheckPermission("personnel.check.verification.single")
+ public Result getSingleCheckTask(){
+ return Result.success();
+ }
}
diff --git a/src/main/java/com/budwk/app/zhgh/staffmanage/personnelcheck/controller/CheckTaskVerificationController.java b/src/main/java/com/budwk/app/zhgh/staffmanage/personnelcheck/controller/CheckTaskVerificationController.java
index e975cca7..e93bfd69 100644
--- a/src/main/java/com/budwk/app/zhgh/staffmanage/personnelcheck/controller/CheckTaskVerificationController.java
+++ b/src/main/java/com/budwk/app/zhgh/staffmanage/personnelcheck/controller/CheckTaskVerificationController.java
@@ -1,6 +1,8 @@
package com.budwk.app.zhgh.staffmanage.personnelcheck.controller;
import cn.dev33.satoken.annotation.SaCheckPermission;
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.StrUtil;
import cn.hutool.json.JSONUtil;
import com.budwk.app.base.annotation.SLog;
@@ -40,8 +42,8 @@ import org.nutz.mvc.upload.UploadAdaptor;
*/
@Slf4j
@IocBean
-@Ok("json:full")
@Api("核对任务")
+@Ok("json:full")
@At("/platform/personnel/check/verification/manage")
public class CheckTaskVerificationController {
@@ -79,9 +81,6 @@ public class CheckTaskVerificationController {
@SaCheckPermission("personnel.check.verification.manage")
@AdaptBy(type = UploadAdaptor.class, args = {"ioc:fileUpload"})
public Result doAddOrModify(@Param("baseData") String data, TempFile file){
- log.info("=================================主体数据:{}", data);
- log.info("=================================导入文件:{}", file);
-
CheckTaskVerificationVO vo = JSONUtil.toBean(data, CheckTaskVerificationVO.class);
if (StrUtil.isNotBlank(vo.getId())) {
@@ -89,14 +88,28 @@ public class CheckTaskVerificationController {
// 1.重新配置核对字段,filedConfigData
dao.clear(CheckTaskFiledConfig.class, Cnd.where("taskId", "=", vo.getId()));
// 2.重新设置待核对人员表,personnelData
-// dao.clear(Check)
+ dao.clear(CheckTaskPersonnel.class, Cnd.where("taskId", "=", vo.getId()));
}
- // 修改审核流程配置
+ // 插入逻辑
+
+ // 1.界面可能会对相关审核步骤做修改,修改审核流程配置
dao.update(vo.getBusinessConfig());
+ // 2.新增或者修改事项任务
+ CheckTaskVerification verification = new CheckTaskVerification();
+ verification.setId(vo.getId());
+ verification.setCreateTime(vo.getCreateTime() == null ? DateUtil.date() : vo.getCreateTime());
+ verification.setYear(DateUtil.year(verification.getCreateTime()));
+ dao.insertOrUpdate(verification);
+
+ // 3.往字段表里面插入数据,最好做下字段映射,把相关字段与数据库的字段对应
+ // todo 字段映射
+
+
+ // 4.读取文件,构造数据(动态字段 data),往 CheckTaskPersonnel 表中插入数据
+ // todo 读取文件 转换成数据
- log.info("=================================数据转换:{}", vo);
return Result.success();
}
diff --git a/src/main/java/com/budwk/app/zhgh/staffmanage/personnelcheck/vo/CheckTaskVerificationVO.java b/src/main/java/com/budwk/app/zhgh/staffmanage/personnelcheck/vo/CheckTaskVerificationVO.java
index 8a712a97..6fc9b05e 100644
--- a/src/main/java/com/budwk/app/zhgh/staffmanage/personnelcheck/vo/CheckTaskVerificationVO.java
+++ b/src/main/java/com/budwk/app/zhgh/staffmanage/personnelcheck/vo/CheckTaskVerificationVO.java
@@ -36,6 +36,12 @@ public class CheckTaskVerificationVO {
@ApiModelProperty("结束时间")
private Date endTime;
+ @ApiModelProperty("创建时间")
+ private Date createTime;
+
+ @ApiModelProperty("状态")
+ private String status;
+
@ApiModelProperty("业务配置数据")
private CheckTaskBusinessConfig businessConfig;
diff --git a/src/main/java/com/budwk/app/zhgh/welfare/service/impl/WelfareStatisticsServiceImpl.java b/src/main/java/com/budwk/app/zhgh/welfare/service/impl/WelfareStatisticsServiceImpl.java
index 956851b9..c04d6012 100644
--- a/src/main/java/com/budwk/app/zhgh/welfare/service/impl/WelfareStatisticsServiceImpl.java
+++ b/src/main/java/com/budwk/app/zhgh/welfare/service/impl/WelfareStatisticsServiceImpl.java
@@ -97,11 +97,11 @@ public class WelfareStatisticsServiceImpl extends BaseServiceImpl v.getString("welfareUnionId", "").equals(union.getString("id"))).count();
+ long teacherSum = welfareSelectionList.stream().filter(v -> StrUtil.isNotBlank(v.getString("welfareUnionId")) && v.getString("welfareUnionId", "").equals(union.getString("id"))).count();
union.put("teacherSum", teacherSum);
// 已选人数
- long selectedNum = welfareSelectionList.stream().filter(v -> v.getString("welfareUnionId", "").equals(union.getString("id")) && v.getBoolean("has_selected")).count();
+ long selectedNum = welfareSelectionList.stream().filter(v -> StrUtil.isNotBlank(v.getString("welfareUnionId")) && v.getString("welfareUnionId", "").equals(union.getString("id")) && v.getBoolean("has_selected")).count();
union.put("selectedNum", selectedNum);
// 未选人数
@@ -109,7 +109,7 @@ public class WelfareStatisticsServiceImpl extends BaseServiceImpl v.getString("welfareUnionId").equals(union.getString("id")) && StrUtil.isNotBlank(v.getString("selectOptionId")) && v.getString("selectOptionId").equals(option.getId())).map(v -> v.getString("selectUserId")).distinct().count();
+ long count = userSelections.stream().filter(v -> StrUtil.isNotBlank(v.getString("welfareUnionId")) && v.getString("welfareUnionId").equals(union.getString("id")) && StrUtil.isNotBlank(v.getString("selectOptionId")) && v.getString("selectOptionId").equals(option.getId())).map(v -> v.getString("selectUserId")).distinct().count();
union.put(option.getId(), count);
}
}
diff --git a/src/main/resources/static/assets/platform/css/common.css b/src/main/resources/static/assets/platform/css/common.css
index 72fc3ba5..87a3f625 100644
--- a/src/main/resources/static/assets/platform/css/common.css
+++ b/src/main/resources/static/assets/platform/css/common.css
@@ -553,7 +553,7 @@ td.no-b {
}
.el-transfer__buttons {
- width: 200px;
+ /*width: 200px;*/
text-align: center;
}
diff --git a/src/main/resources/views/platform/zhgh/activity/sports/applyUser/applyUser.js b/src/main/resources/views/platform/zhgh/activity/sports/applyUser/applyUser.js
index 661c0ddc..12f71cef 100644
--- a/src/main/resources/views/platform/zhgh/activity/sports/applyUser/applyUser.js
+++ b/src/main/resources/views/platform/zhgh/activity/sports/applyUser/applyUser.js
@@ -192,7 +192,7 @@ var ACTIVITY_SPORTS_APPLY_USER = {
prop="mobile" width="150">
+ v-model="row.mobile" maxlength="11">
diff --git a/src/main/resources/views/platform/zhgh/activity/sports/applyUser/indexList.html b/src/main/resources/views/platform/zhgh/activity/sports/applyUser/indexList.html
index df77fddd..abec15c5 100644
--- a/src/main/resources/views/platform/zhgh/activity/sports/applyUser/indexList.html
+++ b/src/main/resources/views/platform/zhgh/activity/sports/applyUser/indexList.html
@@ -7,7 +7,7 @@ layout("/layouts/platform.html"){
-
+
-
+
diff --git a/src/main/resources/views/platform/zhgh/activity/trainSignUp/userAdjust/userInfo.js b/src/main/resources/views/platform/zhgh/activity/trainSignUp/userAdjust/userInfo.js
index 6d75bcd0..9707be8e 100644
--- a/src/main/resources/views/platform/zhgh/activity/trainSignUp/userAdjust/userInfo.js
+++ b/src/main/resources/views/platform/zhgh/activity/trainSignUp/userAdjust/userInfo.js
@@ -206,6 +206,9 @@ const userInfo = {
async getCourse(val) {
const {data} = await this.$axios.post(loc() + "/getCourse", {activityId: val})
this.courseList = data
+ },
+ async getUnitList() {
+ this.unitList = await this.$businessTool.listUnit(this.registerForm.unionId)
}
},
async created() {
diff --git a/src/main/resources/views/platform/zhgh/dayofficework/fund/member/info.js b/src/main/resources/views/platform/zhgh/dayofficework/fund/member/info.js
index e02fa6f8..0db18478 100644
--- a/src/main/resources/views/platform/zhgh/dayofficework/fund/member/info.js
+++ b/src/main/resources/views/platform/zhgh/dayofficework/fund/member/info.js
@@ -16,7 +16,9 @@ const fundMemberInfo = {
{{viewData.address}}
{{viewData.mobile}}
{{viewData.homePhone}}
- {{viewData.avatar}}
+
+
+
diff --git a/src/main/resources/views/platform/zhgh/dayofficework/fund/member/query/index.html b/src/main/resources/views/platform/zhgh/dayofficework/fund/member/query/index.html
index 6ee50b27..32df8067 100644
--- a/src/main/resources/views/platform/zhgh/dayofficework/fund/member/query/index.html
+++ b/src/main/resources/views/platform/zhgh/dayofficework/fund/member/query/index.html
@@ -64,8 +64,9 @@ layout("/layouts/platform.html"){
+
-
+
diff --git a/src/main/resources/views/platform/zhgh/dayofficework/fund/member/write/index.html b/src/main/resources/views/platform/zhgh/dayofficework/fund/member/write/index.html
index 9e585186..b677cbdd 100644
--- a/src/main/resources/views/platform/zhgh/dayofficework/fund/member/write/index.html
+++ b/src/main/resources/views/platform/zhgh/dayofficework/fund/member/write/index.html
@@ -82,12 +82,12 @@ layout("/layouts/platform.html"){
-
+
-
+
@@ -209,7 +209,7 @@ layout("/layouts/platform.html"){
cancelButtonText: "取消",
type: "warning"
}).then(() => {
- this.$axios.post('/platform/suggestionBox/write/submitAgain', {
+ this.$axios.post('/platform/fundMember/write/submitAgain', {
data: JSON.stringify(this.formData),
taskId: GetQueryString("taskId")
}).then(res => {
@@ -244,10 +244,14 @@ layout("/layouts/platform.html"){
idCard: idCard
}
}
- }
+ },
+
},
created() {
this.init()
+ if(!this.bizId){
+ this.$axios.post('/platform/fundMember/write/validateApply')
+ }
}
})
diff --git a/src/main/resources/views/platform/zhgh/staffmanage/personnelcheck/single/index.html b/src/main/resources/views/platform/zhgh/staffmanage/personnelcheck/single/index.html
new file mode 100644
index 00000000..d8d2aea4
--- /dev/null
+++ b/src/main/resources/views/platform/zhgh/staffmanage/personnelcheck/single/index.html
@@ -0,0 +1,25 @@
+
+
+
+
+
+
diff --git a/src/main/resources/views/platform/zhgh/welfare/projectMange/filterUser.js b/src/main/resources/views/platform/zhgh/welfare/projectMange/filterUser.js
index 935de9ac..3f7b1aec 100644
--- a/src/main/resources/views/platform/zhgh/welfare/projectMange/filterUser.js
+++ b/src/main/resources/views/platform/zhgh/welfare/projectMange/filterUser.js
@@ -111,6 +111,7 @@ const filterUser = {
+
{
- this.submitLoading = true;
try {
+ const loading = this.$loading({
+ lock: true,
+ text: "数据保存中,请稍后...",
+ spinner: "el-icon-loading"
+ })
const { code, data, msg } = await this.$axios.post("/platform/welfare/project/mange/addWelfareUser", {
pageForm: JSON.stringify(this.pageForm),
projectId: this.projectId
})
+ loading.close()
if (code === 0) {
this.$message.success(msg)
this.visible = false
diff --git a/src/main/resources/views/platform/zhgh/welfare/projectMange/index.html b/src/main/resources/views/platform/zhgh/welfare/projectMange/index.html
index f89b8ff0..589ee794 100644
--- a/src/main/resources/views/platform/zhgh/welfare/projectMange/index.html
+++ b/src/main/resources/views/platform/zhgh/welfare/projectMange/index.html
@@ -114,7 +114,7 @@ layout("/layouts/platform.html"){
>
-
+
-
+
[]
}
},
-
+
data() {
return {
welfareList: [],
@@ -81,11 +81,11 @@ const welfareOption = {
}
}
},
-
+
created() {
this.welfareList = this.value ? JSON.parse(JSON.stringify(this.value)) : [];
},
-
+
watch: {
welfareList: {
handler(newVal) {
@@ -94,7 +94,7 @@ const welfareOption = {
deep: true
}
},
-
+
methods: {
addOption() {
const newSort = this.welfareList.length + 1;
@@ -105,7 +105,7 @@ const welfareOption = {
description: ''
});
},
-
+
deleteOption(index) {
this.$confirm('确认删除该福利选项?', '提示', {
type: 'warning'
@@ -114,27 +114,27 @@ const welfareOption = {
this.updateSortNumbers();
});
},
-
+
openDescription(row, index) {
this.descriptionDialog.content = row.description || '';
this.descriptionDialog.currentIndex = index;
this.descriptionDialog.visible = true;
},
-
+
saveDescription() {
if (this.descriptionDialog.currentIndex > -1) {
this.welfareList[this.descriptionDialog.currentIndex].description = this.descriptionDialog.content;
}
this.descriptionDialog.visible = false;
},
-
+
handleSortChange(value, index) {
const item = this.welfareList[index];
const oldSort = item.optionSort;
-
+
if (value < 1) value = 1;
if (value > this.welfareList.length) value = this.welfareList.length;
-
+
this.welfareList.forEach(welfare => {
if (welfare !== item) {
if (value > oldSort && welfare.optionSort > oldSort && welfare.optionSort <= value) {
@@ -144,49 +144,49 @@ const welfareOption = {
}
}
});
-
+
item.optionSort = value;
this.welfareList.sort((a, b) => a.optionSort - b.optionSort);
},
-
+
updateSortNumbers() {
this.welfareList.forEach((item, index) => {
item.optionSort = index + 1;
});
}
},
-
+
style: /*language=CSS*/ `
- .welfare-option {
+ /deep/ .welfare-option {
}
- .welfare-option .el-card__body{
+ /deep/ .welfare-option .el-card__body{
padding: 0;
}
- .welfare-option .el-upload-list__item{
- width: 100px;
- height: 100px;
- }
-
- .welfare-option .imgUrl .el-upload--picture-card {
+ /deep/ .welfare-option .el-upload-list__item{
width: 100px;
height: 100px;
}
- .welfare-option .imgUrl .el-upload--picture-card i {
+ /deep/ .welfare-option .imgUrl .el-upload--picture-card {
+ width: 100px;
+ height: 100px;
+ }
+
+ /deep/ .welfare-option .imgUrl .el-upload--picture-card i {
position: absolute;
top: 50%;
left: 50%;
transform: translate(-50%, -50%);
}
-
- .preview-image {
+
+ /deep/ .preview-image {
width: 100%;
height: 100%;
display: block;
object-fit: cover;
}
`
-};
\ No newline at end of file
+};
diff --git a/src/main/resources/views/platform/zhgh/welfare/welfareUser/addUser.js b/src/main/resources/views/platform/zhgh/welfare/welfareUser/addUser.js
index 5982c4dc..984ea2fb 100644
--- a/src/main/resources/views/platform/zhgh/welfare/welfareUser/addUser.js
+++ b/src/main/resources/views/platform/zhgh/welfare/welfareUser/addUser.js
@@ -238,10 +238,16 @@ const addUser = {
cancelButtonText: "取消",
type: "warning"
}).then(async () => {
+ const loading = this.$loading({
+ lock: true,
+ text: "数据保存中,请稍后...",
+ spinner: "el-icon-loading"
+ })
const { code, data, msg } = await this.$axios.post("/platform/welfare/list/mange/addWelfareUser", {
pageForm: JSON.stringify(this.pageForm),
projectId: this.projectId
})
+ loading.close()
if (code === 0) {
this.$message.success(msg)
this.visible = false
diff --git a/src/main/resources/views/platform/zhghh5/welfare/mine/selectView.js b/src/main/resources/views/platform/zhghh5/welfare/mine/selectView.js
index fd63b802..b527a7fa 100644
--- a/src/main/resources/views/platform/zhghh5/welfare/mine/selectView.js
+++ b/src/main/resources/views/platform/zhghh5/welfare/mine/selectView.js
@@ -258,34 +258,34 @@ const selectView = {
}
},
style: /*language=CSS*/ `
- .welfare-view {
+ /deep/ .welfare-view {
background: #f7f8fa;
overflow-y: auto;
-webkit-overflow-scrolling: touch;
}
/* 内容区域样式 */
- .welfare-view__content {
+ /deep/ .welfare-view__content {
padding: 16px;
height: 100%;
}
/* 卡片通用样式 */
- .welfare-card {
+ /deep/ .welfare-card {
background: #fff;
border-radius: 8px;
margin-bottom: 12px;
overflow: hidden;
}
- .welfare-card__header {
+ /deep/ .welfare-card__header {
display: flex;
align-items: center;
padding: 16px;
position: relative;
}
- .welfare-card__header::after {
+ /deep/ .welfare-card__header::after {
content: '';
position: absolute;
left: 16px;
@@ -296,64 +296,64 @@ const selectView = {
transform: scaleY(0.5);
}
- .welfare-card__header i {
+ /deep/ .welfare-card__header i {
font-size: 16px;
margin-right: 6px;
color: var(--color-primary);
}
- .welfare-card__header span {
+ /deep/ .welfare-card__header span {
font-size: 15px;
font-weight: 500;
color: #323233;
}
- .welfare-card__content {
+ /deep/ .welfare-card__content {
padding: 16px;
}
/* 信息行样式 */
- .info-row {
+ /deep/ .info-row {
display: flex;
margin-bottom: 12px;
align-items: center;
}
- .info-row:last-child {
+ /deep/ .info-row:last-child {
margin-bottom: 0;
}
- .info-row__label {
+ /deep/ .info-row__label {
width: 70px;
color: #969799;
font-size: 14px;
flex-shrink: 0;
}
- .info-row__value {
+ /deep/ .info-row__value {
flex: 1;
color: #323233;
font-size: 14px;
min-width: 0;
}
- .info-row--time {
+ /deep/ .info-row--time {
align-items: flex-start;
}
- .info-row--time .info-row__value {
+ /deep/ .info-row--time .info-row__value {
display: flex;
flex-direction: column;
gap: 4px;
}
- .time-item {
+ /deep/ .time-item {
position: relative;
padding-left: 42px;
line-height: 20px;
}
- .time-item--start::before {
+ /deep/ .time-item--start::before {
content: "开始:";
position: absolute;
left: 0;
@@ -361,7 +361,7 @@ const selectView = {
font-size: 12px;
}
- .time-item--end::before {
+ /deep/ .time-item--end::before {
content: "结束:";
position: absolute;
left: 0;
@@ -370,15 +370,15 @@ const selectView = {
}
/* 选择列表样式 */
- .selections-container {
+ /deep/ .selections-container {
margin-bottom: 12px;
}
-
- .selection-list {
+
+ /deep/ .selection-list {
padding: 8px 16px;
}
- .selection-item {
+ /deep/ .selection-item {
display: flex;
align-items: center;
padding: 12px;
@@ -389,15 +389,15 @@ const selectView = {
box-shadow: 0 1px 3px rgba(0, 0, 0, 0.02);
}
- .selection-item:active {
+ /deep/ .selection-item:active {
background: #f8f9fa;
}
- .selection-item:last-child {
+ /deep/ .selection-item:last-child {
margin-bottom: 0;
}
- .selection-item__image {
+ /deep/ .selection-item__image {
width: 72px;
height: 72px;
margin-right: 12px;
@@ -407,19 +407,19 @@ const selectView = {
flex-shrink: 0;
}
- .selection-item__image img {
+ /deep/ .selection-item__image img {
width: 100%;
height: 100%;
object-fit: cover;
}
- .selection-item__content {
+ /deep/ .selection-item__content {
flex: 1;
min-width: 0;
padding: 4px 0;
}
- .selection-item__name {
+ /deep/ .selection-item__name {
font-size: 15px;
font-weight: 500;
color: #323233;
@@ -429,7 +429,7 @@ const selectView = {
white-space: nowrap;
}
- .selection-item__meta {
+ /deep/ .selection-item__meta {
display: flex;
align-items: center;
font-size: 13px;
@@ -437,7 +437,7 @@ const selectView = {
line-height: 1.4;
}
- .selection-item__count {
+ /deep/ .selection-item__count {
display: flex;
align-items: center;
margin-right: 16px;
@@ -446,7 +446,7 @@ const selectView = {
border-radius: 4px;
}
- .selection-item__time {
+ /deep/ .selection-item__time {
display: flex;
align-items: center;
background: #f7f8fa;
@@ -454,19 +454,19 @@ const selectView = {
border-radius: 4px;
}
- .selection-item__meta i {
+ /deep/ .selection-item__meta i {
margin-right: 4px;
font-size: 14px;
}
- .selection-item__arrow {
+ /deep/ .selection-item__arrow {
color: #c8c9cc;
font-size: 16px;
padding: 0 0 0 12px;
}
/* 空状态样式 */
- .empty-state {
+ /deep/ .empty-state {
display: flex;
flex-direction: column;
align-items: center;
@@ -474,42 +474,42 @@ const selectView = {
color: #969799;
}
- .empty-state__icon {
+ /deep/ .empty-state__icon {
font-size: 48px;
margin-bottom: 8px;
}
/* 详情弹窗样式 */
- .welfare-detail {
+ /deep/ .welfare-detail {
padding: 20px 16px;
max-height: 60vh;
overflow-y: auto;
-webkit-overflow-scrolling: touch;
}
- .welfare-detail__content {
+ /deep/ .welfare-detail__content {
font-size: 14px;
line-height: 1.6;
color: #323233;
}
- .rich-text {
+ /deep/ .rich-text {
overflow-x: hidden;
}
- .rich-text img {
+ /deep/ .rich-text img {
max-width: 100%;
height: auto;
margin: 8px 0;
border-radius: 4px;
}
- .rich-text p {
+ /deep/ .rich-text p {
margin: 8px 0;
}
/* 阻止嵌套 action-sheet 时的背景重叠 */
- .no-overlay {
+ /deep/ .no-overlay {
background-color: transparent !important;
}
`