From 80c94a1792638f7f1cc5b11b4a85fbe60e46c369 Mon Sep 17 00:00:00 2001
From: 孔祥富 <kongxf@daryun.com>
Date: 星期四, 04 三月 2021 23:30:57 +0800
Subject: [PATCH] 提交 bug
---
src/views/dashboard/ywUser.vue | 2
src/api/request.js | 2
src/views/user/archivesEdit.vue | 80 +++++++++++++++++++++++++---------------
3 files changed, 52 insertions(+), 32 deletions(-)
diff --git a/src/api/request.js b/src/api/request.js
index d383172..7083bf7 100644
--- a/src/api/request.js
+++ b/src/api/request.js
@@ -10,7 +10,7 @@
// axios中请求配置有baseURL选项，表示请求URL公共部分
baseURL: process.env.VUE_APP_BASE_API,
// 超时
- timeout: 10000
+ timeout: 20000
})
// request拦截器
service.interceptors.request.use(config => {
diff --git a/src/views/dashboard/ywUser.vue b/src/views/dashboard/ywUser.vue
index ff556f1..5814787 100644
--- a/src/views/dashboard/ywUser.vue
+++ b/src/views/dashboard/ywUser.vue
@@ -40,7 +40,7 @@
<el-table-column show-overflow-tooltip="true" prop="hospitalName" label="就诊医院" width="60" />
<el-table-column show-overflow-tooltip="true" prop="treatmentName" label="就诊科室" width="60" />
<el-table-column show-overflow-tooltip="true" prop="hospitalizatioFlag" label="是否住院" width="50" :formatter="hospitalizatioFlagFormat" />
- <el-table-column prop="settleStatus" label="案结状态" width="180" :formatter="hospitalizatioFlagFormat" />
+ <el-table-column prop="settleStatus" label="案结状态" width="180" :formatter="settleStatusFormat" />
<el-table-column show-overflow-tooltip="true" prop="bedNumb" label="床号" width="60" />
<el-table-column show-overflow-tooltip="true" prop="reprotTime" label="报案时间" width="80" />
<el-table-column show-overflow-tooltip="true" prop="submitTime" label="递交资料时间" width="80" />
diff --git a/src/views/user/archivesEdit.vue b/src/views/user/archivesEdit.vue
index 61c2922..2a5ff03 100644
--- a/src/views/user/archivesEdit.vue
+++ b/src/views/user/archivesEdit.vue
@@ -3,7 +3,7 @@
:title="title"
width="100%"
height="100vh"
- fullscreen="true"
+ fullscreen
:close-on-click-modal="false"
:visible.sync="isVisible"
>
@@ -195,6 +195,16 @@
>
编辑
</el-button>
+
+ <el-button
+ v-if="this.readon"
+ style="position:absolute;right: 40px"
+ class="filter-item"
+ type="primary"
+ @click.native="gzupdate1"
+ >
+ 保存
+ </el-button>
</div>
<div class="jbxxCon" style="padding: 20px 40px 0 20px">
@@ -202,17 +212,17 @@
<el-row style="width: 100%;">
<el-col :span="8">
<el-form-item label="档案号" prop="archivesNumb">
- <el-input v-model="empBaseInfoForm.archivesNumb" style="width: 100%;" />
+ <el-input v-model="empBaseInfoForm.archivesNumb" style="width: 100%;" :disabled="this.readon ? false : true" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="姓名" prop="empName">
- <el-input v-model="empBaseInfoForm.empName" />
+ <el-input v-model="empBaseInfoForm.empName" :disabled="this.readon ? false : true" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="性别" prop="sex">
- <el-select v-model="empBaseInfoForm.sex" placeholder="请选择性别">
+ <el-select v-model="empBaseInfoForm.sex" placeholder="请选择性别" :disabled="this.readon ? false : true">
<el-option
v-for="dict in sexOptions"
:key="dict.dicItemCode"
@@ -228,6 +238,7 @@
<el-form-item label="部门(护卫点)" prop="deptId">
<treeselect
v-model="empBaseInfoForm.deptId"
+ :disabled="this.readon ? false : true"
:multiple="false"
:options="depts"
:clear-value-text="$t('common.clear')"
@@ -240,6 +251,7 @@
<el-form-item label="岗位" prop="jobName">
<el-autocomplete
v-model="empBaseInfoForm.jobName"
+ :disabled="this.readon ? false : true"
class="inline-input"
:fetch-suggestions="querySearchJob"
placeholder="请输入岗位"
@@ -249,7 +261,7 @@
</el-col>
<el-col :span="8">
<el-form-item label="员工类别" prop="empType">
- <el-select v-model="empBaseInfoForm.empType" placeholder="请选择员工类型">
+ <el-select v-model="empBaseInfoForm.empType" placeholder="请选择员工类型" :disabled="this.readon ? false : true">
<el-option
v-for="dict in empTypeOptions"
:key="dict.dicItemCode"
@@ -263,7 +275,7 @@
<el-row>
<el-col :span="8">
<el-form-item label="民族" prop="nation">
- <el-select v-model="empBaseInfoForm.nation" placeholder="请选择民族">
+ <el-select v-model="empBaseInfoForm.nation" placeholder="请选择民族" :disabled="this.readon ? false : true">
<el-option
v-for="dict in nationOptions"
:key="dict.dicItemCode"
@@ -275,12 +287,12 @@
</el-col>
<el-col :span="8">
<el-form-item label="年龄" prop="age">
- <el-input v-model="empBaseInfoForm.age" />
+ <el-input v-model="empBaseInfoForm.age" :disabled="this.readon ? false : true" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="婚姻状态" prop="marriage">
- <el-select v-model="empBaseInfoForm.marriage" placeholder="请选择婚姻状态">
+ <el-select v-model="empBaseInfoForm.marriage" placeholder="请选择婚姻状态" :disabled="this.readon ? false : true">
<el-option
v-for="dict in marriageOptions"
:key="dict.dicItemCode"
@@ -296,6 +308,7 @@
<el-form-item label="身份证有效期" prop="certificateValidity">
<el-date-picker
v-model="empBaseInfoForm.certificateValidity"
+ :disabled="this.readon ? false : true"
type="date"
value-format="yyyy-MM-dd"
placeholder="选择日期"
@@ -304,12 +317,12 @@
</el-col>
<el-col :span="8">
<el-form-item label="身高(cm)" prop="stature">
- <el-input v-model="empBaseInfoForm.stature" />
+ <el-input v-model="empBaseInfoForm.stature" :disabled="this.readon ? false : true" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="政治面貌" prop="politics">
- <el-select v-model="empBaseInfoForm.politics" placeholder="请选择政治面貌">
+ <el-select v-model="empBaseInfoForm.politics" placeholder="请选择政治面貌" :disabled="this.readon ? false : true">
<el-option
v-for="dict in statusOptions"
:key="dict.dicItemCode"
@@ -325,6 +338,7 @@
<el-form-item label="出生日期" prop="birthdate">
<el-date-picker
v-model="empBaseInfoForm.birthdate"
+ :disabled="this.readon ? false : true"
type="date"
value-format="yyyy-MM-dd"
placeholder="选择日期"
@@ -333,7 +347,7 @@
</el-col>
<el-col :span="8">
<el-form-item label="最高学历" prop="education">
- <el-select v-model="empBaseInfoForm.education" placeholder="请选择最高学历">
+ <el-select v-model="empBaseInfoForm.education" placeholder="请选择最高学历" :disabled="this.readon ? false : true">
<el-option
v-for="dict in educationOptions"
:key="dict.dicItemCode"
@@ -345,7 +359,7 @@
</el-col>
<el-col :span="8">
<el-form-item label="籍贯" prop="nativePlaceName">
- <el-select v-model="empBaseInfoForm.nativePlace" placeholder="请选择最高学历">
+ <el-select v-model="empBaseInfoForm.nativePlace" placeholder="请选择最高学历" :disabled="this.readon ? false : true">
<el-option
v-for="dict in nativePlaceOptions"
:key="dict.dicItemCode"
@@ -359,29 +373,29 @@
<el-row>
<el-col :span="8">
<el-form-item label="户籍地址" prop="censusAddress">
- <el-input v-model="empBaseInfoForm.censusAddress" />
+ <el-input v-model="empBaseInfoForm.censusAddress" :disabled="this.readon ? false : true" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="现住址" prop="currentAddress">
- <el-input v-model="empBaseInfoForm.currentAddress" />
+ <el-input v-model="empBaseInfoForm.currentAddress" :disabled="this.readon ? false : true" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="保安员回执" prop="returnReceipt">
- <el-input v-model="empBaseInfoForm.returnReceipt" />
+ <el-input v-model="empBaseInfoForm.returnReceipt" :disabled="this.readon ? false : true" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="保安员证号" prop="guardNumb">
- <el-input v-model="empBaseInfoForm.guardNumb" />
+ <el-input v-model="empBaseInfoForm.guardNumb" :disabled="this.readon ? false : true" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="档案情况" prop="archivesStatus">
- <el-select v-model="empBaseInfoForm.archivesStatus" placeholder="请选择档案情况">
+ <el-select v-model="empBaseInfoForm.archivesStatus" placeholder="请选择档案情况" :disabled="this.readon ? false : true">
<el-option
v-for="dict in archivesStatusOptions"
:key="dict.dicItemCode"
@@ -393,25 +407,26 @@
</el-col>
<el-col :span="8">
<el-form-item label="银行名称" prop="bankName">
- <el-input v-model="empBaseInfoForm.bankName" />
+ <el-input v-model="empBaseInfoForm.bankName" :disabled="this.readon ? false : true" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="银行账号" prop="bankNumb">
- <el-input v-model="empBaseInfoForm.bankNumb" />
+ <el-input v-model="empBaseInfoForm.bankNumb" :disabled="this.readon ? false : true" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="电话号码" prop="telePhone">
- <el-input v-model="empBaseInfoForm.telePhone" />
+ <el-input v-model="empBaseInfoForm.telePhone" :disabled="this.readon ? false : true" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="入职日期" prop="entryDate">
<el-date-picker
v-model="empBaseInfoForm.entryDate"
+ :disabled="this.readon ? false : true"
type="date"
value-format="yyyy-MM-dd"
placeholder="选择日期"
@@ -423,7 +438,7 @@
<el-row>
<el-col :span="8">
<el-form-item label="保险类型" prop="insuranceType">
- <el-select v-model="empBaseInfoForm.insuranceType" placeholder="请选择保险类型">
+ <el-select v-model="empBaseInfoForm.insuranceType" placeholder="请选择保险类型" :disabled="this.readon ? false : true">
<el-option
v-for="dict in insuranceTypeOptions"
:key="dict.dicItemCode"
@@ -435,24 +450,24 @@
</el-col>
<el-col :span="8">
<el-form-item label="社保电脑号" prop="socialNumb">
- <el-input v-model="empBaseInfoForm.socialNumb" />
+ <el-input v-model="empBaseInfoForm.socialNumb" :disabled="this.readon ? false : true" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="招聘介绍人" prop="introducer">
- <el-input v-model="empBaseInfoForm.introducer" />
+ <el-input v-model="empBaseInfoForm.introducer" :disabled="this.readon ? false : true" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="入司工龄" prop="seniority">
- <el-input v-model="empBaseInfoForm.seniority" />
+ <el-input v-model="empBaseInfoForm.seniority" :disabled="this.readon ? false : true" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="工作证" prop="empCardStatus">
- <el-select v-model="empBaseInfoForm.empCardStatus" placeholder="请选择工作证">
+ <el-select v-model="empBaseInfoForm.empCardStatus" placeholder="请选择工作证" :disabled="this.readon ? false : true">
<el-option
v-for="dict in empCardStatusOptions"
:key="dict.dicItemCode"
@@ -464,19 +479,19 @@
</el-col>
<el-col :span="8">
<el-form-item label="家庭成员及关系" prop="family">
- <el-input v-model="empBaseInfoForm.family" />
+ <el-input v-model="empBaseInfoForm.family" :disabled="this.readon ? false : true" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="紧急联系电话" prop="urgencyPhone">
- <el-input v-model="empBaseInfoForm.urgencyPhone" />
+ <el-input v-model="empBaseInfoForm.urgencyPhone" :disabled="this.readon ? false : true" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="员工手册" prop="handbookStatus">
- <el-select v-model="empBaseInfoForm.handbookStatus" placeholder="请选择员工手册">
+ <el-select v-model="empBaseInfoForm.handbookStatus" placeholder="请选择员工手册" :disabled="this.readon ? false : true">
<el-option
v-for="dict in handbookStatusOptions"
:key="dict.dicItemCode"
@@ -488,7 +503,7 @@
</el-col>
<el-col :span="8">
<el-form-item label="相关证件" prop="certificateList">
- <el-select v-model="empBaseInfoForm.certificateList" placeholder="请选择相关证件">
+ <el-select v-model="empBaseInfoForm.certificateList" placeholder="请选择相关证件" :disabled="this.readon ? false : true">
<el-option
v-for="dict in certificateListOptions"
:key="dict.dicItemCode"
@@ -502,6 +517,7 @@
<el-form-item label="身份证号码" prop="certificateNumb">
<el-input
v-model="empBaseInfoForm.certificateNumb"
+ :disabled="this.readon ? false : true"
@input="generateUserInfo(0,empBaseInfoForm.certificateNumb)"
/>
</el-form-item>
@@ -2667,6 +2683,7 @@
size: 5,
num: 1
},
+ readon: false,
workExperienceModal: true,
dialogshowArr: [
{
@@ -3476,7 +3493,7 @@
depts: [],
sysConfig: this.initSysConfig(),
listType: ['jbxx', 'gzjl', 'tjxx', 'htxx', 'tgjl', 'qjjl', 'czsq', 'lzdykq', 'rlzjl', 'syjlq', 'sbsq', 'ywxaj', 'gsaj', 'lzaj',
- 'bz', 'jljt', 'xgfj', 'bljl', 'jljt', 'xgfj'],
+ 'bljl', 'bz', 'jljt'],
form: {},
isAdd: false,
thisShowIndex: '',
@@ -4080,6 +4097,9 @@
})
},
gzupdate() {
+ this.readon = true
+ },
+ gzupdate1() {
this.$put('hr/empBaseInfo', { ...this.empBaseInfoForm }).then(() => {
this.$message({
message: this.$t('tips.updateSuccess'),
--
Gitblit v1.8.0