|
|
@@ -13,30 +13,30 @@
|
|
|
|
|
|
<el-divider content-position="left"><i class="el-icon-document"></i> 基础信息</el-divider>
|
|
|
<el-row :gutter="15">
|
|
|
- <el-col :span="12">
|
|
|
- <el-form-item label="头像" prop="headshot"
|
|
|
- :rules="[
|
|
|
- ]">
|
|
|
- <el-popover
|
|
|
- placement="left"
|
|
|
- trigger="hover">
|
|
|
- <el-button style="width: 100%" @click="onPreview(inputForm.headshotLsUrl)" :disabled="false" icon="el-icon-zoom-in"></el-button>
|
|
|
- <el-upload
|
|
|
- slot="reference"
|
|
|
- class="avatar-uploader"
|
|
|
- :action="`${$http.BASE_URL}/roster/base/webUpload/upload`"
|
|
|
- :show-file-list="false"
|
|
|
- :on-success="(response, file, fileList) => {
|
|
|
- return handleAvatarSuccess(response, file, fileList, null, 'head')
|
|
|
- }"
|
|
|
- :before-upload="checkIsPic"
|
|
|
- >
|
|
|
- <img style="width: 150px; height: 150px; line-height: 150px" v-if="inputForm.headshotLsUrl" :src="inputForm.headshotLsUrl"/>
|
|
|
- <i v-else class="el-icon-plus avatar-uploader-icon"></i>
|
|
|
- </el-upload>
|
|
|
- </el-popover>
|
|
|
- </el-form-item>
|
|
|
- </el-col>
|
|
|
+<!-- <el-col :span="12">-->
|
|
|
+<!-- <el-form-item label="头像" prop="headshot"-->
|
|
|
+<!-- :rules="[-->
|
|
|
+<!-- ]">-->
|
|
|
+<!-- <el-popover-->
|
|
|
+<!-- placement="left"-->
|
|
|
+<!-- trigger="hover">-->
|
|
|
+<!-- <el-button style="width: 100%" @click="onPreview(inputForm.headshotLsUrl)" :disabled="false" icon="el-icon-zoom-in"></el-button>-->
|
|
|
+<!-- <el-upload-->
|
|
|
+<!-- slot="reference"-->
|
|
|
+<!-- class="avatar-uploader"-->
|
|
|
+<!-- :action="`${$http.BASE_URL}/roster/base/webUpload/upload`"-->
|
|
|
+<!-- :show-file-list="false"-->
|
|
|
+<!-- :on-success="(response, file, fileList) => {-->
|
|
|
+<!-- return handleAvatarSuccess(response, file, fileList, null, 'head')-->
|
|
|
+<!-- }"-->
|
|
|
+<!-- :before-upload="checkIsPic"-->
|
|
|
+<!-- >-->
|
|
|
+<!-- <img style="width: 150px; height: 150px; line-height: 150px" v-if="inputForm.headshotLsUrl" :src="inputForm.headshotLsUrl"/>-->
|
|
|
+<!-- <i v-else class="el-icon-plus avatar-uploader-icon"></i>-->
|
|
|
+<!-- </el-upload>-->
|
|
|
+<!-- </el-popover>-->
|
|
|
+<!-- </el-form-item>-->
|
|
|
+<!-- </el-col>-->
|
|
|
</el-row>
|
|
|
<el-row :gutter="15">
|
|
|
<el-col :span="12">
|
|
|
@@ -195,7 +195,7 @@
|
|
|
]">
|
|
|
<el-select v-model="inputForm.contractType" placeholder="请选择合同类型" style="width:100%;">
|
|
|
<el-option
|
|
|
- v-for="item in $dictUtils.getDictList('contract_type')"
|
|
|
+ v-for="item in $dictUtils.getDictList('roster_contract_type')"
|
|
|
:key="item.value"
|
|
|
:label="item.label"
|
|
|
:value="item.value">
|
|
|
@@ -218,9 +218,7 @@
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="12">
|
|
|
- <el-form-item label="入职日期" prop="onboardingDate"
|
|
|
- :rules="[{required: true, message: '入职日期不能为空', trigger: 'blur'}
|
|
|
- ]">
|
|
|
+ <el-form-item label="入职日期" prop="onboardingDate">
|
|
|
<el-date-picker
|
|
|
placement="bottom-start"
|
|
|
style="width: 100%"
|
|
|
@@ -257,9 +255,7 @@
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="12">
|
|
|
- <el-form-item label="出生日期" prop="birthDate"
|
|
|
- :rules="[{required: true, message: '出生日期不能为空', trigger: 'blur'}
|
|
|
- ]">
|
|
|
+ <el-form-item label="出生日期" prop="birthDate">
|
|
|
<el-date-picker
|
|
|
placement="bottom-start"
|
|
|
style="width: 100%"
|
|
|
@@ -554,14 +550,16 @@
|
|
|
<el-form-item label="工资卡分支行" :prop="'rosterBankCardsDTOList[' + index_bank + '].payrollCardBranches'"
|
|
|
:rules="[
|
|
|
]">
|
|
|
- <el-select v-model="inputForm.rosterBankCardsDTOList[index_bank].payrollCardBranches" placeholder="请选择工资卡分支行" style="width: 100%;">
|
|
|
- <el-option
|
|
|
- v-for="item in $dictUtils.getDictList('bank_name')"
|
|
|
- :key="item.value"
|
|
|
- :label="item.label"
|
|
|
- :value="item.value">
|
|
|
- </el-option>
|
|
|
- </el-select>
|
|
|
+<!-- <el-select v-model="inputForm.rosterBankCardsDTOList[index_bank].payrollCardBranches" placeholder="请选择工资卡分支行" style="width: 100%;">-->
|
|
|
+<!-- <el-option-->
|
|
|
+<!-- v-for="item in $dictUtils.getDictList('bank_name')"-->
|
|
|
+<!-- :key="item.value"-->
|
|
|
+<!-- :label="item.label"-->
|
|
|
+<!-- :value="item.value">-->
|
|
|
+<!-- </el-option>-->
|
|
|
+<!-- </el-select>-->
|
|
|
+ <el-input v-model="inputForm.rosterBankCardsDTOList[index_bank].payrollCardBranches" placeholder="请填写工资卡分支行"></el-input>
|
|
|
+
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="12">
|
|
|
@@ -1067,14 +1065,16 @@
|
|
|
<el-form-item label="汇报对象" prop="rosterLeadershipDTO.supervisorId"
|
|
|
:rules="[
|
|
|
]">
|
|
|
- <el-select v-model="inputForm.rosterLeadershipDTO.supervisorId" style="width:100%" placeholder="请选择汇报对象">
|
|
|
- <el-option
|
|
|
- v-for="item in supervisorList"
|
|
|
- :key="item.id"
|
|
|
- :label="item.name"
|
|
|
- :value="item.id">
|
|
|
- </el-option>
|
|
|
- </el-select>
|
|
|
+<!-- <el-select v-model="inputForm.rosterLeadershipDTO.supervisorId" style="width:100%" placeholder="请选择汇报对象">-->
|
|
|
+<!-- <el-option-->
|
|
|
+<!-- v-for="item in supervisorList"-->
|
|
|
+<!-- :key="item.id"-->
|
|
|
+<!-- :label="item.name"-->
|
|
|
+<!-- :value="item.id">-->
|
|
|
+<!-- </el-option>-->
|
|
|
+<!-- </el-select>-->
|
|
|
+ <UserSelect :limit='1' :value="inputForm.rosterLeadershipDTO.supervisorId" @getValue='(value, label) => {inputForm.rosterLeadershipDTO.supervisorId = value}'></UserSelect>
|
|
|
+
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
</el-row>
|
|
|
@@ -1099,6 +1099,7 @@
|
|
|
import OSSService from '@/api/sys/OSSService'
|
|
|
import ElImageViewer from 'element-ui/packages/image/src/image-viewer'
|
|
|
import UpLoadComponent from '@/views/common/UpLoadComponent'
|
|
|
+ import UserSelect from '@/components/userSelect'
|
|
|
export default {
|
|
|
data () {
|
|
|
let checkIdCard = (rule, value, callback) => {
|
|
|
@@ -1241,12 +1242,13 @@
|
|
|
components: {
|
|
|
SelectTree,
|
|
|
ElImageViewer,
|
|
|
- UpLoadComponent
|
|
|
+ UpLoadComponent,
|
|
|
+ UserSelect
|
|
|
},
|
|
|
methods: {
|
|
|
init (method, id) {
|
|
|
this.queryAllPosition()
|
|
|
- this.queryAllSupervisor()
|
|
|
+ // this.queryAllSupervisor()
|
|
|
this.method = method
|
|
|
this.inputForm = {
|
|
|
name: '',
|
lizhenhao