diff --git a/src/main/resources/static/components/module/userInfo/index.vue b/src/main/resources/static/components/module/userInfo/index.vue index 1e96106e..0c61870a 100644 --- a/src/main/resources/static/components/module/userInfo/index.vue +++ b/src/main/resources/static/components/module/userInfo/index.vue @@ -22,7 +22,6 @@ {{ viewData.arrivalAtSchoolDate ? $moment(viewData.arrivalAtSchoolDate).format("YYYY-MM-DD") : null }} {{ viewData.identityType }} - {{ viewData.preparedBy }} {{ viewData.personType }} {{ viewData.userState }} diff --git a/src/main/resources/views/platform/sys/data/user/pull.html b/src/main/resources/views/platform/sys/data/user/pull.html index df21324a..12780ca3 100644 --- a/src/main/resources/views/platform/sys/data/user/pull.html +++ b/src/main/resources/views/platform/sys/data/user/pull.html @@ -1,4 +1,4 @@ - @@ -52,7 +52,7 @@ layout("/layouts/platform.html"){ - + @@ -77,8 +77,7 @@ layout("/layouts/platform.html"){ - - + @@ -209,3 +208,4 @@ layout("/layouts/platform.html"){ + diff --git a/src/main/resources/views/platform/sys/data/user/update.html b/src/main/resources/views/platform/sys/data/user/update.html index 5f394ac2..2f416a86 100644 --- a/src/main/resources/views/platform/sys/data/user/update.html +++ b/src/main/resources/views/platform/sys/data/user/update.html @@ -1,4 +1,4 @@ - @@ -39,10 +39,7 @@ layout("/layouts/platform.html"){ - - - - + @@ -72,8 +69,7 @@ layout("/layouts/platform.html"){ - - + @@ -162,9 +158,8 @@ layout("/layouts/platform.html"){ { label: "生日", value: "birthday" }, { label: "手机号", value: "mobile" }, { label: "在职状态", value: "userState" }, - { label: "编制类别", value: "preparedBy" }, { label: "进站时间", value: "postDoctoralJoinDate" }, - { label: "教职工类别", value: "personType" }, + { label: "人员类型", value: "personType" }, { label: "来校年月", value: "arrivalAtSchoolDate" }, { label: "单位", value: "unitName" }, { label: "单位编码", value: "unitId" }, @@ -314,3 +309,4 @@ layout("/layouts/platform.html"){ + diff --git a/src/main/resources/views/platform/sys/msg/msgManage/msgManageForm.js b/src/main/resources/views/platform/sys/msg/msgManage/msgManageForm.js index c7fab10f..560ed3b7 100644 --- a/src/main/resources/views/platform/sys/msg/msgManage/msgManageForm.js +++ b/src/main/resources/views/platform/sys/msg/msgManage/msgManageForm.js @@ -30,8 +30,7 @@ const MSG_FORM_TEMPLATE = { - - + @@ -93,8 +92,7 @@ const MSG_FORM_TEMPLATE = { - - + @@ -262,3 +260,4 @@ const MSG_FORM_TEMPLATE = { this.roleList = await this.getRoleList() } } + diff --git a/src/main/resources/views/platform/zhgh/activity/sports/ActivityResults/index.html b/src/main/resources/views/platform/zhgh/activity/sports/ActivityResults/index.html index b521ef98..7879f634 100644 --- a/src/main/resources/views/platform/zhgh/activity/sports/ActivityResults/index.html +++ b/src/main/resources/views/platform/zhgh/activity/sports/ActivityResults/index.html @@ -394,8 +394,8 @@ layout("/layouts/platform.html"){ - 男性 - 女性 + 男 + 女 @@ -522,7 +522,7 @@ layout("/layouts/platform.html"){ this.$set(this.formData, "awardsMode", this.awardsMode) this.$set(this.formData, "identity", ['1']) this.$set(this.formData, "status", 2) - this.$set(this.formData, "sex", "男性") + this.$set(this.formData, "sex", "男") this.dialogVisible = true if (this.$refs['form']) { this.$refs['form'].resetFields() 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 255f893f..07824bf4 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 @@ -586,13 +586,13 @@ var ACTIVITY_SPORTS_APPLY_USER = { message = teamName + "替补最多设置" + substituteNum + "人" break } - const womanYdyNum = teamApplyData[i].filter((v) => ["女", "女性"].includes(v.sex) && v.identity.includes("1")).length + const womanYdyNum = teamApplyData[i].filter((v) => ["女"].includes(v.sex) && v.identity.includes("1")).length if (restrictGirlNum > 0 && womanYdyNum < restrictGirlNum) { msgFlag = false message = teamName + "女运动员至少设置" + restrictGirlNum + "人" break } - const manYdyNum = teamApplyData[i].filter((v) => ["男", "男性"].includes(v.sex) && v.identity.includes("1")).length + const manYdyNum = teamApplyData[i].filter((v) => ["男"].includes(v.sex) && v.identity.includes("1")).length if (restrictBoyNum > 0 && manYdyNum < restrictBoyNum) { msgFlag = false message = teamName + "男运动员至少设置" + restrictBoyNum + "人" @@ -675,7 +675,7 @@ var ACTIVITY_SPORTS_APPLY_USER = { ) { this.$notify({ title: "警告", - message: "该项目暂不支持男性运动员报名", + message: "该项目暂不支持男运动员报名", type: "warning" }) return @@ -689,7 +689,7 @@ var ACTIVITY_SPORTS_APPLY_USER = { ) { this.$notify({ title: "警告", - message: "该项目暂不支持女性运动员报名", + message: "该项目暂不支持女运动员报名", type: "warning" }) return diff --git a/src/main/resources/views/platform/zhgh/activity/sports/infoManage/addActivity.js b/src/main/resources/views/platform/zhgh/activity/sports/infoManage/addActivity.js index c80a04bd..5afc5062 100644 --- a/src/main/resources/views/platform/zhgh/activity/sports/infoManage/addActivity.js +++ b/src/main/resources/views/platform/zhgh/activity/sports/infoManage/addActivity.js @@ -1,4 +1,4 @@ -let ACTIVITY_SPORTS_ADD_ACTIVITY = { +let ACTIVITY_SPORTS_ADD_ACTIVITY = { template: `
@@ -1193,7 +1193,7 @@ let ACTIVITY_SPORTS_ADD_ACTIVITY = { options: [{label: '男', value: '男'}, {label: '女', value: '女'}] }, {label: '在职状态', value: 'userState', type: "select", options: userStateOptions}, - {label: '教职工类别', value: 'personType', type: "select", options: personTypeOptions}, + {label: '人员类型', value: 'personType', type: "select", options: personTypeOptions}, ]*/ } }, @@ -1206,3 +1206,4 @@ let ACTIVITY_SPORTS_ADD_ACTIVITY = { this.unitOptions = this.clubOptions.concat(units) } } + diff --git a/src/main/resources/views/platform/zhgh/benefit/userList/index.html b/src/main/resources/views/platform/zhgh/benefit/userList/index.html index 007f24d0..dbae3545 100644 --- a/src/main/resources/views/platform/zhgh/benefit/userList/index.html +++ b/src/main/resources/views/platform/zhgh/benefit/userList/index.html @@ -1,4 +1,4 @@ - @@ -52,7 +52,7 @@ layout("/layouts/platform.html"){ - + @@ -124,7 +124,7 @@ layout("/layouts/platform.html"){ { prop: "userName", label: "姓名" }, { prop: "sex", label: "性别", sortable: true }, { prop: "mobile", label: "联系方式" }, - { prop: "personType", label: "教职工类别", sortable: true }, + { prop: "personType", label: "人员类型", sortable: true }, { prop: "userState", label: "在职状态", sortable: true }, { prop: "unionName", label: "所属工会", sortable: true }, { prop: "unitName", label: "所属单位", sortable: true } @@ -218,3 +218,4 @@ layout("/layouts/platform.html"){ + diff --git a/src/main/resources/views/platform/zhgh/benefit/userSelectionList/index.html b/src/main/resources/views/platform/zhgh/benefit/userSelectionList/index.html index 4c898d44..a93f760f 100644 --- a/src/main/resources/views/platform/zhgh/benefit/userSelectionList/index.html +++ b/src/main/resources/views/platform/zhgh/benefit/userSelectionList/index.html @@ -1,4 +1,4 @@ - @@ -59,7 +59,7 @@ layout("/layouts/platform.html"){ - + @@ -192,7 +192,7 @@ layout("/layouts/platform.html"){ { prop: "loginName", label: "工号" }, { prop: "userName", label: "姓名" }, { prop: "sex", label: "性别", sortable: true }, - { prop: "personType", label: "教职工类别", sortable: true }, + { prop: "personType", label: "人员类型", sortable: true }, { prop: "userState", label: "在职状态", sortable: true }, { prop: "unionName", label: "所属工会", sortable: true }, { prop: "unitName", label: "所属单位", sortable: true }, @@ -258,3 +258,4 @@ layout("/layouts/platform.html"){ + diff --git a/src/main/resources/views/platform/zhgh/club/examine/common/examineInfo.js b/src/main/resources/views/platform/zhgh/club/examine/common/examineInfo.js index d7b94457..cf32b907 100644 --- a/src/main/resources/views/platform/zhgh/club/examine/common/examineInfo.js +++ b/src/main/resources/views/platform/zhgh/club/examine/common/examineInfo.js @@ -1,4 +1,4 @@ -const EXAMINE_INFO_COMPONENT = { +const EXAMINE_INFO_COMPONENT = { template: `
@@ -19,7 +19,7 @@ const EXAMINE_INFO_COMPONENT = {
社团成员变化情况
- + @@ -196,3 +196,4 @@ const EXAMINE_INFO_COMPONENT = { } ` } + diff --git a/src/main/resources/views/platform/zhgh/club/infoManage/exitManage/index.html b/src/main/resources/views/platform/zhgh/club/infoManage/exitManage/index.html index eb0994fd..5ab88f44 100644 --- a/src/main/resources/views/platform/zhgh/club/infoManage/exitManage/index.html +++ b/src/main/resources/views/platform/zhgh/club/infoManage/exitManage/index.html @@ -1,4 +1,4 @@ - @@ -16,7 +16,7 @@ layout("/layouts/platform.html"){ - + @@ -98,3 +98,4 @@ layout("/layouts/platform.html"){ + diff --git a/src/main/resources/views/platform/zhgh/club/infoManage/manage/clubInfoManage.js b/src/main/resources/views/platform/zhgh/club/infoManage/manage/clubInfoManage.js index 7630b591..9ce01b83 100644 --- a/src/main/resources/views/platform/zhgh/club/infoManage/manage/clubInfoManage.js +++ b/src/main/resources/views/platform/zhgh/club/infoManage/manage/clubInfoManage.js @@ -1,4 +1,4 @@ -const CLUB_INFO_MANAGE_TEMPLATE = { +const CLUB_INFO_MANAGE_TEMPLATE = { template: `
@@ -6,7 +6,7 @@ const CLUB_INFO_MANAGE_TEMPLATE = { - + @@ -353,3 +353,4 @@ const CLUB_INFO_MANAGE_TEMPLATE = { await this.pageData() } } + diff --git a/src/main/resources/views/platform/zhgh/dayofficework/fund/member/batchJoin/index.html b/src/main/resources/views/platform/zhgh/dayofficework/fund/member/batchJoin/index.html index 327267d6..37dd83db 100644 --- a/src/main/resources/views/platform/zhgh/dayofficework/fund/member/batchJoin/index.html +++ b/src/main/resources/views/platform/zhgh/dayofficework/fund/member/batchJoin/index.html @@ -35,14 +35,10 @@ layout("/layouts/platform.html"){ - - + - - - @@ -105,8 +101,7 @@ layout("/layouts/platform.html"){ { label: "性别", prop: "sex" }, { label: "出生年月", prop: "birthday" }, { label: "在职状态", prop: "userState", sortable: true }, - { label: "教职工类别", prop: "personType", sortable: true }, - { label: '编制类别', prop: 'preparedBy', sortable: true }, + { label: "人员类型", prop: "personType", sortable: true }, { label: "所属工会", prop: "unionName" }, { label: "所属单位", prop: "unitName" }, ], @@ -183,3 +178,4 @@ layout("/layouts/platform.html"){ + 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 71d31ac5..7e99325e 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 @@ -39,14 +39,10 @@ layout("/layouts/platform.html"){ - - + - - - @@ -113,8 +109,7 @@ layout("/layouts/platform.html"){ { label: "性别", prop: "sex" }, { label: "出生年月", prop: "birthday" }, { label: "在职状态", prop: "userState", sortable: true }, - { label: "教职工类别", prop: "personType", sortable: true }, - { label: '编制类别', prop: 'preparedBy', sortable: true }, + { label: "人员类型", prop: "personType", sortable: true }, { label: "所属工会", prop: "unionName" }, { label: "所属单位", prop: "unitName" }, { label: "加入时间", prop: "joinTime" }, @@ -219,3 +214,4 @@ layout("/layouts/platform.html"){ + diff --git a/src/main/resources/views/platform/zhgh/dayofficework/healthCheckup/projectMange/index.html b/src/main/resources/views/platform/zhgh/dayofficework/healthCheckup/projectMange/index.html index 1283eaae..25343df5 100644 --- a/src/main/resources/views/platform/zhgh/dayofficework/healthCheckup/projectMange/index.html +++ b/src/main/resources/views/platform/zhgh/dayofficework/healthCheckup/projectMange/index.html @@ -436,8 +436,7 @@ layout("/layouts/platform.html"){ {label: "年龄", value: "age"}, {label: "婚姻状况", value: "marriage"}, {label: "在职状态", value: "userState"}, - {label: "编制类别", value: "preparedBy"}, - {label: "教职工类别", value: "personType"}, + {label: "人员类型", value: "personType"}, ], conditionGroup: { logic: "AND", @@ -701,3 +700,4 @@ layout("/layouts/platform.html"){ + diff --git a/src/main/resources/views/platform/zhgh/dayofficework/integral/manage/index.html b/src/main/resources/views/platform/zhgh/dayofficework/integral/manage/index.html index 52baa0d4..f7239082 100644 --- a/src/main/resources/views/platform/zhgh/dayofficework/integral/manage/index.html +++ b/src/main/resources/views/platform/zhgh/dayofficework/integral/manage/index.html @@ -1,4 +1,4 @@ -
@@ -43,8 +43,8 @@ layout("/layouts/platform.html"){ - - + @@ -249,7 +249,7 @@ layout("/layouts/platform.html"){ {prop: 'username', label: '姓名', sortable: true}, {prop: 'sex', label: '性别'}, {prop: 'mobile', label: '联系电话'}, - {prop: 'personType', label: '教职工类别', sortable: true}, + {prop: 'personType', label: '人员类型', sortable: true}, {prop: 'userState', label: '在职状态', sortable: true}, {prop: 'unionName', label: '所属工会', sortable: true}, {prop: 'unitName', label: '所属单位', sortable: true}, @@ -460,3 +460,4 @@ layout("/layouts/platform.html"){ + diff --git a/src/main/resources/views/platform/zhgh/dayofficework/meeting/common/meetingInfo.js b/src/main/resources/views/platform/zhgh/dayofficework/meeting/common/meetingInfo.js index 8cc0636b..3b2405ce 100644 --- a/src/main/resources/views/platform/zhgh/dayofficework/meeting/common/meetingInfo.js +++ b/src/main/resources/views/platform/zhgh/dayofficework/meeting/common/meetingInfo.js @@ -31,8 +31,7 @@ const meetingInfo = { - - + @@ -68,3 +67,4 @@ const meetingInfo = { } ` } + diff --git a/src/main/resources/views/platform/zhgh/dayofficework/meeting/manage/basicForm.js b/src/main/resources/views/platform/zhgh/dayofficework/meeting/manage/basicForm.js index 79f9352d..e80dee10 100644 --- a/src/main/resources/views/platform/zhgh/dayofficework/meeting/manage/basicForm.js +++ b/src/main/resources/views/platform/zhgh/dayofficework/meeting/manage/basicForm.js @@ -114,8 +114,7 @@ const basicForm = { - - + @@ -178,8 +177,7 @@ const basicForm = { - - + @@ -394,3 +392,4 @@ const basicForm = { ` } + diff --git a/src/main/resources/views/platform/zhgh/staffbenefit/difficulthelp/apply/form.html b/src/main/resources/views/platform/zhgh/staffbenefit/difficulthelp/apply/form.html index e2a24d15..b504b0e5 100644 --- a/src/main/resources/views/platform/zhgh/staffbenefit/difficulthelp/apply/form.html +++ b/src/main/resources/views/platform/zhgh/staffbenefit/difficulthelp/apply/form.html @@ -44,7 +44,7 @@ - + diff --git a/src/main/resources/views/platform/zhgh/staffbenefit/maternityLeave/apply/index.html b/src/main/resources/views/platform/zhgh/staffbenefit/maternityLeave/apply/index.html index 6724776c..8f4748f0 100644 --- a/src/main/resources/views/platform/zhgh/staffbenefit/maternityLeave/apply/index.html +++ b/src/main/resources/views/platform/zhgh/staffbenefit/maternityLeave/apply/index.html @@ -215,13 +215,13 @@ layout("/layouts/platform.html"){ return total; }, - // 是否为男性 + // 是否为男 isMale() { - return this.formData.sex === '男性' || this.formData.sex === '男'; + return this.formData.sex === '男'; }, - // 是否为女性 + // 是否为女 isFemale() { - return this.formData.sex === '女性' || this.formData.sex === '女'; + return this.formData.sex === '女'; }, }, watch: { @@ -237,7 +237,7 @@ layout("/layouts/platform.html"){ // 监听性别变化，设置默认值 isMale(newVal) { if (newVal) { - // 男性默认设置 + // 男默认设置 this.$set(this.formData, 'loverSex', '女'); this.$set(this.formData, 'withLeave', 15); this.$set(this.formData, 'parentalLeave', 10); @@ -245,7 +245,7 @@ layout("/layouts/platform.html"){ }, isFemale(newVal) { if (newVal) { - // 女性默认设置 + // 女默认设置 this.$set(this.formData, 'loverSex', '男'); this.$set(this.formData, 'maternityLeave', 98); this.$set(this.formData, 'extendLeave', 60); @@ -255,7 +255,7 @@ layout("/layouts/platform.html"){ methods: { // 计算休假时间止 calculateEndTime() { - // 如果是男性，则不自动计算结束时间 + // 如果是男，则不自动计算结束时间 if (this.isMale) { return; } @@ -372,19 +372,19 @@ layout("/layouts/platform.html"){ } // 根据性别设置默认值 if (this.isMale) { - // 男性默认设置 + // 男默认设置 this.$set(this.formData, 'loverSex', '女'); this.$set(this.formData, 'withLeave', 15); this.$set(this.formData, 'parentalLeave', 10); - // 男性默认产假和延长假为0，因为男性不休产假 + // 男默认产假和延长假为0，因为男不休产假 this.$set(this.formData, 'maternityLeave', 0); this.$set(this.formData, 'extendLeave', 0); } else if (this.isFemale) { - // 女性默认设置 + // 女默认设置 this.$set(this.formData, 'loverSex', '男'); this.$set(this.formData, 'maternityLeave', 98); this.$set(this.formData, 'extendLeave', 60); - // 女性默认陪产假和育儿假为0 + // 女默认陪产假和育儿假为0 this.$set(this.formData, 'withLeave', 0); this.$set(this.formData, 'parentalLeave', 0); } diff --git a/src/main/resources/views/platform/zhgh/staffbenefit/maternityLeave/common/info.js b/src/main/resources/views/platform/zhgh/staffbenefit/maternityLeave/common/info.js index fd48b9db..4c092b4f 100644 --- a/src/main/resources/views/platform/zhgh/staffbenefit/maternityLeave/common/info.js +++ b/src/main/resources/views/platform/zhgh/staffbenefit/maternityLeave/common/info.js @@ -21,22 +21,22 @@ const maternityLeaveInfo = { - + {{viewData.withLeave}} - + {{viewData.parentalLeave}} - + {{viewData.maternityLeave}} - + {{viewData.extendLeave}} - + {{viewData.birthsLeave}} - + {{viewData.difficultLeave}} {{viewData.winterLeave}} diff --git a/src/main/resources/views/platform/zhgh/staffmanage/member/apply/branchunionapproval/index.html b/src/main/resources/views/platform/zhgh/staffmanage/member/apply/branchunionapproval/index.html index fcd83796..d3b4563f 100644 --- a/src/main/resources/views/platform/zhgh/staffmanage/member/apply/branchunionapproval/index.html +++ b/src/main/resources/views/platform/zhgh/staffmanage/member/apply/branchunionapproval/index.html @@ -1,4 +1,4 @@ -
@@ -102,7 +102,7 @@ layout("/layouts/platform.html"){ { prop: "loginName", label: "工号", sortable: true }, { prop: "userName", label: "姓名", sortable: true }, { prop: "userState", label: "在职状态", sortable: true }, - // { prop: "personType", label: "教职工类别", sortable: true }, + // { prop: "personType", label: "人员类型", sortable: true }, // { prop: "preparedBy", label: "编制类别", sortable: true }, { prop: "unionName", label: "所属工会", sortable: true }, { prop: "unitName", label: "所属单位", sortable: true }, @@ -194,3 +194,4 @@ layout("/layouts/platform.html"){ + diff --git a/src/main/resources/views/platform/zhgh/staffmanage/member/apply/common/commonQuery.js b/src/main/resources/views/platform/zhgh/staffmanage/member/apply/common/commonQuery.js index da81b45e..586cb59c 100644 --- a/src/main/resources/views/platform/zhgh/staffmanage/member/apply/common/commonQuery.js +++ b/src/main/resources/views/platform/zhgh/staffmanage/member/apply/common/commonQuery.js @@ -1,4 +1,4 @@ -const COMMON_QUERY = { +const COMMON_QUERY = { template: /*language=HTML*/ ` @@ -27,8 +27,8 @@ const COMMON_QUERY = { - - + @@ -99,3 +99,4 @@ const COMMON_QUERY = { this.initData() } } + diff --git a/src/main/resources/views/platform/zhgh/staffmanage/member/apply/common/info.js b/src/main/resources/views/platform/zhgh/staffmanage/member/apply/common/info.js index 653ebb8e..a5b34ce3 100644 --- a/src/main/resources/views/platform/zhgh/staffmanage/member/apply/common/info.js +++ b/src/main/resources/views/platform/zhgh/staffmanage/member/apply/common/info.js @@ -27,8 +27,7 @@ const INFO = { {{ viewData.userState }} - - {{ viewData.preparedBy }} + {{ viewData.marriage }} {{ viewData.arrivalAtSchoolDate }} @@ -147,3 +146,4 @@ const INFO = { } } } + diff --git a/src/main/resources/views/platform/zhgh/staffmanage/member/apply/common/memberApplyAuditInfo.js b/src/main/resources/views/platform/zhgh/staffmanage/member/apply/common/memberApplyAuditInfo.js index 3f316c99..46d8c947 100644 --- a/src/main/resources/views/platform/zhgh/staffmanage/member/apply/common/memberApplyAuditInfo.js +++ b/src/main/resources/views/platform/zhgh/staffmanage/member/apply/common/memberApplyAuditInfo.js @@ -1,4 +1,4 @@ -const MEMBER_APPLY_AUDIT_INFO = { +const MEMBER_APPLY_AUDIT_INFO = { template: /*language=HTML*/ `
@@ -25,7 +25,7 @@ const MEMBER_APPLY_AUDIT_INFO = { {{ viewData.email }} {{ viewData.userState }} - {{ viewData.personType }} + {{ viewData.personType }} @@ -125,3 +125,4 @@ const MEMBER_APPLY_AUDIT_INFO = { } } } + diff --git a/src/main/resources/views/platform/zhgh/staffmanage/member/apply/mine/index.html b/src/main/resources/views/platform/zhgh/staffmanage/member/apply/mine/index.html index c15b5a63..02450bbb 100644 --- a/src/main/resources/views/platform/zhgh/staffmanage/member/apply/mine/index.html +++ b/src/main/resources/views/platform/zhgh/staffmanage/member/apply/mine/index.html @@ -1,4 +1,4 @@ -
@@ -85,7 +85,7 @@ layout("/layouts/platform.html"){ { prop: "loginName", label: "工号", sortable: true }, { prop: "userName", label: "姓名", sortable: true }, { prop: "userState", label: "在职状态", sortable: true }, - // { prop: "personType", label: "教职工类别", sortable: true }, + // { prop: "personType", label: "人员类型", sortable: true }, // { prop: "preparedBy", label: "编制类别", sortable: true }, { prop: "unionName", label: "所属工会", sortable: true }, { prop: "unitName", label: "所属单位", sortable: true }, @@ -161,3 +161,4 @@ layout("/layouts/platform.html"){ + diff --git a/src/main/resources/views/platform/zhgh/staffmanage/member/apply/schoolunionapproval/index.html b/src/main/resources/views/platform/zhgh/staffmanage/member/apply/schoolunionapproval/index.html index f8db9ec9..876d9d4b 100644 --- a/src/main/resources/views/platform/zhgh/staffmanage/member/apply/schoolunionapproval/index.html +++ b/src/main/resources/views/platform/zhgh/staffmanage/member/apply/schoolunionapproval/index.html @@ -1,4 +1,4 @@ -
@@ -120,7 +120,7 @@ layout("/layouts/platform.html"){ { prop: "loginName", label: "工号", sortable: true }, { prop: "userName", label: "姓名", sortable: true }, { prop: "userState", label: "在职状态", sortable: true }, - { prop: "personType", label: "教职工类别", sortable: true }, + { prop: "personType", label: "人员类型", sortable: true }, // { prop: "preparedBy", label: "编制类别", sortable: true }, { prop: "unionName", label: "所属工会", sortable: true }, { prop: "unitName", label: "所属单位", sortable: true }, @@ -225,3 +225,4 @@ layout("/layouts/platform.html"){ + diff --git a/src/main/resources/views/platform/zhgh/staffmanage/member/apply/submit/form.html b/src/main/resources/views/platform/zhgh/staffmanage/member/apply/submit/form.html index fc190816..0c7ad0b1 100644 --- a/src/main/resources/views/platform/zhgh/staffmanage/member/apply/submit/form.html +++ b/src/main/resources/views/platform/zhgh/staffmanage/member/apply/submit/form.html @@ -1,4 +1,4 @@ -
+
@@ -90,7 +90,7 @@ disabled style="width: 100%"> - + @@ -464,3 +464,4 @@ } }) + diff --git a/src/main/resources/views/platform/zhgh/staffmanage/member/apply/submit/index.html b/src/main/resources/views/platform/zhgh/staffmanage/member/apply/submit/index.html index 59935dc6..9e0bbe7f 100644 --- a/src/main/resources/views/platform/zhgh/staffmanage/member/apply/submit/index.html +++ b/src/main/resources/views/platform/zhgh/staffmanage/member/apply/submit/index.html @@ -1,4 +1,4 @@ -
@@ -96,7 +96,7 @@ layout("/layouts/platform.html"){ disabled style="width: 100%"> - + diff --git a/src/main/resources/views/platform/zhgh/staffmanage/member/apply/uniongroupapproval/index.html b/src/main/resources/views/platform/zhgh/staffmanage/member/apply/uniongroupapproval/index.html index 67c7e7b9..a7d5edbb 100644 --- a/src/main/resources/views/platform/zhgh/staffmanage/member/apply/uniongroupapproval/index.html +++ b/src/main/resources/views/platform/zhgh/staffmanage/member/apply/uniongroupapproval/index.html @@ -104,8 +104,7 @@ layout("/layouts/platform.html"){ { prop: "loginName", label: "工号", sortable: true }, { prop: "userName", label: "姓名", sortable: true }, { prop: "userState", label: "在职状态", sortable: true }, - { prop: "personType", label: "教职工类别", sortable: true }, - { prop: "preparedBy", label: "编制类别", sortable: true }, + { prop: "personType", label: "人员类型", sortable: true }, { prop: "unionName", label: "所属工会", sortable: true }, { prop: "unitName", label: "所属单位", sortable: true }, { prop: "sign", label: "签字" }, @@ -196,3 +195,4 @@ layout("/layouts/platform.html"){ + diff --git a/src/main/resources/views/platform/zhgh/staffmanage/member/apply/view/index.html b/src/main/resources/views/platform/zhgh/staffmanage/member/apply/view/index.html index 8f8b6c57..7bb2f66c 100644 --- a/src/main/resources/views/platform/zhgh/staffmanage/member/apply/view/index.html +++ b/src/main/resources/views/platform/zhgh/staffmanage/member/apply/view/index.html @@ -1,4 +1,4 @@ -
+
{{ viewData.loginname }} {{ viewData.username }} @@ -21,7 +21,7 @@ {{ viewData.email }} {{ viewData.userState }} - {{ viewData.personType }} + {{ viewData.personType }} @@ -142,3 +142,4 @@ width: 15%; } + diff --git a/src/main/resources/views/platform/zhgh/staffmanage/member/branch/verification/check/index.html b/src/main/resources/views/platform/zhgh/staffmanage/member/branch/verification/check/index.html index e6c7cbcc..d9ac057d 100644 --- a/src/main/resources/views/platform/zhgh/staffmanage/member/branch/verification/check/index.html +++ b/src/main/resources/views/platform/zhgh/staffmanage/member/branch/verification/check/index.html @@ -42,11 +42,8 @@ layout("/layouts/platform.html"){ - - - - - + + @@ -246,7 +243,7 @@ layout("/layouts/platform.html"){ { prop: "sex", label: "性别", sortable: true, width: "100px" }, { prop: "userState", label: "在职状态", sortable: true }, // {prop: "preparedBy", label: "编制类别", sortable: true}, - // {prop: 'personType', label: '教职工类别', sortable: true}, + // {prop: 'personType', label: '人员类型', sortable: true}, { prop: "unionName", label: "所属工会", sortable: true }, { prop: "unitName", label: "所属单位", sortable: true }, { prop: "isChanged", label: "变更状态", sortable: true }, @@ -549,3 +546,4 @@ layout("/layouts/platform.html"){ + diff --git a/src/main/resources/views/platform/zhgh/staffmanage/member/change/branchunionaudit/index.html b/src/main/resources/views/platform/zhgh/staffmanage/member/change/branchunionaudit/index.html index 641ab471..34c8f7b3 100644 --- a/src/main/resources/views/platform/zhgh/staffmanage/member/change/branchunionaudit/index.html +++ b/src/main/resources/views/platform/zhgh/staffmanage/member/change/branchunionaudit/index.html @@ -1,4 +1,4 @@ - @@ -94,7 +94,7 @@ layout("/layouts/platform.html"){ { prop: "userName", label: "姓名", sortable: true }, { prop: "sex", label: "性别", sortable: true }, { prop: "userState", label: "在职状态", sortable: true }, - { prop: "personType", label: "教职工类别", sortable: true }, + { prop: "personType", label: "人员类型", sortable: true }, // { prop: 'preparedBy', label: '编制类别', sortable: true }, { prop: "unionName", label: "所属工会", sortable: true }, { prop: "unitName", label: "所属单位", sortable: true }, @@ -204,3 +204,4 @@ layout("/layouts/platform.html"){ + diff --git a/src/main/resources/views/platform/zhgh/staffmanage/member/change/common/commonQuery.js b/src/main/resources/views/platform/zhgh/staffmanage/member/change/common/commonQuery.js index 21269146..b52712c9 100644 --- a/src/main/resources/views/platform/zhgh/staffmanage/member/change/common/commonQuery.js +++ b/src/main/resources/views/platform/zhgh/staffmanage/member/change/common/commonQuery.js @@ -1,4 +1,4 @@ -const COMMON_QUERY = { +const COMMON_QUERY = { template: /*language=HTML*/ ` @@ -22,8 +22,8 @@ const COMMON_QUERY = { - - + @@ -97,3 +97,4 @@ const COMMON_QUERY = { this.initData() } } + diff --git a/src/main/resources/views/platform/zhgh/staffmanage/member/change/common/info.js b/src/main/resources/views/platform/zhgh/staffmanage/member/change/common/info.js index d258e01b..ac36ca6f 100644 --- a/src/main/resources/views/platform/zhgh/staffmanage/member/change/common/info.js +++ b/src/main/resources/views/platform/zhgh/staffmanage/member/change/common/info.js @@ -30,8 +30,7 @@ const INFO = { {{ viewData.email }} {{ viewData.userState }} - {{ viewData.personType }} - {{ viewData.preparedBy }} + {{ viewData.personType }}