diff --git a/src/main/java/io/v/nutz/web/commons/controller/userpartupdate/controller/UserPartUpdateController.java b/src/main/java/io/v/nutz/web/commons/controller/userpartupdate/controller/UserPartUpdateController.java index 2b9d5c3..cb9a3a5 100644 --- a/src/main/java/io/v/nutz/web/commons/controller/userpartupdate/controller/UserPartUpdateController.java +++ b/src/main/java/io/v/nutz/web/commons/controller/userpartupdate/controller/UserPartUpdateController.java @@ -16,6 +16,8 @@ import io.v.nutz.base.utils.ViTool; import io.v.nutz.web.commons.utils.ShiroUtil; import org.apache.commons.lang.ArrayUtils; import org.apache.poi.ss.usermodel.Workbook; +import org.apache.shiro.authz.annotation.RequiresAuthentication; +import org.apache.shiro.authz.annotation.RequiresPermissions; import org.nutz.dao.Cnd; import org.nutz.dao.Dao; import org.nutz.dao.Sqls; @@ -75,6 +77,7 @@ public class UserPartUpdateController { @At @ViReturn @POST + @RequiresPermissions("data.user.update") public Object userPartData(PageForm pageForm, @Param(value = "unionId", required = false) String unionId, @Param(value = "unitId", required = false) String unitId, @@ -125,6 +128,7 @@ public class UserPartUpdateController { @At @ViReturn @POST + @RequiresPermissions("data.user.update") public Object pageData(PageForm pageForm, @Param(value = "unionId", required = false) String unionId, @Param(value = "unitId", required = false) String unitId, @@ -252,6 +256,7 @@ public class UserPartUpdateController { @At @ViReturn + @RequiresPermissions("data.user.update") public Object cleanPart(@Param(value = "id", required = false) String id, @Param(value = "groupId", required = false) Integer groupId, @Param(value = "searchKeyword", required = false) String searchKeyword, @@ -302,6 +307,7 @@ public class UserPartUpdateController { @At @ViReturn + @RequiresPermissions("data.user.update") public Object getPartCount() { return dao.count(UserPartUp.class); } @@ -319,6 +325,7 @@ public class UserPartUpdateController { @At @ViReturn @POST + @RequiresPermissions("data.user.update") public Object doSetUpUser(PageForm pageForm, @Param(value = "unionId", required = false) String unionId, @Param(value = "unitId", required = false) String unitId, @@ -393,6 +400,7 @@ public class UserPartUpdateController { */ @At @ViReturn + @RequiresPermissions("data.user.update") public Object getUserPart() { Sql sql = Sqls.create(""" SELECT @@ -418,6 +426,7 @@ public class UserPartUpdateController { @At @ViReturn + @RequiresPermissions("data.user.update") public void doExportUser(PageForm pageForm, @Param(value = "props", required = false) String props, @Param(value = "unionId", required = false) String unionId, @@ -478,4 +487,12 @@ public class UserPartUpdateController { } } + + @At + @ViReturn + @RequiresPermissions("data.user.update") + public Object deleteNotInSourceUser() { + userPartUpService.deleteNotInSourceUser(false); + return null; + } } diff --git a/src/main/java/io/v/nutz/web/commons/controller/userpartupdate/service/UserPatUpService.java b/src/main/java/io/v/nutz/web/commons/controller/userpartupdate/service/UserPatUpService.java index cfbe3f8..31f4b3a 100644 --- a/src/main/java/io/v/nutz/web/commons/controller/userpartupdate/service/UserPatUpService.java +++ b/src/main/java/io/v/nutz/web/commons/controller/userpartupdate/service/UserPatUpService.java @@ -14,5 +14,5 @@ public interface UserPatUpService extends ViService { void renewUserState(); - void deleteNotInSourceUser(); + void deleteNotInSourceUser(Boolean isAuto); } diff --git a/src/main/java/io/v/nutz/web/commons/controller/userpartupdate/service/impl/UserPartUpServiceImpl.java b/src/main/java/io/v/nutz/web/commons/controller/userpartupdate/service/impl/UserPartUpServiceImpl.java index 5c28060..3d34c14 100644 --- a/src/main/java/io/v/nutz/web/commons/controller/userpartupdate/service/impl/UserPartUpServiceImpl.java +++ b/src/main/java/io/v/nutz/web/commons/controller/userpartupdate/service/impl/UserPartUpServiceImpl.java @@ -118,14 +118,14 @@ public class UserPartUpServiceImpl extends ViServiceImpl implements //人员类型 Sql personTypeSql = Sqls.create("select personType from `user` where personType is not null and personType !='' group by personType"); - List personTypes = sysDictService.listMap(personTypeSql).stream().map(v->v.getString("personType")).collect(Collectors.toList()); + List personTypes = sysDictService.listMap(personTypeSql).stream().map(v -> v.getString("personType")).collect(Collectors.toList()); List personTypeList = sysDictService.getSubListByCode("UserType"); //dict中的personType,在user表中没有,这一部分删除 List deletePersonType = personTypeList.stream().filter(v -> !personTypes.contains(v.getName())).collect(Collectors.toList()); List deletePersonTypes = deletePersonType.stream().map(Sys_dict::getId).collect(Collectors.toList()); - if (Lang.isNotEmpty(deletePersonTypes)){ + if (Lang.isNotEmpty(deletePersonTypes)) { sysDictService.delete(deletePersonTypes); } @@ -152,9 +152,18 @@ public class UserPartUpServiceImpl extends ViServiceImpl implements } + /** + * 删除不在人事库的人员状态 + * + * @param isAuto 是否自动更新,true为自动更新,false为手动更新 + */ @Override @Aop(TransAop.READ_COMMITTED) - public void deleteNotInSourceUser() { + public void deleteNotInSourceUser(Boolean isAuto) { + dao().update(Sys_user.class, Chain.make("preparedBy", "会员"), Cnd.where("member", "=", true)); + dao().update(Sys_user.class, Chain.make("preparedBy", "教职工"), Cnd.where("member", "=", false)); + + Sql maxPullTimeSql = Sqls.create("select pullTime from user_source GROUP BY pullTime ORDER BY pullTime desc LIMIT 1"); maxPullTimeSql.setCallback(Sqls.callback.map()); dao().execute(maxPullTimeSql); @@ -174,12 +183,22 @@ public class UserPartUpServiceImpl extends ViServiceImpl implements List userIdList = list.stream().map(v -> v.getString("id")).toList(); List userLoginNameList = list.stream().map(v -> v.getString("loginname")).toList(); - // 修改不在人事库人员的状态 - dao().update(Sys_user.class, Chain.make("userState", "非人事库人员").add("personType", "非人事库人员") - .add("member", 0).add("welfareMember", 0), - Cnd.where("loginname", "in", userLoginNameList)); + if (isAuto == null) { + return; + } + if (isAuto) { + // 修改不在人事库人员的状态 + dao().update(Sys_user.class, Chain.make("userState", "非人事库人员").add("personType", "非人事库人员") + .add("member", 0).add("welfareMember", 0), + Cnd.where("loginname", "in", userLoginNameList)); + + // 去除不在人事库的人员角色,只保留公共角色 + dao().clear(Sys_user_role.class, Cnd.where("userId", "in", userIdList).and("roleId", "!=", Roles.PUBLIC)); + } else { + // 删除不在人事库的人员,并清除角色 + dao().clear(Sys_user.class, Cnd.where("loginname", "in", userLoginNameList)); + dao().clear(Sys_user_role.class, Cnd.where("userId", "in", userIdList)); + } - // 去除不在人事库的人员角色,只保留公共角色 - dao().clear(Sys_user_role.class, Cnd.where("userId", "in", userIdList).and("roleId", "!=", Roles.PUBLIC)); } } diff --git a/src/main/java/io/v/nutz/zhgh/data/constant/SourceData.java b/src/main/java/io/v/nutz/zhgh/data/constant/SourceData.java index aaf7cf7..3f464bb 100644 --- a/src/main/java/io/v/nutz/zhgh/data/constant/SourceData.java +++ b/src/main/java/io/v/nutz/zhgh/data/constant/SourceData.java @@ -1,20 +1,14 @@ package io.v.nutz.zhgh.data.constant; import cn.hutool.core.bean.BeanUtil; -import cn.hutool.core.util.StrUtil; -import cn.hutool.http.HttpRequest; -import cn.hutool.http.HttpResponse; import cn.hutool.http.HttpUtil; import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; import io.v.nutz.base.expression.Exp4; import io.v.nutz.sys.models.Sys_unit; import io.v.nutz.zhgh.data.model.UserSource; import org.nutz.json.Json; -import org.nutz.lang.Lang; import org.nutz.lang.Strings; import org.nutz.lang.util.NutMap; -import org.springframework.util.Assert; import java.util.ArrayList; import java.util.HashMap; @@ -46,10 +40,21 @@ public interface SourceData { } /** - * 不进系统人员 + * 不进系统人员类型 */ - List NOT_ENTERING_USER = List.of("退休人员", "兼职教师", "非全日用工(项目临聘)", "服务外包和其他人员", + List NOT_ENTERING_PERSON_TYPE = List.of("退休人员", "兼职教师", "非全日用工(项目临聘)", "服务外包和其他人员", "教学编制2", "教学教师(附属医院)", "教学编制", "离休人员", "临时人员", "非全日制工", "博士后(在职)"); + /** + * 不进系统在职状态 + * 01 退休 + * 05 调出 + * 06 辞职 + * 07 离职 + * @see io.v.nutz.zhgh.data.constant.HMCFieldCode#USER_STATE_CODE + */ + List NOT_ENTERING_USER_STATE = List.of("01", "05", "06", "07"); + + List NOT_ENTERING_USER_LOGIN_NAME = List.of("2020000410", "2008000010"); /** * 接口中的数据跟SourceUser的对应关系 @@ -114,7 +119,9 @@ public interface SourceData { // checkSuccess(map); List data = map.getAsList("data", NutMap.class); for (NutMap row : data) { - if (NOT_ENTERING_USER.contains(row.getString("RYFLMC"))) { + if (NOT_ENTERING_PERSON_TYPE.contains(row.getString("RYFLMC")) + || NOT_ENTERING_USER_LOGIN_NAME.contains(row.getString("GH")) + || NOT_ENTERING_USER_STATE.contains(row.getString("DQZTM"))) { continue; } Map entity = new HashMap(500); diff --git a/src/main/java/io/v/nutz/zhgh/data/service/impl/SourceUserServiceImpl.java b/src/main/java/io/v/nutz/zhgh/data/service/impl/SourceUserServiceImpl.java index 8572a4f..cc4cf61 100644 --- a/src/main/java/io/v/nutz/zhgh/data/service/impl/SourceUserServiceImpl.java +++ b/src/main/java/io/v/nutz/zhgh/data/service/impl/SourceUserServiceImpl.java @@ -148,33 +148,30 @@ public class SourceUserServiceImpl extends ViServiceImpl implements source.setWelfareMember(null); Sys_user user = userMap.get(source.getLoginname().toLowerCase()); - if (StrUtil.isNotBlank(source.getPersonType()) - && MEMBER_PERSON_TYPE.contains(source.getPersonType()) - && "在职".equals(source.getUserState())) { - source.setMember(1); - source.setWelfareMember(1); - // 符合条件的这类人员 人员性质设为会员 - source.setPreparedBy("会员"); - if (user != null && user.getMember() != 1) { - addMemberUserIds.add(user.getId()); - } - if (user == null) { - addMemberUserIds.add(source.getId()); - } - } else { - source.setMember(0); - source.setWelfareMember(0); - // 不符合条件的这类人员 人员性质设为教职工 - source.setPreparedBy("教职工"); - if (user != null && user.getMember() == 1) { - deleteMemberUserIds.add(user.getId()); - } - } - Sys_user u = new Sys_user(); BeanUtils.copyProperties(source, u); switch (sourceType) { case "all" -> { + if (StrUtil.isNotBlank(source.getPersonType()) + && MEMBER_PERSON_TYPE.contains(source.getPersonType()) + && "在职".equals(source.getUserState())) { + source.setMember(1); + source.setWelfareMember(1); + // 符合条件的这类人员 人员性质设为会员 + if (user != null && user.getMember() != 1) { + addMemberUserIds.add(user.getId()); + } + if (user == null) { + addMemberUserIds.add(source.getId()); + } + } else { + source.setMember(0); + source.setWelfareMember(0); + // 不符合条件的这类人员 人员性质设为教职工 + if (user != null && user.getMember() == 1) { + deleteMemberUserIds.add(user.getId()); + } + } // 复制属性到一个新的user对象 u.setId(user == null ? source.getId() : user.getId()); if (user != null) { @@ -224,20 +221,22 @@ public class SourceUserServiceImpl extends ViServiceImpl implements sysUserRoleService.insert(userRoles); } - // 添加会员角色 - if (Lang.isNotEmpty(addMemberUserIds)) { - String memberRoleId = Roles.MEMBER; - List list = addMemberUserIds.stream().map(v -> { - Sys_user_role userRole = new Sys_user_role(); - userRole.setUserId(v); - userRole.setRoleId(memberRoleId); - return userRole; - }).toList(); - manyAddOrRenewUtil.asyncExecuteInsert(list, 200); - } - // 不是定义的personType的人员,去除会员角色 - if (Lang.isNotEmpty(deleteMemberUserIds)) { - dao().clear(Sys_user_role.class, Cnd.where("userId", "in", deleteMemberUserIds).and("roleId", "=", Roles.MEMBER)); + if ("all".equals(sourceType)) { + // 添加会员角色 + if (Lang.isNotEmpty(addMemberUserIds)) { + String memberRoleId = Roles.MEMBER; + List list = addMemberUserIds.stream().map(v -> { + Sys_user_role userRole = new Sys_user_role(); + userRole.setUserId(v); + userRole.setRoleId(memberRoleId); + return userRole; + }).toList(); + manyAddOrRenewUtil.asyncExecuteInsert(list, 200); + } + // 不是定义的personType的人员,去除会员角色 + if (Lang.isNotEmpty(deleteMemberUserIds)) { + dao().clear(Sys_user_role.class, Cnd.where("userId", "in", deleteMemberUserIds).and("roleId", "=", Roles.MEMBER)); + } } // Collection updateColumns = SourceData.USER_FIELD_RELATION.values(); @@ -253,7 +252,7 @@ public class SourceUserServiceImpl extends ViServiceImpl implements // 人员状态及在职状态更新 userPatUpService.renewUserState(); // 修改不在人事库的人员,删除角色 - userPatUpService.deleteNotInSourceUser(); + userPatUpService.deleteNotInSourceUser(true); //清除缓存 // sysUserService.clearCache(); // sysRoleService.clearCache(); diff --git a/src/main/java/io/v/nutz/zhgh/member/handle/MemberChangeHandle.java b/src/main/java/io/v/nutz/zhgh/member/handle/MemberChangeHandle.java index bdc5f0d..efbb0a6 100644 --- a/src/main/java/io/v/nutz/zhgh/member/handle/MemberChangeHandle.java +++ b/src/main/java/io/v/nutz/zhgh/member/handle/MemberChangeHandle.java @@ -105,6 +105,7 @@ public enum MemberChangeHandle { UserMode.addMemberRole(record.getUserId()); updateMemberStatus(MemberStatus.RESTORE, record.getUserId()); updateMemberAndWelfareMember(record); + sysUserService.update(Chain.make("preparedBy", "会员"), Cnd.where("id", "=", record.getUserId())); } }, WITHDRAWAL(UserChangeType.WITHDRAWAL.getCode()) { @@ -115,6 +116,7 @@ public enum MemberChangeHandle { updateMemberAndWelfareMember(record); updateMemberStatus(MemberStatus.WITHDRAWAL, record.getUserId()); updateUserStateAndPersonType(record); + sysUserService.update(Chain.make("preparedBy", "教职工"), Cnd.where("id", "=", record.getUserId())); } }, CARD_CHANGE(UserChangeType.CARD_CHANGE.getCode()){ diff --git a/src/main/resources/static/components/difficulty/apply.vue b/src/main/resources/static/components/difficulty/apply.vue index e950238..5264184 100644 --- a/src/main/resources/static/components/difficulty/apply.vue +++ b/src/main/resources/static/components/difficulty/apply.vue @@ -412,7 +412,7 @@ module.exports = { } }, components: { - 'sign': httpVueLoader('/components/sign/sign.vue?v=2.0.0'), + 'sign': httpVueLoader('/components/sign/sign.vue?v=2.0.1'), 'file-upload': httpVueLoader('/components/plugins/FileUpload.vue'), }, methods: { diff --git a/src/main/resources/static/components/plugins/Signature.vue b/src/main/resources/static/components/plugins/Signature.vue index dc1b12e..448b567 100644 --- a/src/main/resources/static/components/plugins/Signature.vue +++ b/src/main/resources/static/components/plugins/Signature.vue @@ -33,7 +33,7 @@ module.exports = { props: { scan_title: { type: String, - default: '扫描下方二维码进行签字' + default: '请使用【手机钉钉】扫描下方二维码进行签字' }, prefix: { type: String, @@ -144,4 +144,4 @@ module.exports = { flex-direction: column; z-index: 999; } - \ No newline at end of file + diff --git a/src/main/resources/static/components/sign/sign.vue b/src/main/resources/static/components/sign/sign.vue index 4362600..318073c 100644 --- a/src/main/resources/static/components/sign/sign.vue +++ b/src/main/resources/static/components/sign/sign.vue @@ -34,7 +34,7 @@ module.exports = { props: { scan_title: { type: String, - default: '扫描下方二维码进行签字' + default: '请使用【手机钉钉】扫描二维码进行签字' }, prefix: { type: String, diff --git a/src/main/resources/views/layouts/platform1.html b/src/main/resources/views/layouts/platform1.html index 2f02270..e2e776f 100644 --- a/src/main/resources/views/layouts/platform1.html +++ b/src/main/resources/views/layouts/platform1.html @@ -118,7 +118,7 @@ Vue.component('vuedraggable', window.vuedraggable) Vue.component('guava', httpVueLoader('/components/plugins/Guava.vue')) - Vue.component('sign', httpVueLoader('/components/sign/sign.vue?v=2.0.0')) + Vue.component('sign', httpVueLoader('/components/sign/sign.vue?v=2.0.1')) Vue.component('file-upload', httpVueLoader('/components/plugins/FileUpload.vue')) Vue.component('image-upload', httpVueLoader('/components/plugins/ImageUpload.vue')) Vue.component('dict-tag', httpVueLoader('/components/plugins/sysDict/DictTag.vue')) diff --git a/src/main/resources/views/mobile/welfare/list/receive.html b/src/main/resources/views/mobile/welfare/list/receive.html index 4db9e5e..f968da9 100644 --- a/src/main/resources/views/mobile/welfare/list/receive.html +++ b/src/main/resources/views/mobile/welfare/list/receive.html @@ -36,10 +36,6 @@ layout("/mobile/platform.html"){ align-items: baseline; } - .van-empty { - position: absolute; - } - .van-collapse-item .van-collapse-item__title { } @@ -220,11 +216,10 @@ layout("/mobile/platform.html"){
-
-
TOP{{option.rank}}
-
- --> + + + {{option.selectCount}}人已选 @@ -282,19 +277,21 @@ layout("/mobile/platform.html"){
-
+
配送至
@@ -305,7 +302,7 @@ layout("/mobile/platform.html"){ - 地址管理 + 新增地址
@@ -372,7 +369,9 @@ layout("/mobile/platform.html"){
@@ -535,12 +534,24 @@ layout("/mobile/platform.html"){ this.$toast('一共可以选择' + multiSelectNum + '份,您目前只选择了' + this.sumSelectNum + '份,快去选择吧!') return } + } else { + if (this.sumSelectNum === 0) { + //用户选择了多份 + this.$toast('您还没有选择福利套餐,快去选择吧!') + return + } } this.confirmPopup = true + await this.selectAddressList() //回显用户的地址 if (this.projectInfo.provideMode === 3 && this.isSelect && this.userSelection) { this.selectAddress = this.userSelection[0].receiveAddress + } else if (this.projectInfo.provideMode === 3 && !this.isSelect){ + if (this.addressList && this.addressList.length > 0) { + const resp = this.addressList.find(v=> v.isDefault) + this.addressClick(resp) + } } //回显用户签名 @@ -612,12 +623,18 @@ layout("/mobile/platform.html"){ //地址管理 openAddressManage() { - pjaxReplace('/mobile/welfare/mine/address?projectId=' + this.projectId) + pjaxReplace('/mobile/welfare/mine/addressEdit?projectId=' + this.projectId) window.sessionStorage.setItem('welfareProjectId', this.projectId) + + const formData = { + projectInfo: this.projectInfo, + signData: this.signData || null + } + window.sessionStorage.setItem('welfareProjectSelectInfo' + "${@shiro.getPrincipalProperty('loginname')}", JSON.stringify(formData)) }, clickSelectAddressPopup() { - this.selectAddressList() + // this.selectAddressList() this.selectAddressPopup = true }, @@ -657,7 +674,7 @@ layout("/mobile/platform.html"){ const id = GetQueryString("projectId") if (!id) return this.projectId = id - this.getProjectInfo() + // this.getChoice() getEnumOptions("WelfareProvideMode").then(res => { this.welfareProvideMode = res @@ -665,9 +682,21 @@ layout("/mobile/platform.html"){ getEnumOptions("WelfareSignMode").then(res => { this.welfareSignMode = res }) + + const loginname = "${@shiro.getPrincipalProperty('loginname')}" + const formData = window.sessionStorage.getItem('welfareProjectSelectInfo' + loginname); + if (formData) { + const resp = JSON.parse(formData) + this.projectInfo = resp.projectInfo + this.signData = resp.signData + this.confirmSelect() + window.sessionStorage.removeItem('welfareProjectSelectInfo' + loginname) + // this.selectAddressPopup = true + } else { + this.getProjectInfo() + } }, }) - \ No newline at end of file +#--> diff --git a/src/main/resources/views/platform/proposal/senior/again.html b/src/main/resources/views/platform/proposal/senior/again.html index ccaad47..af39a54 100644 --- a/src/main/resources/views/platform/proposal/senior/again.html +++ b/src/main/resources/views/platform/proposal/senior/again.html @@ -85,7 +85,7 @@ layout("/layouts/platform.html"){ el: '#app', mixins: [initTableMixins], components: { - 'sign': httpVueLoader('/components/sign/sign.vue?v=2.0.0'), + 'sign': httpVueLoader('/components/sign/sign.vue?v=2.0.1'), 'guava': httpVueLoader('/components/plugins/Guava.vue'), 'proposal-info': httpVueLoader('/components/proposal/ProposalInfo.vue'), 'proposal-search': httpVueLoader('/components/proposal/ProposalSearch.vue'), @@ -171,4 +171,4 @@ layout("/layouts/platform.html"){ \ No newline at end of file +#--> diff --git a/src/main/resources/views/platform/proposal/senior/second.html b/src/main/resources/views/platform/proposal/senior/second.html index c57d3be..536a5f7 100644 --- a/src/main/resources/views/platform/proposal/senior/second.html +++ b/src/main/resources/views/platform/proposal/senior/second.html @@ -120,7 +120,7 @@ layout("/layouts/platform.html"){ el: '#app', mixins: [initTableMixins], components: { - 'sign': httpVueLoader('/components/sign/sign.vue?v=2.0.0'), + 'sign': httpVueLoader('/components/sign/sign.vue?v=2.0.1'), 'guava': httpVueLoader('/components/plugins/Guava.vue'), 'proposal-info': httpVueLoader('/components/proposal/ProposalInfo.vue'), 'proposal-search': httpVueLoader('/components/proposal/ProposalSearch.vue'), @@ -212,4 +212,4 @@ layout("/layouts/platform.html"){ \ No newline at end of file +#--> diff --git a/src/main/resources/views/platform/proposal/transact/branchLeaderPrefixAudit.html b/src/main/resources/views/platform/proposal/transact/branchLeaderPrefixAudit.html index 6fbdcfd..95319c6 100644 --- a/src/main/resources/views/platform/proposal/transact/branchLeaderPrefixAudit.html +++ b/src/main/resources/views/platform/proposal/transact/branchLeaderPrefixAudit.html @@ -188,7 +188,7 @@ layout("/layouts/platform.html"){ formRules: { opinion: [{required: true, message: '请输入审核意见', trigger: ['blur', 'change']}], other: [{required: true, message: '请选择立案意见', trigger: ['blur', 'change']}], - sign: [{required: true, message: '请扫描二维码进行签字', trigger: ['blur', 'change']}] + sign: [{required: true, message: '请使用【手机钉钉】扫描二维码进行签字', trigger: ['blur', 'change']}] }, resultOptions: [], isNode: false @@ -318,4 +318,4 @@ layout("/layouts/platform.html"){ \ No newline at end of file +#--> diff --git a/src/main/resources/views/platform/proposal/transact/branchLeaderRead.html b/src/main/resources/views/platform/proposal/transact/branchLeaderRead.html index 391f43e..c87f416 100644 --- a/src/main/resources/views/platform/proposal/transact/branchLeaderRead.html +++ b/src/main/resources/views/platform/proposal/transact/branchLeaderRead.html @@ -190,7 +190,7 @@ layout("/layouts/platform.html"){ formRules: { opinion: [{required: true, message: '请输入审核意见', trigger: ['blur', 'change']}], other: [{required: true, message: '请选择立案意见', trigger: ['blur', 'change']}], - sign: [{required: true, message: '请扫描二维码进行签字', trigger: ['blur', 'change']}] + sign: [{required: true, message: '请使用【手机钉钉】扫描二维码进行签字', trigger: ['blur', 'change']}] }, resultOptions: [], isNode: false, @@ -359,4 +359,4 @@ layout("/layouts/platform.html"){ \ No newline at end of file +#--> diff --git a/src/main/resources/views/platform/proposal/transact/branchLeaderSuffixAudit.html b/src/main/resources/views/platform/proposal/transact/branchLeaderSuffixAudit.html index 179b243..c33f6fc 100644 --- a/src/main/resources/views/platform/proposal/transact/branchLeaderSuffixAudit.html +++ b/src/main/resources/views/platform/proposal/transact/branchLeaderSuffixAudit.html @@ -190,7 +190,7 @@ layout("/layouts/platform.html"){ }, formRules: { opinion: [{required: true, message: '请输入审批意见', trigger: ['blur', 'change']}], - sign: [{required: true, message: '请扫描二维码进行签字', trigger: ['blur', 'change']}] + sign: [{required: true, message: '请使用【手机钉钉】扫描二维码进行签字', trigger: ['blur', 'change']}] }, isNode: false, oneKeyRemindDialogVisible: false, @@ -286,4 +286,4 @@ layout("/layouts/platform.html"){ \ No newline at end of file +#--> diff --git a/src/main/resources/views/platform/proposal/transact/case.html b/src/main/resources/views/platform/proposal/transact/case.html index f2a2e7d..fc91c51 100644 --- a/src/main/resources/views/platform/proposal/transact/case.html +++ b/src/main/resources/views/platform/proposal/transact/case.html @@ -419,7 +419,7 @@ layout("/layouts/platform.html"){ el: '#app', mixins: [initTableMixins], components: { - 'sign': httpVueLoader('/components/sign/sign.vue?v=2.0.0'), + 'sign': httpVueLoader('/components/sign/sign.vue?v=2.0.1'), 'proposal-info': httpVueLoader('/components/proposal/ProposalInfo.vue'), 'proposal-search': httpVueLoader('/components/proposal/ProposalSearch.vue'), 'proposal-table': httpVueLoader('/components/proposal/ProposalTable.vue') @@ -487,7 +487,7 @@ layout("/layouts/platform.html"){ // hostUnit: [{required: true, message: '请选择主办单位', trigger: ['blur', 'change']}], opinion: [{required: true, message: '请输入审核意见', trigger: ['blur', 'change']}], typeId: [{required: true, message: '请输入提案类型', trigger: ['blur', 'change']}], - sign: [{required: true, message: '请扫描二维码进行签字', trigger: ['blur', 'change']}] + sign: [{required: true, message: '请使用【手机钉钉】扫描二维码进行签字', trigger: ['blur', 'change']}] }, multipleSelection: [], editRow: {}, @@ -766,4 +766,4 @@ layout("/layouts/platform.html"){ \ No newline at end of file +#--> diff --git a/src/main/resources/views/platform/proposal/transact/caseUnit.html b/src/main/resources/views/platform/proposal/transact/caseUnit.html index 2e77824..f340951 100644 --- a/src/main/resources/views/platform/proposal/transact/caseUnit.html +++ b/src/main/resources/views/platform/proposal/transact/caseUnit.html @@ -280,7 +280,7 @@ layout("/layouts/platform.html"){ formRules: { hostUnit: [{required: true, message: '请选择主办单位', trigger: ['blur', 'change']}], opinion: [{required: true, message: '请输入审核意见', trigger: ['blur', 'change']}], - sign: [{required: true, message: '请扫描二维码进行签字', trigger: ['blur', 'change']}] + sign: [{required: true, message: '请使用【手机钉钉】扫描二维码进行签字', trigger: ['blur', 'change']}] } } }, @@ -434,4 +434,4 @@ layout("/layouts/platform.html"){ \ No newline at end of file +#--> diff --git a/src/main/resources/views/platform/proposal/transact/delegation.html b/src/main/resources/views/platform/proposal/transact/delegation.html index f2eb167..5a26d4c 100644 --- a/src/main/resources/views/platform/proposal/transact/delegation.html +++ b/src/main/resources/views/platform/proposal/transact/delegation.html @@ -164,7 +164,7 @@ layout("/layouts/platform.html"){ }, formRules: { opinion: [{required: true, message: '请输入审核意见', trigger: ['blur', 'change']}], - sign: [{required: true, message: '请扫描二维码进行签字', trigger: ['blur', 'change']}] + sign: [{required: true, message: '请使用【手机钉钉】扫描二维码进行签字', trigger: ['blur', 'change']}] }, oneKeyRemindDialogVisible: false, oneKeyTableData: [] @@ -275,4 +275,4 @@ layout("/layouts/platform.html"){ \ No newline at end of file +#--> diff --git a/src/main/resources/views/platform/proposal/transact/feedback.html b/src/main/resources/views/platform/proposal/transact/feedback.html index 5408c55..f5f9f76 100644 --- a/src/main/resources/views/platform/proposal/transact/feedback.html +++ b/src/main/resources/views/platform/proposal/transact/feedback.html @@ -210,7 +210,7 @@ layout("/layouts/platform.html"){ message: '请选择对承办单位办理态度的评价', trigger: ['blur', 'change'] }], - sign: [{required: true, message: '请扫描二维码进行签字', trigger: ['blur', 'change']}] + sign: [{required: true, message: '请使用【手机钉钉】扫描二维码进行签字', trigger: ['blur', 'change']}] }, oneKeyRemindDialogVisible: false, oneKeyTableData: [] @@ -329,4 +329,4 @@ layout("/layouts/platform.html"){ \ No newline at end of file +#--> diff --git a/src/main/resources/views/platform/proposal/transact/instructions.html b/src/main/resources/views/platform/proposal/transact/instructions.html index 0a514fa..54c705e 100644 --- a/src/main/resources/views/platform/proposal/transact/instructions.html +++ b/src/main/resources/views/platform/proposal/transact/instructions.html @@ -101,7 +101,7 @@ layout("/layouts/platform.html"){ el: '#app', mixins: [initTableMixins], components: { - 'sign': httpVueLoader('/components/sign/sign.vue?v=2.0.0'), + 'sign': httpVueLoader('/components/sign/sign.vue?v=2.0.1'), 'guava': httpVueLoader('/components/plugins/Guava.vue'), 'proposal-info': httpVueLoader('/components/proposal/ProposalInfo.vue'), 'proposal-search': httpVueLoader('/components/proposal/ProposalSearch.vue'), @@ -221,4 +221,4 @@ layout("/layouts/platform.html"){ \ No newline at end of file +#--> diff --git a/src/main/resources/views/platform/proposal/transact/reply.html b/src/main/resources/views/platform/proposal/transact/reply.html index 9a2c6ba..b3b53f6 100644 --- a/src/main/resources/views/platform/proposal/transact/reply.html +++ b/src/main/resources/views/platform/proposal/transact/reply.html @@ -272,7 +272,7 @@ layout("/layouts/platform.html"){ formRules: { replyContent: [{validator: replyContentBrief, trigger: ['blur', 'change']}], implementState: [{required: true, message: '请选择落实情况', trigger: ['blur', 'change']}], - sign: [{required: true, message: '请扫描二维码进行签字', trigger: ['blur', 'change']}] + sign: [{required: true, message: '请使用【手机钉钉】扫描二维码进行签字', trigger: ['blur', 'change']}] }, proTableSelection: [], forwardDialog: false, @@ -500,4 +500,4 @@ layout("/layouts/platform.html"){ \ No newline at end of file +#--> diff --git a/src/main/resources/views/platform/proposal/transact/seconded.html b/src/main/resources/views/platform/proposal/transact/seconded.html index 67b845e..71de8f3 100644 --- a/src/main/resources/views/platform/proposal/transact/seconded.html +++ b/src/main/resources/views/platform/proposal/transact/seconded.html @@ -167,7 +167,7 @@ layout("/layouts/platform.html"){ }, formRules: { implementUnitId: [{required: true, message: '请选择建议落实部门', trigger: ['blur', 'change']}], - seconderSign: [{required: true, message: '请扫描二维码进行签字', trigger: ['blur', 'change']}], + seconderSign: [{required: true, message: '请使用【手机钉钉】扫描二维码进行签字', trigger: ['blur', 'change']}], }, } }, @@ -267,4 +267,4 @@ layout("/layouts/platform.html"){ \ No newline at end of file +#--> diff --git a/src/main/resources/views/platform/proposal/transact/undersign.html b/src/main/resources/views/platform/proposal/transact/undersign.html index eaa349f..fd94ea6 100644 --- a/src/main/resources/views/platform/proposal/transact/undersign.html +++ b/src/main/resources/views/platform/proposal/transact/undersign.html @@ -99,7 +99,7 @@ layout("/layouts/platform.html"){ el: '#app', mixins: [initTableMixins], components: { - 'sign': httpVueLoader('/components/sign/sign.vue?v=2.0.0'), + 'sign': httpVueLoader('/components/sign/sign.vue?v=2.0.1'), 'guava': httpVueLoader('/components/plugins/Guava.vue'), 'proposal-info': httpVueLoader('/components/proposal/ProposalInfo.vue'), 'proposal-search': httpVueLoader('/components/proposal/ProposalSearch.vue'), @@ -184,4 +184,4 @@ layout("/layouts/platform.html"){ \ No newline at end of file +#--> diff --git a/src/main/resources/views/platform/proposal/transact/write.html b/src/main/resources/views/platform/proposal/transact/write.html index 30044d2..bd8ac03 100644 --- a/src/main/resources/views/platform/proposal/transact/write.html +++ b/src/main/resources/views/platform/proposal/transact/write.html @@ -197,7 +197,7 @@ layout("/layouts/platform.html"){ committeeId: [{required: true, message: '请选择所属委员会', trigger: ['blur', 'change']}], /*typeId: [{required: true, message: '请选择提案类型', trigger: ['blur', 'change']}],*/ implementUnitId: [{required: false, message: '请选择建以落实部门', trigger: ['blur', 'change']}], - sign: [{required: true, message: '请扫描二维码进行签字', trigger: ['blur', 'change']}], + sign: [{required: true, message: '请使用【手机钉钉】扫描二维码进行签字', trigger: ['blur', 'change']}], brief: [{validator: validBrief, trigger: ['blur', 'change']}], measures: [{validator: validMeasures, trigger: ['blur', 'change']}], }, @@ -412,4 +412,4 @@ layout("/layouts/platform.html"){ \ No newline at end of file +#--> diff --git a/src/main/resources/views/platform/reimbursement/AuditConfirm.html b/src/main/resources/views/platform/reimbursement/AuditConfirm.html index bac0612..d731e68 100644 --- a/src/main/resources/views/platform/reimbursement/AuditConfirm.html +++ b/src/main/resources/views/platform/reimbursement/AuditConfirm.html @@ -269,7 +269,7 @@ layout("/layouts/platform.html"){ components: { 'guava': httpVueLoader('/components/plugins/Guava.vue'), 'file-upload': httpVueLoader('/components/plugins/FileUpload.vue'), - 'sign': httpVueLoader('/components/sign/sign.vue?v=2.0.0'), + 'sign': httpVueLoader('/components/sign/sign.vue?v=2.0.1'), 'info': httpVueLoader('/components/condolence/Info.vue'), 'activity-bx-info': httpVueLoader('/components/activityBx/ActivityBxInfo.vue'), 'reimbursement-new': httpVueLoader('/components/reimbursement/reimbursementNew.vue?v=4.0.0'), @@ -410,4 +410,4 @@ layout("/layouts/platform.html"){ \ No newline at end of file +#--> diff --git a/src/main/resources/views/platform/reimbursement/ReimbursementList.html b/src/main/resources/views/platform/reimbursement/ReimbursementList.html index 8c4970f..127e06a 100644 --- a/src/main/resources/views/platform/reimbursement/ReimbursementList.html +++ b/src/main/resources/views/platform/reimbursement/ReimbursementList.html @@ -239,7 +239,7 @@ layout("/layouts/platform.html"){ components: { 'guava': httpVueLoader('/components/plugins/Guava.vue'), 'file-upload': httpVueLoader('/components/plugins/FileUpload.vue'), - 'sign': httpVueLoader('/components/sign/sign.vue?v=2.0.0'), + 'sign': httpVueLoader('/components/sign/sign.vue?v=2.0.1'), 'info': httpVueLoader('/components/condolence/Info.vue'), 'activity-bx-info': httpVueLoader('/components/activityBx/ActivityBxInfo.vue'), 'reimbursement-new': httpVueLoader('/components/reimbursement/reimbursementNew.vue?v=4.0.0'), @@ -451,4 +451,4 @@ layout("/layouts/platform.html"){ \ No newline at end of file +#--> diff --git a/src/main/resources/views/platform/reimbursement/StandingViceChairman.html b/src/main/resources/views/platform/reimbursement/StandingViceChairman.html index 337092d..71f5a6a 100644 --- a/src/main/resources/views/platform/reimbursement/StandingViceChairman.html +++ b/src/main/resources/views/platform/reimbursement/StandingViceChairman.html @@ -257,7 +257,7 @@ layout("/layouts/platform.html"){ components: { 'guava': httpVueLoader('/components/plugins/Guava.vue'), 'file-upload': httpVueLoader('/components/plugins/FileUpload.vue'), - 'sign': httpVueLoader('/components/sign/sign.vue?v=2.0.0'), + 'sign': httpVueLoader('/components/sign/sign.vue?v=2.0.1'), 'info': httpVueLoader('/components/condolence/Info.vue'), 'activity-bx-info': httpVueLoader('/components/activityBx/ActivityBxInfo.vue'), }, @@ -343,4 +343,4 @@ layout("/layouts/platform.html"){ \ No newline at end of file +#--> diff --git a/src/main/resources/views/platform/reimbursement/Summary.html b/src/main/resources/views/platform/reimbursement/Summary.html index 4bfbbb8..80d7a0f 100644 --- a/src/main/resources/views/platform/reimbursement/Summary.html +++ b/src/main/resources/views/platform/reimbursement/Summary.html @@ -206,7 +206,7 @@ layout("/layouts/platform.html"){ components: { 'guava': httpVueLoader('/components/plugins/Guava.vue'), 'file-upload': httpVueLoader('/components/plugins/FileUpload.vue'), - 'sign': httpVueLoader('/components/sign/sign.vue?v=2.0.0'), + 'sign': httpVueLoader('/components/sign/sign.vue?v=2.0.1'), 'info': httpVueLoader('/components/condolence/Info.vue'), 'activity-bx-info': httpVueLoader('/components/activityBx/ActivityBxInfo.vue'), 'reimbursement-new': httpVueLoader('/components/reimbursement/reimbursementNew.vue'), diff --git a/src/main/resources/views/platform/reimbursement/ViceChairman.html b/src/main/resources/views/platform/reimbursement/ViceChairman.html index 9457dfa..fec7975 100644 --- a/src/main/resources/views/platform/reimbursement/ViceChairman.html +++ b/src/main/resources/views/platform/reimbursement/ViceChairman.html @@ -257,7 +257,7 @@ layout("/layouts/platform.html"){ components: { 'guava': httpVueLoader('/components/plugins/Guava.vue'), 'file-upload': httpVueLoader('/components/plugins/FileUpload.vue'), - 'sign': httpVueLoader('/components/sign/sign.vue?v=2.0.0'), + 'sign': httpVueLoader('/components/sign/sign.vue?v=2.0.1'), 'info': httpVueLoader('/components/condolence/Info.vue'), 'activity-bx-info': httpVueLoader('/components/activityBx/ActivityBxInfo.vue'), }, @@ -343,4 +343,4 @@ layout("/layouts/platform.html"){ \ No newline at end of file +#--> diff --git a/src/main/resources/views/platform/reimbursement/dma.html b/src/main/resources/views/platform/reimbursement/dma.html index e02c127..233fbb3 100644 --- a/src/main/resources/views/platform/reimbursement/dma.html +++ b/src/main/resources/views/platform/reimbursement/dma.html @@ -281,7 +281,7 @@ layout("/layouts/platform.html"){ components: { 'guava': httpVueLoader('/components/plugins/Guava.vue'), 'file-upload': httpVueLoader('/components/plugins/FileUpload.vue'), - 'sign': httpVueLoader('/components/sign/sign.vue?v=2.0.0'), + 'sign': httpVueLoader('/components/sign/sign.vue?v=2.0.1'), 'info': httpVueLoader('/components/condolence/Info.vue'), 'activity-bx-info': httpVueLoader('/components/activityBx/ActivityBxInfo.vue'), }, @@ -380,4 +380,4 @@ layout("/layouts/platform.html"){ \ No newline at end of file +#--> diff --git a/src/main/resources/views/platform/reimbursement/finance.html b/src/main/resources/views/platform/reimbursement/finance.html index a3a65a4..71782b3 100644 --- a/src/main/resources/views/platform/reimbursement/finance.html +++ b/src/main/resources/views/platform/reimbursement/finance.html @@ -267,7 +267,7 @@ layout("/layouts/platform.html"){ components: { 'guava': httpVueLoader('/components/plugins/Guava.vue'), 'file-upload': httpVueLoader('/components/plugins/FileUpload.vue'), - 'sign': httpVueLoader('/components/sign/sign.vue?v=2.0.0'), + 'sign': httpVueLoader('/components/sign/sign.vue?v=2.0.1'), 'info': httpVueLoader('/components/condolence/Info.vue'), 'activity-bx-info': httpVueLoader('/components/activityBx/ActivityBxInfo.vue'), }, @@ -355,4 +355,4 @@ layout("/layouts/platform.html"){ \ No newline at end of file +#--> diff --git a/src/main/resources/views/platform/reimbursement/secretary.html b/src/main/resources/views/platform/reimbursement/secretary.html index 3ed04bd..4add25c 100644 --- a/src/main/resources/views/platform/reimbursement/secretary.html +++ b/src/main/resources/views/platform/reimbursement/secretary.html @@ -273,7 +273,7 @@ layout("/layouts/platform.html"){ components: { 'guava': httpVueLoader('/components/plugins/Guava.vue'), 'file-upload': httpVueLoader('/components/plugins/FileUpload.vue'), - 'sign': httpVueLoader('/components/sign/sign.vue?v=2.0.0'), + 'sign': httpVueLoader('/components/sign/sign.vue?v=2.0.1'), 'info': httpVueLoader('/components/condolence/Info.vue'), 'activity-bx-info': httpVueLoader('/components/activityBx/ActivityBxInfo.vue'), }, @@ -365,4 +365,4 @@ layout("/layouts/platform.html"){ \ No newline at end of file +#--> diff --git a/src/main/resources/views/platform/syr/info/zqsh.html b/src/main/resources/views/platform/syr/info/zqsh.html index 12e992f..c7a80bb 100644 --- a/src/main/resources/views/platform/syr/info/zqsh.html +++ b/src/main/resources/views/platform/syr/info/zqsh.html @@ -66,7 +66,7 @@ layout("/layouts/platform.html"){ components: { 'syr-table': httpVueLoader('/components/syr/syrtable.vue'), 'syr-info': httpVueLoader('/components/syr/syrinfo.vue'), - 'sign': httpVueLoader('/components/sign/sign.vue?v=2.0.0'), + 'sign': httpVueLoader('/components/sign/sign.vue?v=2.0.1'), 'syr-info-new': httpVueLoader('/components/syr/SyrInfoNew.vue'), }, methods: { diff --git a/src/main/resources/views/platform/syr/info/zqtx.html b/src/main/resources/views/platform/syr/info/zqtx.html index 5abd3e2..d8702a8 100644 --- a/src/main/resources/views/platform/syr/info/zqtx.html +++ b/src/main/resources/views/platform/syr/info/zqtx.html @@ -126,7 +126,7 @@ layout("/layouts/platform.html"){ components: { 'syr-table': httpVueLoader('/components/syr/syrtable.vue'), 'syr-info': httpVueLoader('/components/syr/syrinfo.vue'), - 'sign': httpVueLoader('/components/sign/sign.vue?v=2.0.0'), + 'sign': httpVueLoader('/components/sign/sign.vue?v=2.0.1'), 'syr-info-new': httpVueLoader('/components/syr/SyrInfoNew.vue'), }, methods: { diff --git a/src/main/resources/views/platform/sys/home/activity.js b/src/main/resources/views/platform/sys/home/activity.js index 0bc9558..d469de7 100644 --- a/src/main/resources/views/platform/sys/home/activity.js +++ b/src/main/resources/views/platform/sys/home/activity.js @@ -5,8 +5,8 @@ const activity = {
最新活动
-
-
+
+
diff --git a/src/main/resources/views/platform/welfare/userChoose.html b/src/main/resources/views/platform/welfare/userChoose.html index 0581289..7a4f8ca 100644 --- a/src/main/resources/views/platform/welfare/userChoose.html +++ b/src/main/resources/views/platform/welfare/userChoose.html @@ -627,17 +627,29 @@ layout("/layouts/platform.html"){ if (isCheckBox === "checkBox") { if (this.sumSelectNum < multiSelectNum) { //用户没有选择完 - this.$message('一共可以选择' + multiSelectNum + '份,您目前只选择了' + this.sumSelectNum + '份,快去选择吧!') + this.$message.warning('一共可以选择' + multiSelectNum + '份,您目前只选择了' + this.sumSelectNum + '份,快去选择吧!') + return + } + } else { + if (this.sumSelectNum === 0) { + //用户选择了多份 + this.$message.warning('您还没有选择福利套餐,快去选择吧!') return } } - if (this.formData.receiveAddress == null || this.formData.receiveAddress === '') { - this.$message.warning('请填写收货地址') - return + + if (this.projectInfo.provideMode == 3) { + if (this.formData.receiveAddress == null || this.formData.receiveAddress === '') { + this.$message.warning('请填写收货地址') + return + } } - if (this.formData.sign == null || this.formData.sign === '') { - this.$message.warning('请签字') - return + + if (![1,4].includes(this.projectInfo.signMode)) { + if (this.formData.sign == null || this.formData.sign === '') { + this.$message.warning('请签字') + return + } } const formData = this.projectInfo.welfareProjectSubjects[0].options.filter(v => v.selectNum >= 1).map(v => { return { diff --git a/src/main/resources/views/platform/zgfw/condolence/ecr.html b/src/main/resources/views/platform/zgfw/condolence/ecr.html index 147fb7a..ffe969c 100644 --- a/src/main/resources/views/platform/zgfw/condolence/ecr.html +++ b/src/main/resources/views/platform/zgfw/condolence/ecr.html @@ -199,7 +199,7 @@ layout("/layouts/platform.html"){ components: { 'guava': httpVueLoader('/components/plugins/Guava.vue'), 'file-upload': httpVueLoader('/components/plugins/FileUpload.vue'), - 'sign': httpVueLoader('/components/sign/sign.vue?v=2.0.0'), + 'sign': httpVueLoader('/components/sign/sign.vue?v=2.0.1'), 'info': httpVueLoader('/components/condolence/Info.vue'), }, methods: { @@ -261,4 +261,4 @@ layout("/layouts/platform.html"){ \ No newline at end of file +#--> diff --git a/src/main/resources/views/platform/zgfw/difficulty/schoolvicechairman.html b/src/main/resources/views/platform/zgfw/difficulty/schoolvicechairman.html index 230a17c..333b7a8 100644 --- a/src/main/resources/views/platform/zgfw/difficulty/schoolvicechairman.html +++ b/src/main/resources/views/platform/zgfw/difficulty/schoolvicechairman.html @@ -178,7 +178,7 @@ layout("/layouts/platform.html"){ mixins: [initTableMixins], components: { 'guava': httpVueLoader('/components/plugins/Guava.vue'), - 'sign': httpVueLoader('/components/sign/sign.vue?v=2.0.0'), + 'sign': httpVueLoader('/components/sign/sign.vue?v=2.0.1'), 'info': httpVueLoader('/components/difficulty/info.vue'), }, data() { @@ -258,4 +258,4 @@ layout("/layouts/platform.html"){ \ No newline at end of file +#--> diff --git a/src/main/resources/views/platform/zgfw/wwj/fghsh.html b/src/main/resources/views/platform/zgfw/wwj/fghsh.html index cc9d549..34830ab 100644 --- a/src/main/resources/views/platform/zgfw/wwj/fghsh.html +++ b/src/main/resources/views/platform/zgfw/wwj/fghsh.html @@ -107,7 +107,7 @@ layout("/layouts/platform.html"){ mixins: [initTableMixins], components: { 'wwj-info': httpVueLoader('/components/zgfw/wwj/wwj.vue'), - 'sign': httpVueLoader('/components/sign/sign.vue?v=2.0.0'), + 'sign': httpVueLoader('/components/sign/sign.vue?v=2.0.1'), }, data() { return { diff --git a/src/main/resources/views/platform/zgfw/wwj/sq.html b/src/main/resources/views/platform/zgfw/wwj/sq.html index 4041edf..10b75de 100644 --- a/src/main/resources/views/platform/zgfw/wwj/sq.html +++ b/src/main/resources/views/platform/zgfw/wwj/sq.html @@ -128,7 +128,7 @@ layout("/layouts/platform.html"){ } }, components: { - 'sign': httpVueLoader('/components/sign/sign.vue?v=2.0.0'), + 'sign': httpVueLoader('/components/sign/sign.vue?v=2.0.1'), }, methods: { async querySqr(key) { diff --git a/src/main/resources/views/platform/zgfw/wwj/sqxx.html b/src/main/resources/views/platform/zgfw/wwj/sqxx.html index 0b217fa..f1a41d5 100644 --- a/src/main/resources/views/platform/zgfw/wwj/sqxx.html +++ b/src/main/resources/views/platform/zgfw/wwj/sqxx.html @@ -183,7 +183,7 @@ layout("/layouts/platform.html"){ mixins: [initTableMixins], components: { 'wwj-info': httpVueLoader('/components/zgfw/wwj/wwj.vue'), - 'sign': httpVueLoader('/components/sign/sign.vue?v=2.0.0') + 'sign': httpVueLoader('/components/sign/sign.vue?v=2.0.1') }, data() { return { diff --git a/src/main/resources/views/platform/zgfw/wwj/xghsh.html b/src/main/resources/views/platform/zgfw/wwj/xghsh.html index 306195e..95a79ac 100644 --- a/src/main/resources/views/platform/zgfw/wwj/xghsh.html +++ b/src/main/resources/views/platform/zgfw/wwj/xghsh.html @@ -100,7 +100,7 @@ layout("/layouts/platform.html"){ mixins: [initTableMixins], components: { 'wwj-info': httpVueLoader('/components/zgfw/wwj/wwj.vue'), - 'sign': httpVueLoader('/components/sign/sign.vue?v=2.0.0'), + 'sign': httpVueLoader('/components/sign/sign.vue?v=2.0.1'), }, data() { return {