Skip to content

D
dd_school
Commit 0f2ada0e by wangjian
Options

Merge remote-tracking branch 'origin/master'

parents 23814581 6a701854
Showing with 462 additions and 99 deletions
ruoyi-ui/src/views/smartSchool/electronicArchives/assessmentView/index.vue
...@@ -349,7 +349,7 @@ export default { ...@@ -349,7 +349,7 @@ export default {
// 查询参数 // 查询参数
queryParams: { queryParams: {
pageNum: 1, pageNum: 1,
pageSize: 10, pageSize: 20,
orderByColumn: "", orderByColumn: "",
isAsc: "asc", isAsc: "asc",
semester: null, semester: null,
...@@ -526,6 +526,8 @@ export default { ...@@ -526,6 +526,8 @@ export default {
// 表单重置 // 表单重置
reset() { reset() {
this.form = { this.form = {
pageNum: 1,
pageSize: 20,
id: null, id: null,
semester: null, semester: null,
year: null, year: null,
...@@ -556,6 +558,24 @@ export default { ...@@ -556,6 +558,24 @@ export default {
}, },
/** 重置按钮操作 */ /** 重置按钮操作 */
resetQuery() { resetQuery() {
this.queryParams = {
pageNum: 1,
pageSize: 20,
orderByColumn: "",
isAsc: "asc",
semester: null,
year: null,
schoolYear: null,
grade: null,
className: null,
teacherName: null,
idCard: null,
moralEduCheckAchievement: null,
intellEduCheckAchievement: null,
totalCheckAchievement: null,
classType: null,
sub: null,
};
this.resetForm("queryParams"); this.resetForm("queryParams");
this.handleQuery(); this.handleQuery();
}, },
......
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"
...@@ -1004,7 +1038,7 @@ export default { ...@@ -1004,7 +1038,7 @@ export default {
// 查询参数 // 查询参数
queryParams: { queryParams: {
pageNum: 1, pageNum: 1,
pageSize: 10, pageSize: 20,
orderByColumn: "", orderByColumn: "",
isAsc: "asc", isAsc: "asc",
teachingSubject: "", teachingSubject: "",
...@@ -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");
}, },
...@@ -1386,7 +1422,7 @@ export default { ...@@ -1386,7 +1422,7 @@ export default {
resetcx() { resetcx() {
this.queryParams = { this.queryParams = {
pageNum: 1, pageNum: 1,
pageSize: 10, pageSize: 20,
teachingSubject: "", teachingSubject: "",
name: "", name: "",
sex: "", sex: "",
...@@ -1403,7 +1439,7 @@ export default { ...@@ -1403,7 +1439,7 @@ export default {
resetQuery() { resetQuery() {
this.queryParams = { this.queryParams = {
pageNum: 1, pageNum: 1,
pageSize: 10, pageSize: 20,
teachingSubject: "", teachingSubject: "",
name: "", name: "",
sex: "", sex: "",
......
ruoyi-ui/src/views/smartSchool/electronicArchives/electronicRecords/index.vue
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<div class="app-container"> <div class="app-container">
<el-dialog title="查询" :visible.sync="query" width="60%" append-to-body> <el-dialog title="查询" :visible.sync="query" width="60%" append-to-body>
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"
label-width="130px"> label-width="130px" class="search">
<el-form-item label="学年" prop="schoolYear"> <el-form-item label="学年" prop="schoolYear">
<el-select v-model="queryParams.schoolYear" clearable placeholder="请选择" style="width: 100%;"> <el-select v-model="queryParams.schoolYear" clearable placeholder="请选择" style="width: 100%;">
<el-option v-for="dict in dict.type.yearda" :key="dict.value" :label="dict.label" <el-option v-for="dict in dict.type.yearda" :key="dict.value" :label="dict.label"
...@@ -427,7 +427,7 @@ export default { ...@@ -427,7 +427,7 @@ export default {
// 查询参数 // 查询参数
queryParams: { queryParams: {
pageNum: 1, pageNum: 1,
pageSize: 10, pageSize: 20,
schoolYear: null, schoolYear: null,
semester: null, semester: null,
year: null, year: null,
...@@ -556,6 +556,8 @@ export default { ...@@ -556,6 +556,8 @@ export default {
// 表单重置 // 表单重置
reset() { reset() {
this.form = { this.form = {
pageNum: 1,
pageSize: 20,
id: null, id: null,
schoolYear: null, schoolYear: null,
semester: null, semester: null,
...@@ -605,6 +607,23 @@ export default { ...@@ -605,6 +607,23 @@ export default {
}, },
/** 重置按钮操作 */ /** 重置按钮操作 */
resetQuery() { resetQuery() {
this.queryParams = {
pageNum: 1,
pageSize: 20,
schoolYear: null,
semester: null,
year: null,
grade: null,
sub: null,
className: null,
name: null,
idCard: null,
incubationPeriod: null,
sameExamResults: null,
situation: null,
highQuality: null,
classCompetition: null,
}
this.resetForm("queryForm"); this.resetForm("queryForm");
this.handleQuery(); this.handleQuery();
}, },
...@@ -680,7 +699,7 @@ export default { ...@@ -680,7 +699,7 @@ export default {
} }
}; };
</script> </script>
<style lang="scss" scoped> <style scoped lang="scss">
.mask { .mask {
position: fixed; position: fixed;
top: 0; top: 0;
...@@ -726,6 +745,10 @@ export default { ...@@ -726,6 +745,10 @@ export default {
width: 200px width: 200px
} }
.add ::v-deep .el-textarea__inner {
margin-bottom: 10px;
}
::v-deep.el-table--border .el-table__cell .cell { ::v-deep.el-table--border .el-table__cell .cell {
padding-left: 0px !important; padding-left: 0px !important;
......
ruoyi-ui/src/views/smartSchool/electronicArchives/examinationScore/index.vue
...@@ -443,7 +443,7 @@ export default { ...@@ -443,7 +443,7 @@ export default {
// 查询参数 // 查询参数
queryParams: { queryParams: {
pageNum: 1, pageNum: 1,
pageSize: 10, pageSize: 20,
orderByColumn: "", orderByColumn: "",
isAsc: "asc", isAsc: "asc",
sub: null, sub: null,
...@@ -636,6 +636,8 @@ export default { ...@@ -636,6 +636,8 @@ export default {
// 表单重置 // 表单重置
reset() { reset() {
this.form = { this.form = {
pageNum: 1,
pageSize: 20,
id: null, id: null,
sub: null, sub: null,
teacherName: null, teacherName: null,
...@@ -669,6 +671,24 @@ export default { ...@@ -669,6 +671,24 @@ export default {
}, },
/** 重置按钮操作 */ /** 重置按钮操作 */
resetQuery() { resetQuery() {
this.queryParams = {
pageNum: 1,
pageSize: 20,
orderByColumn: "",
isAsc: "asc",
sub: null,
teacherName: null,
year: null,
teachingClassName: null,
classType: null,
gkAppraising: null,
topStudentsCulture: null,
incrementSituation: null,
effectiveNumSituation: null,
other: null,
auditState: null,
}
this.resetForm("queryParams"); this.resetForm("queryParams");
this.handleQuery(); this.handleQuery();
}, },
...@@ -805,9 +825,14 @@ export default { ...@@ -805,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/annualAssessment/index.vue
...@@ -188,7 +188,7 @@ export default { ...@@ -188,7 +188,7 @@ export default {
// 查询参数 // 查询参数
queryParams: { queryParams: {
pageNum: 1, pageNum: 1,
pageSize: 10, pageSize: 20,
year: null, year: null,
name: null, name: null,
checkResult: null, checkResult: null,
...@@ -262,6 +262,8 @@ export default { ...@@ -262,6 +262,8 @@ export default {
// 表单重置 // 表单重置
reset() { reset() {
this.form = { this.form = {
pageNum: 1,
pageSize: 20,
id: null, id: null,
year: null, year: null,
name: null, name: null,
...@@ -279,6 +281,13 @@ export default { ...@@ -279,6 +281,13 @@ export default {
}, },
/** 重置按钮操作 */ /** 重置按钮操作 */
resetQuery() { resetQuery() {
this.queryParams = {
pageNum: 1,
pageSize: 20,
year: null,
name: null,
checkResult: null,
}
this.resetForm("queryForm"); this.resetForm("queryForm");
this.handleQuery(); this.handleQuery();
}, },
......
ruoyi-ui/src/views/smartSchool/electronicArchives/professionalDevelopment/awardTutoringstu/index.vue
...@@ -455,7 +455,7 @@ export default { ...@@ -455,7 +455,7 @@ export default {
// 查询参数 // 查询参数
queryParams: { queryParams: {
pageNum: 1, pageNum: 1,
pageSize: 10, pageSize: 20,
orderByColumn: "", orderByColumn: "",
isAsc: "asc", isAsc: "asc",
sub: null, sub: null,
...@@ -713,6 +713,8 @@ export default { ...@@ -713,6 +713,8 @@ export default {
// 表单重置 // 表单重置
reset() { reset() {
this.form = { this.form = {
pageNum: 1,
pageSize: 20,
id: null, id: null,
sub: null, sub: null,
awardType: null, awardType: null,
...@@ -746,6 +748,23 @@ export default { ...@@ -746,6 +748,23 @@ export default {
}, },
/** 重置按钮操作 */ /** 重置按钮操作 */
resetQuery() { resetQuery() {
this.queryParams = {
pageNum: 1,
pageSize: 20,
orderByColumn: "",
isAsc: "asc",
sub: null,
awardType: null,
awardRank: null,
awardLevel: null,
resultName: null,
userId: null,
username: null,
org: null,
awardTime: null,
pictureName: null,
pictureurl: null,
}
this.resetForm("queryParams"); this.resetForm("queryParams");
this.handleQuery(); this.handleQuery();
}, },
...@@ -844,8 +863,13 @@ export default { ...@@ -844,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
...@@ -405,7 +405,7 @@ export default { ...@@ -405,7 +405,7 @@ export default {
// 查询参数 // 查询参数
queryParams: { queryParams: {
pageNum: 1, pageNum: 1,
pageSize: 10, pageSize: 20,
orderByColumn: "", orderByColumn: "",
isAsc: "asc", isAsc: "asc",
sub: "", sub: "",
...@@ -597,6 +597,8 @@ export default { ...@@ -597,6 +597,8 @@ export default {
// 表单重置 // 表单重置
reset() { reset() {
this.form = { this.form = {
pageNum: 1,
pageSize: 20,
id: null, id: null,
sub: null, sub: null,
awardType: null, awardType: null,
...@@ -630,6 +632,19 @@ export default { ...@@ -630,6 +632,19 @@ export default {
}, },
/** 重置按钮操作 */ /** 重置按钮操作 */
resetQuery() { resetQuery() {
this.queryParams = {
pageNum: 1,
pageSize: 20,
orderByColumn: "",
isAsc: "asc",
sub: "",
awardType: "",
awardRank: "",
awardLevel: "",
userName: "",
startTime: "",
endTime: "",
}
this.resetForm("queryParams"); this.resetForm("queryParams");
this.handleQuery(); this.handleQuery();
}, },
...@@ -785,8 +800,13 @@ export default { ...@@ -785,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
...@@ -411,7 +411,7 @@ export default { ...@@ -411,7 +411,7 @@ export default {
// 查询参数 // 查询参数
queryParams: { queryParams: {
pageNum: 1, pageNum: 1,
pageSize: 10, pageSize: 20,
sub: null, sub: null,
awardType: null, awardType: null,
awardRank: null, awardRank: null,
...@@ -629,6 +629,8 @@ export default { ...@@ -629,6 +629,8 @@ export default {
// 表单重置 // 表单重置
reset() { reset() {
this.form = { this.form = {
pageNum: 1,
pageSize: 20,
id: null, id: null,
sub: null, sub: null,
awardType: null, awardType: null,
...@@ -662,6 +664,23 @@ export default { ...@@ -662,6 +664,23 @@ export default {
}, },
/** 重置按钮操作 */ /** 重置按钮操作 */
resetQuery() { resetQuery() {
this.queryParams = {
pageNum: 1,
pageSize: 20,
sub: null,
awardType: null,
awardRank: null,
awardLevel: null,
resultName: null,
userId: null,
userName: null,
org: null,
awardTime: null,
pictureName: null,
pictureUrl: null,
endTime: null,
startTime: null,
}
this.queryParams.startTime = ""; this.queryParams.startTime = "";
this.queryParams.endTime = ""; this.queryParams.endTime = "";
this.resetForm("queryParams"); this.resetForm("queryParams");
...@@ -762,8 +781,13 @@ export default { ...@@ -762,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
...@@ -411,7 +411,20 @@ export default { ...@@ -411,7 +411,20 @@ export default {
// 查询参数 // 查询参数
queryParams: { queryParams: {
pageNum: 1, pageNum: 1,
pageSize: 10, pageSize: 20,
sub: null,
awardType: null,
awardRank: null,
awardLevel: null,
resultName: null,
userId: null,
userName: null,
org: null,
awardTime: null,
pictureName: null,
pictureUrl: null,
endTime: null,
startTime: null,
sub: null, sub: null,
awardType: null, awardType: null,
awardRank: null, awardRank: null,
...@@ -627,6 +640,21 @@ export default { ...@@ -627,6 +640,21 @@ export default {
// 表单重置 // 表单重置
reset() { reset() {
this.form = { this.form = {
pageNum: 1,
pageSize: 20,
sub: null,
awardType: null,
awardRank: null,
awardLevel: null,
resultName: null,
userId: null,
userName: null,
org: null,
awardTime: null,
pictureName: null,
pictureUrl: null,
endTime: null,
startTime: null,
id: null, id: null,
sub: null, sub: null,
awardType: null, awardType: null,
...@@ -660,6 +688,37 @@ export default { ...@@ -660,6 +688,37 @@ export default {
}, },
/** 重置按钮操作 */ /** 重置按钮操作 */
resetQuery() { resetQuery() {
this.queryParams = {
pageNum: 1,
pageSize: 20,
sub: null,
awardType: null,
awardRank: null,
awardLevel: null,
resultName: null,
userId: null,
userName: null,
org: null,
awardTime: null,
pictureName: null,
pictureUrl: null,
endTime: null,
startTime: null,
sub: null,
awardType: null,
awardRank: null,
awardLevel: null,
resultName: null,
userId: null,
userName: null,
org: null,
awardTime: null,
pictureName: null,
pictureUrl: null,
upateBy: null,
endTime: null,
startTime: null,
}
this.queryParams.startTime = ""; this.queryParams.startTime = "";
this.queryParams.endTime = ""; this.queryParams.endTime = "";
this.resetForm("queryParams"); this.resetForm("queryParams");
...@@ -760,8 +819,13 @@ export default { ...@@ -760,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
...@@ -414,7 +414,7 @@ export default { ...@@ -414,7 +414,7 @@ export default {
// 查询参数 // 查询参数
queryParams: { queryParams: {
pageNum: 1, pageNum: 1,
pageSize: 10, pageSize: 20,
orderByColumn: "", orderByColumn: "",
isAsc: "asc", isAsc: "asc",
sub: null, sub: null,
...@@ -651,6 +651,8 @@ export default { ...@@ -651,6 +651,8 @@ export default {
// 表单重置 // 表单重置
reset() { reset() {
this.form = { this.form = {
pageNum: 1,
pageSize: 20,
id: null, id: null,
sub: null, sub: null,
awardType: null, awardType: null,
...@@ -684,6 +686,25 @@ export default { ...@@ -684,6 +686,25 @@ export default {
}, },
/** 重置按钮操作 */ /** 重置按钮操作 */
resetQuery() { resetQuery() {
this.queryParams = {
pageNum: 1,
pageSize: 20,
orderByColumn: "",
isAsc: "asc",
sub: null,
awardType: null,
awardRank: null,
awardLevel: null,
resultName: null,
userId: null,
userName: null,
org: null,
awardTime: null,
pictureName: null,
pictureUrl: null,
endTime: null,
startTime: null,
}
this.queryParams.startTime = ""; this.queryParams.startTime = "";
this.queryParams.endTime = ""; this.queryParams.endTime = "";
this.resetForm("queryParams"); this.resetForm("queryParams");
...@@ -784,8 +805,13 @@ export default { ...@@ -784,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
...@@ -412,7 +412,7 @@ export default { ...@@ -412,7 +412,7 @@ export default {
// 查询参数 // 查询参数
queryParams: { queryParams: {
pageNum: 1, pageNum: 1,
pageSize: 10, pageSize: 20,
sub: null, sub: null,
awardType: null, awardType: null,
awardRank: null, awardRank: null,
...@@ -626,6 +626,8 @@ export default { ...@@ -626,6 +626,8 @@ export default {
// 表单重置 // 表单重置
reset() { reset() {
this.form = { this.form = {
pageNum: 1,
pageSize: 20,
id: null, id: null,
sub: null, sub: null,
awardType: null, awardType: null,
...@@ -659,6 +661,23 @@ export default { ...@@ -659,6 +661,23 @@ export default {
}, },
/** 重置按钮操作 */ /** 重置按钮操作 */
resetQuery() { resetQuery() {
this.queryParams = {
pageNum: 1,
pageSize: 20,
sub: null,
awardType: null,
awardRank: null,
awardLevel: null,
resultName: null,
userId: null,
userName: null,
org: null,
awardTime: null,
pictureName: null,
pictureUrl: null,
endTime: null,
startTime: null,
}
this.queryParams.startTime = ""; this.queryParams.startTime = "";
this.queryParams.endTime = ""; this.queryParams.endTime = "";
this.resetForm("queryParams"); this.resetForm("queryParams");
...@@ -759,8 +778,13 @@ export default { ...@@ -759,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
...@@ -433,7 +433,7 @@ export default { ...@@ -433,7 +433,7 @@ export default {
// 查询参数 // 查询参数
queryParams: { queryParams: {
pageNum: 1, pageNum: 1,
pageSize: 10, pageSize: 20,
orderByColumn: "", orderByColumn: "",
isAsc: "asc", isAsc: "asc",
userName: "", userName: "",
...@@ -558,6 +558,8 @@ export default { ...@@ -558,6 +558,8 @@ export default {
// 表单重置 // 表单重置
reset() { reset() {
this.form = { this.form = {
pageNum: 1,
pageSize: 20,
id: null, id: null,
schoolYear: null, schoolYear: null,
semester: null, semester: null,
...@@ -632,7 +634,7 @@ export default { ...@@ -632,7 +634,7 @@ export default {
resetQuery() { resetQuery() {
this.queryParams = { this.queryParams = {
pageNum: 1, pageNum: 1,
pageSize: 10, pageSize: 20,
userName: "", userName: "",
schoolYear: "", schoolYear: "",
semester: "", semester: "",
...@@ -719,8 +721,8 @@ export default { ...@@ -719,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 {
...@@ -844,4 +846,9 @@ export default { ...@@ -844,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
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
<el-form-item label="学年" prop="schoolYear"> <el-form-item label="学年" prop="schoolYear">
<el-select v-model="queryParams.schoolYear" clearable placeholder="请选择" <el-select v-model="queryParams.schoolYear" clearable placeholder="请选择"
style="width: 100%;"> style="width: 100%;">
<el-option v-for=" dict in dict.type.yearda" :key="dict.value" :label="dict.label" <el-option v-for="dict in dict.type.yearda" :key="dict.value" :label="dict.label"
:value="dict.value"> :value="dict.value">
</el-option> </el-option>
</el-select> </el-select>
...@@ -333,7 +333,7 @@ export default { ...@@ -333,7 +333,7 @@ export default {
// 查询参数 // 查询参数
queryParams: { queryParams: {
pageNum: 1, pageNum: 1,
pageSize: 10, pageSize: 20,
orderByColumn: "", orderByColumn: "",
isAsc: "asc", isAsc: "asc",
schoolYear: null, schoolYear: null,
...@@ -479,6 +479,8 @@ export default { ...@@ -479,6 +479,8 @@ export default {
// 表单重置 // 表单重置
reset() { reset() {
this.form = { this.form = {
pageNum: 1,
pageSize: 20,
id: null, id: null,
schoolYear: null, schoolYear: null,
semester: null, semester: null,
...@@ -509,6 +511,20 @@ export default { ...@@ -509,6 +511,20 @@ export default {
}, },
/** 重置按钮操作 */ /** 重置按钮操作 */
resetQuery() { resetQuery() {
this.queryParams = {
pageNum: 1,
pageSize: 20,
orderByColumn: "",
isAsc: "asc",
schoolYear: null,
semester: null,
year: null,
grade: null,
sub: null,
awardSituation: null,
teamMembersContribution: null,
auditState: null,
}
this.resetForm("queryParams"); this.resetForm("queryParams");
this.handleQuery(); this.handleQuery();
}, },
...@@ -582,8 +598,13 @@ export default { ...@@ -582,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
...@@ -491,7 +491,7 @@ export default { ...@@ -491,7 +491,7 @@ export default {
// 查询参数 // 查询参数
queryParams: { queryParams: {
pageNum: 1, pageNum: 1,
pageSize: 10, pageSize: 20,
orderByColumn: "", orderByColumn: "",
isAsc: "asc", isAsc: "asc",
sub: null, sub: null,
...@@ -751,6 +751,8 @@ export default { ...@@ -751,6 +751,8 @@ export default {
// 表单重置 // 表单重置
reset() { reset() {
this.form = { this.form = {
pageNum: 1,
pageSize: 20,
id: null, id: null,
sub: null, sub: null,
awardType: null, awardType: null,
...@@ -784,6 +786,23 @@ export default { ...@@ -784,6 +786,23 @@ export default {
}, },
/** 重置按钮操作 */ /** 重置按钮操作 */
resetQuery() { resetQuery() {
this.queryParams = {
pageNum: 1,
pageSize: 20,
orderByColumn: "",
isAsc: "asc",
sub: null,
awardType: null,
awardRank: null,
awardLevel: null,
resultName: null,
userId: null,
username: null,
org: null,
awardTime: null,
pictureName: null,
pictureurl: null,
}
this.resetForm("queryParams"); this.resetForm("queryParams");
this.handleQuery(); this.handleQuery();
}, },
...@@ -881,9 +900,14 @@ export default { ...@@ -881,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
...@@ -415,7 +415,7 @@ export default { ...@@ -415,7 +415,7 @@ export default {
// 查询参数 // 查询参数
queryParams: { queryParams: {
pageNum: 1, pageNum: 1,
pageSize: 10, pageSize: 20,
orderByColumn: "", orderByColumn: "",
isAsc: "asc", isAsc: "asc",
semester: null, semester: null,
...@@ -593,6 +593,8 @@ export default { ...@@ -593,6 +593,8 @@ export default {
// 表单重置 // 表单重置
reset() { reset() {
this.form = { this.form = {
pageNum: 1,
pageSize: 20,
id: null, id: null,
semester: null, semester: null,
year: null, year: null,
...@@ -693,9 +695,14 @@ export default { ...@@ -693,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
...@@ -768,7 +768,7 @@ export default { ...@@ -768,7 +768,7 @@ export default {
// 查询参数 // 查询参数
queryParams: { queryParams: {
pageNum: 1, pageNum: 1,
pageSize: 10, pageSize: 20,
orderByColumn: "", orderByColumn: "",
isAsc: "asc", isAsc: "asc",
schoolYear: null, schoolYear: null,
...@@ -947,6 +947,8 @@ export default { ...@@ -947,6 +947,8 @@ export default {
// 表单重置 // 表单重置
reset() { reset() {
this.form = { this.form = {
pageNum: 1,
pageSize: 20,
id: null, id: null,
schoolYear: null, schoolYear: null,
semester: null, semester: null,
...@@ -983,6 +985,8 @@ export default { ...@@ -983,6 +985,8 @@ export default {
/** 重置按钮操作 */ /** 重置按钮操作 */
resetQuery() { resetQuery() {
this.queryParams = { this.queryParams = {
pageNum: 1,
pageSize: 20,
schoolYear: "", schoolYear: "",
semester: "", semester: "",
year: "", year: "",
...@@ -1084,9 +1088,13 @@ export default { ...@@ -1084,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