Commit 2c87e8dd by baochunxin

#修改前端页面显示字段

parent b0715b15
...@@ -58,15 +58,15 @@ ...@@ -58,15 +58,15 @@
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="现具备专技资格" prop="currentProfessionalTitle"> <el-form-item label="现职称" prop="currentProfessionalTitle">
<el-input v-model="queryParams.currentProfessionalTitle" placeholder="请输入现具备专技资格" clearable <!-- <el-input v-model="queryParams.currentProfessionalTitle" placeholder="请输入现职称" clearable
@keyup.enter.native="handleQuery" /> @keyup.enter.native="handleQuery" /> -->
<!-- <el-select v-model="queryParams.currentProfessionalTitle" clearable placeholder="请选择" <el-select v-model="queryParams.currentProfessionalTitle" clearable placeholder="请选择"
style="width: 100%"> style="width: 100%">
<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"
:label="dict.label" :value="dict.value"> :label="dict.label" :value="dict.value">
</el-option> </el-option>
</el-select> --> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
...@@ -187,10 +187,12 @@ ...@@ -187,10 +187,12 @@
</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" <el-table-column label="现职称" :min-width="screenWidth * 0.05" align="center" prop="currentHiringProfessionalTitle"
sortable="custom" show-overflow-tooltip> sortable="custom" show-overflow-tooltip>
<template slot="header"> <template slot-scope="scope">
<span style="white-space: normal;">现具备专<br />技资格</span> <!-- <span style="white-space: normal;">现具备专<br />技资格</span> -->
<!-- <span style="white-space: normal;">现职称</span> -->
<dict-tag :options="dict.type.current_professional" :value="scope.row.currentHiringProfessionalTitle" />
</template> </template>
</el-table-column> </el-table-column>
<!-- <el-table-column label="毕业院校" align="center" prop="graduationInstitution3" sortable="custom" <!-- <el-table-column label="毕业院校" align="center" prop="graduationInstitution3" sortable="custom"
...@@ -324,15 +326,15 @@ ...@@ -324,15 +326,15 @@
</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="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%" /> 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"
:label="dict.label" :value="dict.value"> :label="dict.label" :value="dict.value">
</el-option> </el-option>
</el-select> --> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
...@@ -358,19 +360,19 @@ ...@@ -358,19 +360,19 @@
</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="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"
:label="dict.label" :value="dict.value"> :label="dict.label" :value="dict.value">
</el-option> </el-option>
</el-select> --> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<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: 100%;"> value-format="yyyy-MM" placeholder="请选择" style="width: 100%;">
</el-date-picker> </el-date-picker>
...@@ -382,7 +384,7 @@ ...@@ -382,7 +384,7 @@
</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-form-item label="现职称取得时间" prop="currentProfessionalTitleTime">
<el-date-picker clearable v-model="form.currentProfessionalTitleTime" type="month" <el-date-picker clearable v-model="form.currentProfessionalTitleTime" type="month"
value-format="yyyy-MM" placeholder="请选择" style="width:100%;"> value-format="yyyy-MM" placeholder="请选择" style="width:100%;">
</el-date-picker> </el-date-picker>
...@@ -709,38 +711,38 @@ ...@@ -709,38 +711,38 @@
</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="currentProfessionalTitle"> <el-form-item label="现职称" prop="currentProfessionalTitle">
<el-input v-model="form.currentProfessionalTitle" placeholder="请输入" style="width: 100%;" /> <!-- <el-input v-model="form.currentProfessionalTitle" placeholder="请输入" style="width: 100%;" /> -->
<!-- <el-select v-model="form.currentProfessionalTitle" style="width: 100%" placeholder="请选择"> <el-select v-model="form.currentProfessionalTitle" style="width: 100%" 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"
:label="dict.label" :value="dict.value"> :label="dict.label" :value="dict.value">
</el-option> </el-option>
</el-select> --> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8" class="custom-margin"> <el-col :span="8" class="custom-margin">
<el-form-item label="现具备专技资格时间" prop="currentProfessionalTitleTime"> <el-form-item label="现职称取得时间" prop="currentProfessionalTitleTime">
<el-date-picker clearable v-model="form.currentProfessionalTitleTime" type="month" <el-date-picker clearable v-model="form.currentProfessionalTitleTime" type="month"
value-format="yyyy-MM" placeholder="请选择" style="width: 190px;"> value-format="yyyy-MM" placeholder="请选择" style="width: 190px;">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
<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 v-model="form.currentHiringProfessionalTitle" style="width: 100%" <el-select 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"
:label="dict.label" :value="dict.value"> :label="dict.label" :value="dict.value">
</el-option> </el-option>
</el-select> --> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
</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="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: 190px;">
</el-date-picker> </el-date-picker>
......
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