Skip to content

D
dd_school
Commit 6a701854 by zhaopanyu
Options

zpy 修改

parent 75e7e9f0
Showing with 173 additions and 77 deletions
ruoyi-ui/src/views/smartSchool/electronicArchives/basicInformation/index.vue
...@@ -136,9 +136,8 @@ ...@@ -136,9 +136,8 @@
@sort-change="sortChange" :default-sort="defaultSort" :row-style="{ height: '1px' }" @sort-change="sortChange" :default-sort="defaultSort" :row-style="{ height: '1px' }"
:cell-style="{ padding: '0px' }" :header-cell-style="tableHeaderStyle" :fit="true"> :cell-style="{ padding: '0px' }" :header-cell-style="tableHeaderStyle" :fit="true">
<!-- 添加 fit 属性实现自适应 --> <!-- 添加 fit 属性实现自适应 -->
<el-table-column type="selection" align="center" :width="40" /> <el-table-column type="selection" align="center" :width="38" />
<el-table-column type="index" label="序号" :width="40" align="center" /> <el-table-column type="index" label="序号" :width="38" align="center" />
<!-- 移除 fixed="left" -->
<el-table-column label="姓名" align="center" prop="name" :min-width="screenWidth * 0.04" sortable="custom" <el-table-column label="姓名" align="center" prop="name" :min-width="screenWidth * 0.04" sortable="custom"
show-overflow-tooltip /> show-overflow-tooltip />
<el-table-column label="性别" :min-width="screenWidth * 0.03" align="center" prop="sex" sortable="custom" <el-table-column label="性别" :min-width="screenWidth * 0.03" align="center" prop="sex" sortable="custom"
...@@ -151,16 +150,24 @@ ...@@ -151,16 +150,24 @@
show-overflow-tooltip /> show-overflow-tooltip />
<!-- <el-table-column label="出生日期" :min-width="screenWidth * 0.03" align="center" prop="birthDate" <!-- <el-table-column label="出生日期" :min-width="screenWidth * 0.03" align="center" prop="birthDate"
sortable="custom" show-overflow-tooltip /> --> sortable="custom" show-overflow-tooltip /> -->
<el-table-column label="档案年龄" align="center" prop="fileAge" :min-width="screenWidth * 0.04" <el-table-column label="档案年龄" align="center" prop="fileAge" :min-width="screenWidth * 0.05"
sortable="custom" /> sortable="custom" />
<el-table-column label="政治面貌" align="center" :min-width="screenWidth * 0.06" prop="politicalLandscape" <el-table-column label="退休日期" align="center" prop="txDate" sortable="custom" :min-width="screenWidth * 0.05"
show-overflow-tooltip>
<template slot-scope="scope">
<span>{{ parseTime(scope.row.txDate, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="退休年龄" align="center" prop="txAge" :min-width="screenWidth * 0.05"
sortable="custom" />
<el-table-column label="政治面貌" align="center" :min-width="screenWidth * 0.05" prop="politicalLandscape"
sortable="custom" show-overflow-tooltip> sortable="custom" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.politics_tatusls" :value="scope.row.politicalLandscape" /> <dict-tag :options="dict.type.politics_tatusls" :value="scope.row.politicalLandscape" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="档案生日" align="center" prop="fileBirthDate" sortable="custom" <el-table-column label="档案生日" align="center" prop="fileBirthDate" sortable="custom"
:min-width="screenWidth * 0.06" show-overflow-tooltip> :min-width="screenWidth * 0.05" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.fileBirthDate, '{y}-{m}-{d}') }}</span> <span>{{ parseTime(scope.row.fileBirthDate, '{y}-{m}-{d}') }}</span>
</template> </template>
...@@ -178,8 +185,14 @@ ...@@ -178,8 +185,14 @@
<span style="white-space: normal;">到市二中<br />工作年限</span> <span style="white-space: normal;">到市二中<br />工作年限</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="现具备专技资格" :min-width="screenWidth * 0.08" align="center" <!-- <el-table-column label="现具备专技资格" :min-width="screenWidth * 0.08" align="center"
prop="currentHiringProfessionalTitle" sortable="custom" show-overflow-tooltip /> prop="currentHiringProfessionalTitle" sortable="custom" show-overflow-tooltip /> -->
<el-table-column :min-width="screenWidth * 0.05" align="center" prop="currentHiringProfessionalTitle"
sortable="custom" show-overflow-tooltip>
<template slot="header">
<span style="white-space: normal;">现具备专<br />技资格</span>
</template>
</el-table-column>
<!-- <el-table-column label="毕业院校" align="center" prop="graduationInstitution3" sortable="custom" <!-- <el-table-column label="毕业院校" align="center" prop="graduationInstitution3" sortable="custom"
:min-width="screenWidth * 0.1" show-overflow-tooltip /> :min-width="screenWidth * 0.1" show-overflow-tooltip />
<el-table-column label="学历" :min-width="screenWidth * 0.04" align="center" prop="lastDegree" sortable="custom" <el-table-column label="学历" :min-width="screenWidth * 0.04" align="center" prop="lastDegree" sortable="custom"
...@@ -187,7 +200,7 @@ ...@@ -187,7 +200,7 @@
<el-table-column label="毕业院校" align="center" :formatter="formatGraduationInstitution" sortable="custom" <el-table-column label="毕业院校" align="center" :formatter="formatGraduationInstitution" sortable="custom"
:min-width="screenWidth * 0.1" show-overflow-tooltip /> :min-width="screenWidth * 0.1" show-overflow-tooltip />
<el-table-column label="学历" width="75px" align="center" :formatter="formatDegree" sortable="custom" <el-table-column label="学历" width="75px" align="center" :formatter="formatDegree" sortable="custom"
:min-width="screenWidth * 0.04" show-overflow-tooltip /> :min-width="screenWidth * 0.03" show-overflow-tooltip />
<el-table-column label="在岗情况" align="center" prop="onDutySituation" sortable="custom" show-overflow-tooltip <el-table-column label="在岗情况" align="center" prop="onDutySituation" sortable="custom" show-overflow-tooltip
:min-width="screenWidth * 0.05"> :min-width="screenWidth * 0.05">
<template slot-scope="scope"> <template slot-scope="scope">
...@@ -196,7 +209,7 @@ ...@@ -196,7 +209,7 @@
</el-table-column> </el-table-column>
<!-- 移除 fixed="right" --> <!-- 移除 fixed="right" -->
<el-table-column label="操作" align="center" class-name="small-padding operation-column" <el-table-column label="操作" align="center" class-name="small-padding operation-column"
:min-width="screenWidth * 0.08"> :min-width="screenWidth * 0.07">
<template slot-scope="scope"> <template slot-scope="scope">
<div class="operation-buttons"> <div class="operation-buttons">
<el-button v-hasPermi="['system:student:edit']" size="mini" type="text" <el-button v-hasPermi="['system:student:edit']" size="mini" type="text"
...@@ -256,31 +269,29 @@ ...@@ -256,31 +269,29 @@
<el-col :span="12" class="custom-margin"> <el-col :span="12" class="custom-margin">
<el-form-item label="身份证号" prop="idCard"> <el-form-item label="身份证号" prop="idCard">
<el-input v-model="form.idCard" @blur="handleIdCardBlur" maxlength="18" <el-input v-model="form.idCard" @blur="handleIdCardBlur" maxlength="18"
placeholder="请输入" clearable style="width: 190px;"></el-input> placeholder="请输入" clearable style="width: 100%;"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12" class="custom-margin"> <el-col :span="12" class="custom-margin">
<el-form-item label="档案出生日期" prop="fileBirthDate"> <el-form-item label="档案出生日期" prop="fileBirthDate">
<!-- <el-date-picker v-model="form.fileBirthDate" placeholder="选择日期" style="width: 100%;"
clearable type="month" value-format="yyyy-MM"></el-date-picker> -->
<el-date-picker clearable value-format="yyyy-MM-dd" v-model="form.fileBirthDate" <el-date-picker clearable value-format="yyyy-MM-dd" v-model="form.fileBirthDate"
type="date" style="width: 100%;" placeholder="选择日期"> type="date" style="width: 100%;" placeholder="选择日期">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12" class="custom-margin"> <el-col :span="12" class="custom-margin">
<el-form-item label="退休日期" prop="txDate">
<el-date-picker clearable value-format="yyyy-MM-dd" v-model="form.txDate" type="date"
style="width: 100%;" placeholder="选择日期">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="12" class="custom-margin">
<el-form-item label="籍贯" prop="hometown"> <el-form-item label="籍贯" prop="hometown">
<el-input v-model="form.hometown" placeholder="请输入籍贯" clearable <el-input v-model="form.hometown" placeholder="请输入籍贯" clearable
style="width: 190px;"></el-input> style="width: 100%;"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<!-- <el-col :span=" 12" class="custom-margin"> -->
<!-- <el-form-item label="出生年月" prop="birthDate">
<el-date-picker clearable v-model="form.birthDate" type="date" value-format="yyyy-MM-dd"
placeholder="请选择" :style="{ width: '100%' }">
</el-date-picker>
</el-form-item> -->
<!-- </el-col> -->
<el-col :span="12" class="custom-margin"> <el-col :span="12" class="custom-margin">
<el-form-item label="民族" prop="nation"> <el-form-item label="民族" prop="nation">
<el-input v-model="form.nation" placeholder="请输入民族" clearable></el-input> <el-input v-model="form.nation" placeholder="请输入民族" clearable></el-input>
...@@ -288,7 +299,7 @@ ...@@ -288,7 +299,7 @@
</el-col> </el-col>
<el-col :span="12" class="custom-margin"> <el-col :span="12" class="custom-margin">
<el-form-item label="政治面貌" prop="politicalLandscape"> <el-form-item label="政治面貌" prop="politicalLandscape">
<el-select v-model="form.politicalLandscape" style="width: 190px;" placeholder="请选择"> <el-select v-model="form.politicalLandscape" style="width: 100%;" placeholder="请选择">
<el-option v-for="dict in dict.type.politics_tatusls" clearable :key="dict.value" <el-option v-for="dict in dict.type.politics_tatusls" clearable :key="dict.value"
:label="dict.label" :value="dict.value"> :label="dict.label" :value="dict.value">
</el-option> </el-option>
...@@ -304,7 +315,7 @@ ...@@ -304,7 +315,7 @@
</el-col> </el-col>
<el-col :span="12" class="custom-margin"> <el-col :span="12" class="custom-margin">
<el-form-item label="任教学科" prop="teachingSubject"> <el-form-item label="任教学科" prop="teachingSubject">
<el-select v-model="form.teachingSubject" style="width: 190px;" placeholder="请选择" <el-select v-model="form.teachingSubject" style="width: 100%;" placeholder="请选择"
clearable> clearable>
<el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value" <el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value"
:label="dict.label" :value="dict.value"> :label="dict.label" :value="dict.value">
...@@ -314,7 +325,8 @@ ...@@ -314,7 +325,8 @@
</el-col> </el-col>
<el-col :span="12" class="custom-margin"> <el-col :span="12" class="custom-margin">
<el-form-item label="现具备专技资格" prop="currentProfessionalTitle"> <el-form-item label="现具备专技资格" prop="currentProfessionalTitle">
<el-input v-model="form.currentProfessionalTitle" placeholder="请输入现具备专技资格" clearable /> <el-input v-model="form.currentProfessionalTitle" placeholder="请输入现具备专技资格" clearable
style="width: 100%" />
<!-- <el-select v-model="form.currentProfessionalTitle" style="width: 100%" placeholder="请选择" <!-- <el-select v-model="form.currentProfessionalTitle" style="width: 100%" placeholder="请选择"
clearable> clearable>
<el-option v-for="dict in dict.type.current_professional" :key="dict.value" <el-option v-for="dict in dict.type.current_professional" :key="dict.value"
...@@ -322,12 +334,6 @@ ...@@ -322,12 +334,6 @@
</el-option> </el-option>
</el-select> --> </el-select> -->
</el-form-item> </el-form-item>
</el-col><el-col :span="12" class="custom-margin">
<el-form-item label="现具备专技资格时间" prop="currentProfessionalTitleTime">
<el-date-picker clearable v-model="form.currentProfessionalTitleTime" type="month"
value-format="yyyy-MM" placeholder="请选择" style="width: 190px;">
</el-date-picker>
</el-form-item>
</el-col> </el-col>
</el-col> </el-col>
...@@ -354,7 +360,7 @@ ...@@ -354,7 +360,7 @@
<el-col :span="8" class="custom-margin"> <el-col :span="8" class="custom-margin">
<el-form-item label="现聘专技资格" prop="currentHiringProfessionalTitle"> <el-form-item label="现聘专技资格" prop="currentHiringProfessionalTitle">
<el-input v-model="form.currentHiringProfessionalTitle" placeholder="请输入" <el-input v-model="form.currentHiringProfessionalTitle" placeholder="请输入"
style="width: 100%;" /> style="width: 100%" />
<!-- <el-select clearable v-model="form.currentHiringProfessionalTitle" style="width: 100%" <!-- <el-select clearable v-model="form.currentHiringProfessionalTitle" style="width: 100%"
placeholder="请选择"> placeholder="请选择">
<el-option v-for="dict in dict.type.current_professional" :key="dict.value" <el-option v-for="dict in dict.type.current_professional" :key="dict.value"
...@@ -366,7 +372,7 @@ ...@@ -366,7 +372,7 @@
<el-col :span="8" class="custom-margin"> <el-col :span="8" class="custom-margin">
<el-form-item label="现聘专技资格时间" prop="currentHiringProfessionalTitleTime"> <el-form-item label="现聘专技资格时间" prop="currentHiringProfessionalTitleTime">
<el-date-picker clearable v-model="form.currentHiringProfessionalTitleTime" type="month" <el-date-picker clearable v-model="form.currentHiringProfessionalTitleTime" type="month"
value-format="yyyy-MM" placeholder="请选择" style="width: 190px;"> value-format="yyyy-MM" placeholder="请选择" style="width: 100%;">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
...@@ -376,6 +382,13 @@ ...@@ -376,6 +382,13 @@
</el-row> </el-row>
<el-row :gutter="6" type="flex" justify="space-between"> <el-row :gutter="6" type="flex" justify="space-between">
<el-col :span="8" class="custom-margin"> <el-col :span="8" class="custom-margin">
<el-form-item label="现具备专技资格时间" prop="currentProfessionalTitleTime">
<el-date-picker clearable v-model="form.currentProfessionalTitleTime" type="month"
value-format="yyyy-MM" placeholder="请选择" style="width:100%;">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="8" class="custom-margin">
<el-form-item label="现聘岗位" prop="currentPosition"> <el-form-item label="现聘岗位" prop="currentPosition">
<el-select v-model="form.currentPosition" style="width:100%;" placeholder="请选择" clearable> <el-select v-model="form.currentPosition" style="width:100%;" placeholder="请选择" clearable>
<el-option v-for="dict in dict.type.current_position" :key="dict.value" <el-option v-for="dict in dict.type.current_position" :key="dict.value"
...@@ -393,6 +406,9 @@ ...@@ -393,6 +406,9 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row>
<el-row :gutter="6" type="flex" justify="space-between">
<el-col :span="8" class="custom-margin"> <el-col :span="8" class="custom-margin">
<el-form-item label="现岗位等级聘任时间" prop="currentJobLevelAppointmentTime"> <el-form-item label="现岗位等级聘任时间" prop="currentJobLevelAppointmentTime">
<el-date-picker clearable v-model="form.currentJobLevelAppointmentTime" type="month" <el-date-picker clearable v-model="form.currentJobLevelAppointmentTime" type="month"
...@@ -400,8 +416,6 @@ ...@@ -400,8 +416,6 @@
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row>
<el-row :gutter="6" type="flex" justify="space-between">
<el-col :span="8" class="custom-margin"> <el-col :span="8" class="custom-margin">
<el-form-item label="职务" prop="duties"> <el-form-item label="职务" prop="duties">
<el-input v-model="form.duties" clearable placeholder="请输入" style="width: 100%;" /> <el-input v-model="form.duties" clearable placeholder="请输入" style="width: 100%;" />
...@@ -413,13 +427,14 @@ ...@@ -413,13 +427,14 @@
style="width: 190px;" /> style="width: 190px;" />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row>
<el-row :gutter="6" type="flex" justify="space-between">
<el-col :span="8" class="custom-margin"> <el-col :span="8" class="custom-margin">
<el-form-item label="教师资格证号码" prop="teacherQualificationCertificateNum"> <el-form-item label="教师资格证号码" prop="teacherQualificationCertificateNum">
<el-input v-model="form.teacherQualificationCertificateNum" clearable placeholder="请输入" /> <el-input v-model="form.teacherQualificationCertificateNum" clearable placeholder="请输入" />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row>
<el-row :gutter="6" type="flex" justify="space-between">
<el-col :span="8" class="custom-margin"> <el-col :span="8" class="custom-margin">
<el-form-item label="参加工作时间" prop="workingHours"> <el-form-item label="参加工作时间" prop="workingHours">
<el-date-picker clearable v-model="form.workingHours" type="date" value-format="yyyy-MM-dd" <el-date-picker clearable v-model="form.workingHours" type="date" value-format="yyyy-MM-dd"
...@@ -434,6 +449,9 @@ ...@@ -434,6 +449,9 @@
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row>
<el-row :gutter="2" type="flex" justify="space-between">
<el-col :span="8" class="custom-margin"> <el-col :span="8" class="custom-margin">
<el-form-item label="教龄起算时间" prop="lengthOfTeacherTime"> <el-form-item label="教龄起算时间" prop="lengthOfTeacherTime">
<el-date-picker clearable v-model="form.lengthOfTeacherTime" type="date" <el-date-picker clearable v-model="form.lengthOfTeacherTime" type="date"
...@@ -441,8 +459,6 @@ ...@@ -441,8 +459,6 @@
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row>
<el-row :gutter="2" type="flex" justify="space-between">
<el-col :span="8" class="custom-margin"> <el-col :span="8" class="custom-margin">
<el-form-item label="工龄起算时间" prop="lengthOfServiceTime"> <el-form-item label="工龄起算时间" prop="lengthOfServiceTime">
<el-date-picker clearable v-model="form.lengthOfServiceTime" type="date" <el-date-picker clearable v-model="form.lengthOfServiceTime" type="date"
...@@ -459,6 +475,9 @@ ...@@ -459,6 +475,9 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row>
<el-row :gutter="2" type="flex" justify="space-between">
<el-col :span="8" class="custom-margin"> <el-col :span="8" class="custom-margin">
<el-form-item label="在编情况" prop="currentSituation"> <el-form-item label="在编情况" prop="currentSituation">
<el-select v-model="form.currentSituation" clearable style="width: 100%" placeholder="请选择"> <el-select v-model="form.currentSituation" clearable style="width: 100%" placeholder="请选择">
...@@ -468,8 +487,6 @@ ...@@ -468,8 +487,6 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row>
<el-row :gutter="2" type="flex" justify="space-between">
<el-col :span="8" class="custom-margin"> <el-col :span="8" class="custom-margin">
<el-form-item label="毕业院校1" prop="graduationInstitution1"> <el-form-item label="毕业院校1" prop="graduationInstitution1">
<el-input v-model="form.graduationInstitution1" clearable placeholder="请输入" <el-input v-model="form.graduationInstitution1" clearable placeholder="请输入"
...@@ -481,6 +498,9 @@ ...@@ -481,6 +498,9 @@
<el-input v-model="form.major1" placeholder="请输入" clearable style="width: 190px;" /> <el-input v-model="form.major1" placeholder="请输入" clearable style="width: 190px;" />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row>
<el-row :gutter="2" type="flex" justify="space-between">
<el-col :span="8" class="custom-margin"> <el-col :span="8" class="custom-margin">
<el-form-item label="毕业时间1" prop="graduationTime1"> <el-form-item label="毕业时间1" prop="graduationTime1">
<el-date-picker clearable v-model="form.graduationTime1" type="date" <el-date-picker clearable v-model="form.graduationTime1" type="date"
...@@ -488,8 +508,6 @@ ...@@ -488,8 +508,6 @@
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row>
<el-row :gutter="2" type="flex" justify="space-between">
<el-col :span="8" class="custom-margin"> <el-col :span="8" class="custom-margin">
<el-form-item label="毕业院校2" prop="graduationInstitution2"> <el-form-item label="毕业院校2" prop="graduationInstitution2">
<el-input v-model="form.graduationInstitution2" placeholder="请输入" clearable <el-input v-model="form.graduationInstitution2" placeholder="请输入" clearable
...@@ -501,6 +519,9 @@ ...@@ -501,6 +519,9 @@
<el-input v-model="form.major2" placeholder="请输入" clearable style="width: 190px;" /> <el-input v-model="form.major2" placeholder="请输入" clearable style="width: 190px;" />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row>
<el-row :gutter="2" type="flex" justify="space-between">
<el-col :span="8" class="custom-margin"> <el-col :span="8" class="custom-margin">
<el-form-item label="毕业时间2" prop="graduationTime2"> <el-form-item label="毕业时间2" prop="graduationTime2">
<el-date-picker clearable v-model="form.graduationTime2" type="date" <el-date-picker clearable v-model="form.graduationTime2" type="date"
...@@ -508,8 +529,6 @@ ...@@ -508,8 +529,6 @@
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row>
<el-row :gutter="2" type="flex" justify="space-between">
<el-col :span="8" class="custom-margin"> <el-col :span="8" class="custom-margin">
<el-form-item label="毕业院校3" prop="graduationInstitution3"> <el-form-item label="毕业院校3" prop="graduationInstitution3">
<el-input v-model="form.graduationInstitution3" placeholder="请输入" clearable <el-input v-model="form.graduationInstitution3" placeholder="请输入" clearable
...@@ -521,6 +540,9 @@ ...@@ -521,6 +540,9 @@
<el-input v-model="form.major3" placeholder="请输入" clearable style="width: 190px;" /> <el-input v-model="form.major3" placeholder="请输入" clearable style="width: 190px;" />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row>
<el-row :gutter="2" type="flex" justify="space-between">
<el-col :span="8" class="custom-margin"> <el-col :span="8" class="custom-margin">
<el-form-item label="毕业时间3" prop="graduationTime3"> <el-form-item label="毕业时间3" prop="graduationTime3">
<el-date-picker clearable v-model="form.graduationTime3" type="date" <el-date-picker clearable v-model="form.graduationTime3" type="date"
...@@ -528,8 +550,6 @@ ...@@ -528,8 +550,6 @@
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row>
<el-row :gutter="2" type="flex" justify="space-between">
<el-col :span="8" class="custom-margin"> <el-col :span="8" class="custom-margin">
<el-form-item label="第一学历" prop="firstDegree"> <el-form-item label="第一学历" prop="firstDegree">
<el-input v-model="form.firstDegree" placeholder="请输入" clearable style="width: 100%;" /> <el-input v-model="form.firstDegree" placeholder="请输入" clearable style="width: 100%;" />
...@@ -540,13 +560,14 @@ ...@@ -540,13 +560,14 @@
<el-input v-model="form.lastDegree" placeholder="请输入" clearable style="width: 190px;" /> <el-input v-model="form.lastDegree" placeholder="请输入" clearable style="width: 190px;" />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row>
<el-row :gutter="2" type="flex" justify="space-between">
<el-col :span="8" class="custom-margin"> <el-col :span="8" class="custom-margin">
<el-form-item label="学位" prop="degree"> <el-form-item label="学位" prop="degree">
<el-input v-model="form.degree" placeholder="请输入" clearable /> <el-input v-model="form.degree" placeholder="请输入" clearable />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row>
<el-row :gutter="2" type="flex" justify="space-between">
<el-col :span="8" class="custom-margin"> <el-col :span="8" class="custom-margin">
<el-form-item label="工作经历" prop="workExperience"> <el-form-item label="工作经历" prop="workExperience">
<el-input v-model="form.workExperience" placeholder="请输入" clearable style="width: 100%" /> <el-input v-model="form.workExperience" placeholder="请输入" clearable style="width: 100%" />
...@@ -554,14 +575,14 @@ ...@@ -554,14 +575,14 @@
</el-col> </el-col>
<el-col :span="8" class="custom-margin"> <el-col :span="8" class="custom-margin">
<el-form-item label="钉钉手机号" prop="ddPhone"> <el-form-item label="钉钉手机号" prop="ddPhone">
<el-input v-model="form.ddPhone" placeholder="请输入" clearable /> <el-input v-model="form.ddPhone" placeholder="请输入" clearable style="width: 190px;" />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row :gutter="2" type="flex" justify="space-between"> <el-row :gutter="2" type="flex" justify="space-between">
<el-col :span="24" class="custom-margin"> <el-col :span="8" class="custom-margin">
<el-form-item label="备注" prop="remark"> <el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" placeholder="请输入" clearable /> <el-input v-model="form.remark" placeholder="请输入" clearable style="width: 100%;" />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
...@@ -612,7 +633,20 @@ ...@@ -612,7 +633,20 @@
<el-input v-model="form.fileAge" placeholder="请输入" style="width: 190px;"></el-input> <el-input v-model="form.fileAge" placeholder="请输入" style="width: 190px;"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12" class="custom-margin">
<el-form-item label="退休日期" prop="txDate">
<!-- <el-date-picker v-model="form.fileBirthDate" placeholder="选择日期" style="width: 100%;"
clearable type="month" value-format="yyyy-MM"></el-date-picker> -->
<el-date-picker clearable value-format="yyyy-MM-dd" v-model="form.txDate" type="date"
style="width: 100%;" placeholder="选择日期">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="12" class="custom-margin">
<el-form-item label="退休年龄" prop="txAge">
<el-input v-model="form.txAge" placeholder="请输入" style="width: 190px;"></el-input>
</el-form-item>
</el-col>
<el-col :span="12" class="custom-margin"> <el-col :span="12" class="custom-margin">
<el-form-item label="出生年月" prop="birthDate"> <el-form-item label="出生年月" prop="birthDate">
<el-date-picker clearable v-model="form.birthDate" type="date" value-format="yyyy-MM-dd" <el-date-picker clearable v-model="form.birthDate" type="date" value-format="yyyy-MM-dd"
...@@ -1022,7 +1056,7 @@ export default { ...@@ -1022,7 +1056,7 @@ export default {
form: {}, form: {},
// 表单校验 // 表单校验
rules: { rules: {
name: [{ required: true, trigger: "blur" }], name: [{ required: true, trigger: "blur", }],
idCard: [{ required: true, validator: checkIdcard, trigger: "blur" }], idCard: [{ required: true, validator: checkIdcard, trigger: "blur" }],
teachingSubject: [ teachingSubject: [
{ required: true, trigger: "blur" }, { required: true, trigger: "blur" },
...@@ -1370,6 +1404,8 @@ export default { ...@@ -1370,6 +1404,8 @@ export default {
photoUrl: null, photoUrl: null,
ddPhone: null, ddPhone: null,
delFlag: null, delFlag: null,
txDate: null,
txAge: null,
}; };
this.resetForm("form"); this.resetForm("form");
}, },
......
ruoyi-ui/src/views/smartSchool/electronicArchives/examinationScore/index.vue
...@@ -825,9 +825,14 @@ export default { ...@@ -825,9 +825,14 @@ export default {
margin-bottom: 0px; margin-bottom: 0px;
} }
// 修改 el-dialog 内 el-form-item 的间距
::v-deep .el-dialog .el-form-item {
margin-bottom: 15px; // 你可以根据需要调整这个值来改变输入框之间的距离
}
::v-deep .el-input--medium .el-input__inner { ::v-deep .el-input--medium .el-input__inner {
height: 26px; height: 32px;
line-height: 26px; line-height: 32px;
} }
::v-deep .el-dialog__body { ::v-deep .el-dialog__body {
......
ruoyi-ui/src/views/smartSchool/electronicArchives/professionalDevelopment/awardTutoringstu/index.vue
...@@ -863,8 +863,13 @@ export default { ...@@ -863,8 +863,13 @@ export default {
} }
::v-deep .el-input--medium .el-input__inner { ::v-deep .el-input--medium .el-input__inner {
height: 26px; height: 32px;
line-height: 26px; line-height: 32px;
}
// 修改 el-dialog 内 el-form-item 的间距
::v-deep .el-dialog .el-form-item {
margin-bottom: 15px; // 你可以根据需要调整这个值来改变输入框之间的距离
} }
::v-deep .el-dialog__body { ::v-deep .el-dialog__body {
......
ruoyi-ui/src/views/smartSchool/electronicArchives/professionalDevelopment/comprehensiveHonors/index.vue
...@@ -800,8 +800,13 @@ export default { ...@@ -800,8 +800,13 @@ export default {
} }
::v-deep .el-input--medium .el-input__inner { ::v-deep .el-input--medium .el-input__inner {
height: 26px; height: 32px;
line-height: 26px; line-height: 32px;
}
// 修改 el-dialog 内 el-form-item 的间距
::v-deep .el-dialog .el-form-item {
margin-bottom: 15px; // 你可以根据需要调整这个值来改变输入框之间的距离
} }
::v-deep .el-dialog__body { ::v-deep .el-dialog__body {
......
ruoyi-ui/src/views/smartSchool/electronicArchives/professionalDevelopment/essaysWritings/index.vue
...@@ -781,8 +781,13 @@ export default { ...@@ -781,8 +781,13 @@ export default {
} }
::v-deep .el-input--medium .el-input__inner { ::v-deep .el-input--medium .el-input__inner {
height: 26px; height: 32px;
line-height: 26px; line-height: 32px;
}
// 修改 el-dialog 内 el-form-item 的间距
::v-deep .el-dialog .el-form-item {
margin-bottom: 15px; // 你可以根据需要调整这个值来改变输入框之间的距离
} }
::v-deep .el-dialog__body { ::v-deep .el-dialog__body {
......
ruoyi-ui/src/views/smartSchool/electronicArchives/professionalDevelopment/lectureAwards/index.vue
...@@ -819,8 +819,13 @@ export default { ...@@ -819,8 +819,13 @@ export default {
} }
::v-deep .el-input--medium .el-input__inner { ::v-deep .el-input--medium .el-input__inner {
height: 26px; height: 32px;
line-height: 26px; line-height: 32px;
}
// 修改 el-dialog 内 el-form-item 的间距
::v-deep .el-dialog .el-form-item {
margin-bottom: 15px; // 你可以根据需要调整这个值来改变输入框之间的距离
} }
::v-deep .el-dialog__body { ::v-deep .el-dialog__body {
......
ruoyi-ui/src/views/smartSchool/electronicArchives/professionalDevelopment/projectResearch/index.vue
...@@ -805,8 +805,13 @@ export default { ...@@ -805,8 +805,13 @@ export default {
} }
::v-deep .el-input--medium .el-input__inner { ::v-deep .el-input--medium .el-input__inner {
height: 26px; height: 32px;
line-height: 26px; line-height: 32px;
}
// 修改 el-dialog 内 el-form-item 的间距
::v-deep .el-dialog .el-form-item {
margin-bottom: 15px; // 你可以根据需要调整这个值来改变输入框之间的距离
} }
::v-deep .el-dialog__body { ::v-deep .el-dialog__body {
......
ruoyi-ui/src/views/smartSchool/electronicArchives/professionalDevelopment/teacherAwards/index.vue
...@@ -778,8 +778,13 @@ export default { ...@@ -778,8 +778,13 @@ export default {
} }
::v-deep .el-input--medium .el-input__inner { ::v-deep .el-input--medium .el-input__inner {
height: 26px; height: 32px;
line-height: 26px; line-height: 32px;
}
// 修改 el-dialog 内 el-form-item 的间距
::v-deep .el-dialog .el-form-item {
margin-bottom: 15px; // 你可以根据需要调整这个值来改变输入框之间的距离
} }
::v-deep .el-dialog__body { ::v-deep .el-dialog__body {
......
ruoyi-ui/src/views/smartSchool/electronicArchives/professionalDevelopment/teachingAchievements/index.vue
...@@ -721,8 +721,8 @@ export default { ...@@ -721,8 +721,8 @@ export default {
} }
::v-deep .el-input--medium .el-input__inner { ::v-deep .el-input--medium .el-input__inner {
height: 26px; height: 30px;
line-height: 26px; line-height: 30px;
} }
::v-deep .el-dialog__body { ::v-deep .el-dialog__body {
...@@ -846,4 +846,9 @@ export default { ...@@ -846,4 +846,9 @@ export default {
} }
} }
} }
// 修改 el-dialog 内 el-form-item 的间距
::v-deep .el-dialog .el-form-item {
margin-bottom: 15px; // 你可以根据需要调整这个值来改变输入框之间的距离
}
</style> </style>
\ No newline at end of file
ruoyi-ui/src/views/smartSchool/electronicArchives/professionalDevelopment/teamAward/index.vue
...@@ -598,8 +598,13 @@ export default { ...@@ -598,8 +598,13 @@ export default {
} }
::v-deep .el-input--medium .el-input__inner { ::v-deep .el-input--medium .el-input__inner {
height: 26px; height: 32px;
line-height: 26px; line-height: 32px;
}
// 修改 el-dialog 内 el-form-item 的间距
::v-deep .el-dialog .el-form-item {
margin-bottom: 15px; // 你可以根据需要调整这个值来改变输入框之间的距离
} }
::v-deep .el-dialog__body { ::v-deep .el-dialog__body {
......
ruoyi-ui/src/views/smartSchool/electronicArchives/professionalDevelopment/tutorAward/index.vue
...@@ -900,9 +900,14 @@ export default { ...@@ -900,9 +900,14 @@ export default {
margin-bottom: 0px; margin-bottom: 0px;
} }
// 修改 el-dialog 内 el-form-item 的间距
::v-deep .el-dialog .el-form-item {
margin-bottom: 15px; // 你可以根据需要调整这个值来改变输入框之间的距离
}
::v-deep .el-input--medium .el-input__inner { ::v-deep .el-input--medium .el-input__inner {
height: 26px; height: 30px;
line-height: 26px; line-height: 30px;
} }
::v-deep .el-dialog__body { ::v-deep .el-dialog__body {
......
ruoyi-ui/src/views/smartSchool/electronicArchives/teacherAssessment/index.vue
...@@ -695,9 +695,14 @@ export default { ...@@ -695,9 +695,14 @@ export default {
margin-bottom: 0px; margin-bottom: 0px;
} }
// 修改 el-dialog 内 el-form-item 的间距
::v-deep .el-dialog .el-form-item {
margin-bottom: 15px; // 你可以根据需要调整这个值来改变输入框之间的距离
}
::v-deep .el-input--medium .el-input__inner { ::v-deep .el-input--medium .el-input__inner {
height: 26px; height: 32px;
line-height: 26px; line-height: 32px;
} }
::v-deep .el-dialog__body { ::v-deep .el-dialog__body {
......
ruoyi-ui/src/views/smartSchool/electronicArchives/workloadInformation/index.vue
...@@ -1088,9 +1088,13 @@ export default { ...@@ -1088,9 +1088,13 @@ export default {
margin-bottom: 0px; margin-bottom: 0px;
} }
::v-deep .el-dialog .el-form-item {
margin-bottom: 15px;
}
::v-deep .el-input--medium .el-input__inner { ::v-deep .el-input--medium .el-input__inner {
height: 26px; height: 32px;
line-height: 26px; line-height: 32px;
} }
::v-deep .el-dialog__body { ::v-deep .el-dialog__body {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment