会员
This commit is contained in:
Paidax
@@ -266,7 +266,7 @@ public class MemberCommonController {
|
|||||||
COLUMN_COMMENT
|
COLUMN_COMMENT
|
||||||
FROM INFORMATION_SCHEMA.COLUMNS
|
FROM INFORMATION_SCHEMA.COLUMNS
|
||||||
WHERE TABLE_NAME = 'sys_user'
|
WHERE TABLE_NAME = 'sys_user'
|
||||||
AND TABLE_SCHEMA = 'union_cpu'
|
AND TABLE_SCHEMA = 'zhgh_hmc'
|
||||||
""");
|
""");
|
||||||
List<NutMap> userTableColumnInfos = sysUserService.listMap(userColumnSql);
|
List<NutMap> userTableColumnInfos = sysUserService.listMap(userColumnSql);
|
||||||
|
|
||||||
|
|||||||
@@ -88,22 +88,22 @@
|
|||||||
|
|
||||||
<div v-else-if="welfare_member&&['2'].includes(formData.type)">
|
<div v-else-if="welfare_member&&['2'].includes(formData.type)">
|
||||||
<el-row :gutter="20">
|
<el-row :gutter="20">
|
||||||
<el-col :span="12">
|
<el-col :span="12">
|
||||||
<el-form-item prop="updateWelfareMember" label="福利会员">
|
<el-form-item prop="updateWelfareMember" label="福利会员">
|
||||||
<el-radio-group v-model="formData.updateWelfareMember" size="small">
|
<el-radio-group v-model="formData.updateWelfareMember" size="small">
|
||||||
<el-radio :label="true" border>享受福利</el-radio>
|
<el-radio :label="true" border>享受福利</el-radio>
|
||||||
<el-radio :label="false" border>不享受福利</el-radio>
|
<el-radio :label="false" border>不享受福利</el-radio>
|
||||||
</el-radio-group>
|
</el-radio-group>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="12">
|
<el-col :span="12">
|
||||||
<el-form-item prop="updateMember" label="工会会员">
|
<el-form-item prop="updateMember" label="工会会员">
|
||||||
<el-radio-group v-model="formData.updateMember" size="small">
|
<el-radio-group v-model="formData.updateMember" size="small">
|
||||||
<el-radio :label="true" border>成为会员</el-radio>
|
<el-radio :label="true" border>成为会员</el-radio>
|
||||||
<el-radio :label="false" border>不成为会员</el-radio>
|
<el-radio :label="false" border>不成为会员</el-radio>
|
||||||
</el-radio-group>
|
</el-radio-group>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
</el-row>
|
</el-row>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
@@ -118,39 +118,52 @@
|
|||||||
|
|
||||||
<div v-else-if="welfare_member&&['3','4','5','6','8'].includes(formData.type)">
|
<div v-else-if="welfare_member&&['3','4','5','6','8'].includes(formData.type)">
|
||||||
<el-row :gutter="20">
|
<el-row :gutter="20">
|
||||||
<el-col :span="12">
|
<el-col :span="12">
|
||||||
<el-form-item prop="updateWelfareMember" label="福利会员">
|
<el-form-item prop="updateWelfareMember" label="福利会员">
|
||||||
<el-radio-group v-model="formData.updateWelfareMember" size="small">
|
<el-radio-group v-model="formData.updateWelfareMember" size="small">
|
||||||
<el-radio :label="true" border>保留享受福利</el-radio>
|
<el-radio :label="true" border>保留享受福利</el-radio>
|
||||||
<el-radio :label="false" border>取消享受福利</el-radio>
|
<el-radio :label="false" border>取消享受福利</el-radio>
|
||||||
</el-radio-group>
|
</el-radio-group>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="12">
|
<el-col :span="12">
|
||||||
<el-form-item prop="updateMember" label="工会会员">
|
<el-form-item prop="updateMember" label="工会会员">
|
||||||
<el-radio-group v-model="formData.updateMember" size="small">
|
<el-radio-group v-model="formData.updateMember" size="small">
|
||||||
<el-radio :label="true" border>保留会员资格</el-radio>
|
<el-radio :label="true" border>保留会员资格</el-radio>
|
||||||
<el-radio :label="false" border>取消会员资格</el-radio>
|
<el-radio :label="false" border>取消会员资格</el-radio>
|
||||||
</el-radio-group>
|
</el-radio-group>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
</el-row>
|
</el-row>
|
||||||
|
|
||||||
<template v-if="welfare_member&&['3','4','5','6','8'].includes(formData.type)">
|
<el-row :gutter="20">
|
||||||
|
<el-col :span="12">
|
||||||
|
<el-form-item prop="userState" label="原在职状态">
|
||||||
|
<el-input v-model="formData.userState" readonly placeholder="原在职状态"></el-input>
|
||||||
|
</el-form-item>
|
||||||
|
</el-col>
|
||||||
|
<el-col :span="12">
|
||||||
|
<el-form-item prop="updateUserState" label="是否改变在职状态" style="width: 100%">
|
||||||
|
<dict-select v-model="formData.changeUserState" style="width: 100%" clearable placeholder="是否改变在职状态"
|
||||||
|
code="userState"></dict-select>
|
||||||
|
</el-form-item>
|
||||||
|
</el-col>
|
||||||
|
</el-row>
|
||||||
|
|
||||||
</template>
|
<el-row :gutter="20">
|
||||||
|
<el-col :span="12">
|
||||||
<el-form-item prop="updateUserState" label="是否改变在职状态" style="width: 100%">
|
<el-form-item prop="personType" label="原人员类型">
|
||||||
<dict-select v-model="formData.changeUserState" style="width: 100%" clearable placeholder="变更类型"
|
<el-input v-model="formData.personType" readonly placeholder="原人员类型"></el-input>
|
||||||
code="userState"></dict-select>
|
</el-form-item>
|
||||||
</el-form-item>
|
</el-col>
|
||||||
|
<el-col :span="12">
|
||||||
<el-form-item prop="updateUserState" label="是否改变人员类型" style="width: 100%"
|
<el-form-item prop="updateUserState" label="是否改变人员类型" style="width: 100%">
|
||||||
v-if="welfare_member&&['3','4','5','6','8'].includes(formData.type)">
|
<dict-select v-model="formData.changePersonType" style="width: 100%" clearable
|
||||||
<dict-select v-model="formData.changePersonType" style="width: 100%" clearable
|
placeholder="是否改变人员类型"
|
||||||
placeholder="人员类型"
|
code="UserType"></dict-select>
|
||||||
code="UserType"></dict-select>
|
</el-form-item>
|
||||||
</el-form-item>
|
</el-col>
|
||||||
|
</el-row>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|
||||||
@@ -249,11 +262,12 @@ module.exports = {
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
typeChange() {
|
typeChange(val) {
|
||||||
|
console.log(val)
|
||||||
this.$set(this.formData, "updateWelfareMember", ['2','7'].includes(this.formData.type))
|
this.$set(this.formData, "updateWelfareMember", ['2','7'].includes(this.formData.type))
|
||||||
this.$set(this.formData, "updateWelfareMember", ['2', '3', '4', '5', '6', '8'].includes(this.formData.type))
|
this.$set(this.formData, "updateWelfareMember", !['3', '4', '5', '6', '8'].includes(this.formData.type))
|
||||||
this.$set(this.formData, "updateMember", ['2', '3', '4', '5', '6', '8'].includes(this.formData.type))
|
|
||||||
this.$set(this.formData, "updateMember", ['2'].includes(this.formData.type))
|
this.$set(this.formData, "updateMember", ['2'].includes(this.formData.type))
|
||||||
|
this.$set(this.formData, "updateMember", !['3', '4', '5', '6', '8'].includes(this.formData.type))
|
||||||
},
|
},
|
||||||
async doSubmit() {
|
async doSubmit() {
|
||||||
this.$refs["form"].validate((valid) => {
|
this.$refs["form"].validate((valid) => {
|
||||||
|
|||||||
@@ -326,7 +326,7 @@
|
|||||||
|
|
||||||
<div v-else>
|
<div v-else>
|
||||||
<h3 style="text-align: center; letter-spacing: 6px">工会会员登记表</h3>
|
<h3 style="text-align: center; letter-spacing: 6px">工会会员登记表</h3>
|
||||||
<div style="text-align: right; letter-spacing: 2px">填表日期：{{ moment(formData.applyTime).format("YYYY年MM月DD日") }}</div>
|
<!-- <div style="text-align: right; letter-spacing: 2px">填表日期：{{ moment(formData.applyTime).format("YYYY年MM月DD日") }}</div>-->
|
||||||
|
|
||||||
<el-descriptions :column="3" border class="descriptions-form">
|
<el-descriptions :column="3" border class="descriptions-form">
|
||||||
<el-descriptions-item label="姓名">{{ formData.username }}</el-descriptions-item>
|
<el-descriptions-item label="姓名">{{ formData.username }}</el-descriptions-item>
|
||||||
|
|||||||
Reference in New Issue
Block a user