bug整改
This commit is contained in:
=
@@ -0,0 +1,240 @@
|
||||
/**
|
||||
*Desc:
|
||||
*Create by: jug
|
||||
*Create time:2023/11/20/16:49
|
||||
*/
|
||||
<template>
|
||||
<div>
|
||||
<el-form :model="formData" label-width="0" ref="form" class="applyForm">
|
||||
<border-table>
|
||||
<table>
|
||||
<tr>
|
||||
<th>姓名</th>
|
||||
<td>
|
||||
<el-form-item prop="username" :rules="[{required:true,message:'必填',trigger:['change','blur']}]">
|
||||
<el-input v-model="formData.username"></el-input>
|
||||
</el-form-item>
|
||||
</td>
|
||||
<th>工号</th>
|
||||
<td>
|
||||
<el-form-item prop="loginname" :rules="[{required:true,message:'必填',trigger:['change','blur']}]">
|
||||
<el-input v-model="formData.loginname"></el-input>
|
||||
</el-form-item>
|
||||
</td>
|
||||
<th>性别</th>
|
||||
<td>
|
||||
<el-form-item prop="sex"
|
||||
:rules="[{required:true,message:'必填',trigger:['change','blur']}]">
|
||||
<el-radio-group v-model="formData.sex" size="mini">
|
||||
<el-radio label="男" border>男</el-radio>
|
||||
<el-radio label="女" border>女</el-radio>
|
||||
</el-radio-group>
|
||||
</el-form-item>
|
||||
</td>
|
||||
<th>民族</th>
|
||||
<td>
|
||||
<el-form-item prop="nation">
|
||||
<el-select v-model="formData.nation">
|
||||
<el-option v-for="item in nation" :key="item" :label="item" :value="item"></el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th>出生年月</th>
|
||||
<td>
|
||||
<el-form-item prop="birthday">
|
||||
<el-date-picker v-model="formData.birthday" value-format="yyyy-MM-dd"></el-date-picker>
|
||||
</el-form-item>
|
||||
</td>
|
||||
<th>入党时间</th>
|
||||
<td>
|
||||
<el-form-item prop="partyJoiningTime">
|
||||
<el-date-picker v-model="formData.partyJoiningTime" value-format="yyyy-MM-dd"></el-date-picker>
|
||||
</el-form-item>
|
||||
</td>
|
||||
<th>工作时间</th>
|
||||
<td>
|
||||
<el-form-item prop="workStartDate">
|
||||
<el-date-picker v-model="formData.workStartDate" value-format="yyyy-MM-dd"></el-date-picker>
|
||||
</el-form-item>
|
||||
</td>
|
||||
<th>进校时间</th>
|
||||
<td>
|
||||
<el-form-item prop="schoolTime">
|
||||
<el-date-picker v-model="formData.schoolTime" value-format="yyyy-MM-dd"></el-date-picker>
|
||||
</el-form-item>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th>文化程度</th>
|
||||
<td>
|
||||
<el-form-item prop="schoolTime">
|
||||
<dict-select v-model="formData.personType" clearable placeholder="文化程度"
|
||||
code="Education"></dict-select>
|
||||
</el-form-item>
|
||||
</td>
|
||||
<th>籍贯</th>
|
||||
<td>
|
||||
<el-form-item prop="hometown">
|
||||
<el-input v-model="formData.hometown" maxlength="20" clearable></el-input>
|
||||
</el-form-item>
|
||||
</td>
|
||||
<th>职称</th>
|
||||
<td>
|
||||
<el-form-item prop="jobTitle">
|
||||
<el-input v-model="formData.jobTitle" maxlength="20" clearable></el-input>
|
||||
</el-form-item>
|
||||
</td>
|
||||
<th>待遇</th>
|
||||
<td>
|
||||
<el-form-item prop="treatment">
|
||||
<el-input v-model="formData.treatment" maxlength="20" clearable></el-input>
|
||||
</el-form-item>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th>退休时间</th>
|
||||
<td>
|
||||
<el-form-item prop="retirementTime">
|
||||
<el-date-picker v-model="formData.retirementTime" value-format="yyyy-MM-dd"></el-date-picker>
|
||||
</el-form-item>
|
||||
</td>
|
||||
<th>身份证号码</th>
|
||||
<td>
|
||||
<el-form-item prop="idcard">
|
||||
<el-input v-model="formData.idcard" clearable></el-input>
|
||||
</el-form-item>
|
||||
</td>
|
||||
<th>医疗证号</th>
|
||||
<td>
|
||||
<el-form-item prop="medicalCertificateNumber">
|
||||
<el-input v-model="formData.medicalCertificateNumber" clearable></el-input>
|
||||
</el-form-item>
|
||||
</td>
|
||||
<th>（有/无）基础病</th>
|
||||
<td>
|
||||
<el-form-item prop="basicDiseaseInfo">
|
||||
<el-input v-model="formData.basicDiseaseInfo" clearable></el-input>
|
||||
</el-form-item>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th>原部门</th>
|
||||
<td>
|
||||
<el-form-item prop="originalDepartment">
|
||||
<el-input v-model="formData.originalDepartment" clearable></el-input>
|
||||
</el-form-item>
|
||||
</td>
|
||||
<th>家属姓名</th>
|
||||
<td>
|
||||
<el-form-item prop="familyName">
|
||||
<el-input v-model="formData.familyName" clearable></el-input>
|
||||
</el-form-item>
|
||||
</td>
|
||||
<th>家庭住址</th>
|
||||
<td :colspan="3">
|
||||
<el-form-item prop="homeAddress">
|
||||
<el-input v-model="formData.homeAddress" clearable></el-input>
|
||||
</el-form-item>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th>联系方式</th>
|
||||
<td>
|
||||
<el-form-item prop="mobile">
|
||||
<el-input v-model="formData.mobile" clearable></el-input>
|
||||
</el-form-item>
|
||||
</td>
|
||||
<th>退休性质</th>
|
||||
<td >
|
||||
<el-form-item prop="retireNature">
|
||||
<el-select v-model="formData.retireNature" clearable>
|
||||
<el-option label="离休" value="离休"></el-option>
|
||||
<el-option label="退休" value="退休"></el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</td>
|
||||
|
||||
<th>是否去世</th>
|
||||
<td :colspan="3">
|
||||
<!-- :rules="[{required:true,message:'必填',trigger:['change','blur']}]" -->
|
||||
<el-form-item prop="isDead">
|
||||
<el-radio-group v-model="formData.isDead" size="mini">
|
||||
<el-radio label="true" border>是</el-radio>
|
||||
<el-radio label="false" border>否</el-radio>
|
||||
</el-radio-group>
|
||||
</el-form-item>
|
||||
</td>
|
||||
|
||||
</tr>
|
||||
<tr>
|
||||
<th>备注</th>
|
||||
<td :colspan="7">
|
||||
<el-form-item prop="retireNotes">
|
||||
<el-input type="textarea" :rows="3" v-model="formData.retireNotes" clearable></el-input>
|
||||
</el-form-item>
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
</border-table>
|
||||
</el-form>
|
||||
<el-row :gutter="10" class="mt10" type="flex" justify="end">
|
||||
<el-button @click="doSubmit" type="primary">确定</el-button>
|
||||
</el-row>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
module.exports = {
|
||||
name: "userEdit",
|
||||
data() {
|
||||
return {
|
||||
userId: null
|
||||
}
|
||||
},
|
||||
components: {
|
||||
'dict-select': httpVueLoader('/components/plugins/DictSelect.vue?v=1.0.0'),
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
formData: {},
|
||||
nation: nation
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
doSubmit() {
|
||||
this.$refs.form.validate(async valid => {
|
||||
if (valid) {
|
||||
const {data, code, msg} = await $.post(loc() + '/doSubmit', {
|
||||
user: JSON.stringify(this.formData),
|
||||
userId: this.userId
|
||||
})
|
||||
if (code === 0) {
|
||||
this.$message.success(msg)
|
||||
this.$emit('finish')
|
||||
} else {
|
||||
this.$message.warning(msg)
|
||||
}
|
||||
}
|
||||
})
|
||||
},
|
||||
reset() {
|
||||
this.userId = null
|
||||
this.formData = {}
|
||||
},
|
||||
async getInfo(id) {
|
||||
this.userId = id
|
||||
const {data} = await $.get(loc() + '/getInfo', {id: this.userId})
|
||||
this.formData = data
|
||||
}
|
||||
},
|
||||
created() {
|
||||
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
<style scoped>
|
||||
|
||||
</style>
|
||||
@@ -4,26 +4,112 @@
|
||||
*Create time:2023/7/25/9:14
|
||||
*/
|
||||
<template>
|
||||
<div>
|
||||
<el-descriptions :column="3" border>
|
||||
<el-descriptions-item label="姓名">{{ userData.username }}</el-descriptions-item>
|
||||
<el-descriptions-item label="工号">{{ userData.loginname }}</el-descriptions-item>
|
||||
<el-descriptions-item label="性别">{{ userData.sex }}</el-descriptions-item>
|
||||
<el-descriptions-item label="退休小组">{{ userData.retiredGroupName }}</el-descriptions-item>
|
||||
<el-descriptions-item label="政治面貌">{{ userData.political }}</el-descriptions-item>
|
||||
<el-descriptions-item label="退休党支部">{{ userData.retiredPartyBranchName }}</el-descriptions-item>
|
||||
<el-descriptions-item label="所在科室">{{ userData.threeUnitName }}</el-descriptions-item>
|
||||
<el-descriptions-item label="所在单位">{{ userData.unitname }}</el-descriptions-item>
|
||||
<el-descriptions-item label="所在工会">{{ userData.unionname }}</el-descriptions-item>
|
||||
<el-descriptions-item label="出生日期">{{ userData.birthday }}</el-descriptions-item>
|
||||
<el-descriptions-item label="民族">{{ userData.nation }}</el-descriptions-item>
|
||||
<el-descriptions-item label="学历">{{ userData.education }}</el-descriptions-item>
|
||||
<el-descriptions-item label="在职状态">{{ userData.userState }}</el-descriptions-item>
|
||||
<el-descriptions-item label="人员类型">{{ userData.personType }}</el-descriptions-item>
|
||||
<el-descriptions-item label="联系方式">{{ userData.mobile }}</el-descriptions-item>
|
||||
<el-descriptions-item label="身份证号码">{{ userData.idcard }}</el-descriptions-item>
|
||||
</el-descriptions>
|
||||
</div>
|
||||
<border-table>
|
||||
<table>
|
||||
<tr>
|
||||
<th>姓名</th>
|
||||
<td>
|
||||
{{ formData.username }}
|
||||
</td>
|
||||
<th>工号</th>
|
||||
<td>
|
||||
{{ formData.loginname }}
|
||||
</td>
|
||||
<th>性别</th>
|
||||
<td>
|
||||
{{ formData.sex }}
|
||||
</td>
|
||||
<th>民族</th>
|
||||
<td>
|
||||
{{ formData.nation }}
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th>出生年月</th>
|
||||
<td>
|
||||
{{ formData.birthday }}
|
||||
</td>
|
||||
<th>入党时间</th>
|
||||
<td>
|
||||
{{ formData.partyJoiningTime | formatterDate }}
|
||||
</td>
|
||||
<th>工作时间</th>
|
||||
<td>
|
||||
{{ formData.workStartDate | formatterDate }}
|
||||
</td>
|
||||
<th>进校时间</th>
|
||||
<td>
|
||||
{{ formData.schoolTime | formatterDate }}
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th>文化程度</th>
|
||||
<td>
|
||||
{{ formData.personType }}
|
||||
</td>
|
||||
<th>籍贯</th>
|
||||
<td>
|
||||
{{ formData.hometown }}
|
||||
</td>
|
||||
<th>职称</th>
|
||||
<td>
|
||||
{{ formData.jobTitle }}
|
||||
</td>
|
||||
<th>待遇</th>
|
||||
<td>
|
||||
{{ formData.treatment }}
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th>退休时间</th>
|
||||
<td>
|
||||
{{ formData.retirementTime | formatterDate }}
|
||||
</td>
|
||||
<th>身份证号码</th>
|
||||
<td>
|
||||
{{ formData.idcard }}
|
||||
</td>
|
||||
<th>医疗证号</th>
|
||||
<td>
|
||||
{{ formData.medicalCertificateNumber }}
|
||||
</td>
|
||||
<th>（有/无）基础病</th>
|
||||
<td>
|
||||
{{ formData.basicDiseaseInfo }}
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th>原部门</th>
|
||||
<td>
|
||||
{{ formData.originalDepartment }}
|
||||
</td>
|
||||
<th>家属姓名</th>
|
||||
<td>
|
||||
{{ formData.familyName }}
|
||||
</td>
|
||||
<th>家庭住址</th>
|
||||
<td :colspan="3">
|
||||
{{ formData.homeAddress }}
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th>联系方式</th>
|
||||
<td :colspan="2">
|
||||
{{ formData.mobile }}
|
||||
</td>
|
||||
<th>退休性质</th>
|
||||
<td :colspan="1">
|
||||
{{ formData.retireNature }}
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th>备注</th>
|
||||
<td :colspan="7">
|
||||
<el-input type="textarea" readonly :rows="3" v-model="formData.retireNotes" clearable></el-input>
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
</border-table>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
@@ -37,17 +123,25 @@ module.exports = {
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
userData: {}
|
||||
formData: {}
|
||||
}
|
||||
},
|
||||
filters: {
|
||||
formatterDate(val) {
|
||||
if (val) {
|
||||
return moment(val).format('YYYY-MM-DD')
|
||||
}
|
||||
return null
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
getInfo() {
|
||||
if (this.id) {
|
||||
$.post('/platform/retiredUser/list/userInfo', {userId: this.id}).then(res => {
|
||||
this.userData = res.data
|
||||
$.post('/platform/retiredUser/list/getInfo', {id: this.id}).then(res => {
|
||||
this.formData = res.data
|
||||
})
|
||||
} else {
|
||||
this.userData = {}
|
||||
this.formData = {}
|
||||
}
|
||||
|
||||
}
|
||||
@@ -68,4 +162,4 @@ module.exports = {
|
||||
|
||||
<style scoped>
|
||||
|
||||
</style>
|
||||
</style>
|
||||
|
||||
Reference in New Issue
Block a user