Skip to content

D
dd_school
Commit c7972b4c by zhaopanyu
Options

zpy 12.20

parent b4c21519
Showing with 2541 additions and 1369 deletions
.DS_Store
No preview for this file type
ruoyi-ui/src/views/smartSchool/electronicArchives/basicInformation/index.vue
...@@ -126,37 +126,45 @@ ...@@ -126,37 +126,45 @@
</el-col> </el-col>
</el-row> </el-row>
<el-table :data="informationList" @selection-change="handleSelectionChange" <el-table :data="informationList" @selection-change="handleSelectionChange"
:default-sort="{ prop: 'toSecondMiddleSchoolTime', order: 'descending' }" :row-style="{height: '0'}" :cell-style="{padding: '3px'}"> :default-sort="{ prop: 'toSecondMiddleSchoolTime', order: 'descending' }" :row-style="{ height: '0' }"
:cell-style="{ padding: '3px' }">
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<el-table-column type="index" label="序号" width="55" align="center" fixed="left" /> <el-table-column type="index" label="序号" width="55" align="center" fixed="left" />
<el-table-column label="姓名" align="center" prop="name" sortable fixed="left" width="100" /> <el-table-column label="姓名" align="center" prop="name" sortable fixed="left" width="100"
<el-table-column label="性别" align="center" prop="sex" sortable fixed="left" width="80"> show-overflow-tooltip />
<el-table-column label="性别" align="center" prop="sex" sortable fixed="left" width="80" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.sys_user_sex" :value="scope.row.sex" /> <dict-tag :options="dict.type.sys_user_sex" :value="scope.row.sex" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="年龄" align="center" prop="age" sortable fixed="left" width="80" /> <el-table-column label="年龄" align="center" prop="age" sortable fixed="left" width="80" show-overflow-tooltip />
<el-table-column label="档案年龄" align="center" prop="fileAge" sortable width="120px" /> <el-table-column label="档案年龄" align="center" prop="fileAge" sortable width="120px" show-overflow-tooltip />
<el-table-column label="政治面貌" align="center" prop="politicalLandscape" sortable width="100px"> <el-table-column label="政治面貌" align="center" prop="politicalLandscape" sortable width="100px"
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 width="100px"> <el-table-column label="档案生日" align="center" prop="fileBirthDate" sortable width="100px" 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>
</el-table-column> </el-table-column>
<el-table-column label="到市二中工作时间" align="center" prop="toSecondMiddleSchoolTime" sortable width="155px" /> <el-table-column label="到市二中工作时间" align="center" prop="toSecondMiddleSchoolTime" sortable width="155px"
<el-table-column label="到市二中工作年限" align="center" prop="toSecondAge" sortable width="155px" /> show-overflow-tooltip />
<el-table-column label="现职称" align="center" prop="currentProfessionalTitle" sortable width="100px"> <el-table-column label="到市二中工作年限" align="center" prop="toSecondAge" sortable width="155px"
show-overflow-tooltip />
<el-table-column label="现职称" align="center" prop="currentProfessionalTitle" sortable width="100px"
show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.current_professional" :value="scope.row.currentProfessionalTitle" /> <dict-tag :options="dict.type.current_professional" :value="scope.row.currentProfessionalTitle" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="毕业院校" align="center" prop="graduationInstitution1" sortable width="100px" /> <el-table-column label="毕业院校" align="center" prop="graduationInstitution1" sortable width="160px"
<el-table-column label="学历" align="center" prop="firstDegree" sortable /> show-overflow-tooltip />
<el-table-column label="在岗情况" align="center" prop="onDutySituation" sortable width="100px"> <el-table-column label="学历" align="center" prop="firstDegree" sortable show-overflow-tooltip />
<el-table-column label="在岗情况" align="center" prop="onDutySituation" sortable width="100px"
show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.duty_situation" :value="scope.row.onDutySituation" /> <dict-tag :options="dict.type.duty_situation" :value="scope.row.onDutySituation" />
</template> </template>
...@@ -176,7 +184,7 @@ ...@@ -176,7 +184,7 @@
<pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
@pagination="getList" /> @pagination="getList" />
<!-- 导入对话框 --> <!-- 导入对话框 -->
<el-dialog :title="title" :visible.sync="uploadOpen" width="520px" append-to-body inline @close="cancel"> <el-dialog :title="title" :visible.sync="uploadOpen" width="520px" append-to-body inline @close="cancel">
<el-form ref="uploadForm" :model="uploadForm" :rules="rules" label-width="70px"> <el-form ref="uploadForm" :model="uploadForm" :rules="rules" label-width="70px">
<el-form-item prop="dataUrl"> <el-form-item prop="dataUrl">
<el-upload ref="upload" :limit="1" accept=".xlsx, .xls" :headers="upload.headers" <el-upload ref="upload" :limit="1" accept=".xlsx, .xls" :headers="upload.headers"
...@@ -217,32 +225,24 @@ ...@@ -217,32 +225,24 @@
</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="sex">
<el-select v-model="form.sex" placeholder="请选择性别" :style="{ width: '100%' }">
<el-option v-for="dict in dict.type.sys_user_sex" :key="dict.value" :label="dict.label"
:value="dict.value"></el-option>
</el-select>
</el-form-item>
</el-col>
<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" type="date" placeholder="选择日期" <el-date-picker v-model="form.fileBirthDate" type="date" placeholder="选择日期"
:default-value="form.fileBirthDate" style="width: 190px;" :default-value="form.fileBirthDate" style="width: 100%;"
value-format=" yyyy-MM-dd"></el-date-picker> value-format=" yyyy-MM-dd"></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="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-form-item label="籍贯" prop="hometown"> <el-form-item label="籍贯" prop="hometown">
<el-input v-model="form.hometown" placeholder="请输入籍贯" style="width: 190px;"></el-input> <el-input v-model="form.hometown" 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="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="请输入民族"></el-input> <el-input v-model="form.nation" placeholder="请输入民族"></el-input>
...@@ -272,7 +272,22 @@ ...@@ -272,7 +272,22 @@
</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="currentProfessionalTitle">
<el-select v-model="form.currentProfessionalTitle" style="width: 100%" placeholder="请选择">
<el-option v-for="dict in dict.type.current_professional" :key="dict.value"
:label="dict.label" :value="dict.value">
</el-option>
</el-select>
</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="date"
value-format="yyyy-MM-dd" placeholder="请选择" style="width: 190px;">
</el-date-picker>
</el-form-item>
</el-col> </el-col>
</el-col> </el-col>
<el-col :span="6" class="custom-margin"> <el-col :span="6" class="custom-margin">
<el-card style=" <el-card style="
...@@ -295,8 +310,8 @@ ...@@ -295,8 +310,8 @@
</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="currentHiringProfessionalTitle">
<el-select v-model="form.currentProfessionalTitle" style="width: 100%" placeholder="请选择"> <el-select v-model="form.currentHiringProfessionalTitle" 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>
...@@ -304,33 +319,20 @@ ...@@ -304,33 +319,20 @@
</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="currentHiringProfessionalTitleTime">
<el-date-picker clearable v-model="form.currentProfessionalTitleTime" type="date" <el-date-picker clearable v-model="form.currentHiringProfessionalTitleTime" type="date"
value-format="yyyy-MM-dd" placeholder="请选择" style="width: 190px;"> value-format="yyyy-MM-dd" 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-select v-model="form.currentHiringProfessionalTitle" style="width: 100%" placeholder="请选择">
<el-option v-for="dict in dict.type.current_professional" :key="dict.value"
:label="dict.label" :value="dict.value">
</el-option>
</el-select>
</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-date-picker clearable v-model="form.currentHiringProfessionalTitleTime" type="date"
value-format="yyyy-MM-dd" 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: 190px;" placeholder="请选择"> <el-select v-model="form.currentPosition" style="width:100%;" placeholder="请选择">
<el-option v-for="dict in dict.type.current_position" :key="dict.value" :label="dict.label" <el-option v-for="dict in dict.type.current_position" :key="dict.value" :label="dict.label"
:value="dict.value"> :value="dict.value">
</el-option> </el-option>
...@@ -339,15 +341,13 @@ ...@@ -339,15 +341,13 @@
</el-col> </el-col>
<el-col :span="8" class="custom-margin"> <el-col :span="8" class="custom-margin">
<el-form-item label="现岗位等级" prop="currentJobLevel"> <el-form-item label="现岗位等级" prop="currentJobLevel">
<el-select v-model="form.currentJobLevel" style="width: 100%" placeholder="请选择"> <el-select v-model="form.currentJobLevel" style="width: 190px;" placeholder="请选择">
<el-option v-for="level in filteredJobLevels" :key="level.value" :label="level.label" <el-option v-for="level in filteredJobLevels" :key="level.value" :label="level.label"
:value="level.value"> :value="level.value">
</el-option> </el-option>
</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="date" <el-date-picker clearable v-model="form.currentJobLevelAppointmentTime" type="date"
...@@ -355,39 +355,39 @@ ...@@ -355,39 +355,39 @@
</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" placeholder="请输入" style="width: 190px;" /> <el-input v-model="form.duties" placeholder="请输入" style="width: 100%;" />
</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="teacherQualificationType"> <el-form-item label="教师资格种类" prop="teacherQualificationType">
<el-input v-model="form.teacherQualificationType" placeholder="请输入" /> <el-input v-model="form.teacherQualificationType" placeholder="请输入" 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" placeholder="请输入" /> <el-input v-model="form.teacherQualificationCertificateNum" 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"
placeholder="请选择" style="width: 190px;"> placeholder="请选择" style="width: 100%;">
</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="toSecondMiddleSchoolTime"> <el-form-item label="到二中工作时间" prop="toSecondMiddleSchoolTime">
<el-date-picker clearable v-model="form.toSecondMiddleSchoolTime" type="date" <el-date-picker clearable v-model="form.toSecondMiddleSchoolTime" type="date"
value-format="yyyy-MM-dd" placeholder="请选择" :style="{ width: '100%' }"> value-format="yyyy-MM-dd" placeholder="请选择" style="width: 190px;">
</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"
...@@ -395,24 +395,24 @@ ...@@ -395,24 +395,24 @@
</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"
value-format="yyyy-MM-dd" placeholder="请选择" style="width: 190px;"> value-format="yyyy-MM-dd" placeholder="请选择" style="width: 100%;">
</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="onDutySituation"> <el-form-item label="在岗情况" prop="onDutySituation">
<el-select v-model="form.onDutySituation" style="width: 100%" placeholder="请选择"> <el-select v-model="form.onDutySituation" style="width: 190px;" placeholder="请选择">
<el-option v-for="dict in dict.type.duty_situation" :key="dict.value" :label="dict.label" <el-option v-for="dict in dict.type.duty_situation" :key="dict.value" :label="dict.label"
:value="dict.value"> :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 :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" style="width: 100%" placeholder="请选择"> <el-select v-model="form.currentSituation" style="width: 100%" placeholder="请选择">
...@@ -422,18 +422,18 @@ ...@@ -422,18 +422,18 @@
</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" placeholder="请输入" style="width: 190px;" /> <el-input v-model="form.graduationInstitution1" placeholder="请输入" style="width: 100%;" />
</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="专业1" prop="major1"> <el-form-item label="专业1" prop="major1">
<el-input v-model="form.major1" placeholder="请输入" /> <el-input v-model="form.major1" placeholder="请输入" 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="month" value-format="yyyy-MM" <el-date-picker clearable v-model="form.graduationTime1" type="month" value-format="yyyy-MM"
...@@ -441,18 +441,18 @@ ...@@ -441,18 +441,18 @@
</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="请输入" style="width: 190px;" /> <el-input v-model="form.graduationInstitution2" placeholder="请输入" style="width: 100%;" />
</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="专业2" prop="major2"> <el-form-item label="专业2" prop="major2">
<el-input v-model="form.major2" placeholder="请输入" /> <el-input v-model="form.major2" placeholder="请输入" 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="month" value-format="yyyy-MM" <el-date-picker clearable v-model="form.graduationTime2" type="month" value-format="yyyy-MM"
...@@ -460,18 +460,18 @@ ...@@ -460,18 +460,18 @@
</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="请输入" style="width: 190px;" /> <el-input v-model="form.graduationInstitution3" placeholder="请输入" style="width: 100%;" />
</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="专业3" prop="major3"> <el-form-item label="专业3" prop="major3">
<el-input v-model="form.major3" placeholder="请输入" /> <el-input v-model="form.major3" placeholder="请输入" 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="month" value-format="yyyy-MM" <el-date-picker clearable v-model="form.graduationTime3" type="month" value-format="yyyy-MM"
...@@ -479,26 +479,28 @@ ...@@ -479,26 +479,28 @@
</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="请输入" style="width: 190px;" /> <el-input v-model="form.firstDegree" placeholder="请输入" style="width: 100%;" />
</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="lastDegree"> <el-form-item label="最后学历" prop="lastDegree">
<el-input v-model="form.lastDegree" placeholder="请输入" /> <el-input v-model="form.lastDegree" placeholder="请输入" 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="请输入" /> <el-input v-model="form.degree" placeholder="请输入" />
</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="请输入" style="width: 190px;" /> <el-input v-model="form.workExperience" placeholder="请输入" style="width: 100%" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8" class="custom-margin"> <el-col :span="8" class="custom-margin">
...@@ -520,7 +522,7 @@ ...@@ -520,7 +522,7 @@
<el-button @click="cancel">取 消</el-button> <el-button @click="cancel">取 消</el-button>
</div> </div>
</el-dialog> </el-dialog>
<!-- 修改对话框 --> <!-- 查看对话框 -->
<el-dialog class="editForm" title="详细信息" :visible.sync="look" width="80%" append-to-body> <el-dialog class="editForm" title="详细信息" :visible.sync="look" width="80%" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="138px"> <el-form ref="form" :model="form" :rules="rules" label-width="138px">
<el-row type="flex" justify="space-between"> <el-row type="flex" justify="space-between">
...@@ -961,7 +963,7 @@ export default { ...@@ -961,7 +963,7 @@ export default {
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: "change" }, { required: true, trigger: "blur" },
], ],
toSecondMiddleSchoolTime: [ toSecondMiddleSchoolTime: [
{ {
...@@ -1230,6 +1232,7 @@ export default { ...@@ -1230,6 +1232,7 @@ export default {
handleQuery() { handleQuery() {
this.query = true; this.query = true;
this.getList(); this.getList();
this.query = false;
}, },
resetcx() { resetcx() {
this.queryParams = { this.queryParams = {
...@@ -1296,7 +1299,7 @@ export default { ...@@ -1296,7 +1299,7 @@ export default {
/** 修改按钮操作 */ /** 修改按钮操作 */
handleUpdate(row) { handleUpdate(row) {
console.log(row); console.log(row);
this.look = true; this.open = true;
this.isEditing = true; this.isEditing = true;
this.reset(); this.reset();
const id = row.id || this.ids; const id = row.id || this.ids;
...@@ -1315,7 +1318,7 @@ export default { ...@@ -1315,7 +1318,7 @@ export default {
updateInformation(this.form).then((response) => { updateInformation(this.form).then((response) => {
console.log(this.form, 'this.form'); console.log(this.form, 'this.form');
this.$modal.msgSuccess("修改成功"); this.$modal.msgSuccess("修改成功");
this.look = false; this.open = false;
this.getList(); this.getList();
}); });
} else { } else {
...@@ -1436,27 +1439,35 @@ export default { ...@@ -1436,27 +1439,35 @@ export default {
// margin-top: -40px !important; // margin-top: -40px !important;
// text-align: right !important; // text-align: right !important;
//} //}
::v-deep .el-form-item{ ::v-deep .el-form-item {
margin-bottom: 0px; margin-bottom: 0px;
} }
::v-deep .el-input--medium .el-input__inner { ::v-deep .el-input--medium .el-input__inner {
height: 26px; height: 26px;
line-height: 26px; line-height: 26px;
} }
::v-deep .el-dialog__body{
padding: 10px 20px ::v-deep .el-dialog__body {
padding: 10px 20px
} }
::v-deep .el-dialog:not(.is-fullscreen) { ::v-deep .el-dialog:not(.is-fullscreen) {
margin-top: 4vh !important; margin-top: 4vh !important;
} }
.search ::v-deep .el-form-item__content{
width: 200px .search ::v-deep .el-form-item__content {
width: 200px
} }
.addForm ::v-deep .el-dialog__header,.editForm ::v-deep .el-dialog__header{
padding-bottom: 0px; .addForm ::v-deep .el-dialog__header,
padding-top: 10px; .editForm ::v-deep .el-dialog__header {
padding-bottom: 0px;
padding-top: 10px;
} }
.addForm ::v-deep .el-dialog__footer,.editForm ::v-deep .el-dialog__footer{
padding-bottom: 10px; .addForm ::v-deep .el-dialog__footer,
.editForm ::v-deep .el-dialog__footer {
padding-bottom: 10px;
} }
</style> </style>
ruoyi-ui/src/views/smartSchool/electronicArchives/examinationScore/index.vue
<template> <template>
<div class="app-container"> <div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px"> <el-dialog title="查询" :visible.sync="query" width="50%" append-to-body>
<el-form-item label="届别" prop="year"> <el-form ref="queryParams" :model="queryParams" label-width="96px" class="search">
<el-select v-model="queryParams.year" placeholder="请选择"> <el-row>
<el-option v-for="dict in dict.type.rankda" :key="dict.value" :label="dict.label" :value="dict.value"> <el-col :span="12">
</el-option> <el-form-item label="届别" prop="year">
</el-select> <el-select v-model="queryParams.year" placeholder="请选择" style="width: 100%;">
</el-form-item> <el-option v-for="dict in dict.type.rankda" :key="dict.value" :label="dict.label"
<el-form-item label="学科" prop="sub"> :value="dict.value">
<el-select v-model="queryParams.sub" placeholder="请选择" style="width: 100%;"> </el-option>
<el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value" :label="dict.label" </el-select>
:value="dict.value"> </el-form-item>
</el-option> </el-col>
</el-select> <el-col :span="12">
</el-form-item> <el-form-item label="学科" prop="sub">
<el-form-item label="教师姓名" prop="teacherName"> <el-select v-model="queryParams.sub" placeholder="请选择" style="width: 100%;">
<el-input v-model="queryParams.teacherName" placeholder="请输入教师姓名" clearable <el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value" :label="dict.label"
@keyup.enter.native="handleQuery" /> :value="dict.value">
</el-form-item> </el-option>
<el-form-item label="授课班级" prop="teachingClassName"> </el-select>
<el-select v-model="queryParams.teachingClassName" placeholder="请选择" style="width: 100%"> </el-form-item>
<el-option v-for="dict in dict.type.class_num" :key="dict.value" :label="dict.label" </el-col>
:value="dict.value"> </el-row>
</el-option> <el-row>
</el-select> <el-col :span="12">
</el-form-item> <el-form-item label="教师姓名" prop="teacherName">
<el-form-item label="班级类型" prop="classType"> <el-input v-model="queryParams.teacherName" placeholder="请输入教师姓名" clearable
<el-select v-model="queryParams.classType" placeholder="请选择" style="width: 100%"> @keyup.enter.native="handleQuery" />
<el-option v-for="dict in dict.type.class_type" :key="dict.value" :label="dict.label" </el-form-item>
:value="dict.value"> </el-col>
</el-option> <el-col :span="12">
</el-select> <el-form-item label="授课班级" prop="teachingClassName">
</el-form-item> <el-select v-model="queryParams.teachingClassName" placeholder="请选择" style="width: 100%">
<el-form-item label="高考评优" prop="gkAppraising"> <el-option v-for="dict in dict.type.class_num" :key="dict.value" :label="dict.label"
<el-select v-model="queryParams.gkAppraising" placeholder="请选择" style="width: 100%"> :value="dict.value">
<el-option v-for="dict in dict.type.gk_appraising" :key="dict.value" :label="dict.label" </el-option>
:value="dict.value"> </el-select>
</el-option> </el-form-item>
</el-select> </el-col>
</el-form-item> </el-row>
<el-row>
<el-form-item> <el-col :span="12">
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button> <el-form-item label="班级类型" prop="classType">
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button> <el-select v-model="queryParams.classType" placeholder="请选择" style="width: 100%">
</el-form-item> <el-option v-for="dict in dict.type.class_type" :key="dict.value" :label="dict.label"
</el-form> :value="dict.value">
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="高考评优" prop="gkAppraising">
<el-select v-model="queryParams.gkAppraising" placeholder="请选择" style="width: 100%">
<el-option v-for="dict in dict.type.gk_appraising" :key="dict.value" :label="dict.label"
:value="dict.value">
</el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
</el-form-item>
</el-form>
</el-dialog>
<el-row :gutter="10" class="mb8"> <el-row :gutter="10" class="mb8">
<el-col :span="1.5"> <el-col :span="1.5">
<el-button type="primary" plain icon="el-icon-search" size="mini" @click="handleQuerycx">查询</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd" <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
v-hasPermi="['system:achievement:add']">新增</el-button> v-hasPermi="['system:achievement:add']">新增</el-button>
</el-col> </el-col>
...@@ -70,15 +93,15 @@ ...@@ -70,15 +93,15 @@
@selection-change="handleSelectionChange" :default-sort="{ prop: 'year', order: 'descending' }"> @selection-change="handleSelectionChange" :default-sort="{ prop: 'year', order: 'descending' }">
<el-table-column type="selection" width="55" align="center" sortable /> <el-table-column type="selection" width="55" align="center" sortable />
<el-table-column type="index" label="序号" width="55" align="center" sortable /> <el-table-column type="index" label="序号" width="55" align="center" sortable />
<el-table-column label="届别" align="center" prop="year" sortable /> <el-table-column label="届别" align="center" prop="year" sortable width="80" />
<el-table-column label="学科" align="center" prop="sub" sortable> <el-table-column label="学科" align="center" prop="sub" sortable width="80">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.teaching_subjects" :value="scope.row.sub" /> <dict-tag :options="dict.type.teaching_subjects" :value="scope.row.sub" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="教师姓名" align="center" prop="teacherName" sortable /> <el-table-column label="教师姓名" align="center" prop="teacherName" sortable width="160" />
<el-table-column label="授课班级" align="center" prop="teachingClassName" sortable /> <el-table-column label="授课班级" align="center" prop="teachingClassName" sortable width="150" />
<el-table-column label="班级类型" align="center" prop="classType" sortable> <el-table-column label="班级类型" align="center" prop="classType" sortable show-overflow-tooltip width="200">
<template slot-scope="scope"> <template slot-scope="scope">
<span v-if="getSelectedTypes(scope.row.classType).length > 0"> <span v-if="getSelectedTypes(scope.row.classType).length > 0">
<span v-for="(option, index) in getSelectedTypes(scope.row.classType)" :key="index"> <span v-for="(option, index) in getSelectedTypes(scope.row.classType)" :key="index">
...@@ -88,15 +111,15 @@ ...@@ -88,15 +111,15 @@
</span> </span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="高考评优" align="center" prop="gkAppraising" sortable> <el-table-column label="高考评优" align="center" prop="gkAppraising" sortable width="150">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.gk_appraising" :value="scope.row.gkAppraising" /> <dict-tag :options="dict.type.gk_appraising" :value="scope.row.gkAppraising" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="尖子生培养" align="center" prop="topStudentsCulture" sortable /> <el-table-column label="尖子生培养" align="center" prop="topStudentsCulture" sortable width="150" />
<el-table-column label="增量情况" align="center" prop="incrementSituation" sortable /> <el-table-column label="增量情况" align="center" prop="incrementSituation" sortable width="150" />
<el-table-column label="有效数情况" align="center" prop="effectiveNumSituation" sortable /> <el-table-column label="有效数情况" align="center" prop="effectiveNumSituation" sortable width="150" />
<el-table-column label="其他情况" align="center" prop="other" sortable /> <el-table-column label="其他情况" align="center" prop="other" sortable width="150" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="150"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="150">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button size="mini" type="text" @click="handleUpdate(scope.row)" v-hasPermi="['system:honors:edit']" <el-button size="mini" type="text" @click="handleUpdate(scope.row)" v-hasPermi="['system:honors:edit']"
...@@ -323,6 +346,7 @@ export default { ...@@ -323,6 +346,7 @@ export default {
open: false, open: false,
isEdit: false, isEdit: false,
look: false, look: false,
query: false,
// 查询参数 // 查询参数
queryParams: { queryParams: {
pageNum: 1, pageNum: 1,
...@@ -374,6 +398,7 @@ export default { ...@@ -374,6 +398,7 @@ export default {
this.getList(); this.getList();
}, },
methods: { methods: {
/** 查询高考成绩列表 */ /** 查询高考成绩列表 */
getList() { getList() {
this.loading = true; this.loading = true;
...@@ -458,13 +483,19 @@ export default { ...@@ -458,13 +483,19 @@ export default {
this.resetForm("form"); this.resetForm("form");
}, },
/** 搜索按钮操作 */ /** 搜索按钮操作 */
handleQuerycx() {
this.query = true;
},
/** 搜索按钮操作 */
handleQuery() { handleQuery() {
this.queryParams.pageNum = 1; this.queryParams.pageNum = 1;
this.getList(); this.getList();
this.query = false;
}, },
/** 重置按钮操作 */ /** 重置按钮操作 */
resetQuery() { resetQuery() {
this.resetForm("queryForm"); this.resetForm("queryParams");
this.handleQuery(); this.handleQuery();
}, },
// 多选框选中数据 // 多选框选中数据
...@@ -546,16 +577,24 @@ export default { ...@@ -546,16 +577,24 @@ export default {
}; };
</script> </script>
<style scoped lang="scss" > <style scoped lang="scss" >
::v-deep .el-form-item {
margin-bottom: 0px;
}
::v-deep .el-input--medium .el-input__inner { ::v-deep .el-input--medium .el-input__inner {
height: 26px; height: 26px;
line-height: 26px; line-height: 26px;
} }
::v-deep .el-dialog__body { ::v-deep .el-dialog__body {
padding: 20px padding: 10px 20px
} }
::v-deep .el-dialog:not(.is-fullscreen) { ::v-deep .el-dialog:not(.is-fullscreen) {
margin-top: 4vh !important; margin-top: 4vh !important;
} }
.search ::v-deep .el-form-item__content {
width: 200px
}
</style> </style>
ruoyi-ui/src/views/smartSchool/electronicArchives/personalInformation/index.vue
...@@ -3,10 +3,10 @@ ...@@ -3,10 +3,10 @@
<div class="seach"> <div class="seach">
<el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch"> <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch">
<el-form-item label="教师信息" prop="name"> <el-form-item label="教师信息" prop="name">
<el-input v-model="queryParams.name" placeholder="请输入教师姓名" clearable style="width: 600px;" /> <el-input v-model="queryParams.name" placeholder="请输入教师姓名" clearable style="width: 250px;" />
</el-form-item> </el-form-item>
<el-form-item label="身份证号" prop="idCard"> <el-form-item label="身份证号" prop="idCard">
<el-input v-model="queryParams.idCard" placeholder="请输入身份证号" clearable style="width: 600px;" /> <el-input v-model="queryParams.idCard" placeholder="请输入身份证号" clearable style="width: 250px;" />
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="getList">查询</el-button> <el-button type="primary" icon="el-icon-search" size="mini" @click="getList">查询</el-button>
...@@ -524,7 +524,7 @@ ...@@ -524,7 +524,7 @@
<div style="border: 1px solid #f3f3f3;border-radius: 13px 13px 0 0 ; margin: 20px 0;"> <div style="border: 1px solid #f3f3f3;border-radius: 13px 13px 0 0 ; margin: 20px 0;">
<div class="card_title">工作量信息</div> <div class="card_title">工作量信息</div>
<div style="margin: 3px 10px 15px;"> <div style="margin: 3px 10px 15px;">
<el-table :data="schoolAworkload"> <el-table :data="schoolAworkload" :row-style="{ height: '0' }" :cell-style="{ padding: '3px' }">
<el-table-column label="学年" align="center" prop="schoolYear" width="90px" fixed="left" /> <el-table-column label="学年" align="center" prop="schoolYear" width="90px" fixed="left" />
<el-table-column label="学期" align="center" prop="semester" fixed="left"> <el-table-column label="学期" align="center" prop="semester" fixed="left">
<template slot-scope="scope"> <template slot-scope="scope">
...@@ -570,8 +570,8 @@ ...@@ -570,8 +570,8 @@
<div style="border: 1px solid #f3f3f3;border-radius: 13px 13px 0 0 ; margin: 20px 0;"> <div style="border: 1px solid #f3f3f3;border-radius: 13px 13px 0 0 ; margin: 20px 0;">
<div class="card_title">班主任考核</div> <div class="card_title">班主任考核</div>
<div style="margin: 3px 10px 15px;"> <div style="margin: 3px 10px 15px;">
<el-table :data="schoolAclassTeacherAssessments"> <el-table :data="schoolAclassTeacherAssessments" :row-style="{ height: '0' }"
<el-table-column type="index" label="序号" width="55" align="center" /> :cell-style="{ padding: '3px' }">
<el-table-column label="学年" align="center" prop="schoolYear" /> <el-table-column label="学年" align="center" prop="schoolYear" />
<el-table-column label="学期" align="center" prop="semester"> <el-table-column label="学期" align="center" prop="semester">
<template slot-scope="scope"> <template slot-scope="scope">
...@@ -586,7 +586,6 @@ ...@@ -586,7 +586,6 @@
</el-table-column> </el-table-column>
<el-table-column label="班级" align="center" prop="className" /> <el-table-column label="班级" align="center" prop="className" />
<el-table-column label="班级类型" align="center" prop="classType" width="180px"> <el-table-column label="班级类型" align="center" prop="classType" width="180px">
</el-table-column> </el-table-column>
<el-table-column label="姓名" align="center" prop="teacherName" /> <el-table-column label="姓名" align="center" prop="teacherName" />
<el-table-column label="学科" align="center" prop="sub"> <el-table-column label="学科" align="center" prop="sub">
...@@ -604,7 +603,7 @@ ...@@ -604,7 +603,7 @@
<div style="border: 1px solid #f3f3f3;border-radius: 13px 13px 0 0 ; margin: 20px 0;"> <div style="border: 1px solid #f3f3f3;border-radius: 13px 13px 0 0 ; margin: 20px 0;">
<div class="card_title">专业成长</div> <div class="card_title">专业成长</div>
<div style="margin: 3px 10px 15px;"> <div style="margin: 3px 10px 15px;">
<el-table :data="specialityVos"> <el-table :data="specialityVos" :row-style="{ height: '0' }" :cell-style="{ padding: '3px' }">
<el-table-column label="成长类型" align="center" prop="growthType"> <el-table-column label="成长类型" align="center" prop="growthType">
</el-table-column> </el-table-column>
<el-table-column label="学科" align="center" prop="sub"> <el-table-column label="学科" align="center" prop="sub">
...@@ -640,7 +639,7 @@ ...@@ -640,7 +639,7 @@
<div style="border: 1px solid #f3f3f3;border-radius: 13px 13px 0 0 ; margin: 20px 0;"> <div style="border: 1px solid #f3f3f3;border-radius: 13px 13px 0 0 ; margin: 20px 0;">
<div class="card_title">高考成绩 </div> <div class="card_title">高考成绩 </div>
<div style="margin: 3px 10px 15px;"> <div style="margin: 3px 10px 15px;">
<el-table :data="schoolGkAchievement"> <el-table :data="schoolGkAchievement" :row-style="{ height: '0' }" :cell-style="{ padding: '3px' }">
<el-table-column label="届别" align="center" prop="year" /> <el-table-column label="届别" align="center" prop="year" />
<el-table-column label="学科" align="center" prop="sub"> <el-table-column label="学科" align="center" prop="sub">
<template slot-scope="scope"> <template slot-scope="scope">
...@@ -667,7 +666,7 @@ ...@@ -667,7 +666,7 @@
<div style="border: 1px solid #f3f3f3;border-radius: 13px 13px 0 0 ; margin: 20px 0;"> <div style="border: 1px solid #f3f3f3;border-radius: 13px 13px 0 0 ; margin: 20px 0;">
<div class="card_title">教学成绩</div> <div class="card_title">教学成绩</div>
<div style="margin: 3px 10px 15px;"> <div style="margin: 3px 10px 15px;">
<el-table :data="schoolXteachingAchievements"> <el-table :data="schoolXteachingAchievements" :row-style="{ height: '0' }" :cell-style="{ padding: '3px' }">
<el-table-column label="学年" align="center" prop="schoolYear" /> <el-table-column label="学年" align="center" prop="schoolYear" />
<el-table-column label="学期" align="center" prop="semester"> <el-table-column label="学期" align="center" prop="semester">
<template slot-scope="scope"> <template slot-scope="scope">
...@@ -708,7 +707,7 @@ ...@@ -708,7 +707,7 @@
<div style="border: 1px solid #f3f3f3;border-radius: 13px 13px 0 0 ; margin: 20px 0;"> <div style="border: 1px solid #f3f3f3;border-radius: 13px 13px 0 0 ; margin: 20px 0;">
<div class="card_title">辅导老师获奖</div> <div class="card_title">辅导老师获奖</div>
<div style="margin: 3px 10px 15px;"> <div style="margin: 3px 10px 15px;">
<el-table :data="fudaoTeacher"> <el-table :data="fudaoTeacher" :row-style="{ height: '0' }" :cell-style="{ padding: '3px' }">
<el-table-column label="成长类型" align="center"> <el-table-column label="成长类型" align="center">
<template> <template>
<span>辅导老师获奖</span> <span>辅导老师获奖</span>
...@@ -755,7 +754,7 @@ ...@@ -755,7 +754,7 @@
<div style="border: 1px solid #f3f3f3;border-radius: 13px 13px 0 0 ; margin: 20px 0;"> <div style="border: 1px solid #f3f3f3;border-radius: 13px 13px 0 0 ; margin: 20px 0;">
<div class="card_title">辅导学生获奖</div> <div class="card_title">辅导学生获奖</div>
<div style="margin: 3px 10px 15px;"> <div style="margin: 3px 10px 15px;">
<el-table :data="fudaoStudent"> <el-table :data="fudaoStudent" :row-style="{ height: '0' }" :cell-style="{ padding: '3px' }">
<el-table-column label="成长类型" align="center"> <el-table-column label="成长类型" align="center">
<template> <template>
<span>辅导学生获奖</span> <span>辅导学生获奖</span>
...@@ -797,7 +796,7 @@ ...@@ -797,7 +796,7 @@
<div style="border: 1px solid #f3f3f3;border-radius: 13px 13px 0 0 ; margin: 20px 0;"> <div style="border: 1px solid #f3f3f3;border-radius: 13px 13px 0 0 ; margin: 20px 0;">
<div class="card_title">年度考核</div> <div class="card_title">年度考核</div>
<div style="margin: 3px 10px 15px;"> <div style="margin: 3px 10px 15px;">
<el-table :data="schoolAnnualAssessment"> <el-table :data="schoolAnnualAssessment" :row-style="{ height: '0' }" :cell-style="{ padding: '3px' }">
<el-table-column label="姓名" align="center" prop="name" /> <el-table-column label="姓名" align="center" prop="name" />
<el-table-column label="年度" align="center" prop="year" /> <el-table-column label="年度" align="center" prop="year" />
<el-table-column label="考核结果" align="center" prop="checkResult"> <el-table-column label="考核结果" align="center" prop="checkResult">
......
ruoyi-ui/src/views/smartSchool/electronicArchives/professionalDevelopment/awardTutoringstu/index.vue
<template> <template>
<div class="app-container"> <div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="98px"> <el-dialog title="查询" :visible.sync="query" width="50%" append-to-body>
<el-form-item label="学科" prop="sub"> <el-form ref="queryParams" :model="queryParams" label-width="96px" class="search">
<el-select v-model="queryParams.sub" placeholder="请选择"> <el-row>
<el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value" :label="dict.label" <el-col :span="12">
:value="dict.value"> <el-form-item label="学科" prop="sub">
</el-option> <el-select v-model="queryParams.sub" placeholder="请选择" style="width: 100%;">
</el-select> <el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value" :label="dict.label"
</el-form-item> :value="dict.value">
<el-form-item label="获奖类别" prop="awardtype"> </el-option>
<el-select v-model="queryParams.awardtype" placeholder="请选择" style="width: 220px;"> </el-select>
<el-option v-for="dict in dict.type.award_type_fdxs" :key="dict.value" :label="dict.label" </el-form-item>
:value="dict.value"> </el-col>
</el-option> <el-col :span="12">
</el-select> <el-form-item label="获奖类别" prop="awardtype">
</el-form-item> <el-select v-model="queryParams.awardtype" placeholder="请选择" style="width: 100%;">
<el-form-item label="获奖级别" prop="awardrank"> <el-option v-for="dict in dict.type.award_type_fdxs" :key="dict.value" :label="dict.label"
<el-select v-model="queryParams.awardrank" placeholder="请选择" style="width: 220px;"> :value="dict.value">
<el-option v-for="dict in dict.type.awards_level" :key="dict.value" :label="dict.label" </el-option>
:value="dict.value"> </el-select>
</el-option> </el-form-item>
</el-select> </el-col>
</el-form-item> </el-row>
<el-form-item label="获奖等级" prop="awardlevel"> <el-row>
<el-select v-model="queryParams.awardlevel" placeholder="请选择" style="width:220px;"> <el-col :span="12">
<el-option v-for="dict in dict.type.award_rank" :key="dict.value" :label="dict.label" <el-form-item label="获奖级别" prop="awardrank">
:value="dict.value"> <el-select v-model="queryParams.awardrank" placeholder="请选择" style="width: 100%;">
</el-option> <el-option v-for="dict in dict.type.awards_level" :key="dict.value" :label="dict.label"
</el-select> :value="dict.value">
</el-form-item> </el-option>
<el-form-item label="获奖人" prop="username"> </el-select>
<el-input v-model="queryParams.username" placeholder="请输入获奖人" clearable @keyup.enter.native="handleQuery" /> </el-form-item>
</el-form-item> </el-col>
<el-form-item label="指导教师" prop="guidanceteacher"> <el-col :span="12">
<el-input v-model="queryParams.guidanceteacher" placeholder="请输入内容" style="width: 192px;" /> <el-form-item label="获奖等级" prop="awardlevel">
</el-form-item> <el-select v-model="queryParams.awardlevel" placeholder="请选择" style="width: 100%;">
<el-form-item label="获奖开始时间" prop="startTime"> <el-option v-for="dict in dict.type.award_rank" :key="dict.value" :label="dict.label"
<el-date-picker clearable v-model="queryParams.startTime" type="date" value-format="yyyy-MM-dd" :value="dict.value">
placeholder="请选择"> </el-option>
</el-date-picker> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="获奖结束时间" prop="endTime"> </el-col>
<el-date-picker clearable v-model="queryParams.endTime" type="date" value-format="yyyy-MM-dd" </el-row>
placeholder="请选择"> <el-row>
</el-date-picker> <el-col :span="12">
</el-form-item> <el-form-item label="获奖人" prop="username">
<el-form-item> <el-input v-model="queryParams.username" placeholder="请输入获奖人" clearable
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button> @keyup.enter.native="handleQuery" />
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button> </el-form-item>
</el-form-item> </el-col>
</el-form> <el-col :span="12">
<el-form-item label="指导教师" prop="guidanceteacher">
<el-input v-model="queryParams.guidanceteacher" placeholder="请输入内容" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="获奖开始时间" prop="startTime">
<el-date-picker clearable v-model="queryParams.startTime" type="date" value-format="yyyy-MM-dd"
placeholder="请选择" style="width: 100%;">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="获奖结束时间" prop="endTime">
<el-date-picker clearable v-model="queryParams.endTime" type="date" value-format="yyyy-MM-dd"
placeholder="请选择" style="width: 100%;">
</el-date-picker>
</el-form-item>
</el-col>
</el-row>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
</el-form-item>
</el-form>
</el-dialog>
<el-row :gutter="10" class="mb8"> <el-row :gutter="10" class="mb8">
<el-col :span="1.5"> <el-col :span="1.5">
<el-button type="primary" plain icon="el-icon-search" size="mini" @click="handleQuerycx">查询</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd" <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
v-hasPermi="['school:fudaos:addgl']">新增</el-button> v-hasPermi="['school:fudaos:addgl']">新增</el-button>
</el-col> </el-col>
...@@ -70,45 +100,45 @@ ...@@ -70,45 +100,45 @@
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row> </el-row>
<el-table :data="awardsList" @selection-change="handleSelectionChange" <el-table :row-style="{ height: '0' }" :cell-style="{ padding: '3px' }" :data="awardsList"
:default-sort="{ prop: 'awardtime', order: 'descending' }"> @selection-change="handleSelectionChange" :default-sort="{ prop: 'awardtime', order: 'descending' }">
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<el-table-column type="index" label="序号" width="55" align="center" sortable /> <el-table-column type="index" label="序号" width="55" align="center" sortable fixed="left" />
<el-table-column label="成长类型" align="center"> <el-table-column label="成长类型" align="center" fixed="left" width="120px">
<template> <template>
<span>辅导学生获奖</span> <span>辅导学生获奖</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="学科" align="center" prop="sub" sortable> <el-table-column label="学科" align="center" prop="sub" sortable fixed="left" width="120px">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.teaching_subjects" :value="scope.row.sub" /> <dict-tag :options="dict.type.teaching_subjects" :value="scope.row.sub" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="获奖类别" align="center" prop="awardtype" sortable> <el-table-column label="获奖类别" align="center" prop="awardtype" sortable width="120px">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.award_type_fdxs" :value="scope.row.awardtype" /> <dict-tag :options="dict.type.award_type_fdxs" :value="scope.row.awardtype" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="获奖等级" align="center" prop="awardlevel" sortable> <el-table-column label="获奖等级" align="center" prop="awardlevel" sortable width="120px">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.award_rank" :value="scope.row.awardlevel" /> <dict-tag :options="dict.type.award_rank" :value="scope.row.awardlevel" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="获奖级别" align="center" prop="awardrank" sortable> <el-table-column label="获奖级别" align="center" prop="awardrank" sortable width="120px">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.awards_level" :value="scope.row.awardrank" /> <dict-tag :options="dict.type.awards_level" :value="scope.row.awardrank" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="比赛名称" align="center" prop="resultname" sortable /> <el-table-column label="比赛名称" align="center" prop="resultname" sortable width="180px" />
<el-table-column label="获奖人" align="center" prop="username" sortable /> <el-table-column label="获奖人" align="center" prop="username" sortable width="120px" />
<el-table-column label="指导教师" align="center" prop="guidanceteacher" sortable /> <el-table-column label="指导教师" align="center" prop="guidanceteacher" sortable width="120px" />
<el-table-column label="主办单位" align="center" prop="org" sortable /> <el-table-column label="主办单位" align="center" prop="org" sortable width="180px" />
<el-table-column label="获奖时间" align="center" prop="awardtime" width="180" sortable> <el-table-column label="获奖时间" align="center" prop="awardtime" width="180" sortable>
<!-- <template slot-scope="scope"> <!-- <template slot-scope="scope">
<span>{{ parseTime(scope.row.awardTime, '{y}-{m}-{d}') }}</span> <span>{{ parseTime(scope.row.awardTime, '{y}-{m}-{d}') }}</span>
</template> --> </template> -->
</el-table-column> </el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="100"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="180" fixed="right">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
v-hasPermi="['school:fudaos:edit']" v-hasPermi="['school:fudaos:edit']"
...@@ -403,6 +433,7 @@ export default { ...@@ -403,6 +433,7 @@ export default {
open: false, open: false,
look: false, look: false,
isEdit: false, isEdit: false,
query: false,
// 查询参数 // 查询参数
queryParams: { queryParams: {
pageNum: 1, pageNum: 1,
...@@ -614,13 +645,18 @@ export default { ...@@ -614,13 +645,18 @@ export default {
this.resetForm("form"); this.resetForm("form");
}, },
/** 搜索按钮操作 */ /** 搜索按钮操作 */
handleQuerycx() {
this.query = true;
this.resetcx();
},
handleQuery() { handleQuery() {
this.queryParams.pageNum = 1; this.query = true;
this.getList(); this.getList();
this.query = false;
}, },
/** 重置按钮操作 */ /** 重置按钮操作 */
resetQuery() { resetQuery() {
this.resetForm("queryForm"); this.resetForm("queryParams");
this.handleQuery(); this.handleQuery();
}, },
// 多选框选中数据 // 多选框选中数据
...@@ -685,3 +721,25 @@ export default { ...@@ -685,3 +721,25 @@ export default {
} }
}; };
</script> </script>
<style scoped lang="scss" >
::v-deep .el-form-item {
margin-bottom: 0px;
}
::v-deep .el-input--medium .el-input__inner {
height: 26px;
line-height: 26px;
}
::v-deep .el-dialog__body {
padding: 10px 20px
}
::v-deep .el-dialog:not(.is-fullscreen) {
margin-top: 4vh !important;
}
.search ::v-deep .el-form-item__content {
width: 200px
}
</style>
ruoyi-ui/src/views/smartSchool/electronicArchives/professionalDevelopment/comprehensiveHonors/index.vue
<template> <template>
<div class="app-container"> <div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="98px"> <el-dialog title="查询" :visible.sync="query" width="50%" append-to-body>
<el-form-item label="学科" prop="sub"> <el-form ref="queryParams" :model="queryParams" label-width="96px" class="search">
<el-select v-model="queryParams.sub" placeholder="请选择" style="width: 220px;"> <el-row>
<el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value" :label="dict.label" <el-col :span="12">
:value="dict.value"> <el-form-item label="学科" prop="sub">
</el-option> <el-select v-model="queryParams.sub" placeholder="请选择" style="width: 100%;">
</el-select> <el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value" :label="dict.label"
</el-form-item> :value="dict.value">
<el-form-item label="获奖类别" prop="awardType"> </el-option>
<el-input v-model="queryParams.awardType" placeholder="请输入" clearable @keyup.enter.native="handleQuery" </el-select>
style="width: 220px;" /> </el-form-item>
</el-form-item> </el-col>
<el-form-item label="获奖级别" prop="awardRank"> <el-col :span="12">
<el-select v-model="queryParams.awardRank" placeholder="请选择"> <el-form-item label="获奖类别" prop="awardType">
<el-option v-for="dict in dict.type.awards_level" :key="dict.value" :label="dict.label" <el-input v-model="queryParams.awardType" placeholder="请输入" clearable
:value="dict.value"> @keyup.enter.native="handleQuery" />
</el-option> </el-form-item>
</el-select> </el-col>
</el-form-item> </el-row>
<el-form-item label="获奖等级" prop="awardLevel"> <el-row>
<el-select v-model="queryParams.awardLevel" placeholder="请选择"> <el-col :span="12">
<el-option v-for="dict in dict.type.award_rank" :key="dict.value" :label="dict.label" <el-form-item label="获奖级别" prop="awardRank">
:value="dict.value"> <el-select v-model="queryParams.awardRank" placeholder="请选择" style="width: 100%;">
</el-option> <el-option v-for="dict in dict.type.awards_level" :key="dict.value" :label="dict.label"
</el-select> :value="dict.value">
</el-form-item> </el-option>
<el-form-item label="获奖人" prop="userName"> </el-select>
<el-input v-model="queryParams.userName" placeholder="请输入" clearable @keyup.enter.native="handleQuery" /> </el-form-item>
</el-form-item> </el-col>
<el-form-item label="获奖开始时间" prop="startTime"> <el-col :span="12">
<el-date-picker clearable v-model="queryParams.startTime" type="date" value-format="yyyy-MM-dd" <el-form-item label="获奖等级" prop="awardLevel">
placeholder="请选择"> <el-select v-model="queryParams.awardLevel" placeholder="请选择" style="width: 100%;">
</el-date-picker> <el-option v-for="dict in dict.type.award_rank" :key="dict.value" :label="dict.label"
</el-form-item> :value="dict.value">
<el-form-item label="获奖结束时间" prop="endTime"> </el-option>
<el-date-picker clearable v-model="queryParams.endTime" type="date" value-format="yyyy-MM-dd" </el-select>
placeholder="请选择"> </el-form-item>
</el-date-picker> </el-col>
</el-form-item> </el-row>
<el-form-item> <el-row>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button> <el-col :span="12">
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button> <el-form-item label="获奖人" prop="userName">
</el-form-item> <el-input v-model="queryParams.userName" placeholder="请输入" clearable
</el-form> @keyup.enter.native="handleQuery" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="获奖开始时间" prop="startTime">
<el-date-picker clearable v-model="queryParams.startTime" type="date" value-format="yyyy-MM-dd"
placeholder="请选择" style="width: 100%;">
</el-date-picker>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="获奖结束时间" prop="endTime">
<el-date-picker clearable v-model="queryParams.endTime" type="date" value-format="yyyy-MM-dd"
placeholder="请选择" style="width: 100%;">
</el-date-picker>
</el-form-item>
</el-col>
</el-row>
<el-form-item class="dialog-footer" style="display: flex; justify-content: center; align-items: center">
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
</el-form-item>
</el-form>
</el-dialog>
<el-row :gutter="10" class="mb8"> <el-row :gutter="10" class="mb8">
<el-col :span="1.5"> <el-col :span="1.5">
<el-button type="primary" plain icon="el-icon-search" size="mini" @click="handleQuerycx">查询</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd" <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
v-hasPermi="['system:honors:add']">新增</el-button> v-hasPermi="['system:honors:add']">新增</el-button>
</el-col> </el-col>
...@@ -65,40 +92,41 @@ ...@@ -65,40 +92,41 @@
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row> </el-row>
<el-table :data="honorsList" @selection-change="handleSelectionChange" <el-table :row-style="{ height: '0' }" :cell-style="{ padding: '3px' }" :data="honorsList"
:default-sort="{ prop: 'awardTime', order: 'descending' }"> @selection-change="handleSelectionChange" :default-sort="{ prop: 'awardTime', order: 'descending' }">
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<el-table-column type="index" label="序号" width="55" align="center" sortable /> <el-table-column type="index" label="序号" width="55" align="center" sortable fixed="left" />
<el-table-column label="成长类型" align="center" prop="type" sortable> <el-table-column label="成长类型" align="center" prop="type" sortable width="130px" fixed="left">
<template> <template>
<span>综合荣誉</span> <span>综合荣誉</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="学科" align="center" prop="sub" sortable> <el-table-column label="学科" align="center" prop="sub" sortable fixed="left" width="130px">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.teaching_subjects" :value="scope.row.sub" /> <dict-tag :options="dict.type.teaching_subjects" :value="scope.row.sub" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="获奖类别" align="center" prop="awardType" sortable /> <el-table-column label="获奖类别" align="center" prop="awardType" sortable width="130px" />
<el-table-column label="获奖等级" align="center" prop="awardLevel" sortable> <el-table-column label="获奖等级" align="center" prop="awardLevel" sortable width="130px">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.award_rank" :value="scope.row.awardLevel" /> <dict-tag :options="dict.type.award_rank" :value="scope.row.awardLevel" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="获奖级别" align="center" prop="awardRank" sortable> <el-table-column label="获奖级别" align="center" prop="awardRank" sortable width="120px">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.awards_level" :value="scope.row.awardRank" /> <dict-tag :options="dict.type.awards_level" :value="scope.row.awardRank" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="综合荣誉-成果名称" align="center" prop="resultName" sortable /> <el-table-column label="综合荣誉-成果名称" align="center" prop="resultName" sortable width="220px"
<el-table-column label="获奖人" align="center" prop="userName" sortable /> show-overflow-tooltip />
<el-table-column label="主办单位" align="center" prop="org" sortable /> <el-table-column label="获奖人" align="center" prop="userName" sortable width="150px" />
<el-table-column label="主办单位" align="center" prop="org" sortable width="180px" show-overflow-tooltip />
<el-table-column label="获奖时间" align="center" prop="awardTime" width="180" sortable> <el-table-column label="获奖时间" align="center" prop="awardTime" width="180" sortable>
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.awardTime, '{y}-{m}-{d}') }}</span> <span>{{ parseTime(scope.row.awardTime, '{y}-{m}-{d}') }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" width="180px">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
v-hasPermi="['system:honors:edit']" v-hasPermi="['system:honors:edit']"
...@@ -347,6 +375,7 @@ export default { ...@@ -347,6 +375,7 @@ export default {
showSearch: true, showSearch: true,
// 总条数 // 总条数
total: 0, total: 0,
query: false,
// 综合荣誉表格数据 // 综合荣誉表格数据
honorsList: [], honorsList: [],
// 弹出层标题 // 弹出层标题
...@@ -527,13 +556,18 @@ export default { ...@@ -527,13 +556,18 @@ export default {
this.resetForm("form"); this.resetForm("form");
}, },
/** 搜索按钮操作 */ /** 搜索按钮操作 */
handleQuerycx() {
this.query = true;
this.resetcx();
},
handleQuery() { handleQuery() {
this.queryParams.pageNum = 1; this.query = true;
this.getList(); this.getList();
this.query = false;
}, },
/** 重置按钮操作 */ /** 重置按钮操作 */
resetQuery() { resetQuery() {
this.resetForm("queryForm"); this.resetForm("queryParams");
this.handleQuery(); this.handleQuery();
}, },
// 多选框选中数据 // 多选框选中数据
...@@ -654,3 +688,25 @@ export default { ...@@ -654,3 +688,25 @@ export default {
} }
}; };
</script> </script>
<style scoped lang="scss" >
::v-deep .el-form-item {
margin-bottom: 0px;
}
::v-deep .el-input--medium .el-input__inner {
height: 26px;
line-height: 26px;
}
::v-deep .el-dialog__body {
padding: 10px 20px
}
::v-deep .el-dialog:not(.is-fullscreen) {
margin-top: 4vh !important;
}
.search ::v-deep .el-form-item__content {
width: 200px
}
</style>
ruoyi-ui/src/views/smartSchool/electronicArchives/professionalDevelopment/essaysWritings/index.vue
<template> <template>
<div class="app-container"> <div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="98px"> <el-dialog title="查询" :visible.sync="query" width="50%" append-to-body>
<el-form-item label="学科" prop="sub"> <el-form ref="queryParams" :model="queryParams" label-width="96px" class="search">
<el-select v-model="queryParams.sub" placeholder="请选择" style="width: 220px;"> <el-row>
<el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value" :label="dict.label" <el-col :span="12">
:value="dict.value"> <el-form-item label="学科" prop="sub">
</el-option> <el-select v-model="queryParams.sub" placeholder="请选择" style="width: 100%;">
</el-select> <el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value" :label="dict.label"
</el-form-item> :value="dict.value">
<el-form-item label="获奖类别" prop="awardType"> </el-option>
<el-select v-model="queryParams.awardType" placeholder="请选择" style="width: 220px;"> </el-select>
<el-option v-for="dict in dict.type.award_categories" :key="dict.value" :label="dict.label" </el-form-item>
:value="dict.value"> </el-col>
</el-option> <el-col :span="12">
</el-select> <el-form-item label="获奖类别" prop="awardType">
</el-form-item> <el-select v-model="queryParams.awardType" placeholder="请选择" style="width: 100%;">
<el-form-item label="获奖级别" prop="awardRank"> <el-option v-for="dict in dict.type.award_categoriesjk" :key="dict.value"
<el-select v-model="queryParams.awardRank" placeholder="请选择"> :label="dict.label" :value="dict.value">
<el-option v-for="dict in dict.type.awards_level" :key="dict.value" :label="dict.label" </el-option>
:value="dict.value"> </el-select>
</el-option> </el-form-item>
</el-select> </el-col>
</el-form-item> </el-row>
<el-form-item label="获奖等级" prop="awardLevel"> <el-row>
<el-select v-model="queryParams.awardLevel" placeholder="请选择" style="width: 100%;"> <el-col :span="12">
<el-option v-for="dict in dict.type.award_rank" :key="dict.value" :label="dict.label" <el-form-item label="获奖级别" prop="awardRank">
:value="dict.value"> <el-select v-model="queryParams.awardRank" placeholder="请选择" style="width: 100%;">
</el-option> <el-option v-for="dict in dict.type.awards_level" :key="dict.value" :label="dict.label"
</el-select> :value="dict.value">
</el-form-item> </el-option>
<el-form-item label="获奖人" prop="userName"> </el-select>
<el-input v-model="queryParams.userName" placeholder="请输入获奖人" clearable @keyup.enter.native="handleQuery" /> </el-form-item>
</el-form-item> </el-col>
<el-form-item label="获奖开始时间" prop="awardTime"> <el-col :span="12">
<el-date-picker clearable v-model="queryParams.startTime" type="date" value-format="yyyy-MM-dd" <el-form-item label="获奖等级" prop="awardLevel">
placeholder="请选择"> <el-select v-model="queryParams.awardLevel" placeholder="请选择" style="width: 100%;">
</el-date-picker> <el-option v-for="dict in dict.type.award_rank" :key="dict.value" :label="dict.label"
</el-form-item> :value="dict.value">
<el-form-item label="获奖结束时间" prop="awardTime"> </el-option>
<el-date-picker clearable v-model="queryParams.endTime" type="date" value-format="yyyy-MM-dd" </el-select>
placeholder="请选择"> </el-form-item>
</el-date-picker> </el-col>
</el-form-item> </el-row>
<el-row>
<el-form-item> <el-col :span="12">
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button> <el-form-item label="获奖人" prop="userName">
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button> <el-input v-model="queryParams.userName" placeholder="请输入获奖人" clearable
</el-form-item> @keyup.enter.native="handleQuery" />
</el-form> </el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="获奖开始时间" prop="awardTime">
<el-date-picker clearable v-model="queryParams.startTime" type="date" value-format="yyyy-MM-dd"
placeholder="请选择" style="width: 100%;">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="获奖结束时间" prop="awardTime">
<el-date-picker clearable v-model="queryParams.endTime" type="date" value-format="yyyy-MM-dd"
placeholder="请选择" style="width: 100%;">
</el-date-picker>
</el-form-item>
</el-col>
</el-row>
<el-form-item class="dialog-footer" style="display: flex; justify-content: center; align-items: center">
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
</el-form-item>
</el-form>
</el-dialog>
<el-row :gutter="10" class="mb8"> <el-row :gutter="10" class="mb8">
<el-col :span="1.5"> <el-col :span="1.5">
<el-button type="primary" plain icon="el-icon-search" size="mini" @click="handleQuerycx">查询</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd" <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
v-hasPermi="['system:works:add']">新增</el-button> v-hasPermi="['system:works:add']">新增</el-button>
</el-col> </el-col>
...@@ -70,44 +95,45 @@ ...@@ -70,44 +95,45 @@
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row> </el-row>
<el-table :data="worksList" @selection-change="handleSelectionChange" <el-table :row-style="{ height: '0' }" :cell-style="{ padding: '3px' }" :data="worksList"
:default-sort="{ prop: 'awardTime', order: 'descending' }"> @selection-change="handleSelectionChange" :default-sort="{ prop: 'awardTime', order: 'descending' }">
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<el-table-column type="index" label="序号" width="55" align="center" sortable /> <el-table-column type="index" label="序号" width="55" align="center" sortable fixed="left" />
<el-table-column label="成长类型" align="center"> <el-table-column label="成长类型" align="center" fixed="left" width="120px">
<template> <template>
<span>论文论著</span> <span>论文论著</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="学科" align="center" prop="sub" sortable> <el-table-column label="学科" align="center" prop="sub" sortable fixed="left" width="120px">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.teaching_subjects" :value="scope.row.sub" /> <dict-tag :options="dict.type.teaching_subjects" :value="scope.row.sub" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="获奖类别" align="center" prop="awardType" sortable> <el-table-column label="获奖类别" align="center" prop="awardType" sortable width="180px">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.award_categories" :value="scope.row.awardType" /> <dict-tag :options="dict.type.award_categories" :value="scope.row.awardType" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="获奖等级" align="center" prop="awardLevel" sortable> <el-table-column label="获奖等级" align="center" prop="awardLevel" sortable width="130px">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.award_rank" :value="scope.row.awardLevel" /> <dict-tag :options="dict.type.award_rank" :value="scope.row.awardLevel" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="获奖级别" align="center" prop="awardRank" sortable> <el-table-column label="获奖级别" align="center" prop="awardRank" sortable width="130px">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.awards_level" :value="scope.row.awardRank" /> <dict-tag :options="dict.type.awards_level" :value="scope.row.awardRank" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="成果名称" align="center" prop="resultName" sortable /> <el-table-column label="论文论著-成果名称" align="center" prop="resultName" sortable width="180px"
<el-table-column label="获奖人" align="center" prop="userName" sortable /> show-overflow-tooltip />
<el-table-column label="主办单位" align="center" prop="org" sortable /> <el-table-column label="获奖人" align="center" prop="userName" sortable width="130px" />
<el-table-column label="主办单位" align="center" prop="org" sortable width="180px" show-overflow-tooltip />
<el-table-column label="获奖时间" align="center" prop="awardTime" width="180" sortable> <el-table-column label="获奖时间" align="center" prop="awardTime" width="180" sortable>
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.awardTime, '{y}-{m}-{d}') }}</span> <span>{{ parseTime(scope.row.awardTime, '{y}-{m}-{d}') }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" width="180px">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
v-hasPermi="['system:honors:edit']" v-hasPermi="['system:honors:edit']"
...@@ -346,6 +372,7 @@ export default { ...@@ -346,6 +372,7 @@ export default {
method: null, method: null,
type: null // 处理类型： 1 级部/处室； 2 分管； 3 主管 type: null // 处理类型： 1 级部/处室； 2 分管； 3 主管
}, },
query: false,
// 遮罩层 // 遮罩层
loading: true, loading: true,
// 选中数组 // 选中数组
...@@ -383,9 +410,12 @@ export default { ...@@ -383,9 +410,12 @@ export default {
awardTime: null, awardTime: null,
pictureName: null, pictureName: null,
pictureUrl: null, pictureUrl: null,
endTime: null,
startTime: null,
}, },
baseUrl: [process.env.VUE_APP_BASE_API], baseUrl: [process.env.VUE_APP_BASE_API],
uploadFileLoading: false, uploadFileLoading: false,
query: false,
// 表单参数 // 表单参数
form: {}, form: {},
// 表单校验 // 表单校验
...@@ -587,13 +617,20 @@ export default { ...@@ -587,13 +617,20 @@ export default {
this.resetForm("form"); this.resetForm("form");
}, },
/** 搜索按钮操作 */ /** 搜索按钮操作 */
handleQuerycx() {
this.query = true;
this.resetcx();
},
handleQuery() { handleQuery() {
this.queryParams.pageNum = 1; this.query = true;
this.getList(); this.getList();
this.query = false;
}, },
/** 重置按钮操作 */ /** 重置按钮操作 */
resetQuery() { resetQuery() {
this.resetForm("queryForm"); this.queryParams.startTime = "";
this.queryParams.endTime = "";
this.resetForm("queryParams");
this.handleQuery(); this.handleQuery();
}, },
// 多选框选中数据 // 多选框选中数据
...@@ -658,3 +695,25 @@ export default { ...@@ -658,3 +695,25 @@ export default {
} }
}; };
</script> </script>
<style scoped lang="scss" >
::v-deep .el-form-item {
margin-bottom: 0px;
}
::v-deep .el-input--medium .el-input__inner {
height: 26px;
line-height: 26px;
}
::v-deep .el-dialog__body {
padding: 10px 20px
}
::v-deep .el-dialog:not(.is-fullscreen) {
margin-top: 4vh !important;
}
.search ::v-deep .el-form-item__content {
width: 200px
}
</style>
ruoyi-ui/src/views/smartSchool/electronicArchives/professionalDevelopment/lectureAwards/index.vue
<template> <template>
<div class="app-container"> <div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="98px"> <el-dialog title="查询" :visible.sync="query" width="50%" append-to-body>
<el-form-item label="学科" prop="sub"> <el-form ref="queryParams" :model="queryParams" label-width="96px" class="search">
<el-select v-model="queryParams.sub" placeholder="请选择" style="width: 220px;"> <el-row>
<el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value" :label="dict.label" <el-col :span="12">
:value="dict.value"> <el-form-item label="学科" prop="sub">
</el-option> <el-select v-model="queryParams.sub" placeholder="请选择" style="width: 100%;">
</el-select> <el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value" :label="dict.label"
</el-form-item> :value="dict.value">
<el-form-item label="获奖类别" prop="awardType"> </el-option>
<el-select v-model="queryParams.awardType" placeholder="请选择" style="width: 220px"> </el-select>
<el-option v-for="dict in dict.type.award_categoriesjk" :key="dict.value" :label="dict.label" </el-form-item>
:value="dict.value"> </el-col>
</el-option> <el-col :span="12">
</el-select> <el-form-item label="获奖类别" prop="awardType">
</el-form-item> <el-select v-model="queryParams.awardType" placeholder="请选择" style="width: 100%;">
<el-form-item label="获奖级别" prop="awardRank"> <el-option v-for="dict in dict.type.award_categoriesjk" :key="dict.value"
<el-select v-model="queryParams.awardRank" placeholder="请选择" style="width: 100%;"> :label="dict.label" :value="dict.value">
<el-option v-for="dict in dict.type.awards_level" :key="dict.value" :label="dict.label" </el-option>
:value="dict.value"> </el-select>
</el-option> </el-form-item>
</el-select> </el-col>
</el-form-item> </el-row>
<el-row>
<el-form-item label="获奖等级" prop="awardLevel"> <el-col :span="12">
<el-select v-model="queryParams.awardLevel" placeholder="请选择" style="width: 100%;"> <el-form-item label="获奖级别" prop="awardRank">
<el-option v-for="dict in dict.type.award_rank" :key="dict.value" :label="dict.label" <el-select v-model="queryParams.awardRank" placeholder="请选择" style="width: 100%;">
:value="dict.value"> <el-option v-for="dict in dict.type.awards_level" :key="dict.value" :label="dict.label"
</el-option> :value="dict.value">
</el-select> </el-option>
</el-form-item> </el-select>
<el-form-item label="获奖人" prop="userName"> </el-form-item>
<el-input v-model="queryParams.userName" placeholder="请输入获奖人" clearable @keyup.enter.native="handleQuery" /> </el-col>
</el-form-item> <el-col :span="12">
<el-form-item label="获奖开始时间" prop="awardTime"> <el-form-item label="获奖等级" prop="awardLevel">
<el-date-picker clearable v-model="queryParams.startTime" type="date" value-format="yyyy-MM-dd" <el-select v-model="queryParams.awardLevel" placeholder="请选择" style="width: 100%;">
placeholder="请选择"> <el-option v-for="dict in dict.type.award_rank" :key="dict.value" :label="dict.label"
</el-date-picker> :value="dict.value">
</el-form-item> </el-option>
<el-form-item label="获奖结束时间" prop="awardTime"> </el-select>
<el-date-picker clearable v-model="queryParams.endTime" type="date" value-format="yyyy-MM-dd" </el-form-item>
placeholder="请选择"> </el-col>
</el-date-picker> </el-row>
</el-form-item> <el-row>
<el-form-item> <el-col :span="12">
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button> <el-form-item label="获奖人" prop="userName">
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button> <el-input v-model="queryParams.userName" placeholder="请输入获奖人" clearable
</el-form-item> @keyup.enter.native="handleQuery" />
</el-form> </el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="获奖开始时间" prop="awardTime">
<el-date-picker clearable v-model="queryParams.startTime" type="date" value-format="yyyy-MM-dd"
placeholder="请选择" style="width: 100%;">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="获奖结束时间" prop="awardTime">
<el-date-picker clearable v-model="queryParams.endTime" type="date" value-format="yyyy-MM-dd"
placeholder="请选择" style="width: 100%;">
</el-date-picker>
</el-form-item>
</el-col>
</el-row>
<el-form-item class="dialog-footer" style="display: flex; justify-content: center; align-items: center">
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
</el-form-item>
</el-form>
</el-dialog>
<el-row :gutter="10" class="mb8"> <el-row :gutter="10" class="mb8">
<el-col :span="1.5"> <el-col :span="1.5">
<el-button type="primary" plain icon="el-icon-search" size="mini" @click="handleQuerycx">查询</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd" <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
v-hasPermi="['system:awards:add']">新增</el-button> v-hasPermi="['system:awards:add']">新增</el-button>
</el-col> </el-col>
...@@ -69,44 +93,45 @@ ...@@ -69,44 +93,45 @@
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row> </el-row>
<el-table :data="awardsList" @selection-change="handleSelectionChange" <el-table :row-style="{ height: '0' }" :cell-style="{ padding: '3px' }" :data="awardsList"
:default-sort="{ prop: 'awardTime', order: 'descending' }"> @selection-change="handleSelectionChange" :default-sort="{ prop: 'awardTime', order: 'descending' }">
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<el-table-column type="index" label="序号" width="55" align="center" sortable /> <el-table-column type="index" label="序号" width="55" align="center" sortable fixed="left" />
<el-table-column label="成长类型" align="center"> <el-table-column label="成长类型" align="center" fixed="left" width="130px">
<template> <template>
<span>讲课获奖</span> <span>讲课获奖</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="学科" align="center" prop="sub" sortable> <el-table-column label="学科" align="center" prop="sub" sortable fixed="left">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.teaching_subjects" :value="scope.row.sub" /> <dict-tag :options="dict.type.teaching_subjects" :value="scope.row.sub" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="获奖类别" align="center" prop="awardType" sortable> <el-table-column label="获奖类别" align="center" prop="awardType" sortable width="130px">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.award_categoriesjk" :value="scope.row.awardType" /> <dict-tag :options="dict.type.award_categoriesjk" :value="scope.row.awardType" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="获奖等级" align="center" prop="awardLevel" sortable> <el-table-column label="获奖等级" align="center" prop="awardLevel" sortable width="130px">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.award_rank" :value="scope.row.awardLevel" /> <dict-tag :options="dict.type.award_rank" :value="scope.row.awardLevel" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="获奖级别" align="center" prop="awardRank" sortable> <el-table-column label="获奖级别" align="center" prop="awardRank" sortable width="130px">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.awards_level" :value="scope.row.awardRank" /> <dict-tag :options="dict.type.awards_level" :value="scope.row.awardRank" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="讲课获奖-成果名称" align="center" prop="resultName" sortable /> <el-table-column label="讲课获奖-成果名称" align="center" prop="resultName" sortable width="180px"
<el-table-column label="获奖人" align="center" prop="userName" sortable /> show-overflow-tooltip />
<el-table-column label="主办单位" align="center" prop="org" sortable /> <el-table-column label="获奖人" align="center" prop="userName" sortable width="130px" />
<el-table-column label="主办单位" align="center" prop="org" sortable width="150px" show-overflow-tooltip />
<el-table-column label="获奖时间" align="center" prop="awardTime" width="180" sortable> <el-table-column label="获奖时间" align="center" prop="awardTime" width="180" sortable>
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.awardTime, '{y}-{m}-{d}') }}</span> <span>{{ parseTime(scope.row.awardTime, '{y}-{m}-{d}') }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" width="150px">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
v-hasPermi="['system:honors:edit']" v-hasPermi="['system:honors:edit']"
...@@ -349,6 +374,7 @@ export default { ...@@ -349,6 +374,7 @@ export default {
baseUrl: [process.env.VUE_APP_BASE_API], baseUrl: [process.env.VUE_APP_BASE_API],
// 遮罩层 // 遮罩层
loading: true, loading: true,
query: false,
// 选中数组 // 选中数组
ids: [], ids: [],
// 非单个禁用 // 非单个禁用
...@@ -383,9 +409,12 @@ export default { ...@@ -383,9 +409,12 @@ export default {
pictureName: null, pictureName: null,
pictureUrl: null, pictureUrl: null,
upateBy: null, upateBy: null,
endTime: null,
startTime: null,
}, },
// 表单参数 // 表单参数
form: {}, form: {},
query: false,
// 表单校验 // 表单校验
rules: { rules: {
sub: [ sub: [
...@@ -581,13 +610,20 @@ export default { ...@@ -581,13 +610,20 @@ export default {
this.resetForm("form"); this.resetForm("form");
}, },
/** 搜索按钮操作 */ /** 搜索按钮操作 */
handleQuerycx() {
this.query = true;
this.resetcx();
},
handleQuery() { handleQuery() {
this.queryParams.pageNum = 1; this.query = true;
this.getList(); this.getList();
this.query = false;
}, },
/** 重置按钮操作 */ /** 重置按钮操作 */
resetQuery() { resetQuery() {
this.resetForm("queryForm"); this.queryParams.startTime = "";
this.queryParams.endTime = "";
this.resetForm("queryParams");
this.handleQuery(); this.handleQuery();
}, },
// 多选框选中数据 // 多选框选中数据
...@@ -652,3 +688,25 @@ export default { ...@@ -652,3 +688,25 @@ export default {
} }
}; };
</script> </script>
<style scoped lang="scss" >
::v-deep .el-form-item {
margin-bottom: 0px;
}
::v-deep .el-input--medium .el-input__inner {
height: 26px;
line-height: 26px;
}
::v-deep .el-dialog__body {
padding: 10px 20px
}
::v-deep .el-dialog:not(.is-fullscreen) {
margin-top: 4vh !important;
}
.search ::v-deep .el-form-item__content {
width: 200px
}
</style>
ruoyi-ui/src/views/smartSchool/electronicArchives/professionalDevelopment/projectResearch/index.vue
<template> <template>
<div class="app-container"> <div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="98px"> <el-dialog title="查询" :visible.sync="query" width="50%" append-to-body>
<el-form-item label="学科" prop="sub"> <el-form ref="queryParams" :model="queryParams" label-width="96px" class="search">
<el-select v-model="queryParams.sub" placeholder="请选择" style="width: 220px;"> <el-row>
<el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value" :label="dict.label" <el-col :span="12">
:value="dict.value"> <el-form-item label="学科" prop="sub">
</el-option> <el-select v-model="queryParams.sub" placeholder="请选择" style="width: 100%;">
</el-select> <el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value" :label="dict.label"
</el-form-item> :value="dict.value">
<el-form-item label="获奖类别" prop="awardType"> </el-option>
<el-select v-model="queryParams.awardType" placeholder="请选择" style="width: 220px;"> </el-select>
<el-option v-for="dict in dict.type.project_research" :key="dict.value" :label="dict.label" </el-form-item>
:value="dict.value"> </el-col>
</el-option> <el-col :span="12">
</el-select> <el-form-item label="获奖类别" prop="awardType">
</el-form-item> <el-select v-model="queryParams.awardType" placeholder="请选择" style="width: 100%;">
<el-form-item label="获奖级别" prop="awardRank"> <el-option v-for="dict in dict.type.award_categoriesjk" :key="dict.value"
<el-select v-model="queryParams.awardRank" placeholder="请选择" style="width: 100%;"> :label="dict.label" :value="dict.value">
<el-option v-for="dict in dict.type.awards_level" :key="dict.value" :label="dict.label" </el-option>
:value="dict.value"> </el-select>
</el-option> </el-form-item>
</el-select> </el-col>
</el-form-item> </el-row>
<el-form-item label="获奖等级" prop="awardLevel"> <el-row>
<el-select v-model="queryParams.awardLevel" placeholder="请选择" style="width: 100%;"> <el-col :span="12">
<el-option v-for="dict in dict.type.award_rank" :key="dict.value" :label="dict.label" <el-form-item label="获奖级别" prop="awardRank">
:value="dict.value"> <el-select v-model="queryParams.awardRank" placeholder="请选择" style="width: 100%;">
</el-option> <el-option v-for="dict in dict.type.awards_level" :key="dict.value" :label="dict.label"
</el-select> :value="dict.value">
</el-form-item> </el-option>
<el-form-item label="获奖人" prop="userName"> </el-select>
<el-input v-model="queryParams.userName" placeholder="请输入获奖人" clearable @keyup.enter.native="handleQuery" /> </el-form-item>
</el-form-item> </el-col>
<el-form-item label="获奖开始时间" prop="awardTime"> <el-col :span="12">
<el-date-picker clearable v-model="queryParams.startTime" type="date" value-format="yyyy-MM-dd" <el-form-item label="获奖等级" prop="awardLevel">
placeholder="请选择"> <el-select v-model="queryParams.awardLevel" placeholder="请选择" style="width: 100%;">
</el-date-picker> <el-option v-for="dict in dict.type.award_rank" :key="dict.value" :label="dict.label"
</el-form-item> :value="dict.value">
<el-form-item label="获奖结束时间" prop="awardTime"> </el-option>
<el-date-picker clearable v-model="queryParams.endTime" type="date" value-format="yyyy-MM-dd" </el-select>
placeholder="请选择"> </el-form-item>
</el-date-picker> </el-col>
</el-form-item> </el-row>
<el-row>
<el-form-item> <el-col :span="12">
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button> <el-form-item label="获奖人" prop="userName">
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button> <el-input v-model="queryParams.userName" placeholder="请输入获奖人" clearable
</el-form-item> @keyup.enter.native="handleQuery" />
</el-form> </el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="获奖开始时间" prop="awardTime">
<el-date-picker clearable v-model="queryParams.startTime" type="date" value-format="yyyy-MM-dd"
placeholder="请选择" style="width: 100%;">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="获奖结束时间" prop="awardTime">
<el-date-picker clearable v-model="queryParams.endTime" type="date" value-format="yyyy-MM-dd"
placeholder="请选择" style="width: 100%;">
</el-date-picker>
</el-form-item>
</el-col>
</el-row>
<el-form-item class="dialog-footer" style="display: flex; justify-content: center; align-items: center">
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
</el-form-item>
</el-form>
</el-dialog>
<el-row :gutter="10" class="mb8"> <el-row :gutter="10" class="mb8">
<el-col :span="1.5"> <el-col :span="1.5">
<el-button type="primary" plain icon="el-icon-search" size="mini" @click="handleQuerycx">查询</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd" <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
v-hasPermi="['system:research:add']">新增</el-button> v-hasPermi="['system:research:add']">新增</el-button>
</el-col> </el-col>
...@@ -70,42 +95,42 @@ ...@@ -70,42 +95,42 @@
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row> </el-row>
<el-table :data="worksList" @selection-change="handleSelectionChange" <el-table :row-style="{ height: '0' }" :cell-style="{ padding: '3px' }" :data="worksList"
:default-sort="{ prop: 'awardTime', order: 'descending' }"> @selection-change="handleSelectionChange" :default-sort="{ prop: 'awardTime', order: 'descending' }">
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<el-table-column type="index" label="序号" width="55" align="center" sortable /> <el-table-column type="index" label="序号" width="55" align="center" sortable fixed="left" />
<el-table-column label="成长类型" align="center" sortable> <el-table-column label="成长类型" align="center" sortable fixed="left" width="130px">
<span>课题研究</span> <span>课题研究</span>
</el-table-column> </el-table-column>
<el-table-column label="学科" align="center" prop="sub" sortable> <el-table-column label="学科" align="center" prop="sub" sortable fixed="left" width="130px">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.teaching_subjects" :value="scope.row.sub" /> <dict-tag :options="dict.type.teaching_subjects" :value="scope.row.sub" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="获奖类别" align="center" prop="awardType" sortable> <el-table-column label="获奖类别" align="center" prop="awardType" sortable width="130px">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.project_research" :value="scope.row.awardType" /> <dict-tag :options="dict.type.project_research" :value="scope.row.awardType" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="获奖等级" align="center" prop="awardLevel" sortable> <el-table-column label="获奖等级" align="center" prop="awardLevel" sortable width="120px">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.award_rank" :value="scope.row.awardLevel" /> <dict-tag :options="dict.type.award_rank" :value="scope.row.awardLevel" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="获奖级别" align="center" prop="awardRank" sortable> <el-table-column label="获奖级别" align="center" prop="awardRank" sortable width="120px">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.awards_level" :value="scope.row.awardRank" /> <dict-tag :options="dict.type.awards_level" :value="scope.row.awardRank" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="课题研究-成果名称" align="center" prop="resultName" sortable /> <el-table-column label="课题研究-成果名称" align="center" prop="resultName" sortable width="180px" />
<el-table-column label="获奖人" align="center" prop="userName" sortable /> <el-table-column label="获奖人" align="center" prop="userName" sortable width="120px" />
<el-table-column label="主办单位" align="center" prop="org" sortable /> <el-table-column label="主办单位" align="center" prop="org" sortable width="180px" />
<el-table-column label="获奖时间" align="center" prop="awardTime" width="180" sortable> <el-table-column label="获奖时间" align="center" prop="awardTime" width="180" sortable>
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.awardTime, '{y}-{m}-{d}') }}</span> <span>{{ parseTime(scope.row.awardTime, '{y}-{m}-{d}') }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="150px" fixed="right">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
v-hasPermi="['system:research:edit']" v-hasPermi="['system:research:edit']"
...@@ -350,6 +375,7 @@ export default { ...@@ -350,6 +375,7 @@ export default {
}, },
// 遮罩层 // 遮罩层
loading: true, loading: true,
query: false,
// 选中数组 // 选中数组
ids: [], ids: [],
// 非单个禁用 // 非单个禁用
...@@ -370,6 +396,7 @@ export default { ...@@ -370,6 +396,7 @@ export default {
open: false, open: false,
look: false, look: false,
isEdit: false, isEdit: false,
query: false,
// 查询参数 // 查询参数
queryParams: { queryParams: {
pageNum: 1, pageNum: 1,
...@@ -385,6 +412,8 @@ export default { ...@@ -385,6 +412,8 @@ export default {
awardTime: null, awardTime: null,
pictureName: null, pictureName: null,
pictureUrl: null, pictureUrl: null,
endTime: null,
startTime: null,
}, },
baseUrl: [process.env.VUE_APP_BASE_API], baseUrl: [process.env.VUE_APP_BASE_API],
uploadFileLoading: false, uploadFileLoading: false,
...@@ -589,13 +618,20 @@ export default { ...@@ -589,13 +618,20 @@ export default {
this.resetForm("form"); this.resetForm("form");
}, },
/** 搜索按钮操作 */ /** 搜索按钮操作 */
handleQuerycx() {
this.query = true;
this.resetcx();
},
handleQuery() { handleQuery() {
this.queryParams.pageNum = 1; this.query = true;
this.getList(); this.getList();
this.query = false;
}, },
/** 重置按钮操作 */ /** 重置按钮操作 */
resetQuery() { resetQuery() {
this.resetForm("queryForm"); this.queryParams.startTime = "";
this.queryParams.endTime = "";
this.resetForm("queryParams");
this.handleQuery(); this.handleQuery();
}, },
// 多选框选中数据 // 多选框选中数据
...@@ -660,3 +696,25 @@ export default { ...@@ -660,3 +696,25 @@ export default {
} }
}; };
</script> </script>
<style scoped lang="scss" >
::v-deep .el-form-item {
margin-bottom: 0px;
}
::v-deep .el-input--medium .el-input__inner {
height: 26px;
line-height: 26px;
}
::v-deep .el-dialog__body {
padding: 10px 20px
}
::v-deep .el-dialog:not(.is-fullscreen) {
margin-top: 4vh !important;
}
.search ::v-deep .el-form-item__content {
width: 200px
}
</style>
ruoyi-ui/src/views/smartSchool/electronicArchives/professionalDevelopment/teacherAwards/index.vue
<template> <template>
<div class="app-container"> <div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="98px"> <el-dialog title="查询" :visible.sync="query" width="50%" append-to-body>
<el-form-item label="学科" prop="sub"> <el-form ref="queryParams" :model="queryParams" label-width="96px" class="search">
<el-select v-model="queryParams.sub" placeholder="请选择" style="width: 220px;"> <el-row>
<el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value" :label="dict.label" <el-col :span="12">
:value="dict.value"> <el-form-item label="学科" prop="sub">
</el-option> <el-select v-model="queryParams.sub" placeholder="请选择" style="width: 100%;">
</el-select> <el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value" :label="dict.label"
</el-form-item> :value="dict.value">
<el-form-item label="获奖级别" prop="awardRank"> </el-option>
<el-select v-model="queryParams.awardRank" placeholder="请选择" style="width: 220px;"> </el-select>
<el-option v-for="dict in dict.type.awards_level" :key="dict.value" :label="dict.label" </el-form-item>
:value="dict.value"> </el-col>
</el-option> <el-col :span="12">
</el-select> <el-form-item label="获奖级别" prop="awardRank">
</el-form-item> <el-select v-model="queryParams.awardRank" placeholder="请选择" style="width: 100%;">
<el-form-item label="获奖类别" prop="awardType"> <el-option v-for="dict in dict.type.awards_level" :key="dict.value" :label="dict.label"
<el-select v-model="queryParams.awardType" placeholder="请选择" style="width: 100%;"> :value="dict.value">
<el-option v-for="dict in dict.type.award_categoriesjs" :key="dict.value" :label="dict.label" </el-option>
:value="dict.value"> </el-select>
</el-option> </el-form-item>
</el-select> </el-col>
</el-form-item> </el-row>
<el-row>
<el-form-item label="获奖等级" prop="awardLevel"> <el-col :span="12">
<el-select v-model="queryParams.awardLevel" placeholder="请选择" style="width: 100%;"> <el-form-item label="获奖类别" prop="awardType">
<el-option v-for="dict in dict.type.award_rank" :key="dict.value" :label="dict.label" <el-select v-model="queryParams.awardType" placeholder="请选择" style="width: 100%;">
:value="dict.value"> <el-option v-for="dict in dict.type.award_categoriesjs" :key="dict.value"
</el-option> :label="dict.label" :value="dict.value">
</el-select> </el-option>
</el-form-item> </el-select>
<el-form-item label="获奖人" prop="userName"> </el-form-item>
<el-input v-model="queryParams.userName" placeholder="请输入获奖人" clearable @keyup.enter.native="handleQuery" /> </el-col>
</el-form-item> <el-col :span="12">
<el-form-item label="获奖开始时间" prop="awardTime"> <el-form-item label="获奖等级" prop="awardLevel">
<el-date-picker clearable v-model="queryParams.startTime" type="date" value-format="yyyy-MM-dd" <el-select v-model="queryParams.awardLevel" placeholder="请选择" style="width: 100%;">
placeholder="请选择"> <el-option v-for="dict in dict.type.award_rank" :key="dict.value" :label="dict.label"
</el-date-picker> :value="dict.value">
</el-form-item> </el-option>
<el-form-item label="获奖结束时间" prop="awardTime"> </el-select>
<el-date-picker clearable v-model="queryParams.endTime" type="date" value-format="yyyy-MM-dd" </el-form-item>
placeholder="请选择"> </el-col>
</el-date-picker> </el-row>
</el-form-item> <el-row>
<el-col :span="12">
<el-form-item> <el-form-item label="获奖人" prop="userName">
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button> <el-input v-model="queryParams.userName" placeholder="请输入获奖人" clearable
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button> @keyup.enter.native="handleQuery" />
</el-form-item> </el-form-item>
</el-form> </el-col>
<el-col :span="12">
<el-form-item label="获奖开始时间" prop="awardTime">
<el-date-picker clearable v-model="queryParams.startTime" type="date" value-format="yyyy-MM-dd"
placeholder="请选择" style="width: 100%;">
</el-date-picker>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="获奖结束时间" prop="awardTime">
<el-date-picker clearable v-model="queryParams.endTime" type="date" value-format="yyyy-MM-dd"
placeholder="请选择" style="width: 100%;">
</el-date-picker>
</el-form-item>
</el-col>
</el-row>
<el-form-item class="dialog-footer" style="display: flex; justify-content: center; align-items: center">
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
</el-form-item>
</el-form>
</el-dialog>
<el-row :gutter="10" class="mb8"> <el-row :gutter="10" class="mb8">
<el-col :span="1.5"> <el-col :span="1.5">
<el-button type="primary" plain icon="el-icon-search" size="mini" @click="handleQuerycx">查询</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd" <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
v-hasPermi="['school:teacherAwards:add']">新增</el-button> v-hasPermi="['school:teacherAwards:add']">新增</el-button>
</el-col> </el-col>
...@@ -70,44 +95,46 @@ ...@@ -70,44 +95,46 @@
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row> </el-row>
<el-table :data="awardsList" @selection-change="handleSelectionChange" <el-table :row-style="{ height: '0' }" :cell-style="{ padding: '3px' }" :data="awardsList"
:default-sort="{ prop: 'awardTime', order: 'descending' }"> @selection-change="handleSelectionChange" :default-sort="{ prop: 'awardTime', order: 'descending' }">
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<el-table-column type="index" label="序号" width="55" align="center" sortable /> <el-table-column type="index" label="序号" width="55" align="center" sortable fixed="left" />
<el-table-column label="成长类型" align="center"> <el-table-column label="成长类型" align="center" fixed="left" width="130px">
<template> <template>
<span>教学获奖</span> <span>教学获奖</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="学科" align="center" prop="sub" sortable> <el-table-column label="学科" align="center" prop="sub" sortable fixed="left">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.teaching_subjects" :value="scope.row.sub" /> <dict-tag :options="dict.type.teaching_subjects" :value="scope.row.sub" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="获奖类别" align="center" prop="awardType" sortable> <el-table-column label="获奖类别" align="center" prop="awardType" sortable width="130px">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.award_categoriesjs" :value="scope.row.awardType" /> <dict-tag :options="dict.type.award_categoriesjs" :value="scope.row.awardType" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="获奖等级" align="center" prop="awardLevel" sortable> <el-table-column label="获奖等级" align="center" prop="awardLevel" sortable width="130px">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.award_rank" :value="scope.row.awardLevel" /> <dict-tag :options="dict.type.award_rank" :value="scope.row.awardLevel" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="获奖级别" align="center" prop="awardRank" sortable> <el-table-column label="获奖级别" align="center" prop="awardRank" sortable width="130px">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.awards_level" :value="scope.row.awardRank" /> <dict-tag :options="dict.type.awards_level" :value="scope.row.awardRank" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="教学获奖-成果名称" align="center" prop="resultName" sortable /> <el-table-column label="教学获奖-成果名称" align="center" prop="resultName" sortable width="190px"
<el-table-column label="获奖人" align="center" prop="userName" sortable /> show-overflow-tooltip />
<el-table-column label="主办单位" align="center" prop="org" sortable /> <el-table-column label="获奖人" align="center" prop="userName" sortable width="130px" />
<el-table-column label="主办单位" align="center" prop="org" sortable width="130px" show-overflow-tooltip />
<el-table-column label="获奖时间" align="center" prop="awardTime" width="180" sortable> <el-table-column label="获奖时间" align="center" prop="awardTime" width="180" sortable>
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.awardTime, '{y}-{m}-{d}') }}</span> <span>{{ parseTime(scope.row.awardTime, '{y}-{m}-{d}') }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" width="180px
">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
v-hasPermi="['school:teacherAwards:edit']" v-hasPermi="['school:teacherAwards:edit']"
...@@ -366,6 +393,7 @@ export default { ...@@ -366,6 +393,7 @@ export default {
open: false, open: false,
look: false, look: false,
isEdit: false, isEdit: false,
query: false,
// 查询参数 // 查询参数
queryParams: { queryParams: {
pageNum: 1, pageNum: 1,
...@@ -381,6 +409,8 @@ export default { ...@@ -381,6 +409,8 @@ export default {
awardTime: null, awardTime: null,
pictureName: null, pictureName: null,
pictureUrl: null, pictureUrl: null,
endTime: null,
startTime: null,
}, },
// 表单参数 // 表单参数
form: {}, form: {},
...@@ -577,13 +607,20 @@ export default { ...@@ -577,13 +607,20 @@ export default {
this.resetForm("form"); this.resetForm("form");
}, },
/** 搜索按钮操作 */ /** 搜索按钮操作 */
handleQuerycx() {
this.query = true;
this.resetcx();
},
handleQuery() { handleQuery() {
this.queryParams.pageNum = 1; this.query = true;
this.getList(); this.getList();
this.query = false;
}, },
/** 重置按钮操作 */ /** 重置按钮操作 */
resetQuery() { resetQuery() {
this.resetForm("queryForm"); this.queryParams.startTime = "";
this.queryParams.endTime = "";
this.resetForm("queryParams");
this.handleQuery(); this.handleQuery();
}, },
// 多选框选中数据 // 多选框选中数据
...@@ -648,3 +685,25 @@ export default { ...@@ -648,3 +685,25 @@ export default {
} }
}; };
</script> </script>
<style scoped lang="scss" >
::v-deep .el-form-item {
margin-bottom: 0px;
}
::v-deep .el-input--medium .el-input__inner {
height: 26px;
line-height: 26px;
}
::v-deep .el-dialog__body {
padding: 10px 20px
}
::v-deep .el-dialog:not(.is-fullscreen) {
margin-top: 4vh !important;
}
.search ::v-deep .el-form-item__content {
width: 200px
}
</style>
ruoyi-ui/src/views/smartSchool/electronicArchives/professionalDevelopment/teachingAchievements/index.vue
<template> <template>
<div class="app-container"> <div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px"> <el-dialog title="查询" :visible.sync="query" width="50%" append-to-body>
<el-form-item label="姓名" prop="userName"> <el-form ref="queryParams" :model="queryParams" label-width="96px" class="search">
<el-input v-model="queryParams.userName" placeholder="请输入" clearable @keyup.enter.native="handleQuery" /> <el-row>
</el-form-item> <el-col :span="12">
<el-form-item label="学年" prop="schoolYear"> <el-form-item label="姓名" prop="userName">
<el-select v-model="queryParams.schoolYear" placeholder="请选择" style="width: 190px;"> <el-input v-model="queryParams.userName" placeholder="请输入" clearable
<el-option v-for="dict in dict.type.yearda" :key="dict.value" :label="dict.label" :value="dict.value"> @keyup.enter.native="handleQuery" />
</el-option> </el-form-item>
</el-select> </el-col>
</el-form-item> <el-col :span="12">
<el-form-item label="学期" prop="semester"> <el-form-item label="学年" prop="schoolYear">
<el-select v-model="queryParams.semester" placeholder="请选择"> <el-select v-model="queryParams.schoolYear" placeholder="请选择" style="width: 100%;">
<el-option v-for="dict in dict.type.semester_jsdzda" :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>
</el-form-item> </el-form-item>
<el-form-item label="届别" prop="year"> </el-col>
<el-select v-model="queryParams.year" placeholder="请选择"> </el-row>
<el-option v-for="dict in dict.type.rankda" :key="dict.value" :label="dict.label" :value="dict.value"> <el-row>
</el-option> <el-col :span="12">
</el-select> <el-form-item label="学期" prop="semester">
</el-form-item> <el-select v-model="queryParams.semester" placeholder="请选择" style="width: 100%;">
<el-form-item label="年级" prop="grade"> <el-option v-for="dict in dict.type.semester_jsdzda" :key="dict.value" :label="dict.label"
<el-select v-model="queryParams.grade" placeholder="请选择" style="width: 100%;"> :value="dict.value">
<el-option v-for="dict in dict.type.grade_da" :key="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-form-item label="学科" prop="sub"> <el-col :span="12">
<el-select v-model="queryParams.sub" placeholder="请选择" style="width: 100%;"> <el-form-item label="届别" prop="year">
<el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value" :label="dict.label" <el-select v-model="queryParams.year" placeholder="请选择" style="width: 100%;">
:value="dict.value"> <el-option v-for="dict in dict.type.rankda" :key="dict.value" :label="dict.label"
</el-option> :value="dict.value">
</el-select> </el-option>
</el-form-item> </el-select>
<el-form-item label="考试开始时间" prop="startTime"> </el-form-item>
<el-date-picker clearable v-model="queryParams.startTime" type="date" value-format="yyyy-MM-dd" </el-col>
placeholder="请选择" style="width: 190px;"> </el-row>
</el-date-picker> <el-row>
</el-form-item> <el-col :span="12">
<el-form-item label="考试结束时间" prop="endTime"> <el-form-item label="年级" prop="grade">
<el-date-picker clearable v-model="queryParams.endTime" type="date" value-format="yyyy-MM-dd" <el-select v-model="queryParams.grade" placeholder="请选择" style="width: 100%;">
placeholder="请选择" style="width: 190px;"> <el-option v-for="dict in dict.type.grade_da" :key="dict.value" :label="dict.label"
</el-date-picker> :value="dict.value">
</el-form-item> </el-option>
<el-form-item label="考试类型" prop="examType"> </el-select>
<el-select v-model="queryParams.examType" placeholder="请选择" style="width: 100%;"> </el-form-item>
<el-option v-for="dict in dict.type.exam_typeda" :key="dict.value" :label="dict.label" </el-col>
:value="dict.value"> <el-col :span="12">
</el-option> <el-form-item label="学科" prop="sub">
</el-select> <el-select v-model="queryParams.sub" placeholder="请选择" style="width: 100%;">
</el-form-item> <el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value" :label="dict.label"
<el-form-item label="班级" prop="className"> :value="dict.value">
<el-input v-model="queryParams.className" placeholder="请输入班级" clearable @keyup.enter.native="handleQuery" /> </el-option>
</el-form-item> </el-select>
<el-form-item label="班级类型" prop="classType"> </el-form-item>
<el-select v-model="queryParams.classType" placeholder="请选择" style="width: 100%;"> </el-col>
<el-option v-for="dict in dict.type.class_type" :key="dict.value" :label="dict.label" </el-row>
:value="dict.value"> <el-row>
</el-option> <el-col :span="12">
</el-select> <el-form-item label="考试开始时间" prop="startTime">
</el-form-item> <el-date-picker clearable v-model="queryParams.startTime" type="date" value-format="yyyy-MM-dd"
<el-form-item label="考核分" prop="assessmentScore"> placeholder="请选择" style="width: 100%;">
<el-input v-model="queryParams.assessmentScore" placeholder="请输入考核分" clearable </el-date-picker>
@keyup.enter.native="handleQuery" /> </el-form-item>
</el-form-item> </el-col>
<el-form-item> <el-col :span="12">
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button> <el-form-item label="考试结束时间" prop="endTime">
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button> <el-date-picker clearable v-model="queryParams.endTime" type="date" value-format="yyyy-MM-dd"
</el-form-item> placeholder="请选择" style="width: 100%;">
</el-form> </el-date-picker>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="考试类型" prop="examType">
<el-select v-model="queryParams.examType" placeholder="请选择" style="width: 100%;">
<el-option v-for="dict in dict.type.exam_typeda" :key="dict.value" :label="dict.label"
:value="dict.value">
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="班级" prop="className">
<el-input v-model="queryParams.className" placeholder="请输入班级" clearable
@keyup.enter.native="handleQuery" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="班级类型" prop="classType">
<el-select v-model="queryParams.classType" placeholder="请选择" style="width: 100%;">
<el-option v-for="dict in dict.type.class_type" :key="dict.value" :label="dict.label"
:value="dict.value">
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="考核分" prop="assessmentScore">
<el-input v-model="queryParams.assessmentScore" placeholder="请输入考核分" clearable
@keyup.enter.native="handleQuery" />
</el-form-item>
</el-col>
</el-row>
<el-form-item class="dialog-footer" style="display: flex; justify-content: center; align-items: center">
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
</el-form-item>
</el-form>
</el-dialog>
<el-row :gutter="10" class="mb8"> <el-row :gutter="10" class="mb8">
<el-col :span="1.5"> <el-col :span="1.5">
<el-button type="primary" plain icon="el-icon-search" size="mini" @click="handleQuerycx">查询</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd" <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
v-hasPermi="['system:achievements:add']">新增</el-button> v-hasPermi="['system:achievements:add']">新增</el-button>
</el-col> </el-col>
...@@ -99,11 +144,12 @@ ...@@ -99,11 +144,12 @@
</el-row> </el-row>
<el-table :data="achievementsList" @selection-change="handleSelectionChange" <el-table :data="achievementsList" @selection-change="handleSelectionChange"
:default-sort="{ prop: 'examTime', order: 'descending' }"> :default-sort="{ prop: 'examTime', order: 'descending' }" :row-style="{ height: '0' }"
:cell-style="{ padding: '3px' }">
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<el-table-column type="index" label="序号" width="55" align="center" sortable /> <el-table-column type="index" label="序号" width="55" align="center" sortable fixed="left" />
<el-table-column label="学年" align="center" prop="schoolYear" sortable /> <el-table-column label="学年" align="center" prop="schoolYear" sortable fixed="left" width="120px" />
<el-table-column label="学期" align="center" prop="semester" sortable> <el-table-column label="学期" align="center" prop="semester" sortable fixed="left" width="120px">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.semester_jsdzda" :value="scope.row.semester" /> <dict-tag :options="dict.type.semester_jsdzda" :value="scope.row.semester" />
</template> </template>
...@@ -113,7 +159,7 @@ ...@@ -113,7 +159,7 @@
<span>{{ parseTime(scope.row.examTime, '{y}-{m}-{d}') }}</span> <span>{{ parseTime(scope.row.examTime, '{y}-{m}-{d}') }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="考试类型" align="center" prop="examType" sortable> <el-table-column label="考试类型" align="center" prop="examType" sortable width="120px">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.exam_typeda" :value="scope.row.examType" /> <dict-tag :options="dict.type.exam_typeda" :value="scope.row.examType" />
</template> </template>
...@@ -132,7 +178,7 @@ ...@@ -132,7 +178,7 @@
</el-table-column> </el-table-column>
<el-table-column label="班级" align="center" prop="className" sortable> <el-table-column label="班级" align="center" prop="className" sortable>
</el-table-column> </el-table-column>
<el-table-column label="班级类型" align="center" sortable> <el-table-column label="班级类型" align="center" sortable show-overflow-tooltip width="180px">
<template slot-scope="scope"> <template slot-scope="scope">
<span v-if="getSelectedTypes(scope.row.classType).length > 0"> <span v-if="getSelectedTypes(scope.row.classType).length > 0">
<span v-for="(option, index) in getSelectedTypes(scope.row.classType)" :key="index"> <span v-for="(option, index) in getSelectedTypes(scope.row.classType)" :key="index">
...@@ -142,8 +188,8 @@ ...@@ -142,8 +188,8 @@
</span> </span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="考核分" align="center" prop="assessmentScore" sortable /> <el-table-column label="考核分" align="center" prop="assessmentScore" sortable width="100px" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="180px" fixed="right">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
v-hasPermi="['system:achievements:edit']">修改</el-button> v-hasPermi="['system:achievements:edit']">修改</el-button>
...@@ -342,6 +388,7 @@ export default { ...@@ -342,6 +388,7 @@ export default {
title: "", title: "",
// 是否显示弹出层 // 是否显示弹出层
open: false, open: false,
query: false,
// 查询参数 // 查询参数
queryParams: { queryParams: {
pageNum: 1, pageNum: 1,
...@@ -445,6 +492,11 @@ export default { ...@@ -445,6 +492,11 @@ export default {
}; };
this.resetForm("form"); this.resetForm("form");
}, },
/** 搜索按钮操作 */
handleQuerycx() {
this.query = true;
this.resetcx();
},
// 提交上传文件 // 提交上传文件
submitFileForm() { submitFileForm() {
this.$refs.upload.submit() this.$refs.upload.submit()
...@@ -461,6 +513,7 @@ export default { ...@@ -461,6 +513,7 @@ export default {
handleQuery() { handleQuery() {
this.queryParams.pageNum = 1; this.queryParams.pageNum = 1;
this.getList(); this.getList();
this.query = false;
}, },
getSelectedTypes(classType) { getSelectedTypes(classType) {
const selectedTypes = classType.split(','); // 将逗号分隔的字符串转换为数组 const selectedTypes = classType.split(','); // 将逗号分隔的字符串转换为数组
...@@ -574,3 +627,25 @@ export default { ...@@ -574,3 +627,25 @@ export default {
} }
}; };
</script> </script>
<style lang="less" scoped>
::v-deep .el-form-item {
margin-bottom: 0px;
}
::v-deep .el-input--medium .el-input__inner {
height: 26px;
line-height: 26px;
}
::v-deep .el-dialog__body {
padding: 10px 20px
}
::v-deep .el-dialog:not(.is-fullscreen) {
margin-top: 4vh !important;
}
.search ::v-deep .el-form-item__content {
width: 200px
}
</style>
\ No newline at end of file
ruoyi-ui/src/views/smartSchool/electronicArchives/professionalDevelopment/teamAward/index.vue
<template> <template>
<div class="app-container"> <div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px"> <el-dialog title="查询" :visible.sync="query" width="50%" append-to-body>
<el-form-item label="学年" prop="schoolYear"> <el-form ref="queryParams" :model="queryParams" label-width="96px" class="search">
<el-select v-model="queryParams.schoolYear" placeholder="请选择" style="width: 190px;"> <el-row>
<el-option v-for="dict in dict.type.yearda" :key="dict.value" :label="dict.label" :value="dict.value"> <el-col :span="12">
</el-option> <el-form-item label="学年" prop="schoolYear">
</el-select> <el-select v-model="queryParams.schoolYear" placeholder="请选择" style="width: 100%;">
</el-form-item> <el-option v-for=" dict in dict.type.yearda" :key="dict.value" :label="dict.label"
<el-form-item label="学期" prop="semester"> :value="dict.value">
<el-select v-model="queryParams.semester" placeholder="请选择"> </el-option>
<el-option v-for="dict in dict.type.semester_jsdzda" :key="dict.value" :label="dict.label" </el-select>
:value="dict.value"> </el-form-item>
</el-option> </el-col>
</el-select> <el-col :span="12">
</el-form-item> <el-form-item label="学期" prop="semester">
<el-form-item label="届别" prop="year"> <el-select v-model="queryParams.semester" placeholder="请选择" style="width: 100%;">
<el-select v-model="queryParams.year" placeholder="请选择"> <el-option v-for="dict in dict.type.semester_jsdzda" :key="dict.value" :label="dict.label"
<el-option v-for="dict in dict.type.rankda" :key="dict.value" :label="dict.label" :value="dict.value"> :value="dict.value">
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="年级" prop="grade"> </el-col>
<el-select v-model="queryParams.grade" placeholder="请选择" style="width: 100%;"> </el-row>
<el-option v-for="dict in dict.type.grade_da" :key="dict.value" :label="dict.label" :value="dict.value"> <el-row>
</el-option> <el-col :span="12">
</el-select> <el-form-item label="届别" prop="year">
</el-form-item> <el-select v-model="queryParams.year" placeholder="请选择" style="width: 100%;">
<el-form-item label="学科" prop="sub"> <el-option v-for="dict in dict.type.rankda" :key="dict.value" :label="dict.label"
<el-select v-model="queryParams.sub" placeholder="请选择" style="width: 100%;"> :value="dict.value">
<el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value" :label="dict.label" </el-option>
:value="dict.value"> </el-select>
</el-option> </el-form-item>
</el-select> </el-col>
</el-form-item> <el-col :span="12">
<el-form-item> <el-form-item label="年级" prop="grade">
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button> <el-select v-model="queryParams.grade" placeholder="请选择" style="width: 100%;">
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button> <el-option v-for="dict in dict.type.grade_da" :key="dict.value" :label="dict.label"
</el-form-item> :value="dict.value">
</el-form> </el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="学科" prop="sub">
<el-select v-model="queryParams.sub" placeholder="请选择" style="width: 100%;">
<el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value" :label="dict.label"
:value="dict.value">
</el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
</el-form-item>
</el-form>
</el-dialog>
<el-row :gutter="10" class="mb8"> <el-row :gutter="10" class="mb8">
<el-col :span="1.5"> <el-col :span="1.5">
<el-button type="primary" plain icon="el-icon-search" size="mini" @click="handleQuerycx">查询</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd" <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
v-hasPermi="['system:award:add']">新增</el-button> v-hasPermi="['system:award:add']">新增</el-button>
</el-col> </el-col>
...@@ -59,12 +82,12 @@ ...@@ -59,12 +82,12 @@
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row> </el-row>
<el-table v-loading="loading" :data="awardList" @selection-change="handleSelectionChange" <el-table :row-style="{ height: '0' }" :cell-style="{ padding: '3px' }" v-loading="loading" :data="awardList"
:default-sort="{ prop: 'schoolYear', order: 'descending' }"> @selection-change="handleSelectionChange" :default-sort="{ prop: 'schoolYear', order: 'descending' }">
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<el-table-column type="index" label="序号" width="55" align="center" sortable /> <el-table-column type="index" label="序号" width="55" align="center" sortable fixed="left" />
<el-table-column label="学年" align="center" prop="schoolYear" sortable /> <el-table-column label="学年" align="center" prop="schoolYear" sortable fixed="left" width="120px" />
<el-table-column label="学期" align="center" prop="semester" sortable> <el-table-column label="学期" align="center" prop="semester" sortable fixed="left" width="120px">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.semester_jsdzda" :value="scope.row.semester" /> <dict-tag :options="dict.type.semester_jsdzda" :value="scope.row.semester" />
</template> </template>
...@@ -84,10 +107,12 @@ ...@@ -84,10 +107,12 @@
<dict-tag :options="dict.type.teaching_subjects" :value="scope.row.sub" /> <dict-tag :options="dict.type.teaching_subjects" :value="scope.row.sub" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="获奖情况" align="center" prop="awardSituation" sortable /> <el-table-column label="获奖情况" align="center" prop="awardSituation" sortable show-overflow-tooltip
<el-table-column label="团队成员贡献情况" align="center" prop="teamMembersContribution" sortable /> width="180px" />
<el-table-column label="团队成员贡献情况" align="center" prop="teamMembersContribution" sortable width="200"
show-overflow-tooltip />
<el-table-column label="备注" align="center" prop="remark" sortable /> <el-table-column label="备注" align="center" prop="remark" sortable />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="120"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="180" fixed="right">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button size="mini" type="text" @click="handleUpdate(scope.row)" v-hasPermi="['system:honors:edit']" <el-button size="mini" type="text" @click="handleUpdate(scope.row)" v-hasPermi="['system:honors:edit']"
v-if="scope.row.auditState === '1' || scope.row.auditState === '2' || scope.row.auditState === '3'">修改</el-button> v-if="scope.row.auditState === '1' || scope.row.auditState === '2' || scope.row.auditState === '3'">修改</el-button>
...@@ -269,6 +294,7 @@ export default { ...@@ -269,6 +294,7 @@ export default {
return { return {
// 遮罩层 // 遮罩层
loading: true, loading: true,
query: false,
// 选中数组 // 选中数组
ids: [], ids: [],
// 非单个禁用 // 非单个禁用
...@@ -410,13 +436,18 @@ export default { ...@@ -410,13 +436,18 @@ export default {
this.resetForm("form"); this.resetForm("form");
}, },
/** 搜索按钮操作 */ /** 搜索按钮操作 */
handleQuerycx() {
this.query = true;
this.resetcx();
},
handleQuery() { handleQuery() {
this.queryParams.pageNum = 1; this.query = true;
this.getList(); this.getList();
this.query = false;
}, },
/** 重置按钮操作 */ /** 重置按钮操作 */
resetQuery() { resetQuery() {
this.resetForm("queryForm"); this.resetForm("queryParams");
this.handleQuery(); this.handleQuery();
}, },
// 多选框选中数据 // 多选框选中数据
...@@ -483,3 +514,25 @@ export default { ...@@ -483,3 +514,25 @@ export default {
} }
}; };
</script> </script>
<style lang="less" scoped>
::v-deep .el-form-item {
margin-bottom: 0px;
}
::v-deep .el-input--medium .el-input__inner {
height: 26px;
line-height: 26px;
}
::v-deep .el-dialog__body {
padding: 10px 20px
}
::v-deep .el-dialog:not(.is-fullscreen) {
margin-top: 4vh !important;
}
.search ::v-deep .el-form-item__content {
width: 200px
}
</style>
\ No newline at end of file
ruoyi-ui/src/views/smartSchool/electronicArchives/professionalDevelopment/tutorAward/index.vue
<template> <template>
<div class="app-container"> <div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="98px"> <el-dialog title="查询" :visible.sync="query" width="50%" append-to-body>
<el-form-item label="学科" prop="sub"> <el-form ref="queryParams" :model="queryParams" label-width="96px" class="search">
<el-select v-model="queryParams.sub" placeholder="请选择"> <el-row>
<el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value" :label="dict.label" <el-col :span="12">
:value="dict.value"> <el-form-item label="学科" prop="sub">
</el-option> <el-select v-model="queryParams.sub" placeholder="请选择" style="width: 100%;">
</el-select> <el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value" :label="dict.label"
</el-form-item> :value="dict.value">
<el-form-item label="获奖类别" prop="awardtype"> </el-option>
<el-select v-model="queryParams.awardtype" placeholder="请选择"> </el-select>
<el-option v-for="dict in dict.type.award_type_fdjs" :key="dict.value" :label="dict.label" </el-form-item>
:value="dict.value"> </el-col>
</el-option> <el-col :span="12">
</el-select> <el-form-item label="获奖类别" prop="awardtype">
</el-form-item> <el-select v-model="queryParams.awardtype" placeholder="请选择" style="width: 100%;">
<el-form-item label="获奖级别" prop="awardrank"> <el-option v-for="dict in dict.type.award_type_fdjs" :key="dict.value" :label="dict.label"
<el-select v-model="queryParams.awardrank" placeholder="请选择" style="width: 220px;"> :value="dict.value">
<el-option v-for="dict in dict.type.awards_level" :key="dict.value" :label="dict.label" </el-option>
:value="dict.value"> </el-select>
</el-option> </el-form-item>
</el-select> </el-col>
</el-form-item> </el-row>
<el-form-item label="获奖等级" prop="awardlevel"> <el-row>
<el-select v-model="queryParams.awardlevel" placeholder="请选择" style="width:220px;"> <el-col :span="12">
<el-option v-for="dict in dict.type.award_rank" :key="dict.value" :label="dict.label" <el-form-item label="获奖级别" prop="awardrank">
:value="dict.value"> <el-select v-model="queryParams.awardrank" placeholder="请选择" style="width: 100%;">
</el-option> <el-option v-for="dict in dict.type.awards_level" :key="dict.value" :label="dict.label"
</el-select> :value="dict.value">
</el-form-item> </el-option>
<el-form-item label="获奖人" prop="username"> </el-select>
<el-input v-model="queryParams.username" placeholder="请输入获奖人" clearable @keyup.enter.native="handleQuery" /> </el-form-item>
</el-form-item> </el-col>
<el-form-item label="指导教师" prop="guidanceteacher"> <el-col :span="12">
<el-input v-model="queryParams.guidanceteacher" placeholder="请输入内容" style="width: 192px;" /> <el-form-item label="获奖等级" prop="awardlevel">
</el-form-item> <el-select v-model="queryParams.awardlevel" placeholder="请选择" style="width: 100%;">
<el-form-item label="辅导职责" prop="coachingr"> <el-option v-for="dict in dict.type.award_rank" :key="dict.value" :label="dict.label"
<el-select v-model="queryParams.coachingr" placeholder="请选择" style="width: 100%;"> :value="dict.value">
<el-option v-for="dict in dict.type.coachingr" :key="dict.value" :label="dict.label" </el-option>
:value="dict.value"> </el-select>
</el-option> </el-form-item>
</el-select> </el-col>
</el-form-item> </el-row>
<el-form-item label="获奖开始时间" prop="startTime"> <el-row>
<el-date-picker clearable v-model="queryParams.startTime" type="date" value-format="yyyy-MM-dd" <el-col :span="12">
placeholder="请选择"> <el-form-item label="获奖人" prop="username">
</el-date-picker> <el-input v-model="queryParams.username" placeholder="请输入获奖人" clearable
</el-form-item> @keyup.enter.native="handleQuery" />
<el-form-item label="获奖结束时间" prop="endTime"> </el-form-item>
<el-date-picker clearable v-model="queryParams.endTime" type="date" value-format="yyyy-MM-dd" </el-col>
placeholder="请选择"> <el-col :span="12">
</el-date-picker> <el-form-item label="指导教师" prop="guidanceteacher">
</el-form-item> <el-input v-model="queryParams.guidanceteacher" placeholder="请输入内容" />
<el-form-item> </el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button> </el-col>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button> </el-row>
</el-form-item> <el-row>
</el-form> <el-col :span="12">
<el-form-item label="辅导职责" prop="coachingr">
<el-select v-model="queryParams.coachingr" placeholder="请选择" style="width: 100%;">
<el-option v-for="dict in dict.type.coachingr" :key="dict.value" :label="dict.label"
:value="dict.value">
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="获奖开始时间" prop="startTime">
<el-date-picker clearable v-model="queryParams.startTime" type="date" value-format="yyyy-MM-dd"
placeholder="请选择" style="width: 100%;">
</el-date-picker>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="获奖结束时间" prop="endTime">
<el-date-picker clearable v-model="queryParams.endTime" type="date" value-format="yyyy-MM-dd"
placeholder="请选择" style="width: 100%;">
</el-date-picker>
</el-form-item>
</el-col>
</el-row>
<el-form-item class="dialog-footer" style="display: flex; justify-content: center; align-items: center">
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
</el-form-item>
</el-form>
</el-dialog>
<el-row :gutter="10" class="mb8"> <el-row :gutter="10" class="mb8">
<el-col :span="1.5"> <el-col :span="1.5">
<el-button type="primary" plain icon="el-icon-search" size="mini" @click="handleQuerycx">查询</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd" <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
v-hasPermi="['school:fudaot:addgl']">新增</el-button> v-hasPermi="['school:fudaot:addgl']">新增</el-button>
</el-col> </el-col>
...@@ -77,50 +111,51 @@ ...@@ -77,50 +111,51 @@
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row> </el-row>
<el-table :data="awardsList" @selection-change="handleSelectionChange" <el-table :row-style="{ height: '0' }" :cell-style="{ padding: '3px' }" :data="awardsList"
:default-sort="{ prop: 'awardtime', order: 'descending' }"> @selection-change="handleSelectionChange" :default-sort="{ prop: 'awardtime', order: 'descending' }">
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<el-table-column type="index" label="序号" width="55" align="center" sortable /> <el-table-column type="index" label="序号" width="55" align="center" sortable fixed="left" />
<el-table-column label="成长类型" align="center"> <el-table-column label="成长类型" align="center" fixed="left" width="120px">
<template> <template>
<span>辅导老师获奖</span> <span>辅导老师获奖</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="学科" align="center" prop="sub" sortable> <el-table-column label="学科" align="center" prop="sub" sortable fixed="left" width="100px">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.teaching_subjects" :value="scope.row.sub" /> <dict-tag :options="dict.type.teaching_subjects" :value="scope.row.sub" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="获奖类别" align="center" prop="awardtype" sortable> <el-table-column label="获奖类别" align="center" prop="awardtype" sortable width="130px">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.award_type_fdjs" :value="scope.row.awardtype" /> <dict-tag :options="dict.type.award_type_fdjs" :value="scope.row.awardtype" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="获奖等级" align="center" prop="awardlevel" sortable> <el-table-column label="获奖等级" align="center" prop="awardlevel" sortable width="130px">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.award_rank" :value="scope.row.awardlevel" /> <dict-tag :options="dict.type.award_rank" :value="scope.row.awardlevel" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="获奖级别" align="center" prop="awardrank" sortable> <el-table-column label="获奖级别" align="center" prop="awardrank" sortable width="130px">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.awards_level" :value="scope.row.awardrank" /> <dict-tag :options="dict.type.awards_level" :value="scope.row.awardrank" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="比赛名称" align="center" prop="competitionname" sortable /> <el-table-column label="比赛名称" align="center" prop="competitionname" sortable width="130px"
<el-table-column label="获奖人" align="center" prop="username" sortable /> show-overflow-tooltip />
<el-table-column label="指导教师" align="center" prop="guidanceteacher" sortable /> <el-table-column label="获奖人" align="center" prop="username" sortable width="130px" />
<el-table-column label="辅导职责" align="center" prop="coachingr" sortable> <el-table-column label="指导教师" align="center" prop="guidanceteacher" sortable width="130px" />
<el-table-column label="辅导职责" align="center" prop="coachingr" sortable width="130px">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.coachingr" :value="scope.row.coachingr" /> <dict-tag :options="dict.type.coachingr" :value="scope.row.coachingr" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="主办单位" align="center" prop="org" sortable /> <el-table-column label="主办单位" align="center" prop="org" sortable width="180px" show-overflow-tooltip />
<el-table-column label="获奖时间" align="center" prop="awardtime" width="180" sortable> <el-table-column label="获奖时间" align="center" prop="awardtime" width="180" sortable>
<!-- <template slot-scope="scope"> <!-- <template slot-scope="scope">
<span>{{ parseTime(scope.row.awardTime, '{y}-{m}-{d}') }}</span> <span>{{ parseTime(scope.row.awardTime, '{y}-{m}-{d}') }}</span>
</template> --> </template> -->
</el-table-column> </el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="180px" fixed="right">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
v-hasPermi="['school:fudaot:edit']" v-hasPermi="['school:fudaot:edit']"
...@@ -453,6 +488,7 @@ export default { ...@@ -453,6 +488,7 @@ export default {
}, },
// 表单参数 // 表单参数
form: {}, form: {},
query: false,
// 表单校验 // 表单校验
rules: { rules: {
sub: [ sub: [
...@@ -646,13 +682,18 @@ export default { ...@@ -646,13 +682,18 @@ export default {
this.resetForm("form"); this.resetForm("form");
}, },
/** 搜索按钮操作 */ /** 搜索按钮操作 */
handleQuerycx() {
this.query = true;
this.resetcx();
},
handleQuery() { handleQuery() {
this.queryParams.pageNum = 1; this.query = true;
this.getList(); this.getList();
this.query = false;
}, },
/** 重置按钮操作 */ /** 重置按钮操作 */
resetQuery() { resetQuery() {
this.resetForm("queryForm"); this.resetForm("queryParams");
this.handleQuery(); this.handleQuery();
}, },
// 多选框选中数据 // 多选框选中数据
...@@ -717,3 +758,25 @@ export default { ...@@ -717,3 +758,25 @@ export default {
} }
}; };
</script> </script>
<style scoped lang="scss" >
::v-deep .el-form-item {
margin-bottom: 0px;
}
::v-deep .el-input--medium .el-input__inner {
height: 26px;
line-height: 26px;
}
::v-deep .el-dialog__body {
padding: 10px 20px
}
::v-deep .el-dialog:not(.is-fullscreen) {
margin-top: 4vh !important;
}
.search ::v-deep .el-form-item__content {
width: 200px
}
</style>
ruoyi-ui/src/views/smartSchool/electronicArchives/teacherAssessment/index.vue
<template> <template>
<div class="app-container"> <div class="app-container">
<el-dialog title="查询" :visible.sync="query" width="50%" append-to-body> <el-dialog title="查询" :visible.sync="query" width="50%" append-to-body>
<el-form ref="queryParams" :model="queryParams" label-width="96px"> <el-form ref="queryParams" :model="queryParams" label-width="96px" class="search">
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="姓名" prop="teacherName"> <el-form-item label="姓名" prop="teacherName">
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
@keyup.enter.native="handleQuery" /> @keyup.enter.native="handleQuery" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12">> <el-col :span="12">
<el-form-item label="学年" prop="schoolYear"> <el-form-item label="学年" prop="schoolYear">
<el-select v-model="queryParams.schoolYear" placeholder="请选择" style="width: 100%;"> <el-select v-model="queryParams.schoolYear" 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"
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="届别" prop="year"> <el-form-item label="届别" prop="year">
<el-select v-model="queryParams.year" placeholder="请选择"> <el-select v-model="queryParams.year" placeholder="请选择" style="width: 100%;">
<el-option v-for="dict in dict.type.rankda" :key="dict.value" :label="dict.label" <el-option v-for="dict in dict.type.rankda" :key="dict.value" :label="dict.label"
:value="dict.value"> :value="dict.value">
</el-option> </el-option>
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
</el-form-item></el-col> </el-form-item></el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="学期" prop="semester"> <el-form-item label="学期" prop="semester">
<el-select v-model="queryParams.semester" placeholder="请选择"> <el-select v-model="queryParams.semester" placeholder="请选择" style="width: 100%;">
<el-option v-for="dict in dict.type.semester_jsdzda" :key="dict.value" :label="dict.label" <el-option v-for="dict in dict.type.semester_jsdzda" :key="dict.value" :label="dict.label"
:value="dict.value"> :value="dict.value">
</el-option> </el-option>
...@@ -89,7 +89,7 @@ ...@@ -89,7 +89,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-form-item> <el-form-item class="dialog-footer" style="display: flex; justify-content: center; align-items: center">
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button> <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button> <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
</el-form-item> </el-form-item>
...@@ -127,14 +127,15 @@ ...@@ -127,14 +127,15 @@
:cell-style="{ padding: '3px' }"> :cell-style="{ padding: '3px' }">
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<el-table-column type="index" label="序号" width="55" align="center" sortable fixed="left" /> <el-table-column type="index" label="序号" width="55" align="center" sortable fixed="left" />
<el-table-column label="学年" align="center" prop="schoolYear" sortable fixed="left" /> <el-table-column label="学年" align="center" prop="schoolYear" sortable fixed="left" width="130px
<el-table-column label="学期" align="center" prop="semester" sortable fixed="left"> " />
<el-table-column label="学期" align="center" prop="semester" sortable fixed="left" width="130px">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.semester_jsdzda" :value="scope.row.semester" /> <dict-tag :options="dict.type.semester_jsdzda" :value="scope.row.semester" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="届别" align="center" prop="year" sortable fixed="left" /> <el-table-column label="届别" align="center" prop="year" sortable fixed="left" />
<el-table-column label="年级" align="center" prop="grade" sortable> <el-table-column label="年级" align="center" prop="grade" sortable show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.grade_da" :value="scope.row.grade" /> <dict-tag :options="dict.type.grade_da" :value="scope.row.grade" />
</template> </template>
...@@ -150,18 +151,20 @@ ...@@ -150,18 +151,20 @@
</span> </span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="姓名" align="center" prop="teacherName" sortable /> <el-table-column label="姓名" align="center" prop="teacherName" sortable show-overflow-tooltip />
<el-table-column label="学科" align="center" prop="sub" sortable> <el-table-column label="学科" align="center" prop="sub" sortable show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.teaching_subjects" :value="scope.row.sub" /> <dict-tag :options="dict.type.teaching_subjects" :value="scope.row.sub" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="德育考核成绩" align="center" prop="moralEduCheckAchievement" sortable fixed="right" <el-table-column label="德育考核成绩" align="center" prop="moralEduCheckAchievement" sortable fixed="right"
width="130px" /> width="130px" show-overflow-tooltip />
<el-table-column label="智育考核成绩" align="center" prop="intellEduCheckAchievement" sortable fixed="right" <el-table-column label="智育考核成绩" align="center" prop="intellEduCheckAchievement" sortable fixed="right"
width="130px" /> width="130px" show-overflow-tooltip />
<!-- <el-table-column label="总考核成绩" align="center" prop="totalCheckAchievement" sortable fixed="right"
width="130px" /> -->
<el-table-column label="备注" align="center" prop="remark" sortable fixed="right" /> <el-table-column label="备注" align="center" prop="remark" sortable fixed="right" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" width="150px">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
v-hasPermi="['system:assessment:edit']">修改</el-button> v-hasPermi="['system:assessment:edit']">修改</el-button>
...@@ -220,7 +223,7 @@ ...@@ -220,7 +223,7 @@
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="班级" prop="className"> <el-form-item label="班级" prop="className">
<el-select v-model="form.className" multiple placeholder="请选择" style="width: 100%;"> <el-select v-model="form.className" placeholder="请选择" style="width: 100%;">
<el-option v-for="dict in dict.type.class_num" :key="dict.value" :label="dict.label" <el-option v-for="dict in dict.type.class_num" :key="dict.value" :label="dict.label"
:value="dict.value"> :value="dict.value">
</el-option> </el-option>
...@@ -254,18 +257,22 @@ ...@@ -254,18 +257,22 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="总考核成绩" prop="totalCheckAchievement">
<el-input v-model="form.totalCheckAchievement" type="number" placeholder="请输入" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="班级类型" prop="classType"> <el-form-item label="班级类型" prop="classType">
<el-select v-model="form.classType" multiple placeholder="请选择" style="width: 100%"> <el-select v-model="form.classType" placeholder="请选择" style="width: 100%">
<el-option v-for="dict in dict.type.class_type" :key="dict.value" :label="dict.label" <el-option v-for="dict in dict.type.class_type" :key="dict.value" :label="dict.label"
:value="dict.value"> :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-col :span="12"> <el-col :span="12">
<el-form-item label="学科" prop="sub"> <el-form-item label="学科" prop="sub">
<el-select v-model="form.sub" placeholder="请选择" style="width: 100%"> <el-select v-model="form.sub" placeholder="请选择" style="width: 100%">
...@@ -441,7 +448,8 @@ export default { ...@@ -441,7 +448,8 @@ export default {
/** 搜索按钮操作 */ /** 搜索按钮操作 */
handleQuerycx() { handleQuerycx() {
this.query = true; this.query = true;
this.resetcx();
}, },
// 取消按钮 // 取消按钮
cancel() { cancel() {
...@@ -517,10 +525,11 @@ export default { ...@@ -517,10 +525,11 @@ export default {
handleQuery() { handleQuery() {
this.queryParams.pageNum = 1; this.queryParams.pageNum = 1;
this.getList(); this.getList();
this.query = false;
}, },
/** 重置按钮操作 */ /** 重置按钮操作 */
resetQuery() { resetQuery() {
this.resetForm("queryForm"); this.resetForm("queryParams");
this.handleQuery(); this.handleQuery();
}, },
// 多选框选中数据 // 多选框选中数据
...@@ -541,8 +550,6 @@ export default { ...@@ -541,8 +550,6 @@ export default {
const id = row.id || this.ids const id = row.id || this.ids
getAssessment(id).then(response => { getAssessment(id).then(response => {
this.form = response.data; this.form = response.data;
this.form.classType = this.form.classType.split(',');
this.form.className = this.form.className.split(',');
this.open = true; this.open = true;
this.title = "修改班主任考核"; this.title = "修改班主任考核";
}); });
...@@ -550,19 +557,15 @@ export default { ...@@ -550,19 +557,15 @@ export default {
/** 提交按钮 */ /** 提交按钮 */
submitForm() { submitForm() {
this.$refs["form"].validate(valid => { this.$refs["form"].validate(valid => {
const classTypeStr = this.form.classType.join(',');
console.log(classTypeStr); // 输出转换后的字符串
const classNameStr = this.form.className.join(',');
console.log(classNameStr); // 输出转换后的字符串
if (valid) { if (valid) {
if (this.form.id != null) { if (this.form.id != null) {
updateAssessment({ ...this.form, classType: classTypeStr, className: classNameStr }).then(response => { updateAssessment({ ...this.form }).then(response => {
this.$modal.msgSuccess("修改成功"); this.$modal.msgSuccess("修改成功");
this.open = false; this.open = false;
this.getList(); this.getList();
}); });
} else { } else {
addAssessment({ ...this.form, classType: classTypeStr, className: classNameStr }).then(response => { addAssessment({ ...this.form }).then(response => {
this.$modal.msgSuccess("新增成功"); this.$modal.msgSuccess("新增成功");
this.open = false; this.open = false;
this.getList(); this.getList();
...@@ -590,3 +593,25 @@ export default { ...@@ -590,3 +593,25 @@ export default {
} }
}; };
</script> </script>
<style lang="less" scoped>
::v-deep .el-form-item {
margin-bottom: 0px;
}
::v-deep .el-input--medium .el-input__inner {
height: 26px;
line-height: 26px;
}
::v-deep .el-dialog__body {
padding: 10px 20px
}
::v-deep .el-dialog:not(.is-fullscreen) {
margin-top: 4vh !important;
}
.search ::v-deep .el-form-item__content {
width: 200px
}
</style>
\ No newline at end of file
ruoyi-ui/src/views/smartSchool/electronicArchives/workloadInformation/index.vue
<template> <template>
<div class="app-container"> <div class="app-container">
<el-dialog title="查询" :visible.sync="query" width="50%" append-to-body> <el-dialog title="查询" :visible.sync="query" width="50%" append-to-body>
<el-form ref="queryParams" :model="queryParams" label-width="96px"> <el-form ref="queryParams" :model="queryParams" label-width="96px" class="search">
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="姓名" prop="name"> <el-form-item label="姓名" prop="name">
...@@ -147,31 +147,36 @@ ...@@ -147,31 +147,36 @@
:cell-style="{ padding: '3px' }"> :cell-style="{ padding: '3px' }">
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<el-table-column type="index" label="序号" width="55" align="center" sortable fixed="left" /> <el-table-column type="index" label="序号" width="55" align="center" sortable fixed="left" />
<el-table-column label="学年" align="center" prop="schoolYear" width="100px" fixed="left" sortable /> <el-table-column label="学年" align="center" prop="schoolYear" width="100px" fixed="left" sortable
<el-table-column label="学期" align="center" prop="semester" fixed="left" sortable width="100px"> show-overflow-tooltip />
<el-table-column label="学期" align="center" prop="semester" fixed="left" sortable width="100px"
show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.semester_jsdzda" :value="scope.row.semester" /> <dict-tag :options="dict.type.semester_jsdzda" :value="scope.row.semester" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="届别" align="center" prop="year" fixed="left" sortable /> <el-table-column label="届别" align="center" prop="year" fixed="left" sortable show-overflow-tooltip />
<el-table-column label="年级" align="center" prop="grade" fixed="left" sortable> <el-table-column label="年级" align="center" prop="grade" fixed="left" sortable show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.grade_da" :value="scope.row.grade" /> <dict-tag :options="dict.type.grade_da" :value="scope.row.grade" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="姓名" align="center" prop="name" sortable /> <el-table-column label="姓名" align="center" prop="name" sortable width="130px" show-overflow-tooltip />
<el-table-column label="学科" align="center" prop="sub" sortable> <el-table-column label="学科" align="center" prop="sub" sortable show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.teaching_subjects" :value="scope.row.sub" /> <dict-tag :options="dict.type.teaching_subjects" :value="scope.row.sub" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="聘任岗位" align="center" prop="appointmentPost" sortable width="120px"> <el-table-column label="聘任岗位" align="center" prop="appointmentPost" sortable width="120px"
show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.appointment_positions" :value="scope.row.appointmentPost" /> <dict-tag :options="dict.type.appointment_positions" :value="scope.row.appointmentPost" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="聘任职务" align="center" prop="appointmentPosition" sortable width="120px" /> <el-table-column label="聘任职务" align="center" prop="appointmentPosition" sortable width="120px"
<el-table-column label="聘任情况" align="center" prop="appointmentSituation" sortable width="120px"> show-overflow-tooltip />
<el-table-column label="聘任情况" align="center" prop="appointmentSituation" sortable width="120px"
show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.appointment_situation" :value="scope.row.appointmentSituation" /> <dict-tag :options="dict.type.appointment_situation" :value="scope.row.appointmentSituation" />
</template> </template>
...@@ -187,12 +192,15 @@ ...@@ -187,12 +192,15 @@
</span> </span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="早读" align="center" prop="earlyReading" sortable width="90px" /> <el-table-column label="早读" align="center" prop="earlyReading" sortable width="90px" show-overflow-tooltip />
<el-table-column label="正课" align="center" prop="requiredCourses" sortable width="90px" /> <el-table-column label="正课" align="center" prop="requiredCourses" sortable width="90px" show-overflow-tooltip />
<el-table-column label="晚自习" align="center" prop="eveningSelfStudy" sortable width="90px" /> <el-table-column label="晚自习" align="center" prop="eveningSelfStudy" sortable width="90px"
<el-table-column label="合计" align="center" prop="amountTo" sortable /> show-overflow-tooltip />
<el-table-column label="证明人" align="center" prop="userName" width="120px" fixed="right" sortable /> <el-table-column label="合计" align="center" prop="amountTo" sortable show-overflow-tooltip />
<el-table-column label="备注" align="center" prop="remark" fixed="right" sortable /> <el-table-column label="证明人" align="center" prop="userName" width="120px" fixed="right" sortable
show-overflow-tooltip />
<el-table-column label="备注" align="center" prop="remark" fixed="right" sortable width="150px"
show-overflow-tooltip />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="150px" fixed="right"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="150px" fixed="right">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button size="mini" type="text" @click="handleUpdate(scope.row)" <el-button size="mini" type="text" @click="handleUpdate(scope.row)"
...@@ -316,24 +324,24 @@ ...@@ -316,24 +324,24 @@
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="早读" prop="earlyReading"> <el-form-item label="早读" prop="earlyReading">
<el-input v-model="form.earlyReading" type="number" placeholder="请输入早读" /> <el-input v-model="form.earlyReading" type="number" placeholder="请输入" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="正课" prop="requiredCourses"> <el-form-item label="正课" prop="requiredCourses">
<el-input v-model="form.requiredCourses" type="number" placeholder="请输入正课" /> <el-input v-model="form.requiredCourses" type="number" placeholder="请输入" />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="晚自习" prop="eveningSelfStudy"> <el-form-item label="晚自习" prop="eveningSelfStudy">
<el-input v-model="form.eveningSelfStudy" type="number" placeholder="请输入晚自习" /> <el-input v-model="form.eveningSelfStudy" type="number" placeholder="请输入" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="证明人" prop="userName"> <el-form-item label="证明人" prop="userName">
<el-input v-model="form.userName" placeholder="请输入证明人" /> <el-input v-model="form.userName" placeholder="请输入" />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
...@@ -460,19 +468,19 @@ ...@@ -460,19 +468,19 @@
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="早读" prop="earlyReading"> <el-form-item label="早读" prop="earlyReading">
<el-input v-model="form.earlyReading" placeholder="请输入早读" /> <el-input v-model="form.earlyReading" placeholder="请输入" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="正课" prop="requiredCourses"> <el-form-item label="正课" prop="requiredCourses">
<el-input v-model="form.requiredCourses" placeholder="请输入正课" /> <el-input v-model="form.requiredCourses" placeholder="请输入" />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="晚自习" prop="eveningSelfStudy"> <el-form-item label="晚自习" prop="eveningSelfStudy">
<el-input v-model="form.eveningSelfStudy" placeholder="请输入晚自习" /> <el-input v-model="form.eveningSelfStudy" placeholder="请输入" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
...@@ -890,11 +898,30 @@ export default { ...@@ -890,11 +898,30 @@ export default {
handleQuery() { handleQuery() {
this.queryParams.pageNum = 1; this.queryParams.pageNum = 1;
this.getList(); this.getList();
this.query = false;
}, },
/** 重置按钮操作 */ /** 重置按钮操作 */
resetQuery() { resetQuery() {
this.resetForm("queryParams"); this.queryParams = {
this.handleQuery(); schoolYear: "",
semester: "",
year: "",
grade: "",
name: "",
sub: "",
idCard: "",
appointmentPost: "",
appointmentPosition: "",
appointmentSituation: "",
className: "",
classType: "",
earlyReading: "",
requiredCourses: "",
eveningSelfStudy: "",
userId: "",
userName: "",
},
this.handleQuery();
}, },
// 多选框选中数据 // 多选框选中数据
handleSelectionChange(selection) { handleSelectionChange(selection) {
...@@ -973,16 +1000,24 @@ export default { ...@@ -973,16 +1000,24 @@ export default {
}; };
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>
::v-deep .el-form-item {
margin-bottom: 0px;
}
::v-deep .el-input--medium .el-input__inner { ::v-deep .el-input--medium .el-input__inner {
height: 26px; height: 26px;
line-height: 26px; line-height: 26px;
} }
::v-deep .el-dialog__body { ::v-deep .el-dialog__body {
padding: 20px padding: 10px 20px
} }
::v-deep .el-dialog:not(.is-fullscreen) { ::v-deep .el-dialog:not(.is-fullscreen) {
margin-top: 4vh !important; margin-top: 4vh !important;
} }
.search ::v-deep .el-form-item__content {
width: 200px
}
</style> </style>
\ No newline at end of file
ruoyi-ui/src/views/smartSchool/personWork/awardTutoringstu/index.vue
<template> <template>
<div class="app-container"> <div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="98px"> <el-dialog title="查询" :visible.sync="query" width="50%" append-to-body>
<el-form-item label="学科" prop="sub"> <el-form ref="queryParams" :model="queryParams" label-width="96px" class="search">
<el-select v-model="queryParams.sub" placeholder="请选择"> <el-row>
<el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value" :label="dict.label" <el-col :span="12">
:value="dict.value"> <el-form-item label="学科" prop="sub">
</el-option> <el-select v-model="queryParams.sub" placeholder="请选择" style="width: 100%;">
</el-select> <el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value" :label="dict.label"
</el-form-item> :value="dict.value">
<el-form-item label="获奖类别" prop="awardtype"> </el-option>
<el-select v-model="queryParams.awardtype" placeholder="请选择" style="width: 220px;"> </el-select>
<el-option v-for="dict in dict.type.award_type_fdxs" :key="dict.value" :label="dict.label" </el-form-item>
:value="dict.value"> </el-col>
</el-option> <el-col :span="12">
</el-select> <el-form-item label="获奖类别" prop="awardtype">
</el-form-item> <el-select v-model="queryParams.awardtype" placeholder="请选择" style="width: 100%;">
<el-form-item label="获奖级别" prop="awardrank"> <el-option v-for="dict in dict.type.award_type_fdxs" :key="dict.value" :label="dict.label"
<el-select v-model="queryParams.awardrank" placeholder="请选择" style="width: 220px;"> :value="dict.value">
<el-option v-for="dict in dict.type.awards_level" :key="dict.value" :label="dict.label" </el-option>
:value="dict.value"> </el-select>
</el-option> </el-form-item>
</el-select> </el-col>
</el-form-item> </el-row>
<el-form-item label="获奖等级" prop="awardlevel"> <el-row>
<el-select v-model="queryParams.awardlevel" placeholder="请选择" style="width:220px;"> <el-col :span="12">
<el-option v-for="dict in dict.type.award_rank" :key="dict.value" :label="dict.label" <el-form-item label="获奖级别" prop="awardrank">
:value="dict.value"> <el-select v-model="queryParams.awardrank" placeholder="请选择" style="width: 100%;">
</el-option> <el-option v-for="dict in dict.type.awards_level" :key="dict.value" :label="dict.label"
</el-select> :value="dict.value">
</el-form-item> </el-option>
<el-form-item label="获奖人" prop="username"> </el-select>
<el-input v-model="queryParams.username" placeholder="请输入获奖人" clearable @keyup.enter.native="handleQuery" /> </el-form-item>
</el-form-item> </el-col>
<el-form-item label="指导教师" prop="guidanceteacher"> <el-col :span="12">
<el-input v-model="queryParams.guidanceteacher" placeholder="请输入内容" style="width: 192px;" /> <el-form-item label="获奖等级" prop="awardlevel">
</el-form-item> <el-select v-model="queryParams.awardlevel" placeholder="请选择" style="width: 100%;">
<el-form-item label="获奖开始时间" prop="startTime"> <el-option v-for="dict in dict.type.award_rank" :key="dict.value" :label="dict.label"
<el-date-picker clearable v-model="queryParams.startTime" type="date" value-format="yyyy-MM-dd" :value="dict.value">
placeholder="请选择"> </el-option>
</el-date-picker> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="获奖结束时间" prop="endTime"> </el-col>
<el-date-picker clearable v-model="queryParams.endTime" type="date" value-format="yyyy-MM-dd" </el-row>
placeholder="请选择"> <el-row>
</el-date-picker> <el-col :span="12">
</el-form-item> <el-form-item label="获奖人" prop="username">
<el-form-item> <el-input v-model="queryParams.username" placeholder="请输入获奖人" clearable
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button> @keyup.enter.native="handleQuery" />
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button> </el-form-item>
</el-form-item> </el-col>
</el-form> <el-col :span="12">
<el-form-item label="指导教师" prop="guidanceteacher">
<el-input v-model="queryParams.guidanceteacher" placeholder="请输入内容" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="获奖开始时间" prop="startTime">
<el-date-picker clearable v-model="queryParams.startTime" type="date" value-format="yyyy-MM-dd"
placeholder="请选择" style="width: 100%;">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="获奖结束时间" prop="endTime">
<el-date-picker clearable v-model="queryParams.endTime" type="date" value-format="yyyy-MM-dd"
placeholder="请选择" style="width: 100%;">
</el-date-picker>
</el-form-item>
</el-col>
</el-row>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
</el-form-item>
</el-form>
</el-dialog>
<el-row :gutter="10" class="mb8"> <el-row :gutter="10" class="mb8">
<el-col :span="1.5"> <el-col :span="1.5">
<el-button type="primary" plain icon="el-icon-search" size="mini" @click="handleQuerycx">查询</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd" <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
v-hasPermi="['system:tutoringstu:add']">新增</el-button> v-hasPermi="['system:tutoringstu:add']">新增</el-button>
</el-col> </el-col>
...@@ -70,45 +100,45 @@ ...@@ -70,45 +100,45 @@
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row> </el-row>
<el-table :data="awardsList" @selection-change="handleSelectionChange" <el-table :row-style="{ height: '0' }" :cell-style="{ padding: '3px' }" :data="awardsList"
:default-sort="{ prop: 'awardtime', order: 'descending' }"> @selection-change="handleSelectionChange" :default-sort="{ prop: 'awardtime', order: 'descending' }">
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<el-table-column type="index" label="序号" width="55" align="center" sortable /> <el-table-column type="index" label="序号" width="55" align="center" sortable fixed="left" />
<el-table-column label="成长类型" align="center" sortable> <el-table-column label="成长类型" align="center" fixed="left" width="120px">
<template> <template>
<span>辅导学生获奖</span> <span>辅导学生获奖</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="学科" align="center" prop="sub" sortable> <el-table-column label="学科" align="center" prop="sub" sortable fixed="left" width="120px">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.teaching_subjects" :value="scope.row.sub" /> <dict-tag :options="dict.type.teaching_subjects" :value="scope.row.sub" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="获奖类别" align="center" prop="awardtype" sortable> <el-table-column label="获奖类别" align="center" prop="awardtype" sortable width="120px">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.award_type_fdxs" :value="scope.row.awardtype" /> <dict-tag :options="dict.type.award_type_fdxs" :value="scope.row.awardtype" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="获奖等级" align="center" prop="awardlevel" sortable> <el-table-column label="获奖等级" align="center" prop="awardlevel" sortable width="120px">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.award_rank" :value="scope.row.awardlevel" /> <dict-tag :options="dict.type.award_rank" :value="scope.row.awardlevel" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="获奖级别" align="center" prop="awardrank" sortable> <el-table-column label="获奖级别" align="center" prop="awardrank" sortable width="120px">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.awards_level" :value="scope.row.awardrank" /> <dict-tag :options="dict.type.awards_level" :value="scope.row.awardrank" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="比赛名称" align="center" prop="resultname" sortable /> <el-table-column label="比赛名称" align="center" prop="resultname" sortable width="180px" />
<el-table-column label="获奖人" align="center" prop="username" sortable /> <el-table-column label="获奖人" align="center" prop="username" sortable width="120px" />
<el-table-column label="指导教师" align="center" prop="guidanceteacher" sortable /> <el-table-column label="指导教师" align="center" prop="guidanceteacher" sortable width="120px" />
<el-table-column label="主办单位" align="center" prop="org" sortable /> <el-table-column label="主办单位" align="center" prop="org" sortable width="180px" />
<el-table-column label="获奖时间" align="center" prop="awardtime" width="180" sortable> <el-table-column label="获奖时间" align="center" prop="awardtime" width="180" sortable>
<!-- <template slot-scope="scope"> <!-- <template slot-scope="scope">
<span>{{ parseTime(scope.row.awardTime, '{y}-{m}-{d}') }}</span> <span>{{ parseTime(scope.row.awardTime, '{y}-{m}-{d}') }}</span>
</template> --> </template> -->
</el-table-column> </el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="150" fixed="right">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button size="mini" type="text" @click="handleUpdate(scope.row)" <el-button size="mini" type="text" @click="handleUpdate(scope.row)"
v-hasPermi="['system:tutoringstu:edit']" v-hasPermi="['system:tutoringstu:edit']"
...@@ -257,6 +287,7 @@ export default { ...@@ -257,6 +287,7 @@ export default {
multiple: true, multiple: true,
// 显示搜索条件 // 显示搜索条件
showSearch: true, showSearch: true,
query: false,
// 总条数 // 总条数
total: 0, total: 0,
// 教师获奖表格数据 // 教师获奖表格数据
...@@ -457,13 +488,18 @@ export default { ...@@ -457,13 +488,18 @@ export default {
this.resetForm("form"); this.resetForm("form");
}, },
/** 搜索按钮操作 */ /** 搜索按钮操作 */
handleQuerycx() {
this.query = true;
this.resetcx();
},
handleQuery() { handleQuery() {
this.queryParams.pageNum = 1; this.query = true;
this.getList(); this.getList();
this.query = false;
}, },
/** 重置按钮操作 */ /** 重置按钮操作 */
resetQuery() { resetQuery() {
this.resetForm("queryForm"); this.resetForm("queryParams");
this.handleQuery(); this.handleQuery();
}, },
// 多选框选中数据 // 多选框选中数据
...@@ -472,6 +508,7 @@ export default { ...@@ -472,6 +508,7 @@ export default {
this.single = selection.length !== 1 this.single = selection.length !== 1
this.multiple = !selection.length this.multiple = !selection.length
}, },
/** 新增按钮操作 */ /** 新增按钮操作 */
handleAdd() { handleAdd() {
this.reset(); this.reset();
...@@ -532,3 +569,25 @@ export default { ...@@ -532,3 +569,25 @@ export default {
} }
}; };
</script> </script>
<style scoped lang="scss" >
::v-deep .el-form-item {
margin-bottom: 0px;
}
::v-deep .el-input--medium .el-input__inner {
height: 26px;
line-height: 26px;
}
::v-deep .el-dialog__body {
padding: 10px 20px
}
::v-deep .el-dialog:not(.is-fullscreen) {
margin-top: 4vh !important;
}
.search ::v-deep .el-form-item__content {
width: 200px
}
</style>
ruoyi-ui/src/views/smartSchool/personWork/comprehensiveHonors/index.vue
<template> <template>
<div class="app-container"> <div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="98px"> <el-dialog title="查询" :visible.sync="query" width="50%" append-to-body>
<el-form-item label="学科" prop="sub"> <el-form ref="queryParams" :model="queryParams" label-width="96px" class="search">
<el-select v-model="queryParams.sub" placeholder="请选择" style="width: 220px;"> <el-row>
<el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value" :label="dict.label" <el-col :span="12">
:value="dict.value"> <el-form-item label="学科" prop="sub">
</el-option> <el-select v-model="queryParams.sub" placeholder="请选择" style="width: 100%;">
</el-select> <el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value" :label="dict.label"
</el-form-item> :value="dict.value">
<el-form-item label="获奖类别" prop="awardType"> </el-option>
<el-input v-model="queryParams.awardType" placeholder="请输入获奖类别" clearable @keyup.enter.native="handleQuery" </el-select>
style="width: 220px;" /> </el-form-item>
</el-form-item> </el-col>
<el-form-item label="获奖级别" prop="awardRank"> <el-col :span="12">
<el-select v-model="queryParams.awardRank" placeholder="请选择"> <el-form-item label="获奖类别" prop="awardType">
<el-option v-for="dict in dict.type.awards_level" :key="dict.value" :label="dict.label" <el-input v-model="queryParams.awardType" placeholder="请输入" clearable
:value="dict.value"> @keyup.enter.native="handleQuery" />
</el-option> </el-form-item>
</el-select> </el-col>
</el-form-item> </el-row>
<el-form-item label="获奖等级" prop="awardLevel"> <el-row>
<el-select v-model="queryParams.awardLevel" placeholder="请选择"> <el-col :span="12">
<el-option v-for="dict in dict.type.award_rank" :key="dict.value" :label="dict.label" <el-form-item label="获奖级别" prop="awardRank">
:value="dict.value"> <el-select v-model="queryParams.awardRank" placeholder="请选择" style="width: 100%;">
</el-option> <el-option v-for="dict in dict.type.awards_level" :key="dict.value" :label="dict.label"
</el-select> :value="dict.value">
</el-form-item> </el-option>
<el-form-item label="获奖人" prop="userName"> </el-select>
<el-input v-model="queryParams.userName" placeholder="请输入获奖人" clearable @keyup.enter.native="handleQuery" /> </el-form-item>
</el-form-item> </el-col>
<el-form-item label="获奖开始时间" prop="startTime"> <el-col :span="12">
<el-date-picker clearable v-model="queryParams.startTime" type="date" value-format="yyyy-MM-dd" <el-form-item label="获奖等级" prop="awardLevel">
placeholder="请选择"> <el-select v-model="queryParams.awardLevel" placeholder="请选择" style="width: 100%;">
</el-date-picker> <el-option v-for="dict in dict.type.award_rank" :key="dict.value" :label="dict.label"
</el-form-item> :value="dict.value">
<el-form-item label="获奖结束时间" prop="endTime"> </el-option>
<el-date-picker clearable v-model="queryParams.endTime" type="date" value-format="yyyy-MM-dd" </el-select>
placeholder="请选择"> </el-form-item>
</el-date-picker> </el-col>
</el-form-item> </el-row>
<el-form-item> <el-row>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button> <el-col :span="12">
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button> <el-form-item label="获奖人" prop="userName">
</el-form-item> <el-input v-model="queryParams.userName" placeholder="请输入" clearable
</el-form> @keyup.enter.native="handleQuery" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="获奖开始时间" prop="startTime">
<el-date-picker clearable v-model="queryParams.startTime" type="date" value-format="yyyy-MM-dd"
placeholder="请选择" style="width: 100%;">
</el-date-picker>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="获奖结束时间" prop="endTime">
<el-date-picker clearable v-model="queryParams.endTime" type="date" value-format="yyyy-MM-dd"
placeholder="请选择" style="width: 100%;">
</el-date-picker>
</el-form-item>
</el-col>
</el-row>
<el-form-item class="dialog-footer" style="display: flex; justify-content: center; align-items: center">
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
</el-form-item>
</el-form>
</el-dialog>
<el-row :gutter="10" class="mb8"> <el-row :gutter="10" class="mb8">
<el-col :span="1.5"> <el-col :span="1.5">
<el-button type="primary" plain icon="el-icon-search" size="mini" @click="handleQuerycx">查询</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd" <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
v-hasPermi="['system:honors:add']">新增</el-button> v-hasPermi="['system:honors:add']">新增</el-button>
</el-col> </el-col>
...@@ -60,40 +88,41 @@ ...@@ -60,40 +88,41 @@
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row> </el-row>
<el-table :data="honorsList" @selection-change="handleSelectionChange" <el-table :row-style="{ height: '0' }" :cell-style="{ padding: '3px' }" :data="honorsList"
:default-sort="{ prop: 'awardTime', order: 'descending' }"> @selection-change="handleSelectionChange" :default-sort="{ prop: 'awardTime', order: 'descending' }">
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<el-table-column type="index" label="序号" width="55" align="center" sortable /> <el-table-column type="index" label="序号" width="55" align="center" sortable fixed="left" />
<el-table-column label="成长类型" align="center" prop="type"> <el-table-column label="成长类型" align="center" prop="type" sortable width="120px" fixed="left">
<template> <template>
<span>综合荣誉</span> <span>综合荣誉</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="学科" align="center" prop="sub" sortable> <el-table-column label="学科" align="center" prop="sub" sortable fixed="left">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.teaching_subjects" :value="scope.row.sub" /> <dict-tag :options="dict.type.teaching_subjects" :value="scope.row.sub" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="获奖类别" align="center" prop="awardType" sortable /> <el-table-column label="获奖类别" align="center" prop="awardType" sortable width="120px" />
<el-table-column label="获奖等级" align="center" prop="awardLevel" sortable> <el-table-column label="获奖等级" align="center" prop="awardLevel" sortable width="120px">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.award_rank" :value="scope.row.awardLevel" /> <dict-tag :options="dict.type.award_rank" :value="scope.row.awardLevel" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="获奖级别" align="center" prop="awardRank" sortable> <el-table-column label="获奖级别" align="center" prop="awardRank" sortable width="120px">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.awards_level" :value="scope.row.awardRank" /> <dict-tag :options="dict.type.awards_level" :value="scope.row.awardRank" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="综合荣誉-成果名称" align="center" prop="resultName" sortable /> <el-table-column label="综合荣誉-成果名称" align="center" prop="resultName" sortable width="180px"
<el-table-column label="获奖人" align="center" prop="userName" sortable /> show-overflow-tooltip />
<el-table-column label="主办单位" align="center" prop="org" sortable /> <el-table-column label="获奖人" align="center" prop="userName" sortable width="120px" />
<el-table-column label="主办单位" align="center" prop="org" sortable width="150px" show-overflow-tooltip />
<el-table-column label="获奖时间" align="center" prop="awardTime" width="180" sortable> <el-table-column label="获奖时间" align="center" prop="awardTime" width="180" sortable>
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.awardTime, '{y}-{m}-{d}') }}</span> <span>{{ parseTime(scope.row.awardTime, '{y}-{m}-{d}') }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" width="150px">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button size="mini" type="text" @click="handleUpdate(scope.row)" v-hasPermi="['system:honors:edit']" <el-button size="mini" type="text" @click="handleUpdate(scope.row)" v-hasPermi="['system:honors:edit']"
v-if="scope.row.auditState === '0' || scope.row.auditState === '3'">修改</el-button> v-if="scope.row.auditState === '0' || scope.row.auditState === '3'">修改</el-button>
...@@ -271,6 +300,7 @@ export default { ...@@ -271,6 +300,7 @@ export default {
startTime: "", startTime: "",
endTime: "", endTime: "",
}, },
query: false,
// 表单参数 // 表单参数
form: {}, form: {},
// 表单校验 // 表单校验
...@@ -409,13 +439,18 @@ export default { ...@@ -409,13 +439,18 @@ export default {
this.resetForm("form"); this.resetForm("form");
}, },
/** 搜索按钮操作 */ /** 搜索按钮操作 */
handleQuerycx() {
this.query = true;
this.resetcx();
},
handleQuery() { handleQuery() {
this.queryParams.pageNum = 1; this.query = true;
this.getList(); this.getList();
this.query = false;
}, },
/** 重置按钮操作 */ /** 重置按钮操作 */
resetQuery() { resetQuery() {
this.resetForm("queryForm"); this.resetForm("queryParams");
this.handleQuery(); this.handleQuery();
}, },
// 多选框选中数据 // 多选框选中数据
...@@ -551,3 +586,25 @@ export default { ...@@ -551,3 +586,25 @@ export default {
} }
}; };
</script> </script>
<style scoped lang="scss" >
::v-deep .el-form-item {
margin-bottom: 0px;
}
::v-deep .el-input--medium .el-input__inner {
height: 26px;
line-height: 26px;
}
::v-deep .el-dialog__body {
padding: 10px 20px
}
::v-deep .el-dialog:not(.is-fullscreen) {
margin-top: 4vh !important;
}
.search ::v-deep .el-form-item__content {
width: 200px
}
</style>
ruoyi-ui/src/views/smartSchool/personWork/essaysWritings/index.vue
<template> <template>
<div class="app-container"> <div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="98px"> <el-dialog title="查询" :visible.sync="query" width="50%" append-to-body>
<el-form-item label="学科" prop="sub"> <el-form ref="queryParams" :model="queryParams" label-width="96px" class="search">
<el-select v-model="queryParams.sub" placeholder="请选择" style="width: 220px;"> <el-row>
<el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value" :label="dict.label" <el-col :span="12">
:value="dict.value"> <el-form-item label="学科" prop="sub">
</el-option> <el-select v-model="queryParams.sub" placeholder="请选择" style="width: 100%;">
</el-select> <el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value" :label="dict.label"
</el-form-item> :value="dict.value">
<el-form-item label="获奖类别" prop="awardType"> </el-option>
<el-select v-model="queryParams.awardType" placeholder="请选择" style="width: 220px;"> </el-select>
<el-option v-for="dict in dict.type.award_categories" :key="dict.value" :label="dict.label" </el-form-item>
:value="dict.value"> </el-col>
</el-option> <el-col :span="12">
</el-select> <el-form-item label="获奖类别" prop="awardType">
</el-form-item> <el-select v-model="queryParams.awardType" placeholder="请选择" style="width: 100%;">
<el-form-item label="获奖级别" prop="awardRank"> <el-option v-for="dict in dict.type.award_categoriesjk" :key="dict.value"
<el-select v-model="queryParams.awardRank" placeholder="请选择" style="width: 100%;"> :label="dict.label" :value="dict.value">
<el-option v-for="dict in dict.type.awards_level" :key="dict.value" :label="dict.label" </el-option>
:value="dict.value"> </el-select>
</el-option> </el-form-item>
</el-select> </el-col>
</el-form-item> </el-row>
<el-form-item label="获奖等级" prop="awardLevel"> <el-row>
<el-select v-model="queryParams.awardLevel" placeholder="请选择" style="width: 100%;"> <el-col :span="12">
<el-option v-for="dict in dict.type.award_rank" :key="dict.value" :label="dict.label" <el-form-item label="获奖级别" prop="awardRank">
:value="dict.value"> <el-select v-model="queryParams.awardRank" placeholder="请选择" style="width: 100%;">
</el-option> <el-option v-for="dict in dict.type.awards_level" :key="dict.value" :label="dict.label"
</el-select> :value="dict.value">
</el-form-item> </el-option>
<el-form-item label="获奖人" prop="userName"> </el-select>
<el-input v-model="queryParams.userName" placeholder="请输入获奖人" clearable @keyup.enter.native="handleQuery" /> </el-form-item>
</el-form-item> </el-col>
<el-form-item label="获奖开始时间" prop="awardTime"> <el-col :span="12">
<el-date-picker clearable v-model="queryParams.startTime" type="date" value-format="yyyy-MM-dd" <el-form-item label="获奖等级" prop="awardLevel">
placeholder="请选择"> <el-select v-model="queryParams.awardLevel" placeholder="请选择" style="width: 100%;">
</el-date-picker> <el-option v-for="dict in dict.type.award_rank" :key="dict.value" :label="dict.label"
</el-form-item> :value="dict.value">
<el-form-item label="获奖结束时间" prop="awardTime"> </el-option>
<el-date-picker clearable v-model="queryParams.endTime" type="date" value-format="yyyy-MM-dd" </el-select>
placeholder="请选择"> </el-form-item>
</el-date-picker> </el-col>
</el-form-item> </el-row>
<el-row>
<el-form-item> <el-col :span="12">
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button> <el-form-item label="获奖人" prop="userName">
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button> <el-input v-model="queryParams.userName" placeholder="请输入获奖人" clearable
</el-form-item> @keyup.enter.native="handleQuery" />
</el-form> </el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="获奖开始时间" prop="awardTime">
<el-date-picker clearable v-model="queryParams.startTime" type="date" value-format="yyyy-MM-dd"
placeholder="请选择" style="width: 100%;">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="获奖结束时间" prop="awardTime">
<el-date-picker clearable v-model="queryParams.endTime" type="date" value-format="yyyy-MM-dd"
placeholder="请选择" style="width: 100%;">
</el-date-picker>
</el-form-item>
</el-col>
</el-row>
<el-form-item class="dialog-footer" style="display: flex; justify-content: center; align-items: center">
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
</el-form-item>
</el-form>
</el-dialog>
<el-row :gutter="10" class="mb8"> <el-row :gutter="10" class="mb8">
<el-col :span="1.5"> <el-col :span="1.5">
<el-button type="primary" plain icon="el-icon-search" size="mini" @click="handleQuerycx">查询</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd" <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
v-hasPermi="['system:works:add']">新增</el-button> v-hasPermi="['system:works:add']">新增</el-button>
</el-col> </el-col>
...@@ -70,44 +94,45 @@ ...@@ -70,44 +94,45 @@
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row> </el-row>
<el-table :data="worksList" @selection-change="handleSelectionChange" <el-table :row-style="{ height: '0' }" :cell-style="{ padding: '3px' }" :data="worksList"
:default-sort="{ prop: 'awardTime', order: 'descending' }"> @selection-change="handleSelectionChange" :default-sort="{ prop: 'awardTime', order: 'descending' }">
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<el-table-column type="index" label="序号" width="55" align="center" sortable /> <el-table-column type="index" label="序号" width="55" align="center" sortable fixed="left" />
<el-table-column label="成长类型" align="center" sortable> <el-table-column label="成长类型" align="center" fixed="left" width="120px">
<template> <template>
<span>论文论著</span> <span>论文论著</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="学科" align="center" prop="sub" sortable> <el-table-column label="学科" align="center" prop="sub" sortable fixed="left" width="120px">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.teaching_subjects" :value="scope.row.sub" /> <dict-tag :options="dict.type.teaching_subjects" :value="scope.row.sub" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="获奖类别" align="center" prop="awardType" sortable> <el-table-column label="获奖类别" align="center" prop="awardType" sortable width="180px">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.award_categories" :value="scope.row.awardType" /> <dict-tag :options="dict.type.award_categories" :value="scope.row.awardType" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="获奖等级" align="center" prop="awardLevel" sortable> <el-table-column label="获奖等级" align="center" prop="awardLevel" sortable width="130px">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.award_rank" :value="scope.row.awardLevel" /> <dict-tag :options="dict.type.award_rank" :value="scope.row.awardLevel" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="获奖级别" align="center" prop="awardRank" sortable> <el-table-column label="获奖级别" align="center" prop="awardRank" sortable width="130px">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.awards_level" :value="scope.row.awardRank" /> <dict-tag :options="dict.type.awards_level" :value="scope.row.awardRank" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="成果名称" align="center" prop="resultName" sortable /> <el-table-column label="论文论著-成果名称" align="center" prop="resultName" sortable width="180px"
<el-table-column label="获奖人" align="center" prop="userName" sortable /> show-overflow-tooltip />
<el-table-column label="主办单位" align="center" prop="org" sortable /> <el-table-column label="获奖人" align="center" prop="userName" sortable width="130px" />
<el-table-column label="主办单位" align="center" prop="org" sortable width="180px" show-overflow-tooltip />
<el-table-column label="获奖时间" align="center" prop="awardTime" width="180" sortable> <el-table-column label="获奖时间" align="center" prop="awardTime" width="180" sortable>
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.awardTime, '{y}-{m}-{d}') }}</span> <span>{{ parseTime(scope.row.awardTime, '{y}-{m}-{d}') }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" width="150px">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button size="mini" type="text" @click="handleUpdate(scope.row)" v-hasPermi="['system:works:edit']" <el-button size="mini" type="text" @click="handleUpdate(scope.row)" v-hasPermi="['system:works:edit']"
v-if="scope.row.auditState === '0' || scope.row.auditState === '3'">修改</el-button> v-if="scope.row.auditState === '0' || scope.row.auditState === '3'">修改</el-button>
...@@ -248,6 +273,7 @@ export default { ...@@ -248,6 +273,7 @@ export default {
method: null, method: null,
type: null // 处理类型： 1 级部/处室； 2 分管； 3 主管 type: null // 处理类型： 1 级部/处室； 2 分管； 3 主管
}, },
query: false,
// 遮罩层 // 遮罩层
loading: true, loading: true,
// 选中数组 // 选中数组
...@@ -459,13 +485,20 @@ export default { ...@@ -459,13 +485,20 @@ export default {
this.resetForm("form"); this.resetForm("form");
}, },
/** 搜索按钮操作 */ /** 搜索按钮操作 */
handleQuerycx() {
this.query = true;
this.resetcx();
},
handleQuery() { handleQuery() {
this.queryParams.pageNum = 1; this.query = true;
this.getList(); this.getList();
this.query = false;
}, },
/** 重置按钮操作 */ /** 重置按钮操作 */
resetQuery() { resetQuery() {
this.resetForm("queryForm"); this.queryParams.startTime = "";
this.queryParams.endTime = "";
this.resetForm("queryParams");
this.handleQuery(); this.handleQuery();
}, },
// 多选框选中数据 // 多选框选中数据
...@@ -554,3 +587,25 @@ export default { ...@@ -554,3 +587,25 @@ export default {
} }
}; };
</script> </script>
<style scoped lang="scss" >
::v-deep .el-form-item {
margin-bottom: 0px;
}
::v-deep .el-input--medium .el-input__inner {
height: 26px;
line-height: 26px;
}
::v-deep .el-dialog__body {
padding: 10px 20px
}
::v-deep .el-dialog:not(.is-fullscreen) {
margin-top: 4vh !important;
}
.search ::v-deep .el-form-item__content {
width: 200px
}
</style>
ruoyi-ui/src/views/smartSchool/personWork/examinationScore/index.vue
<template> <template>
<div class="app-container"> <div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px"> <el-dialog title="查询" :visible.sync="query" width="50%" append-to-body>
<el-form-item label="届别" prop="year"> <el-form ref="queryParams" :model="queryParams" label-width="96px" class="search">
<el-select v-model="queryParams.year" placeholder="请选择"> <el-row>
<el-option v-for="dict in dict.type.rankda" :key="dict.value" :label="dict.label" :value="dict.value"> <el-col :span="12">
</el-option> <el-form-item label="届别" prop="year">
</el-select> <el-select v-model="queryParams.year" placeholder="请选择">
</el-form-item> <el-option v-for="dict in dict.type.rankda" :key="dict.value" :label="dict.label"
<el-form-item label="学科" prop="sub"> :value="dict.value">
<el-select v-model="queryParams.sub" placeholder="请选择" style="width: 100%;"> </el-option>
<el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value" :label="dict.label" </el-select>
:value="dict.value"> </el-form-item>
</el-option> </el-col>
</el-select> <el-col :span="12">
</el-form-item> <el-form-item label="学科" prop="sub">
<el-form-item label="教师姓名" prop="teacherName"> <el-select v-model="queryParams.sub" placeholder="请选择" style="width: 100%;">
<el-input v-model="queryParams.teacherName" placeholder="请输入教师姓名" clearable <el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value" :label="dict.label"
@keyup.enter.native="handleQuery" /> :value="dict.value">
</el-form-item> </el-option>
<el-form-item label="授课班级" prop="teachingClassName"> </el-select>
<el-select v-model="queryParams.teachingClassName" placeholder="请选择" style="width: 100%"> </el-form-item>
<el-option v-for="dict in dict.type.class_num" :key="dict.value" :label="dict.label" </el-col>
:value="dict.value"> </el-row>
</el-option> <el-row>
</el-select> <el-col :span="12">
</el-form-item> <el-form-item label="教师姓名" prop="teacherName">
<el-form-item label="班级类型" prop="classType"> <el-input v-model="queryParams.teacherName" placeholder="请输入教师姓名" clearable
<el-select v-model="queryParams.classType" multiple placeholder="请选择" style="width: 100%"> @keyup.enter.native="handleQuery" />
<el-option v-for="dict in dict.type.class_type" :key="dict.value" :label="dict.label" </el-form-item>
:value="dict.value"> </el-col>
</el-option> <el-col :span="12">
</el-select> <el-form-item label="授课班级" prop="teachingClassName">
</el-form-item> <el-select v-model="queryParams.teachingClassName" placeholder="请选择" style="width: 100%">
<el-form-item label="高考评优" prop="gkAppraising"> <el-option v-for="dict in dict.type.class_num" :key="dict.value" :label="dict.label"
<el-select v-model="queryParams.gkAppraising" placeholder="请选择" style="width: 100%"> :value="dict.value">
<el-option v-for="dict in dict.type.gk_appraising" :key="dict.value" :label="dict.label" </el-option>
:value="dict.value"> </el-select>
</el-option> </el-form-item>
</el-select> </el-col>
</el-form-item> </el-row>
<el-row>
<el-col :span="12">
<el-form-item label="班级类型" prop="classType">
<el-select v-model="queryParams.classType" placeholder="请选择" style="width: 100%">
<el-option v-for="dict in dict.type.class_type" :key="dict.value" :label="dict.label"
:value="dict.value">
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="高考评优" prop="gkAppraising">
<el-select v-model="queryParams.gkAppraising" placeholder="请选择" style="width: 100%">
<el-option v-for="dict in dict.type.gk_appraising" :key="dict.value" :label="dict.label"
:value="dict.value">
</el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-form-item> <el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button> <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button> <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
</el-dialog>
<el-row :gutter="10" class="mb8"> <el-row :gutter="10" class="mb8">
<el-col :span="1.5"> <el-col :span="1.5">
<el-button type="primary" plain icon="el-icon-search" size="mini" @click="handleQuerycx">查询</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd" <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
v-hasPermi="['system:achievement:add']">新增</el-button> v-hasPermi="['system:achievement:add']">新增</el-button>
</el-col> </el-col>
...@@ -66,19 +90,19 @@ ...@@ -66,19 +90,19 @@
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row> </el-row>
<el-table :data="achievementList" @selection-change="handleSelectionChange" <el-table :row-style="{ height: '0' }" :cell-style="{ padding: '3px' }" :data="achievementList"
:default-sort="{ prop: 'year', order: 'descending' }"> @selection-change="handleSelectionChange" :default-sort="{ prop: 'year', order: 'descending' }">
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" sortable />
<el-table-column type="index" label="序号" width="55" align="center" sortable /> <el-table-column type="index" label="序号" width="55" align="center" sortable />
<el-table-column label="届别" align="center" prop="year" sortable /> <el-table-column label="届别" align="center" prop="year" sortable width="80" />
<el-table-column label="学科" align="center" prop="sub" sortable> <el-table-column label="学科" align="center" prop="sub" sortable width="80">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.teaching_subjects" :value="scope.row.sub" /> <dict-tag :options="dict.type.teaching_subjects" :value="scope.row.sub" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="教师姓名" align="center" prop="teacherName" sortable /> <el-table-column label="教师姓名" align="center" prop="teacherName" sortable width="150" />
<el-table-column label="授课班级" align="center" prop="teachingClassName" sortable /> <el-table-column label="授课班级" align="center" prop="teachingClassName" sortable width="130" />
<el-table-column label="班级类型" align="center" prop="classType" sortable> <el-table-column label="班级类型" align="center" prop="classType" sortable show-overflow-tooltip width="180">
<template slot-scope="scope"> <template slot-scope="scope">
<span v-if="getSelectedTypes(scope.row.classType).length > 0"> <span v-if="getSelectedTypes(scope.row.classType).length > 0">
<span v-for="(option, index) in getSelectedTypes(scope.row.classType)" :key="index"> <span v-for="(option, index) in getSelectedTypes(scope.row.classType)" :key="index">
...@@ -88,16 +112,16 @@ ...@@ -88,16 +112,16 @@
</span> </span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="高考评优" align="center" prop="gkAppraising" sortable> <el-table-column label="高考评优" align="center" prop="gkAppraising" sortable width="180">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.gk_appraising" :value="scope.row.sub" /> <dict-tag :options="dict.type.gk_appraising" :value="scope.row.gkAppraising" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="尖子生培养" align="center" prop="topStudentsCulture" sortable /> <el-table-column label="尖子生培养" align="center" prop="topStudentsCulture" sortable width="150" />
<el-table-column label="增量情况" align="center" prop="incrementSituation" sortable /> <el-table-column label="增量情况" align="center" prop="incrementSituation" sortable width="150" />
<el-table-column label="有效数情况" align="center" prop="effectiveNumSituation" sortable /> <el-table-column label="有效数情况" align="center" prop="effectiveNumSituation" sortable width="180" />
<el-table-column label="其他" align="center" prop="other" sortable /> <el-table-column label="其他情况" align="center" prop="other" sortable width="150" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="180">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button size="mini" type="text" @click="handleUpdate(scope.row)" <el-button size="mini" type="text" @click="handleUpdate(scope.row)"
v-hasPermi="['system:achievement:edit']" v-hasPermi="['system:achievement:edit']"
...@@ -238,6 +262,7 @@ export default { ...@@ -238,6 +262,7 @@ export default {
// 是否显示弹出层 // 是否显示弹出层
open: false, open: false,
isEdit: false, isEdit: false,
query: false,
// 查询参数 // 查询参数
queryParams: { queryParams: {
pageNum: 1, pageNum: 1,
...@@ -355,13 +380,19 @@ export default { ...@@ -355,13 +380,19 @@ export default {
this.resetForm("form"); this.resetForm("form");
}, },
/** 搜索按钮操作 */ /** 搜索按钮操作 */
handleQuerycx() {
this.query = true;
},
/** 搜索按钮操作 */
handleQuery() { handleQuery() {
this.queryParams.pageNum = 1; this.queryParams.pageNum = 1;
this.getList(); this.getList();
this.query = false;
}, },
/** 重置按钮操作 */ /** 重置按钮操作 */
resetQuery() { resetQuery() {
this.resetForm("queryForm"); this.resetForm("queryParams");
this.handleQuery(); this.handleQuery();
}, },
// 多选框选中数据 // 多选框选中数据
...@@ -447,3 +478,25 @@ export default { ...@@ -447,3 +478,25 @@ export default {
} }
}; };
</script> </script>
<style scoped lang="scss" >
::v-deep .el-form-item {
margin-bottom: 0px;
}
::v-deep .el-input--medium .el-input__inner {
height: 26px;
line-height: 26px;
}
::v-deep .el-dialog__body {
padding: 10px 20px
}
::v-deep .el-dialog:not(.is-fullscreen) {
margin-top: 4vh !important;
}
.search ::v-deep .el-form-item__content {
width: 200px
}
</style>
ruoyi-ui/src/views/smartSchool/personWork/lectureAwards/index.vue
<template> <template>
<div class="app-container"> <div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="98px"> <el-dialog title="查询" :visible.sync="query" width="50%" append-to-body>
<el-form-item label="学科" prop="sub"> <el-form ref="queryParams" :model="queryParams" label-width="96px" class="search">
<el-select v-model="queryParams.sub" placeholder="请选择" style="width: 220px;"> <el-row>
<el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value" :label="dict.label" <el-col :span="12">
:value="dict.value"> <el-form-item label="学科" prop="sub">
</el-option> <el-select v-model="queryParams.sub" placeholder="请选择" style="width: 100%;">
</el-select> <el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value" :label="dict.label"
</el-form-item> :value="dict.value">
<el-form-item label="获奖类别" prop="awardType"> </el-option>
<el-select v-model="queryParams.awardType" placeholder="请选择" style="width: 220px"> </el-select>
<el-option v-for="dict in dict.type.award_categoriesjk" :key="dict.value" :label="dict.label" </el-form-item>
:value="dict.value"> </el-col>
</el-option> <el-col :span="12">
</el-select> <el-form-item label="获奖类别" prop="awardType">
</el-form-item> <el-select v-model="queryParams.awardType" placeholder="请选择" style="width: 100%;">
<el-form-item label="获奖级别" prop="awardRank"> <el-option v-for="dict in dict.type.award_categoriesjk" :key="dict.value"
<el-select v-model="queryParams.awardRank" placeholder="请选择" style="width: 100%;"> :label="dict.label" :value="dict.value">
<el-option v-for="dict in dict.type.awards_level" :key="dict.value" :label="dict.label" </el-option>
:value="dict.value"> </el-select>
</el-option> </el-form-item>
</el-select> </el-col>
</el-form-item> </el-row>
<el-row>
<el-form-item label="获奖等级" prop="awardLevel"> <el-col :span="12">
<el-select v-model="queryParams.awardLevel" placeholder="请选择" style="width: 100%;"> <el-form-item label="获奖级别" prop="awardRank">
<el-option v-for="dict in dict.type.award_rank" :key="dict.value" :label="dict.label" <el-select v-model="queryParams.awardRank" placeholder="请选择" style="width: 100%;">
:value="dict.value"> <el-option v-for="dict in dict.type.awards_level" :key="dict.value" :label="dict.label"
</el-option> :value="dict.value">
</el-select> </el-option>
</el-form-item> </el-select>
<el-form-item label="获奖人" prop="userName"> </el-form-item>
<el-input v-model="queryParams.userName" placeholder="请输入获奖人" clearable @keyup.enter.native="handleQuery" /> </el-col>
</el-form-item> <el-col :span="12">
<el-form-item label="获奖开始时间" prop="awardTime"> <el-form-item label="获奖等级" prop="awardLevel">
<el-date-picker clearable v-model="queryParams.startTime" type="date" value-format="yyyy-MM-dd" <el-select v-model="queryParams.awardLevel" placeholder="请选择" style="width: 100%;">
placeholder="请选择"> <el-option v-for="dict in dict.type.award_rank" :key="dict.value" :label="dict.label"
</el-date-picker> :value="dict.value">
</el-form-item> </el-option>
<el-form-item label="获奖结束时间" prop="awardTime"> </el-select>
<el-date-picker clearable v-model="queryParams.endTime" type="date" value-format="yyyy-MM-dd" </el-form-item>
placeholder="请选择"> </el-col>
</el-date-picker> </el-row>
</el-form-item> <el-row>
<el-form-item> <el-col :span="12">
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button> <el-form-item label="获奖人" prop="userName">
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button> <el-input v-model="queryParams.userName" placeholder="请输入获奖人" clearable
</el-form-item> @keyup.enter.native="handleQuery" />
</el-form> </el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="获奖开始时间" prop="awardTime">
<el-date-picker clearable v-model="queryParams.startTime" type="date" value-format="yyyy-MM-dd"
placeholder="请选择" style="width: 100%;">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="获奖结束时间" prop="awardTime">
<el-date-picker clearable v-model="queryParams.endTime" type="date" value-format="yyyy-MM-dd"
placeholder="请选择" style="width: 100%;">
</el-date-picker>
</el-form-item>
</el-col>
</el-row>
<el-form-item class="dialog-footer" style="display: flex; justify-content: center; align-items: center">
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
</el-form-item>
</el-form>
</el-dialog>
<el-row :gutter="10" class="mb8"> <el-row :gutter="10" class="mb8">
<el-col :span="1.5"> <el-col :span="1.5">
<el-button type="primary" plain icon="el-icon-search" size="mini" @click="handleQuerycx">查询</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd" <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
v-hasPermi="['system:awards:add']">新增</el-button> v-hasPermi="['system:awards:add']">新增</el-button>
</el-col> </el-col>
...@@ -69,44 +94,45 @@ ...@@ -69,44 +94,45 @@
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row> </el-row>
<el-table :data="awardsList" @selection-change="handleSelectionChange" <el-table :row-style="{ height: '0' }" :cell-style="{ padding: '3px' }" :data="awardsList"
:default-sort="{ prop: 'awardTime', order: 'descending' }" > @selection-change="handleSelectionChange" :default-sort="{ prop: 'awardTime', order: 'descending' }">
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<el-table-column type="index" label="序号" width="55" align="center" sortable /> <el-table-column type="index" label="序号" width="55" align="center" sortable fixed="left" />
<el-table-column label="成长类型" align="center" sortable> <el-table-column label="成长类型" align="center" fixed="left" width="130px">
<template> <template>
<span>讲课获奖</span> <span>讲课获奖</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="学科" align="center" prop="sub" sortable> <el-table-column label="学科" align="center" prop="sub" sortable fixed="left">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.teaching_subjects" :value="scope.row.sub" /> <dict-tag :options="dict.type.teaching_subjects" :value="scope.row.sub" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="获奖类别" align="center" prop="awardType" sortable> <el-table-column label="获奖类别" align="center" prop="awardType" sortable width="130px">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.award_categoriesjk" :value="scope.row.awardType" /> <dict-tag :options="dict.type.award_categoriesjk" :value="scope.row.awardType" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="获奖等级" align="center" prop="awardLevel" sortable> <el-table-column label="获奖等级" align="center" prop="awardLevel" sortable width="130px">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.award_rank" :value="scope.row.awardLevel" /> <dict-tag :options="dict.type.award_rank" :value="scope.row.awardLevel" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="获奖级别" align="center" prop="awardRank" sortable> <el-table-column label="获奖级别" align="center" prop="awardRank" sortable width="130px">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.awards_level" :value="scope.row.awardRank" /> <dict-tag :options="dict.type.awards_level" :value="scope.row.awardRank" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="讲课获奖-成果名称" align="center" prop="resultName" sortable /> <el-table-column label="讲课获奖-成果名称" align="center" prop="resultName" sortable width="180px"
<el-table-column label="获奖人" align="center" prop="userName" sortable /> show-overflow-tooltip />
<el-table-column label="主办单位" align="center" prop="org" sortable /> <el-table-column label="获奖人" align="center" prop="userName" sortable width="130px" />
<el-table-column label="主办单位" align="center" prop="org" sortable width="150px" show-overflow-tooltip />
<el-table-column label="获奖时间" align="center" prop="awardTime" width="180" sortable> <el-table-column label="获奖时间" align="center" prop="awardTime" width="180" sortable>
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.awardTime, '{y}-{m}-{d}') }}</span> <span>{{ parseTime(scope.row.awardTime, '{y}-{m}-{d}') }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" width="150px">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button size="mini" type="text" @click="handleUpdate(scope.row)" v-hasPermi="['system:awards:edit']" <el-button size="mini" type="text" @click="handleUpdate(scope.row)" v-hasPermi="['system:awards:edit']"
v-if="scope.row.auditState === '0' || scope.row.auditState === '3'">修改</el-button> v-if="scope.row.auditState === '0' || scope.row.auditState === '3'">修改</el-button>
...@@ -275,6 +301,7 @@ export default { ...@@ -275,6 +301,7 @@ export default {
open: false, open: false,
look: false, look: false,
isEdit: false, isEdit: false,
query: false,
// 查询参数 // 查询参数
queryParams: { queryParams: {
pageNum: 1, pageNum: 1,
...@@ -291,6 +318,8 @@ export default { ...@@ -291,6 +318,8 @@ export default {
pictureName: null, pictureName: null,
pictureUrl: null, pictureUrl: null,
upateBy: null, upateBy: null,
startTime: null,
endTime: null,
}, },
// 表单参数 // 表单参数
form: {}, form: {},
...@@ -479,13 +508,20 @@ export default { ...@@ -479,13 +508,20 @@ export default {
this.resetForm("form"); this.resetForm("form");
}, },
/** 搜索按钮操作 */ /** 搜索按钮操作 */
handleQuerycx() {
this.query = true;
this.resetcx();
},
handleQuery() { handleQuery() {
this.queryParams.pageNum = 1; this.query = true;
this.getList(); this.getList();
this.query = false;
}, },
/** 重置按钮操作 */ /** 重置按钮操作 */
resetQuery() { resetQuery() {
this.resetForm("queryForm"); this.queryParams.startTime = "";
this.queryParams.endTime = "";
this.resetForm("queryParams");
this.handleQuery(); this.handleQuery();
}, },
// 多选框选中数据 // 多选框选中数据
...@@ -554,3 +590,25 @@ export default { ...@@ -554,3 +590,25 @@ export default {
} }
}; };
</script> </script>
<style scoped lang="scss" >
::v-deep .el-form-item {
margin-bottom: 0px;
}
::v-deep .el-input--medium .el-input__inner {
height: 26px;
line-height: 26px;
}
::v-deep .el-dialog__body {
padding: 10px 20px
}
::v-deep .el-dialog:not(.is-fullscreen) {
margin-top: 4vh !important;
}
.search ::v-deep .el-form-item__content {
width: 200px
}
</style>
ruoyi-ui/src/views/smartSchool/personWork/personalInformation/index.vue
...@@ -512,7 +512,7 @@ ...@@ -512,7 +512,7 @@
<div style="border: 1px solid #f3f3f3;border-radius: 13px 13px 0 0 ; margin: 20px 0;"> <div style="border: 1px solid #f3f3f3;border-radius: 13px 13px 0 0 ; margin: 20px 0;">
<div class="card_title">工作量信息</div> <div class="card_title">工作量信息</div>
<div style="margin: 3px 10px 15px;"> <div style="margin: 3px 10px 15px;">
<el-table :data="schoolAworkload"> <el-table :data="schoolAworkload" :row-style="{ height: '0' }" :cell-style="{ padding: '3px' }">
<el-table-column label="学年" align="center" prop="schoolYear" width="90px" fixed="left" /> <el-table-column label="学年" align="center" prop="schoolYear" width="90px" fixed="left" />
<el-table-column label="学期" align="center" prop="semester" fixed="left"> <el-table-column label="学期" align="center" prop="semester" fixed="left">
<template slot-scope="scope"> <template slot-scope="scope">
...@@ -558,8 +558,8 @@ ...@@ -558,8 +558,8 @@
<div style="border: 1px solid #f3f3f3;border-radius: 13px 13px 0 0 ; margin: 20px 0;"> <div style="border: 1px solid #f3f3f3;border-radius: 13px 13px 0 0 ; margin: 20px 0;">
<div class="card_title">班主任考核</div> <div class="card_title">班主任考核</div>
<div style="margin: 3px 10px 15px;"> <div style="margin: 3px 10px 15px;">
<el-table :data="schoolAclassTeacherAssessments"> <el-table :data="schoolAclassTeacherAssessments" :row-style="{ height: '0' }"
<el-table-column type="index" label="序号" width="55" align="center" /> :cell-style="{ padding: '3px' }">
<el-table-column label="学年" align="center" prop="schoolYear" /> <el-table-column label="学年" align="center" prop="schoolYear" />
<el-table-column label="学期" align="center" prop="semester"> <el-table-column label="学期" align="center" prop="semester">
<template slot-scope="scope"> <template slot-scope="scope">
...@@ -592,7 +592,7 @@ ...@@ -592,7 +592,7 @@
<div style="border: 1px solid #f3f3f3;border-radius: 13px 13px 0 0 ; margin: 20px 0;"> <div style="border: 1px solid #f3f3f3;border-radius: 13px 13px 0 0 ; margin: 20px 0;">
<div class="card_title">专业成长</div> <div class="card_title">专业成长</div>
<div style="margin: 3px 10px 15px;"> <div style="margin: 3px 10px 15px;">
<el-table :data="specialityVos"> <el-table :data="specialityVos" :row-style="{ height: '0' }" :cell-style="{ padding: '3px' }">
<el-table-column label="成长类型" align="center" prop="growthType"> <el-table-column label="成长类型" align="center" prop="growthType">
</el-table-column> </el-table-column>
<el-table-column label="学科" align="center" prop="sub"> <el-table-column label="学科" align="center" prop="sub">
...@@ -628,7 +628,7 @@ ...@@ -628,7 +628,7 @@
<div style="border: 1px solid #f3f3f3;border-radius: 13px 13px 0 0 ; margin: 20px 0;"> <div style="border: 1px solid #f3f3f3;border-radius: 13px 13px 0 0 ; margin: 20px 0;">
<div class="card_title">高考成绩 </div> <div class="card_title">高考成绩 </div>
<div style="margin: 3px 10px 15px;"> <div style="margin: 3px 10px 15px;">
<el-table :data="schoolGkAchievement"> <el-table :data="schoolGkAchievement" :row-style="{ height: '0' }" :cell-style="{ padding: '3px' }">
<el-table-column label="届别" align="center" prop="year" /> <el-table-column label="届别" align="center" prop="year" />
<el-table-column label="学科" align="center" prop="sub"> <el-table-column label="学科" align="center" prop="sub">
<template slot-scope="scope"> <template slot-scope="scope">
...@@ -655,7 +655,7 @@ ...@@ -655,7 +655,7 @@
<div style="border: 1px solid #f3f3f3;border-radius: 13px 13px 0 0 ; margin: 20px 0;"> <div style="border: 1px solid #f3f3f3;border-radius: 13px 13px 0 0 ; margin: 20px 0;">
<div class="card_title">教学成绩</div> <div class="card_title">教学成绩</div>
<div style="margin: 3px 10px 15px;"> <div style="margin: 3px 10px 15px;">
<el-table :data="schoolXteachingAchievements"> <el-table :data="schoolXteachingAchievements" :row-style="{ height: '0' }" :cell-style="{ padding: '3px' }">
<el-table-column label="学年" align="center" prop="schoolYear" /> <el-table-column label="学年" align="center" prop="schoolYear" />
<el-table-column label="学期" align="center" prop="semester"> <el-table-column label="学期" align="center" prop="semester">
<template slot-scope="scope"> <template slot-scope="scope">
...@@ -696,7 +696,7 @@ ...@@ -696,7 +696,7 @@
<div style="border: 1px solid #f3f3f3;border-radius: 13px 13px 0 0 ; margin: 20px 0;"> <div style="border: 1px solid #f3f3f3;border-radius: 13px 13px 0 0 ; margin: 20px 0;">
<div class="card_title">辅导老师获奖</div> <div class="card_title">辅导老师获奖</div>
<div style="margin: 3px 10px 15px;"> <div style="margin: 3px 10px 15px;">
<el-table :data="fudaoTeacher"> <el-table :data="fudaoTeacher" :row-style="{ height: '0' }" :cell-style="{ padding: '3px' }">
<el-table-column label="成长类型" align="center"> <el-table-column label="成长类型" align="center">
<template> <template>
<span>辅导老师获奖</span> <span>辅导老师获奖</span>
...@@ -743,7 +743,7 @@ ...@@ -743,7 +743,7 @@
<div style="border: 1px solid #f3f3f3;border-radius: 13px 13px 0 0 ; margin: 20px 0;"> <div style="border: 1px solid #f3f3f3;border-radius: 13px 13px 0 0 ; margin: 20px 0;">
<div class="card_title">辅导学生获奖</div> <div class="card_title">辅导学生获奖</div>
<div style="margin: 3px 10px 15px;"> <div style="margin: 3px 10px 15px;">
<el-table :data="fudaoStudent"> <el-table :data="fudaoStudent" :row-style="{ height: '0' }" :cell-style="{ padding: '3px' }">
<el-table-column label="成长类型" align="center"> <el-table-column label="成长类型" align="center">
<template> <template>
<span>辅导学生获奖</span> <span>辅导学生获奖</span>
...@@ -785,7 +785,7 @@ ...@@ -785,7 +785,7 @@
<div style="border: 1px solid #f3f3f3;border-radius: 13px 13px 0 0 ; margin: 20px 0;"> <div style="border: 1px solid #f3f3f3;border-radius: 13px 13px 0 0 ; margin: 20px 0;">
<div class="card_title">年度考核</div> <div class="card_title">年度考核</div>
<div style="margin: 3px 10px 15px;"> <div style="margin: 3px 10px 15px;">
<el-table :data="schoolAnnualAssessment"> <el-table :data="schoolAnnualAssessment" :row-style="{ height: '0' }" :cell-style="{ padding: '3px' }">
<el-table-column label="姓名" align="center" prop="name" /> <el-table-column label="姓名" align="center" prop="name" />
<el-table-column label="年度" align="center" prop="year" /> <el-table-column label="年度" align="center" prop="year" />
<el-table-column label="考核结果" align="center" prop="checkResult"> <el-table-column label="考核结果" align="center" prop="checkResult">
......
ruoyi-ui/src/views/smartSchool/personWork/projectResearch/index.vue
<template> <template>
<div class="app-container"> <div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="98px"> <el-dialog title="查询" :visible.sync="query" width="50%" append-to-body>
<el-form-item label="学科" prop="sub"> <el-form ref="queryParams" :model="queryParams" label-width="96px" class="search">
<el-select v-model="queryParams.sub" placeholder="请选择" style="width: 220px;"> <el-row>
<el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value" :label="dict.label" <el-col :span="12">
:value="dict.value"> <el-form-item label="学科" prop="sub">
</el-option> <el-select v-model="queryParams.sub" placeholder="请选择" style="width: 100%;">
</el-select> <el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value" :label="dict.label"
</el-form-item> :value="dict.value">
<el-form-item label="获奖类别" prop="awardType"> </el-option>
<el-select v-model="queryParams.awardType" placeholder="请选择" style="width: 220px;"> </el-select>
<el-option v-for="dict in dict.type.project_research" :key="dict.value" :label="dict.label" </el-form-item>
:value="dict.value"> </el-col>
</el-option> <el-col :span="12">
</el-select> <el-form-item label="获奖类别" prop="awardType">
</el-form-item> <el-select v-model="queryParams.awardType" placeholder="请选择" style="width: 100%;">
<el-form-item label="获奖级别" prop="awardRank"> <el-option v-for="dict in dict.type.award_categoriesjk" :key="dict.value"
<el-select v-model="queryParams.awardRank" placeholder="请选择" style="width: 100%;"> :label="dict.label" :value="dict.value">
<el-option v-for="dict in dict.type.awards_level" :key="dict.value" :label="dict.label" </el-option>
:value="dict.value"> </el-select>
</el-option> </el-form-item>
</el-select> </el-col>
</el-form-item> </el-row>
<el-form-item label="获奖等级" prop="awardLevel"> <el-row>
<el-select v-model="queryParams.awardLevel" placeholder="请选择" style="width: 100%;"> <el-col :span="12">
<el-option v-for="dict in dict.type.award_rank" :key="dict.value" :label="dict.label" <el-form-item label="获奖级别" prop="awardRank">
:value="dict.value"> <el-select v-model="queryParams.awardRank" placeholder="请选择" style="width: 100%;">
</el-option> <el-option v-for="dict in dict.type.awards_level" :key="dict.value" :label="dict.label"
</el-select> :value="dict.value">
</el-form-item> </el-option>
<el-form-item label="获奖人" prop="userName"> </el-select>
<el-input v-model="queryParams.userName" placeholder="请输入获奖人" clearable @keyup.enter.native="handleQuery" /> </el-form-item>
</el-form-item> </el-col>
<el-form-item label="获奖开始时间" prop="awardTime"> <el-col :span="12">
<el-date-picker clearable v-model="queryParams.startTime" type="date" value-format="yyyy-MM-dd" <el-form-item label="获奖等级" prop="awardLevel">
placeholder="请选择"> <el-select v-model="queryParams.awardLevel" placeholder="请选择" style="width: 100%;">
</el-date-picker> <el-option v-for="dict in dict.type.award_rank" :key="dict.value" :label="dict.label"
</el-form-item> :value="dict.value">
<el-form-item label="获奖结束时间" prop="awardTime"> </el-option>
<el-date-picker clearable v-model="queryParams.endTime" type="date" value-format="yyyy-MM-dd" </el-select>
placeholder="请选择"> </el-form-item>
</el-date-picker> </el-col>
</el-form-item> </el-row>
<el-row>
<el-form-item> <el-col :span="12">
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button> <el-form-item label="获奖人" prop="userName">
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button> <el-input v-model="queryParams.userName" placeholder="请输入获奖人" clearable
</el-form-item> @keyup.enter.native="handleQuery" />
</el-form> </el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="获奖开始时间" prop="awardTime">
<el-date-picker clearable v-model="queryParams.startTime" type="date" value-format="yyyy-MM-dd"
placeholder="请选择" style="width: 100%;">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="获奖结束时间" prop="awardTime">
<el-date-picker clearable v-model="queryParams.endTime" type="date" value-format="yyyy-MM-dd"
placeholder="请选择" style="width: 100%;">
</el-date-picker>
</el-form-item>
</el-col>
</el-row>
<el-form-item class="dialog-footer" style="display: flex; justify-content: center; align-items: center">
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
</el-form-item>
</el-form>
</el-dialog>
<el-row :gutter="10" class="mb8"> <el-row :gutter="10" class="mb8">
<el-col :span="1.5"> <el-col :span="1.5">
<el-button type="primary" plain icon="el-icon-search" size="mini" @click="handleQuerycx">查询</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd" <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
v-hasPermi="['system:research:add']">新增</el-button> v-hasPermi="['system:research:add']">新增</el-button>
</el-col> </el-col>
...@@ -70,42 +95,43 @@ ...@@ -70,42 +95,43 @@
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row> </el-row>
<el-table :data="worksList" @selection-change="handleSelectionChange"
:default-sort="{ prop: 'awardTime', order: 'descending' }"> <el-table :row-style="{ height: '0' }" :cell-style="{ padding: '3px' }" :data="worksList"
@selection-change="handleSelectionChange" :default-sort="{ prop: 'awardTime', order: 'descending' }">
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<el-table-column type="index" label="序号" width="55" align="center" sortable /> <el-table-column type="index" label="序号" width="55" align="center" sortable fixed="left" />
<el-table-column label="成长类型" align="center" sortable> <el-table-column label="成长类型" align="center" sortable fixed="left" width="130px">
<span>课题研究</span> <span>课题研究</span>
</el-table-column> </el-table-column>
<el-table-column label="学科" align="center" prop="sub" sortable> <el-table-column label="学科" align="center" prop="sub" sortable fixed="left" width="130px">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.teaching_subjects" :value="scope.row.sub" /> <dict-tag :options="dict.type.teaching_subjects" :value="scope.row.sub" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="获奖类别" align="center" prop="awardType" sortable> <el-table-column label="获奖类别" align="center" prop="awardType" sortable width="130px">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.project_research" :value="scope.row.awardType" /> <dict-tag :options="dict.type.project_research" :value="scope.row.awardType" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="获奖等级" align="center" prop="awardLevel" sortable> <el-table-column label="获奖等级" align="center" prop="awardLevel" sortable width="120px">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.award_rank" :value="scope.row.awardLevel" /> <dict-tag :options="dict.type.award_rank" :value="scope.row.awardLevel" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="获奖级别" align="center" prop="awardRank" sortable> <el-table-column label="获奖级别" align="center" prop="awardRank" sortable width="120px">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.awards_level" :value="scope.row.awardRank" /> <dict-tag :options="dict.type.awards_level" :value="scope.row.awardRank" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="课题研究-成果名称" align="center" prop="resultName" sortable /> <el-table-column label="课题研究-成果名称" align="center" prop="resultName" sortable width="180px" />
<el-table-column label="获奖人" align="center" prop="userName" sortable /> <el-table-column label="获奖人" align="center" prop="userName" sortable width="120px" />
<el-table-column label="主办单位" align="center" prop="org" sortable /> <el-table-column label="主办单位" align="center" prop="org" sortable width="180px" />
<el-table-column label="获奖时间" align="center" prop="awardTime" width="180" sortable> <el-table-column label="获奖时间" align="center" prop="awardTime" width="180" sortable>
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.awardTime, '{y}-{m}-{d}') }}</span> <span>{{ parseTime(scope.row.awardTime, '{y}-{m}-{d}') }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="150px" fixed="right">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button size="mini" type="text" @click="handleUpdate(scope.row)" <el-button size="mini" type="text" @click="handleUpdate(scope.row)"
v-hasPermi="['system:research:edit']" v-hasPermi="['system:research:edit']"
...@@ -254,6 +280,7 @@ export default { ...@@ -254,6 +280,7 @@ export default {
}, },
// 遮罩层 // 遮罩层
loading: true, loading: true,
query: false,
// 选中数组 // 选中数组
ids: [], ids: [],
// 非单个禁用 // 非单个禁用
...@@ -289,6 +316,8 @@ export default { ...@@ -289,6 +316,8 @@ export default {
awardTime: null, awardTime: null,
pictureName: null, pictureName: null,
pictureUrl: null, pictureUrl: null,
startTime: null,
endTime: null,
}, },
baseUrl: [process.env.VUE_APP_BASE_API], baseUrl: [process.env.VUE_APP_BASE_API],
uploadFileLoading: false, uploadFileLoading: false,
...@@ -483,13 +512,20 @@ export default { ...@@ -483,13 +512,20 @@ export default {
this.resetForm("form"); this.resetForm("form");
}, },
/** 搜索按钮操作 */ /** 搜索按钮操作 */
handleQuerycx() {
this.query = true;
this.resetcx();
},
handleQuery() { handleQuery() {
this.queryParams.pageNum = 1; this.query = true;
this.getList(); this.getList();
this.query = false;
}, },
/** 重置按钮操作 */ /** 重置按钮操作 */
resetQuery() { resetQuery() {
this.resetForm("queryForm"); this.queryParams.startTime = "";
this.queryParams.endTime = "";
this.resetForm("queryParams");
this.handleQuery(); this.handleQuery();
}, },
// 多选框选中数据 // 多选框选中数据
...@@ -558,3 +594,25 @@ export default { ...@@ -558,3 +594,25 @@ export default {
} }
}; };
</script> </script>
<style scoped lang="scss" >
::v-deep .el-form-item {
margin-bottom: 0px;
}
::v-deep .el-input--medium .el-input__inner {
height: 26px;
line-height: 26px;
}
::v-deep .el-dialog__body {
padding: 10px 20px
}
::v-deep .el-dialog:not(.is-fullscreen) {
margin-top: 4vh !important;
}
.search ::v-deep .el-form-item__content {
width: 200px
}
</style>
\ No newline at end of file
ruoyi-ui/src/views/smartSchool/personWork/teacherAwards/index.vue
<template> <template>
<div class="app-container"> <div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="98px"> <el-dialog title="查询" :visible.sync="query" width="50%" append-to-body>
<el-form-item label="学科" prop="sub"> <el-form ref="queryParams" :model="queryParams" label-width="96px" class="search">
<el-select v-model="queryParams.sub" placeholder="请选择" style="width: 220px;"> <el-row>
<el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value" :label="dict.label" <el-col :span="12">
:value="dict.value"> <el-form-item label="学科" prop="sub">
</el-option> <el-select v-model="queryParams.sub" placeholder="请选择" style="width: 100%;">
</el-select> <el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value" :label="dict.label"
</el-form-item> :value="dict.value">
<el-form-item label="获奖级别" prop="awardRank"> </el-option>
<el-select v-model="queryParams.awardRank" placeholder="请选择" style="width: 220px;"> </el-select>
<el-option v-for="dict in dict.type.awards_level" :key="dict.value" :label="dict.label" </el-form-item>
:value="dict.value"> </el-col>
</el-option> <el-col :span="12">
</el-select> <el-form-item label="获奖级别" prop="awardRank">
</el-form-item> <el-select v-model="queryParams.awardRank" placeholder="请选择" style="width: 100%;">
<el-form-item label="获奖类别" prop="awardType"> <el-option v-for="dict in dict.type.awards_level" :key="dict.value" :label="dict.label"
<el-select v-model="queryParams.awardType" placeholder="请选择" style="width: 100%;"> :value="dict.value">
<el-option v-for="dict in dict.type.award_categoriesjs" :key="dict.value" :label="dict.label" </el-option>
:value="dict.value"> </el-select>
</el-option> </el-form-item>
</el-select> </el-col>
</el-form-item> </el-row>
<el-row>
<el-form-item label="获奖等级" prop="awardLevel"> <el-col :span="12">
<el-select v-model="queryParams.awardLevel" placeholder="请选择" style="width: 100%;"> <el-form-item label="获奖类别" prop="awardType">
<el-option v-for="dict in dict.type.award_rank" :key="dict.value" :label="dict.label" <el-select v-model="queryParams.awardType" placeholder="请选择" style="width: 100%;">
:value="dict.value"> <el-option v-for="dict in dict.type.award_categoriesjs" :key="dict.value"
</el-option> :label="dict.label" :value="dict.value">
</el-select> </el-option>
</el-form-item> </el-select>
<el-form-item label="获奖人" prop="userName"> </el-form-item>
<el-input v-model="queryParams.userName" placeholder="请输入获奖人" clearable @keyup.enter.native="handleQuery" /> </el-col>
</el-form-item> <el-col :span="12">
<el-form-item label="获奖开始时间" prop="awardTime"> <el-form-item label="获奖等级" prop="awardLevel">
<el-date-picker clearable v-model="queryParams.startTime" type="date" value-format="yyyy-MM-dd" <el-select v-model="queryParams.awardLevel" placeholder="请选择" style="width: 100%;">
placeholder="请选择"> <el-option v-for="dict in dict.type.award_rank" :key="dict.value" :label="dict.label"
</el-date-picker> :value="dict.value">
</el-form-item> </el-option>
<el-form-item label="获奖结束时间" prop="awardTime"> </el-select>
<el-date-picker clearable v-model="queryParams.endTime" type="date" value-format="yyyy-MM-dd" </el-form-item>
placeholder="请选择"> </el-col>
</el-date-picker> </el-row>
</el-form-item> <el-row>
<el-col :span="12">
<el-form-item> <el-form-item label="获奖人" prop="userName">
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button> <el-input v-model="queryParams.userName" placeholder="请输入获奖人" clearable
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button> @keyup.enter.native="handleQuery" />
</el-form-item> </el-form-item>
</el-form> </el-col>
<el-col :span="12">
<el-form-item label="获奖开始时间" prop="awardTime">
<el-date-picker clearable v-model="queryParams.startTime" type="date" value-format="yyyy-MM-dd"
placeholder="请选择" style="width: 100%;">
</el-date-picker>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="获奖结束时间" prop="awardTime">
<el-date-picker clearable v-model="queryParams.endTime" type="date" value-format="yyyy-MM-dd"
placeholder="请选择" style="width: 100%;">
</el-date-picker>
</el-form-item>
</el-col>
</el-row>
<el-form-item class="dialog-footer" style="display: flex; justify-content: center; align-items: center">
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
</el-form-item>
</el-form>
</el-dialog>
<el-row :gutter="10" class="mb8"> <el-row :gutter="10" class="mb8">
<el-col :span="1.5"> <el-col :span="1.5">
<el-button type="primary" plain icon="el-icon-search" size="mini" @click="handleQuerycx">查询</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd" <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
v-hasPermi="['system:awards:add']">新增</el-button> v-hasPermi="['system:awards:add']">新增</el-button>
</el-col> </el-col>
...@@ -70,44 +95,46 @@ ...@@ -70,44 +95,46 @@
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row> </el-row>
<el-table :data="awardsList" @selection-change="handleSelectionChange" <el-table :row-style="{ height: '0' }" :cell-style="{ padding: '3px' }" :data="awardsList"
:default-sort="{ prop: 'awardTime', order: 'descending' }"> @selection-change="handleSelectionChange" :default-sort="{ prop: 'awardTime', order: 'descending' }">
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<el-table-column type="index" label="序号" width="55" align="center" sortable /> <el-table-column type="index" label="序号" width="55" align="center" sortable fixed="left" />
<el-table-column label="成长类型" align="center" sortable> <el-table-column label="成长类型" align="center" fixed="left" width="130px">
<template> <template>
<span>教学获奖</span> <span>教学获奖</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="学科" align="center" prop="sub" sortable> <el-table-column label="学科" align="center" prop="sub" sortable fixed="left">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.teaching_subjects" :value="scope.row.sub" /> <dict-tag :options="dict.type.teaching_subjects" :value="scope.row.sub" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="获奖类别" align="center" prop="awardType" sortable> <el-table-column label="获奖类别" align="center" prop="awardType" sortable width="130px">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.award_categoriesjs" :value="scope.row.awardType" /> <dict-tag :options="dict.type.award_categoriesjs" :value="scope.row.awardType" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="获奖等级" align="center" prop="awardLevel" sortable> <el-table-column label="获奖等级" align="center" prop="awardLevel" sortable width="130px">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.award_rank" :value="scope.row.awardLevel" /> <dict-tag :options="dict.type.award_rank" :value="scope.row.awardLevel" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="获奖级别" align="center" prop="awardRank" sortable> <el-table-column label="获奖级别" align="center" prop="awardRank" sortable width="130px">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.awards_level" :value="scope.row.awardRank" /> <dict-tag :options="dict.type.awards_level" :value="scope.row.awardRank" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="教学获奖-成果名称" align="center" prop="resultName" /> <el-table-column label="教学获奖-成果名称" align="center" prop="resultName" sortable width="190px"
<el-table-column label="获奖人" align="center" prop="userName" /> show-overflow-tooltip />
<el-table-column label="主办单位" align="center" prop="org" /> <el-table-column label="获奖人" align="center" prop="userName" sortable width="130px" />
<el-table-column label="主办单位" align="center" prop="org" sortable width="130px" show-overflow-tooltip />
<el-table-column label="获奖时间" align="center" prop="awardTime" width="180" sortable> <el-table-column label="获奖时间" align="center" prop="awardTime" width="180" sortable>
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.awardTime, '{y}-{m}-{d}') }}</span> <span>{{ parseTime(scope.row.awardTime, '{y}-{m}-{d}') }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" width="150px
">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button size="mini" type="text" @click="handleUpdate(scope.row)" v-hasPermi="['system:awards:edit']" <el-button size="mini" type="text" @click="handleUpdate(scope.row)" v-hasPermi="['system:awards:edit']"
v-if="scope.row.auditState === '0' || scope.row.auditState === '3'">修改</el-button> v-if="scope.row.auditState === '0' || scope.row.auditState === '3'">修改</el-button>
...@@ -259,6 +286,7 @@ export default { ...@@ -259,6 +286,7 @@ export default {
loading: true, loading: true,
// 选中数组 // 选中数组
ids: [], ids: [],
query: false,
// 非单个禁用 // 非单个禁用
single: true, single: true,
// 非多个禁用 // 非多个禁用
...@@ -290,6 +318,8 @@ export default { ...@@ -290,6 +318,8 @@ export default {
awardTime: null, awardTime: null,
pictureName: null, pictureName: null,
pictureUrl: null, pictureUrl: null,
startTime: null,
endTime: null,
}, },
// 表单参数 // 表单参数
form: {}, form: {},
...@@ -465,13 +495,20 @@ export default { ...@@ -465,13 +495,20 @@ export default {
this.resetForm("form"); this.resetForm("form");
}, },
/** 搜索按钮操作 */ /** 搜索按钮操作 */
handleQuerycx() {
this.query = true;
this.resetcx();
},
handleQuery() { handleQuery() {
this.queryParams.pageNum = 1; this.query = true;
this.getList(); this.getList();
this.query = false;
}, },
/** 重置按钮操作 */ /** 重置按钮操作 */
resetQuery() { resetQuery() {
this.resetForm("queryForm"); this.queryParams.startTime = "";
this.queryParams.endTime = "";
this.resetForm("queryParams");
this.handleQuery(); this.handleQuery();
}, },
// 多选框选中数据 // 多选框选中数据
...@@ -552,3 +589,25 @@ export default { ...@@ -552,3 +589,25 @@ export default {
} }
}; };
</script> </script>
<style scoped lang="scss" >
::v-deep .el-form-item {
margin-bottom: 0px;
}
::v-deep .el-input--medium .el-input__inner {
height: 26px;
line-height: 26px;
}
::v-deep .el-dialog__body {
padding: 10px 20px
}
::v-deep .el-dialog:not(.is-fullscreen) {
margin-top: 4vh !important;
}
.search ::v-deep .el-form-item__content {
width: 200px
}
</style>
\ No newline at end of file
ruoyi-ui/src/views/smartSchool/personWork/teamAward/index.vue
<template> <template>
<div class="app-container"> <div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px"> <el-dialog title="查询" :visible.sync="query" width="50%" append-to-body>
<el-form-item label="学年" prop="schoolYear"> <el-form ref="queryParams" :model="queryParams" label-width="96px" class="search">
<el-select v-model="queryParams.schoolYear" placeholder="请选择" style="width: 190px;"> <el-row>
<el-option v-for="dict in dict.type.yearda" :key="dict.value" :label="dict.label" :value="dict.value"> <el-col :span="12">
</el-option> <el-form-item label="学年" prop="schoolYear">
</el-select> <el-select v-model="queryParams.schoolYear" placeholder="请选择" style="width: 100%;">
</el-form-item> <el-option v-for=" dict in dict.type.yearda" :key="dict.value" :label="dict.label"
<el-form-item label="学期" prop="semester"> :value="dict.value">
<el-select v-model="queryParams.semester" placeholder="请选择"> </el-option>
<el-option v-for="dict in dict.type.semester_jsdzda" :key="dict.value" :label="dict.label" </el-select>
:value="dict.value"> </el-form-item>
</el-option> </el-col>
</el-select> <el-col :span="12">
</el-form-item> <el-form-item label="学期" prop="semester">
<el-form-item label="届别" prop="year"> <el-select v-model="queryParams.semester" placeholder="请选择" style="width: 100%;">
<el-select v-model="queryParams.year" placeholder="请选择"> <el-option v-for="dict in dict.type.semester_jsdzda" :key="dict.value" :label="dict.label"
<el-option v-for="dict in dict.type.rankda" :key="dict.value" :label="dict.label" :value="dict.value"> :value="dict.value">
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="年级" prop="grade"> </el-col>
<el-select v-model="queryParams.grade" placeholder="请选择" style="width: 100%;"> </el-row>
<el-option v-for="dict in dict.type.grade_da" :key="dict.value" :label="dict.label" :value="dict.value"> <el-row>
</el-option> <el-col :span="12">
</el-select> <el-form-item label="届别" prop="year">
</el-form-item> <el-select v-model="queryParams.year" placeholder="请选择" style="width: 100%;">
<el-form-item label="学科" prop="sub"> <el-option v-for="dict in dict.type.rankda" :key="dict.value" :label="dict.label"
<el-select v-model="queryParams.sub" placeholder="请选择" style="width: 100%;"> :value="dict.value">
<el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value" :label="dict.label" </el-option>
:value="dict.value"> </el-select>
</el-option> </el-form-item>
</el-select> </el-col>
</el-form-item> <el-col :span="12">
<el-form-item> <el-form-item label="年级" prop="grade">
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button> <el-select v-model="queryParams.grade" placeholder="请选择" style="width: 100%;">
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button> <el-option v-for="dict in dict.type.grade_da" :key="dict.value" :label="dict.label"
</el-form-item> :value="dict.value">
</el-form> </el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="学科" prop="sub">
<el-select v-model="queryParams.sub" placeholder="请选择" style="width: 100%;">
<el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value" :label="dict.label"
:value="dict.value">
</el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
</el-form-item>
</el-form>
</el-dialog>
<el-row :gutter="10" class="mb8"> <el-row :gutter="10" class="mb8">
<el-col :span="1.5"> <el-col :span="1.5">
<el-button type="primary" plain icon="el-icon-search" size="mini" @click="handleQuerycx">查询</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd" <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
v-hasPermi="['system:teamaward:add']">新增</el-button> v-hasPermi="['system:teamaward:add']">新增</el-button>
</el-col> </el-col>
...@@ -59,12 +83,12 @@ ...@@ -59,12 +83,12 @@
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row> </el-row>
<el-table v-loading="loading" :data="awardList" @selection-change="handleSelectionChange" <el-table :row-style="{ height: '0' }" :cell-style="{ padding: '3px' }" v-loading="loading" :data="awardList"
:default-sort="{ prop: 'schoolYear', order: 'descending' }"> @selection-change="handleSelectionChange" :default-sort="{ prop: 'schoolYear', order: 'descending' }">
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<el-table-column type="index" label="序号" width="55" align="center" sortable /> <el-table-column type="index" label="序号" width="55" align="center" sortable fixed="left" />
<el-table-column label="学年" align="center" prop="schoolYear" sortable /> <el-table-column label="学年" align="center" prop="schoolYear" sortable fixed="left" width="120px" />
<el-table-column label="学期" align="center" prop="semester" sortable> <el-table-column label="学期" align="center" prop="semester" sortable fixed="left" width="120px">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.semester_jsdzda" :value="scope.row.semester" /> <dict-tag :options="dict.type.semester_jsdzda" :value="scope.row.semester" />
</template> </template>
...@@ -84,16 +108,17 @@ ...@@ -84,16 +108,17 @@
<dict-tag :options="dict.type.teaching_subjects" :value="scope.row.sub" /> <dict-tag :options="dict.type.teaching_subjects" :value="scope.row.sub" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="获奖情况" align="center" prop="awardSituation" sortable /> <el-table-column label="获奖情况" align="center" prop="awardSituation" sortable show-overflow-tooltip
<el-table-column label="团队成员贡献情况" align="center" prop="teamMembersContribution" sortable /> width="180px" />
<el-table-column label="团队成员贡献情况" align="center" prop="teamMembersContribution" sortable width="200"
show-overflow-tooltip />
<el-table-column label="备注" align="center" prop="remark" sortable /> <el-table-column label="备注" align="center" prop="remark" sortable />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="150" fixed="right">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button size="mini" type="text" @click="handleUpdate(scope.row)" <el-button size="mini" type="text" @click="handleUpdate(scope.row)"
v-hasPermi="['system:teamaward:edit']" v-hasPermi="['system:teamaward:edit']"
v-if="scope.row.auditState === '0' || scope.row.auditState === '3'">修改</el-button> v-if="scope.row.auditState === '0' || scope.row.auditState === '3'">修改</el-button>
<el-button size="mini" type="text" @click="handleLook(scope.row)" <el-button size="mini" type="text" @click="handleLook(scope.row)" v-hasPermi="['system:teamaward:look']"
v-hasPermi="['system:teamaward:look']"
v-if="scope.row.auditState === '0' || scope.row.auditState === '1' || scope.row.auditState === '3' || scope.row.auditState === '2'">查看</el-button> v-if="scope.row.auditState === '0' || scope.row.auditState === '1' || scope.row.auditState === '3' || scope.row.auditState === '2'">查看</el-button>
<el-button size="mini" type="text" @click="handleDelete(scope.row)" <el-button size="mini" type="text" @click="handleDelete(scope.row)"
v-hasPermi="['system:teamaward:remove']" v-hasPermi="['system:teamaward:remove']"
...@@ -214,6 +239,7 @@ export default { ...@@ -214,6 +239,7 @@ export default {
// 是否显示弹出层 // 是否显示弹出层
open: false, open: false,
isEdit: false, isEdit: false,
query: false,
// 查询参数 // 查询参数
queryParams: { queryParams: {
pageNum: 1, pageNum: 1,
...@@ -346,13 +372,18 @@ export default { ...@@ -346,13 +372,18 @@ export default {
this.resetForm("form"); this.resetForm("form");
}, },
/** 搜索按钮操作 */ /** 搜索按钮操作 */
handleQuerycx() {
this.query = true;
this.resetcx();
},
handleQuery() { handleQuery() {
this.queryParams.pageNum = 1; this.query = true;
this.getList(); this.getList();
this.query = false;
}, },
/** 重置按钮操作 */ /** 重置按钮操作 */
resetQuery() { resetQuery() {
this.resetForm("queryForm"); this.resetForm("queryParams");
this.handleQuery(); this.handleQuery();
}, },
// 多选框选中数据 // 多选框选中数据
...@@ -422,3 +453,25 @@ export default { ...@@ -422,3 +453,25 @@ export default {
} }
}; };
</script> </script>
<style lang="less" scoped>
::v-deep .el-form-item {
margin-bottom: 0px;
}
::v-deep .el-input--medium .el-input__inner {
height: 26px;
line-height: 26px;
}
::v-deep .el-dialog__body {
padding: 10px 20px
}
::v-deep .el-dialog:not(.is-fullscreen) {
margin-top: 4vh !important;
}
.search ::v-deep .el-form-item__content {
width: 200px
}
</style>
\ No newline at end of file
ruoyi-ui/src/views/smartSchool/personWork/tutorAward/index.vue
<template> <template>
<div class="app-container"> <div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="98px"> <el-dialog title="查询" :visible.sync="query" width="50%" append-to-body>
<el-form-item label="学科" prop="sub"> <el-form ref="queryParams" :model="queryParams" label-width="96px" class="search">
<el-select v-model="queryParams.sub" placeholder="请选择"> <el-row>
<el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value" :label="dict.label" <el-col :span="12">
:value="dict.value"> <el-form-item label="学科" prop="sub">
</el-option> <el-select v-model="queryParams.sub" placeholder="请选择" style="width: 100%;">
</el-select> <el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value" :label="dict.label"
</el-form-item> :value="dict.value">
<el-form-item label="获奖类别" prop="awardtype"> </el-option>
<el-select v-model="queryParams.awardtype" placeholder="请选择"> </el-select>
<el-option v-for="dict in dict.type.award_type_fdjs" :key="dict.value" :label="dict.label" </el-form-item>
:value="dict.value"> </el-col>
</el-option> <el-col :span="12">
</el-select> <el-form-item label="获奖类别" prop="awardtype">
</el-form-item> <el-select v-model="queryParams.awardtype" placeholder="请选择" style="width: 100%;">
<el-form-item label="获奖级别" prop="awardrank"> <el-option v-for="dict in dict.type.award_type_fdjs" :key="dict.value" :label="dict.label"
<el-select v-model="queryParams.awardrank" placeholder="请选择" style="width: 220px;"> :value="dict.value">
<el-option v-for="dict in dict.type.awards_level" :key="dict.value" :label="dict.label" </el-option>
:value="dict.value"> </el-select>
</el-option> </el-form-item>
</el-select> </el-col>
</el-form-item> </el-row>
<el-form-item label="获奖等级" prop="awardlevel"> <el-row>
<el-select v-model="queryParams.awardlevel" placeholder="请选择" style="width:220px;"> <el-col :span="12">
<el-option v-for="dict in dict.type.award_rank" :key="dict.value" :label="dict.label" <el-form-item label="获奖级别" prop="awardrank">
:value="dict.value"> <el-select v-model="queryParams.awardrank" placeholder="请选择" style="width: 100%;">
</el-option> <el-option v-for="dict in dict.type.awards_level" :key="dict.value" :label="dict.label"
</el-select> :value="dict.value">
</el-form-item> </el-option>
<el-form-item label="获奖人" prop="username"> </el-select>
<el-input v-model="queryParams.username" placeholder="请输入获奖人" clearable @keyup.enter.native="handleQuery" /> </el-form-item>
</el-form-item> </el-col>
<el-form-item label="指导教师" prop="guidanceteacher"> <el-col :span="12">
<el-input v-model="queryParams.guidanceteacher" placeholder="请输入内容" style="width: 192px;" /> <el-form-item label="获奖等级" prop="awardlevel">
</el-form-item> <el-select v-model="queryParams.awardlevel" placeholder="请选择" style="width: 100%;">
<el-form-item label="辅导职责" prop="coachingr"> <el-option v-for="dict in dict.type.award_rank" :key="dict.value" :label="dict.label"
<el-select v-model="queryParams.coachingr" placeholder="请选择" style="width: 100%;"> :value="dict.value">
<el-option v-for="dict in dict.type.coachingr" :key="dict.value" :label="dict.label" </el-option>
:value="dict.value"> </el-select>
</el-option> </el-form-item>
</el-select> </el-col>
</el-form-item> </el-row>
<el-form-item label="获奖开始时间" prop="startTime"> <el-row>
<el-date-picker clearable v-model="queryParams.startTime" type="date" value-format="yyyy-MM-dd" <el-col :span="12">
placeholder="请选择"> <el-form-item label="获奖人" prop="username">
</el-date-picker> <el-input v-model="queryParams.username" placeholder="请输入获奖人" clearable
</el-form-item> @keyup.enter.native="handleQuery" />
<el-form-item label="获奖结束时间" prop="endTime"> </el-form-item>
<el-date-picker clearable v-model="queryParams.endTime" type="date" value-format="yyyy-MM-dd" </el-col>
placeholder="请选择"> <el-col :span="12">
</el-date-picker> <el-form-item label="指导教师" prop="guidanceteacher">
</el-form-item> <el-input v-model="queryParams.guidanceteacher" placeholder="请输入内容" />
<el-form-item> </el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button> </el-col>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button> </el-row>
</el-form-item> <el-row>
</el-form> <el-col :span="12">
<el-form-item label="辅导职责" prop="coachingr">
<el-select v-model="queryParams.coachingr" placeholder="请选择" style="width: 100%;">
<el-option v-for="dict in dict.type.coachingr" :key="dict.value" :label="dict.label"
:value="dict.value">
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="获奖开始时间" prop="startTime">
<el-date-picker clearable v-model="queryParams.startTime" type="date" value-format="yyyy-MM-dd"
placeholder="请选择" style="width: 100%;">
</el-date-picker>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="获奖结束时间" prop="endTime">
<el-date-picker clearable v-model="queryParams.endTime" type="date" value-format="yyyy-MM-dd"
placeholder="请选择" style="width: 100%;">
</el-date-picker>
</el-form-item>
</el-col>
</el-row>
<el-form-item class="dialog-footer" style="display: flex; justify-content: center; align-items: center">
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
</el-form-item>
</el-form>
</el-dialog>
<el-row :gutter="10" class="mb8"> <el-row :gutter="10" class="mb8">
<el-col :span="1.5"> <el-col :span="1.5">
<el-button type="primary" plain icon="el-icon-search" size="mini" @click="handleQuerycx">查询</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd" <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
v-hasPermi="['system:tutoraward:add']">新增</el-button> v-hasPermi="['system:tutoraward:add']">新增</el-button>
</el-col> </el-col>
...@@ -77,54 +111,57 @@ ...@@ -77,54 +111,57 @@
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row> </el-row>
<el-table :data="awardsList" @selection-change="handleSelectionChange" <el-table :row-style="{ height: '0' }" :cell-style="{ padding: '3px' }" :data="awardsList"
:default-sort="{ prop: 'awardtime', order: 'descending' }"> @selection-change="handleSelectionChange" :default-sort="{ prop: 'awardtime', order: 'descending' }">
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<el-table-column type="index" label="序号" width="55" align="center" sortable /> <el-table-column type="index" label="序号" width="55" align="center" sortable fixed="left" />
<el-table-column label="成长类型" align="center" sortable> <el-table-column label="成长类型" align="center" fixed="left" width="120px">
<template> <template>
<span>辅导老师获奖</span> <span>辅导老师获奖</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="学科" align="center" prop="sub" sortable> <el-table-column label="学科" align="center" prop="sub" sortable fixed="left" width="100px">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.teaching_subjects" :value="scope.row.sub" /> <dict-tag :options="dict.type.teaching_subjects" :value="scope.row.sub" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="获奖类别" align="center" prop="awardtype" sortable> <el-table-column label="获奖类别" align="center" prop="awardtype" sortable width="130px">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.award_type_fdjs" :value="scope.row.awardtype" /> <dict-tag :options="dict.type.award_type_fdjs" :value="scope.row.awardtype" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="获奖等级" align="center" prop="awardlevel" sortable> <el-table-column label="获奖等级" align="center" prop="awardlevel" sortable width="130px">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.award_rank" :value="scope.row.awardlevel" /> <dict-tag :options="dict.type.award_rank" :value="scope.row.awardlevel" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="获奖级别" align="center" prop="awardrank" sortable> <el-table-column label="获奖级别" align="center" prop="awardrank" sortable width="130px">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.awards_level" :value="scope.row.awardrank" /> <dict-tag :options="dict.type.awards_level" :value="scope.row.awardrank" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="比赛名称" align="center" prop="competitionname" sortable /> <el-table-column label="比赛名称" align="center" prop="competitionname" sortable width="130px"
<el-table-column label="获奖人" align="center" prop="username" sortable /> show-overflow-tooltip />
<el-table-column label="指导教师" align="center" prop="guidanceteacher" sortable /> <el-table-column label="获奖人" align="center" prop="username" sortable width="130px" />
<el-table-column label="辅导职责" align="center" prop="coachingr" sortable> <el-table-column label="指导教师" align="center" prop="guidanceteacher" sortable width="130px" />
<el-table-column label="辅导职责" align="center" prop="coachingr" sortable width="130px">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.coachingr" :value="scope.row.coachingr" /> <dict-tag :options="dict.type.coachingr" :value="scope.row.coachingr" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="主办单位" align="center" prop="org" sortable /> <el-table-column label="主办单位" align="center" prop="org" sortable width="180px" show-overflow-tooltip />
<el-table-column label="获奖时间" align="center" prop="awardtime" width="180" sortable> <el-table-column label="获奖时间" align="center" prop="awardtime" width="180" sortable>
<!-- <template slot-scope="scope"> <!-- <template slot-scope="scope">
<span>{{ parseTime(scope.row.awardTime, '{y}-{m}-{d}') }}</span> <span>{{ parseTime(scope.row.awardTime, '{y}-{m}-{d}') }}</span>
</template> --> </template> -->
</el-table-column> </el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="180px" fixed="right">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button size="mini" type="text" @click="handleUpdate(scope.row)" v-hasPermi="['system:tutoraward:edit']" <el-button size="mini" type="text" @click="handleUpdate(scope.row)"
v-hasPermi="['system:tutoraward:edit']"
v-if="scope.row.auditstate === '0' || scope.row.auditstate === '3'">修改</el-button> v-if="scope.row.auditstate === '0' || scope.row.auditstate === '3'">修改</el-button>
<el-button size="mini" type="text" @click="handleLook(scope.row)" v-hasPermi="['system:tutoraward:look']" <el-button size="mini" type="text" @click="handleLook(scope.row)"
v-hasPermi="['system:tutoraward:look']"
v-if="scope.row.auditstate === '0' || scope.row.auditstate === '1' || scope.row.auditstate === '3' || scope.row.auditstate === '2'">查看</el-button> v-if="scope.row.auditstate === '0' || scope.row.auditstate === '1' || scope.row.auditstate === '3' || scope.row.auditstate === '2'">查看</el-button>
<el-button size="mini" type="text" @click="handleDelete(scope.row)" <el-button size="mini" type="text" @click="handleDelete(scope.row)"
v-hasPermi="['system:tutoraward:remove']" v-hasPermi="['system:tutoraward:remove']"
...@@ -281,6 +318,7 @@ export default { ...@@ -281,6 +318,7 @@ export default {
method: null, method: null,
type: null // 处理类型： 1 级部/处室； 2 分管； 3 主管 type: null // 处理类型： 1 级部/处室； 2 分管； 3 主管
}, },
query: false,
// 图片上传遮罩层 // 图片上传遮罩层
uploadLoading: false, uploadLoading: false,
baseUrl: [process.env.VUE_APP_BASE_API], baseUrl: [process.env.VUE_APP_BASE_API],
...@@ -524,13 +562,18 @@ export default { ...@@ -524,13 +562,18 @@ export default {
this.resetForm("form"); this.resetForm("form");
}, },
/** 搜索按钮操作 */ /** 搜索按钮操作 */
handleQuerycx() {
this.query = true;
this.resetcx();
},
handleQuery() { handleQuery() {
this.queryParams.pageNum = 1; this.query = true;
this.getList(); this.getList();
this.query = false;
}, },
/** 重置按钮操作 */ /** 重置按钮操作 */
resetQuery() { resetQuery() {
this.resetForm("queryForm"); this.resetForm("queryParams");
this.handleQuery(); this.handleQuery();
}, },
// 多选框选中数据 // 多选框选中数据
...@@ -599,3 +642,25 @@ export default { ...@@ -599,3 +642,25 @@ export default {
} }
}; };
</script> </script>
<style scoped lang="scss" >
::v-deep .el-form-item {
margin-bottom: 0px;
}
::v-deep .el-input--medium .el-input__inner {
height: 26px;
line-height: 26px;
}
::v-deep .el-dialog__body {
padding: 10px 20px
}
::v-deep .el-dialog:not(.is-fullscreen) {
margin-top: 4vh !important;
}
.search ::v-deep .el-form-item__content {
width: 200px
}
</style>
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