Skip to content

D
dd_school
Commit 2f6018ae by zhaopanyu
Options

zpy 12.21

parent 10b0e16a
Showing with 692 additions and 150 deletions
ruoyi-ui/src/views/smartSchool/electronicArchives/basicInformation/index.vue
...@@ -166,7 +166,7 @@ ...@@ -166,7 +166,7 @@
</el-table-column> </el-table-column>
<el-table-column label="毕业院校" align="center" prop="graduationInstitution1" sortable width="160px" <el-table-column label="毕业院校" align="center" prop="graduationInstitution1" sortable width="160px"
show-overflow-tooltip /> show-overflow-tooltip />
<el-table-column label="学历" align="center" prop="firstDegree" sortable show-overflow-tooltip /> <el-table-column label="学历" align="center" prop="lastDegree" sortable show-overflow-tooltip />
<el-table-column label="在岗情况" align="center" prop="onDutySituation" sortable width="100px" <el-table-column label="在岗情况" align="center" prop="onDutySituation" sortable width="100px"
show-overflow-tooltip> show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
...@@ -207,6 +207,12 @@ ...@@ -207,6 +207,12 @@
</el-upload> </el-upload>
</el-form-item> </el-form-item>
</el-form> </el-form>
<div class="mask" v-if="importing">
<div class="mask-content">
<i class="el-icon-loading"></i>
<span>正在导入，请稍候...</span>
</div>
</div>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitFileForm">确 定</el-button> <el-button type="primary" @click="submitFileForm">确 定</el-button>
<el-button @click="cancelFile">取 消</el-button> <el-button @click="cancelFile">取 消</el-button>
...@@ -868,9 +874,7 @@ ...@@ -868,9 +874,7 @@
<el-button @click="cancel">取 消</el-button> <el-button @click="cancel">取 消</el-button>
</div> </div>
</el-dialog> </el-dialog>
<!-- 导出对话框 -->
<ExportTableNew :open-export.sync="exportOptions.open" :title="exportOptions.title" @export="exportFile">
</ExportTableNew>
</div> </div>
</template> </template>
...@@ -901,8 +905,10 @@ export default { ...@@ -901,8 +905,10 @@ export default {
"duty_situation", "duty_situation",
"current_situation", "current_situation",
], ],
data() { data() {
return { return {
importing: false,
isEditing: false, // 默认为查看模式 isEditing: false, // 默认为查看模式
// 导出选项 // 导出选项
exportOptions: { exportOptions: {
...@@ -1145,6 +1151,7 @@ export default { ...@@ -1145,6 +1151,7 @@ export default {
}, },
handleFileUploadProgress(event, file, fileList) { handleFileUploadProgress(event, file, fileList) {
this.upload.isUploading = true; this.upload.isUploading = true;
this.importing = true;
}, },
// 提交上传文件 // 提交上传文件
...@@ -1160,6 +1167,7 @@ export default { ...@@ -1160,6 +1167,7 @@ export default {
handleFileSuccess(response, file, fileList) { handleFileSuccess(response, file, fileList) {
this.uploadOpen = false; this.uploadOpen = false;
this.upload.isUploading = false; this.upload.isUploading = false;
this.importing = false;
this.$refs.upload.clearFiles(); this.$refs.upload.clearFiles();
this.$alert( this.$alert(
"<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" + "<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" +
...@@ -1317,8 +1325,7 @@ export default { ...@@ -1317,8 +1325,7 @@ export default {
const id = row.id || this.ids; const id = row.id || this.ids;
getInformation(id).then((response) => { getInformation(id).then((response) => {
this.form = response.data; this.form = response.data;
this.pictureUrl = this.pev + response.url; console.log(this.form.photoUrl, 'this.form.photoUrl');
console.log(this.form, "this.form ");
this.title = "修改教师基础信息"; this.title = "修改教师基础信息";
}); });
}, },
...@@ -1482,4 +1489,24 @@ export default { ...@@ -1482,4 +1489,24 @@ export default {
.editForm ::v-deep .el-dialog__footer { .editForm ::v-deep .el-dialog__footer {
padding-bottom: 10px; padding-bottom: 10px;
} }
.mask {
position: fixed;
top: 0;
left: 0;
width: 100%;
height: 100%;
background-color: rgba(0, 0, 0, 0.5);
display: flex;
align-items: center;
justify-content: center;
}
.mask-content {
display: flex;
align-items: center;
justify-content: center;
color: #1a74be;
font-size: 15px;
}
</style> </style>
ruoyi-ui/src/views/smartSchool/electronicArchives/examinationScore/index.vue
...@@ -94,8 +94,8 @@ ...@@ -94,8 +94,8 @@
@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 width="80" /> <el-table-column label="届别" align="center" prop="year" sortable width="80" show-overflow-tooltip />
<el-table-column label="学科" align="center" prop="sub" sortable width="80"> <el-table-column label="学科" align="center" prop="sub" sortable width="80" 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>
...@@ -125,7 +125,7 @@ ...@@ -125,7 +125,7 @@
<el-table-column label="有效数情况" align="center" prop="effectiveNumSituation" sortable width="150" <el-table-column label="有效数情况" align="center" prop="effectiveNumSituation" sortable width="150"
show-overflow-tooltip /> show-overflow-tooltip />
<el-table-column label="其他情况" align="center" prop="other" sortable width="150" show-overflow-tooltip /> <el-table-column label="其他情况" align="center" prop="other" sortable width="150" show-overflow-tooltip />
<el-table-column label="审核状态" align="center" prop="auditState" sortable width="120"> <el-table-column label="审核状态" align="center" prop="auditState" sortable width="120" fixed="right">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.audit_states" :value="scope.row.auditState" /> <dict-tag :options="dict.type.audit_states" :value="scope.row.auditState" />
</template> </template>
...@@ -152,7 +152,7 @@ ...@@ -152,7 +152,7 @@
<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="请选择" clearable style="width: 100%;">
<el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value" :label="dict.label" <el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value" :label="dict.label"
:value="dict.value"> :value="dict.value">
</el-option> </el-option>
...@@ -161,7 +161,7 @@ ...@@ -161,7 +161,7 @@
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="教师姓名" prop="teacherName"> <el-form-item label="教师姓名" prop="teacherName">
<el-input v-model="form.teacherName" placeholder="请选择" <el-input v-model="form.teacherName" placeholder="请选择" clearable
@input="openSelect('选择分管领导', 'leaderList', 2)" @input="openSelect('选择分管领导', 'leaderList', 2)"
@focus="openSelect('选择分管领导', 'leaderList', 2)"></el-input> @focus="openSelect('选择分管领导', 'leaderList', 2)"></el-input>
</el-form-item> </el-form-item>
...@@ -170,7 +170,7 @@ ...@@ -170,7 +170,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="form.year" placeholder="请选择" style="width: 100%;"> <el-select v-model="form.year" placeholder="请选择" clearable 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>
...@@ -179,7 +179,7 @@ ...@@ -179,7 +179,7 @@
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="授课班级" prop="teachingClassName"> <el-form-item label="授课班级" prop="teachingClassName">
<el-select v-model="form.teachingClassName" placeholder="请选择" style="width: 100%"> <el-select v-model="form.teachingClassName" clearable 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>
...@@ -190,7 +190,7 @@ ...@@ -190,7 +190,7 @@
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="班级类型" prop="classType"> <el-form-item label="班级类型" prop="classType">
<el-select v-model="form.classType" placeholder="请选择" style="width: 100%"> <el-select v-model="form.classType" placeholder="请选择" clearable 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>
...@@ -199,7 +199,7 @@ ...@@ -199,7 +199,7 @@
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="高考评优" prop="gkAppraising"> <el-form-item label="高考评优" prop="gkAppraising">
<el-select v-model="form.gkAppraising" placeholder="请选择" style="width: 100%"> <el-select v-model="form.gkAppraising" placeholder="请选择" clearable style="width: 100%">
<el-option v-for="dict in dict.type.gk_appraising" :key="dict.value" :label="dict.label" <el-option v-for="dict in dict.type.gk_appraising" :key="dict.value" :label="dict.label"
:value="dict.value"> :value="dict.value">
</el-option> </el-option>
...@@ -210,24 +210,25 @@ ...@@ -210,24 +210,25 @@
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="尖子生培养" prop="topStudentsCulture"> <el-form-item label="尖子生培养" prop="topStudentsCulture">
<el-input v-model="form.topStudentsCulture" type="textarea" placeholder="请输入内容" /> <el-input v-model="form.topStudentsCulture" type="textarea" clearable placeholder="请输入内容" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="增量情况" prop="incrementSituation"> <el-form-item label="增量情况" prop="incrementSituation">
<el-input v-model="form.incrementSituation" type="textarea" placeholder="请输入内容" /> <el-input v-model="form.incrementSituation" type="textarea" clearable 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="effectiveNumSituation"> <el-form-item label="有效数情况" prop="effectiveNumSituation">
<el-input v-model="form.effectiveNumSituation" type="textarea" placeholder="请输入有效数情况" /> <el-input v-model="form.effectiveNumSituation" clearable type="textarea"
placeholder="请输入有效数情况" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="其他" prop="other"> <el-form-item label="其他" prop="other">
<el-input v-model="form.other" type="textarea" placeholder="请输入内容" /> <el-input v-model="form.other" type="textarea" clearable placeholder="请输入内容" />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
......
ruoyi-ui/src/views/smartSchool/electronicArchives/professionalDevelopment/annualAssessment/index.vue
...@@ -89,6 +89,12 @@ ...@@ -89,6 +89,12 @@
</el-upload> </el-upload>
</el-form-item> </el-form-item>
</el-form> </el-form>
<div class="mask" v-if="importing">
<div class="mask-content">
<i class="el-icon-loading"></i>
<span>正在导入，请稍候...</span>
</div>
</div>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitFileForm">确 定</el-button> <el-button type="primary" @click="submitFileForm">确 定</el-button>
<el-button @click="cancelFile">取 消</el-button> <el-button @click="cancelFile">取 消</el-button>
...@@ -140,6 +146,7 @@ export default { ...@@ -140,6 +146,7 @@ export default {
dicts: ["check_result", 'rankda'], dicts: ["check_result", 'rankda'],
data() { data() {
return { return {
importing: false,
uploadOpen: false, uploadOpen: false,
// 遮罩层 // 遮罩层
loading: true, loading: true,
...@@ -226,6 +233,7 @@ export default { ...@@ -226,6 +233,7 @@ export default {
}, },
handleFileUploadProgress(event, file, fileList) { handleFileUploadProgress(event, file, fileList) {
this.upload.isUploading = true; this.upload.isUploading = true;
this.importing = true;
// console.log(event, file, fileList); // console.log(event, file, fileList);
}, },
...@@ -233,6 +241,7 @@ export default { ...@@ -233,6 +241,7 @@ export default {
handleFileSuccess(response, file, fileList) { handleFileSuccess(response, file, fileList) {
this.uploadOpen = false this.uploadOpen = false
this.upload.isUploading = false this.upload.isUploading = false
this.importing = false;
this.$refs.upload.clearFiles() this.$refs.upload.clearFiles()
this.$alert("<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" + response.msg + '</div>', '导入结果', { dangerouslyUseHTMLString: true }) this.$alert("<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" + response.msg + '</div>', '导入结果', { dangerouslyUseHTMLString: true })
this.getList() this.getList()
...@@ -363,3 +372,24 @@ export default { ...@@ -363,3 +372,24 @@ export default {
} }
}; };
</script> </script>
<style lang="scss" scoped>
.mask {
position: fixed;
top: 0;
left: 0;
width: 100%;
height: 100%;
background-color: rgba(0, 0, 0, 0.5);
display: flex;
align-items: center;
justify-content: center;
}
.mask-content {
display: flex;
align-items: center;
justify-content: center;
color: #1a74be;
font-size: 16px;
}
</style>
\ No newline at end of file
ruoyi-ui/src/views/smartSchool/electronicArchives/professionalDevelopment/awardTutoringstu/index.vue
...@@ -51,7 +51,7 @@ ...@@ -51,7 +51,7 @@
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="指导教师" prop="guidanceteacher"> <el-form-item label="指导教师" prop="guidanceteacher">
<el-input v-model="queryParams.guidanceteacher" clearable placeholder="请输入内容" /> <el-input v-model="queryParams.guidanceteacher" clearable placeholder="请输入内容" />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
...@@ -138,7 +138,7 @@ ...@@ -138,7 +138,7 @@
<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" prop="auditstate" sortable width="120"> <el-table-column label="审核状态" align="center" prop="auditstate" sortable width="120" fixed="right">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.audit_states" :value="scope.row.auditstate" /> <dict-tag :options="dict.type.audit_states" :value="scope.row.auditstate" />
</template> </template>
...@@ -471,7 +471,7 @@ export default { ...@@ -471,7 +471,7 @@ export default {
awardlevel: [ awardlevel: [
{ required: true, message: "获奖等级不能为空", trigger: "change" } { required: true, message: "获奖等级不能为空", trigger: "change" }
], ],
competitionname: [ resultname: [
{ required: true, message: "成果名称不能为空", trigger: "blur" } { required: true, message: "成果名称不能为空", trigger: "blur" }
], ],
username: [ username: [
...@@ -727,6 +727,33 @@ export default { ...@@ -727,6 +727,33 @@ export default {
}; };
</script> </script>
<style scoped lang="scss" > <style scoped lang="scss" >
.avatar-uploader .el-upload {
border: 1px dashed #d9d9d9;
border-radius: 6px;
cursor: pointer;
position: relative;
overflow: hidden;
}
.avatar-uploader .el-upload:hover {
border-color: #409eff;
}
.avatar-uploader-icon {
font-size: 30px;
color: #8c939d;
width: 70px;
height: 70px;
line-height: 70px;
text-align: center;
}
.avatar {
width: 300px;
height: 220px;
display: block;
}
::v-deep .el-form-item { ::v-deep .el-form-item {
margin-bottom: 0px; margin-bottom: 0px;
} }
......
ruoyi-ui/src/views/smartSchool/electronicArchives/professionalDevelopment/comprehensiveHonors/index.vue
...@@ -96,37 +96,38 @@ ...@@ -96,37 +96,38 @@
@selection-change="handleSelectionChange" :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 fixed="left" /> <el-table-column type="index" label="序号" width="55" align="center" sortable fixed="left" />
<el-table-column label="成长类型" align="center" prop="type" sortable width="130px" fixed="left"> <el-table-column label="成长类型" align="center" prop="type" sortable width="130px" fixed="left"
show-overflow-tooltip>
<template> <template>
<span>综合荣誉</span> <span>综合荣誉</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="学科" align="center" prop="sub" sortable fixed="left" width="130px"> <el-table-column label="学科" align="center" prop="sub" sortable fixed="left" width="130px" 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="awardType" sortable width="130px" /> <el-table-column label="获奖类别" align="center" prop="awardType" sortable width="130px" show-overflow-tooltip />
<el-table-column label="获奖等级" align="center" prop="awardLevel" sortable width="130px"> <el-table-column label="获奖等级" align="center" prop="awardLevel" sortable width="130px" show-overflow-tooltip>
<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 width="120px"> <el-table-column label="获奖级别" align="center" prop="awardRank" sortable width="120px" show-overflow-tooltip>
<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 width="220px" <el-table-column label="综合荣誉-成果名称" align="center" prop="resultName" sortable width="220px"
show-overflow-tooltip /> show-overflow-tooltip />
<el-table-column label="获奖人" align="center" prop="userName" sortable width="150px" /> <el-table-column label="获奖人" align="center" prop="userName" sortable width="150px" show-overflow-tooltip />
<el-table-column label="主办单位" align="center" prop="org" sortable width="180px" show-overflow-tooltip /> <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 show-overflow-tooltip>
<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" prop="auditState" sortable width="120"> <el-table-column label="审核状态" align="center" prop="auditState" sortable width="120" fixed="right">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.audit_states" :value="scope.row.auditState" /> <dict-tag :options="dict.type.audit_states" :value="scope.row.auditState" />
</template> </template>
...@@ -456,7 +457,7 @@ export default { ...@@ -456,7 +457,7 @@ export default {
this.look = true; this.look = true;
this.isEdit = true, this.isEdit = true,
this.form = response.data; this.form = response.data;
this.pictureUrl = this.pev + this.form.pictureUrl this.pictureUrl = this.baseUrl + this.form.pictureUrl
this.title = "修改综合荣誉"; this.title = "修改综合荣誉";
}); });
}, },
...@@ -523,8 +524,9 @@ export default { ...@@ -523,8 +524,9 @@ export default {
.then((response) => { .then((response) => {
this.uploadLoading = false; this.uploadLoading = false;
this.$modal.msgSuccess("上传成功"); this.$modal.msgSuccess("上传成功");
this.pictureUrl = this.pev + response.url; this.pictureUrl = this.baseUrl + response.url;
this.form.pictureUrl = response.url; this.form.pictureUrl = response.url;
console.log(this.form.pictureUrl, 'this.pictureUrl');
}) })
.catch((error) => { .catch((error) => {
this.uploadLoading = false; this.uploadLoading = false;
...@@ -594,7 +596,8 @@ export default { ...@@ -594,7 +596,8 @@ export default {
const id = row.id || this.ids const id = row.id || this.ids
getHonors(id).then(response => { getHonors(id).then(response => {
this.form = response.data; this.form = response.data;
this.pictureUrl = this.pev + this.form.pictureUrl // this.form.pictureUrl = this.baseUrl + this.form.pictureUrl
// console.log(this.form.pictureUrl, 'this.form.pictureUrl ');
this.title = "修改综合荣誉"; this.title = "修改综合荣誉";
}); });
}, },
...@@ -694,6 +697,33 @@ export default { ...@@ -694,6 +697,33 @@ export default {
}; };
</script> </script>
<style scoped lang="scss" > <style scoped lang="scss" >
.avatar-uploader .el-upload {
border: 1px dashed #d9d9d9;
border-radius: 6px;
cursor: pointer;
position: relative;
overflow: hidden;
}
.avatar-uploader .el-upload:hover {
border-color: #409eff;
}
.avatar-uploader-icon {
font-size: 30px;
color: #8c939d;
width: 70px;
height: 70px;
line-height: 70px;
text-align: center;
}
.avatar {
width: 300px;
height: 220px;
display: block;
}
::v-deep .el-form-item { ::v-deep .el-form-item {
margin-bottom: 0px; margin-bottom: 0px;
} }
......
ruoyi-ui/src/views/smartSchool/electronicArchives/professionalDevelopment/essaysWritings/index.vue
...@@ -133,7 +133,7 @@ ...@@ -133,7 +133,7 @@
<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" prop="auditState" sortable width="120"> <el-table-column label="审核状态" align="center" prop="auditState" sortable width="120" fixed="right">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.audit_states" :value="scope.row.auditState" /> <dict-tag :options="dict.type.audit_states" :value="scope.row.auditState" />
</template> </template>
...@@ -452,18 +452,13 @@ export default { ...@@ -452,18 +452,13 @@ export default {
awardTime: [ awardTime: [
{ required: true, message: "获奖时间不能为空", trigger: "blur" } { required: true, message: "获奖时间不能为空", trigger: "blur" }
], ],
remark: [
{ required: true, message: "备注不能为空", trigger: "blur" }
],
pictureName: [ pictureName: [
{ required: true, message: "证书图片名称不能为空", trigger: "blur" } { required: true, message: "证书图片名称不能为空", trigger: "blur" }
], ],
pictureUrl: [ pictureUrl: [
{ required: true, message: "证书图片地址不能为空", trigger: "blur" } { required: true, message: "证书图片地址不能为空", trigger: "blur" }
], ],
// delFlag: [
// { required: true, message: "删除状态不能为空", trigger: "blur" }
// ]
} }
}; };
}, },
...@@ -701,6 +696,33 @@ export default { ...@@ -701,6 +696,33 @@ export default {
}; };
</script> </script>
<style scoped lang="scss" > <style scoped lang="scss" >
.avatar-uploader .el-upload {
border: 1px dashed #d9d9d9;
border-radius: 6px;
cursor: pointer;
position: relative;
overflow: hidden;
}
.avatar-uploader .el-upload:hover {
border-color: #409eff;
}
.avatar-uploader-icon {
font-size: 30px;
color: #8c939d;
width: 70px;
height: 70px;
line-height: 70px;
text-align: center;
}
.avatar {
width: 300px;
height: 220px;
display: block;
}
::v-deep .el-form-item { ::v-deep .el-form-item {
margin-bottom: 0px; margin-bottom: 0px;
} }
......
ruoyi-ui/src/views/smartSchool/electronicArchives/professionalDevelopment/lectureAwards/index.vue
...@@ -131,7 +131,7 @@ ...@@ -131,7 +131,7 @@
<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" prop="auditState" sortable width="120"> <el-table-column label="审核状态" align="center" prop="auditState" sortable width="120" fixed="right">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.audit_states" :value="scope.row.auditState" /> <dict-tag :options="dict.type.audit_states" :value="scope.row.auditState" />
</template> </template>
...@@ -694,6 +694,33 @@ export default { ...@@ -694,6 +694,33 @@ export default {
}; };
</script> </script>
<style scoped lang="scss" > <style scoped lang="scss" >
.avatar-uploader .el-upload {
border: 1px dashed #d9d9d9;
border-radius: 6px;
cursor: pointer;
position: relative;
overflow: hidden;
}
.avatar-uploader .el-upload:hover {
border-color: #409eff;
}
.avatar-uploader-icon {
font-size: 30px;
color: #8c939d;
width: 70px;
height: 70px;
line-height: 70px;
text-align: center;
}
.avatar {
width: 300px;
height: 220px;
display: block;
}
::v-deep .el-form-item { ::v-deep .el-form-item {
margin-bottom: 0px; margin-bottom: 0px;
} }
......
ruoyi-ui/src/views/smartSchool/electronicArchives/professionalDevelopment/projectResearch/index.vue
...@@ -130,7 +130,7 @@ ...@@ -130,7 +130,7 @@
<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" prop="auditState" sortable width="120"> <el-table-column label="审核状态" align="center" prop="auditState" sortable width="120" fixed="right">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.audit_states" :value="scope.row.auditState" /> <dict-tag :options="dict.type.audit_states" :value="scope.row.auditState" />
</template> </template>
...@@ -453,18 +453,14 @@ export default { ...@@ -453,18 +453,14 @@ export default {
awardTime: [ awardTime: [
{ required: true, message: "获奖时间不能为空", trigger: "blur" } { required: true, message: "获奖时间不能为空", trigger: "blur" }
], ],
remark: [
{ required: true, message: "备注不能为空", trigger: "blur" }
],
pictureName: [ pictureName: [
{ required: true, message: "证书图片名称不能为空", trigger: "blur" } { required: true, message: "证书图片名称不能为空", trigger: "blur" }
], ],
pictureUrl: [ pictureUrl: [
{ required: true, message: "证书图片地址不能为空", trigger: "blur" } { required: true, message: "证书图片地址不能为空", trigger: "blur" }
], ],
// delFlag: [
// { required: true, message: "删除状态不能为空", trigger: "blur" }
// ]
} }
}; };
}, },
...@@ -702,6 +698,33 @@ export default { ...@@ -702,6 +698,33 @@ export default {
}; };
</script> </script>
<style scoped lang="scss" > <style scoped lang="scss" >
.avatar-uploader .el-upload {
border: 1px dashed #d9d9d9;
border-radius: 6px;
cursor: pointer;
position: relative;
overflow: hidden;
}
.avatar-uploader .el-upload:hover {
border-color: #409eff;
}
.avatar-uploader-icon {
font-size: 30px;
color: #8c939d;
width: 70px;
height: 70px;
line-height: 70px;
text-align: center;
}
.avatar {
width: 300px;
height: 220px;
display: block;
}
::v-deep .el-form-item { ::v-deep .el-form-item {
margin-bottom: 0px; margin-bottom: 0px;
} }
......
ruoyi-ui/src/views/smartSchool/electronicArchives/professionalDevelopment/teacherAwards/index.vue
...@@ -133,7 +133,7 @@ ...@@ -133,7 +133,7 @@
<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" prop="auditState" sortable width="120"> <el-table-column label="审核状态" align="center" prop="auditState" sortable width="120" fixed="right">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.audit_states" :value="scope.row.auditState" /> <dict-tag :options="dict.type.audit_states" :value="scope.row.auditState" />
</template> </template>
...@@ -691,6 +691,33 @@ export default { ...@@ -691,6 +691,33 @@ export default {
}; };
</script> </script>
<style scoped lang="scss" > <style scoped lang="scss" >
.avatar-uploader .el-upload {
border: 1px dashed #d9d9d9;
border-radius: 6px;
cursor: pointer;
position: relative;
overflow: hidden;
}
.avatar-uploader .el-upload:hover {
border-color: #409eff;
}
.avatar-uploader-icon {
font-size: 30px;
color: #8c939d;
width: 70px;
height: 70px;
line-height: 70px;
text-align: center;
}
.avatar {
width: 300px;
height: 220px;
display: block;
}
::v-deep .el-form-item { ::v-deep .el-form-item {
margin-bottom: 0px; margin-bottom: 0px;
} }
......
ruoyi-ui/src/views/smartSchool/electronicArchives/professionalDevelopment/teachingAchievements/index.vue
...@@ -78,7 +78,7 @@ ...@@ -78,7 +78,7 @@
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="考试类型" prop="examType"> <el-form-item label="考试类型" prop="examType">
<el-select v-model="queryParams.examType" placeholder="请选择" style="width: 100%;"> <el-select v-model="queryParams.examType" clearable placeholder="请选择" style="width: 100%;">
<el-option v-for="dict in dict.type.exam_typeda" :key="dict.value" :label="dict.label" <el-option v-for="dict in dict.type.exam_typeda" :key="dict.value" :label="dict.label"
:value="dict.value"> :value="dict.value">
</el-option> </el-option>
...@@ -95,7 +95,7 @@ ...@@ -95,7 +95,7 @@
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="班级类型" prop="classType"> <el-form-item label="班级类型" prop="classType">
<el-select v-model="queryParams.classType" placeholder="请选择" style="width: 100%;"> <el-select v-model="queryParams.classType" clearable 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>
...@@ -148,35 +148,37 @@ ...@@ -148,35 +148,37 @@
: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" width="120px" /> <el-table-column label="学年" align="center" prop="schoolYear" sortable fixed="left" width="120px"
<el-table-column label="学期" align="center" prop="semester" sortable fixed="left" width="120px"> show-overflow-tooltip />
<el-table-column label="学期" align="center" prop="semester" sortable fixed="left" width="120px"
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="examTime" width="180" sortable> <el-table-column label="考试时间" align="center" prop="examTime" width="180" sortable show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
<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 width="120px"> <el-table-column label="考试类型" align="center" prop="examType" sortable width="120px" show-overflow-tooltip>
<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>
</el-table-column> </el-table-column>
<el-table-column label="届别" align="center" prop="year" sortable /> <el-table-column label="届别" align="center" prop="year" sortable show-overflow-tooltip />
<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>
</el-table-column> </el-table-column>
<el-table-column label="姓名" align="center" prop="userName" sortable /> <el-table-column label="姓名" align="center" prop="userName" 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="className" sortable> <el-table-column label="班级" align="center" prop="className" sortable show-overflow-tooltip>
</el-table-column> </el-table-column>
<el-table-column label="班级类型" align="center" sortable show-overflow-tooltip width="180px"> <el-table-column label="班级类型" align="center" sortable show-overflow-tooltip width="180px">
<template slot-scope="scope"> <template slot-scope="scope">
...@@ -188,7 +190,8 @@ ...@@ -188,7 +190,8 @@
</span> </span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="考核分" align="center" prop="assessmentScore" sortable width="100px" /> <el-table-column label="考核分" align="center" prop="assessmentScore" sortable width="100px"
show-overflow-tooltip />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="180px" fixed="right"> <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)"
...@@ -218,6 +221,12 @@ ...@@ -218,6 +221,12 @@
</el-upload> </el-upload>
</el-form-item> </el-form-item>
</el-form> </el-form>
<div class="mask" v-if="importing">
<div class="mask-content">
<i class="el-icon-loading"></i>
<span>正在导入，请稍候...</span>
</div>
</div>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitFileForm">确 定</el-button> <el-button type="primary" @click="submitFileForm">确 定</el-button>
<el-button @click="cancelFile">取 消</el-button> <el-button @click="cancelFile">取 消</el-button>
...@@ -229,7 +238,7 @@ ...@@ -229,7 +238,7 @@
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="学年" prop="schoolYear"> <el-form-item label="学年" prop="schoolYear">
<el-select v-model="form.schoolYear" placeholder="请选择" style="width: 100%;"> <el-select v-model="form.schoolYear" clearable placeholder="请选择" style="width: 100%;">
<el-option v-for="dict in dict.type.yearda" :key="dict.value" :label="dict.label" <el-option v-for="dict in dict.type.yearda" :key="dict.value" :label="dict.label"
:value="dict.value"> :value="dict.value">
</el-option> </el-option>
...@@ -238,7 +247,7 @@ ...@@ -238,7 +247,7 @@
</el-col> </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="form.semester" placeholder="请选择" style="width: 100%;"> <el-select v-model="form.semester" clearable 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"></el-option> :value="dict.value"></el-option>
</el-select> </el-select>
...@@ -255,7 +264,7 @@ ...@@ -255,7 +264,7 @@
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="考试类型" prop="examType"> <el-form-item label="考试类型" prop="examType">
<el-select v-model="form.examType" placeholder="请选择" style="width: 100%;"> <el-select v-model="form.examType" clearable placeholder="请选择" style="width: 100%;">
<el-option v-for="dict in dict.type.exam_typeda" :key="dict.value" :label="dict.label" <el-option v-for="dict in dict.type.exam_typeda" :key="dict.value" :label="dict.label"
:value="dict.value"> :value="dict.value">
</el-option> </el-option>
...@@ -266,7 +275,7 @@ ...@@ -266,7 +275,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="form.year" placeholder="请选择" style="width: 100%;"> <el-select v-model="form.year" clearable 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>
...@@ -275,7 +284,7 @@ ...@@ -275,7 +284,7 @@
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="年级" prop="grade"> <el-form-item label="年级" prop="grade">
<el-select v-model="form.grade" placeholder="请选择" style="width: 100%;"> <el-select v-model="form.grade" clearable placeholder="请选择" style="width: 100%;">
<el-option v-for="dict in dict.type.grade_da" :key="dict.value" :label="dict.label" <el-option v-for="dict in dict.type.grade_da" :key="dict.value" :label="dict.label"
:value="dict.value"> :value="dict.value">
</el-option> </el-option>
...@@ -286,19 +295,19 @@ ...@@ -286,19 +295,19 @@
<el-row> <el-row>
<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="请输入用户姓名" clearable />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="身份证号" prop="idCard"> <el-form-item label="身份证号" prop="idCard">
<el-input v-model="form.idCard" placeholder="请输入身份证号" /> <el-input v-model="form.idCard" placeholder="请输入身份证号" clearable />
</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="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%;" clearable>
<el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value" :label="dict.label" <el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value" :label="dict.label"
:value="dict.value"> :value="dict.value">
</el-option> </el-option>
...@@ -307,14 +316,14 @@ ...@@ -307,14 +316,14 @@
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="班级" prop="className"> <el-form-item label="班级" prop="className">
<el-input v-model="form.className" placeholder="请输入班级" /> <el-input v-model="form.className" placeholder="请输入班级" clearable />
</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="classType"> <el-form-item label="班级类型" prop="classType">
<el-select v-model="form.classType" multiple placeholder="请选择" style="width: 100%;"> <el-select v-model="form.classType" multiple placeholder="请选择" clearable 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>
...@@ -323,12 +332,12 @@ ...@@ -323,12 +332,12 @@
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="考核分" prop="assessmentScore"> <el-form-item label="考核分" prop="assessmentScore">
<el-input v-model="form.assessmentScore" placeholder="请输入考核分" type="number" /> <el-input v-model="form.assessmentScore" placeholder="请输入考核分" type="number" clearable />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-form-item label="备注" prop="remark"> <el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" placeholder="请输入备注" /> <el-input v-model="form.remark" placeholder="请输入备注" clearable />
</el-form-item> </el-form-item>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
...@@ -349,6 +358,7 @@ export default { ...@@ -349,6 +358,7 @@ export default {
dicts: ["teaching_subjects", 'semester_jsdzda', 'exam_typeda', 'grade_da', 'class_type', 'yearda', 'rankda', 'audit_states'], dicts: ["teaching_subjects", 'semester_jsdzda', 'exam_typeda', 'grade_da', 'class_type', 'yearda', 'rankda', 'audit_states'],
data() { data() {
return { return {
importing: false,
uploadOpen: false, uploadOpen: false,
upload: { upload: {
// 是否显示弹出层（用户导入） // 是否显示弹出层（用户导入）
...@@ -447,9 +457,7 @@ export default { ...@@ -447,9 +457,7 @@ export default {
assessmentScore: [ assessmentScore: [
{ required: true, message: "考核分不能为空", trigger: "blur" } { required: true, message: "考核分不能为空", trigger: "blur" }
], ],
delFlag: [
{ required: true, message: "删除状态不能为空", trigger: "blur" }
]
} }
}; };
}, },
...@@ -527,12 +535,14 @@ export default { ...@@ -527,12 +535,14 @@ export default {
}, },
handleFileUploadProgress(event, file, fileList) { handleFileUploadProgress(event, file, fileList) {
this.upload.isUploading = true; this.upload.isUploading = true;
this.importing = true;
// console.log(event, file, fileList); // console.log(event, file, fileList);
}, },
// 文件上传成功处理 // 文件上传成功处理
handleFileSuccess(response, file, fileList) { handleFileSuccess(response, file, fileList) {
this.uploadOpen = false this.uploadOpen = false
this.upload.isUploading = false this.upload.isUploading = false
this.importing = false;
this.$refs.upload.clearFiles() this.$refs.upload.clearFiles()
this.$alert("<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" + response.msg + '</div>', '导入结果', { dangerouslyUseHTMLString: true }) this.$alert("<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" + response.msg + '</div>', '导入结果', { dangerouslyUseHTMLString: true })
this.getList() this.getList()
...@@ -648,4 +658,24 @@ export default { ...@@ -648,4 +658,24 @@ export default {
.search ::v-deep .el-form-item__content { .search ::v-deep .el-form-item__content {
width: 200px width: 200px
} }
.mask {
position: fixed;
top: 0;
left: 0;
width: 100%;
height: 100%;
background-color: rgba(0, 0, 0, 0.5);
display: flex;
align-items: center;
justify-content: center;
}
.mask-content {
display: flex;
align-items: center;
justify-content: center;
color: #1a74be;
font-size: 15px;
}
</style> </style>
\ No newline at end of file
ruoyi-ui/src/views/smartSchool/electronicArchives/professionalDevelopment/teamAward/index.vue
...@@ -112,6 +112,11 @@ ...@@ -112,6 +112,11 @@
<el-table-column label="团队成员贡献情况" align="center" prop="teamMembersContribution" sortable width="200" <el-table-column label="团队成员贡献情况" align="center" prop="teamMembersContribution" sortable width="200"
show-overflow-tooltip /> show-overflow-tooltip />
<el-table-column label="备注" align="center" prop="remark" sortable show-overflow-tooltip /> <el-table-column label="备注" align="center" prop="remark" sortable show-overflow-tooltip />
<el-table-column label="审核状态" align="center" prop="auditState" sortable width="120" fixed="right">
<template slot-scope="scope">
<dict-tag :options="dict.type.audit_states" :value="scope.row.auditState" />
</template>
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="180" fixed="right"> <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']"
...@@ -190,12 +195,12 @@ ...@@ -190,12 +195,12 @@
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="团队成员贡献情况" prop="teamMembersContribution"> <el-form-item label="团队成员贡献情况" prop="teamMembersContribution">
<el-input v-model="form.teamMembersContribution" placeholder="请输入内容" /> <el-input v-model="form.teamMembersContribution" type="textarea" placeholder="请输入内容" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="备注" prop="remark"> <el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" placeholder="请输入内容" /> <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
...@@ -289,7 +294,7 @@ ...@@ -289,7 +294,7 @@
import { listAward, getAward, delAward, addAward, updateAward, audit } from "@/api/smartSchool/electronicArchives/teamAward"; import { listAward, getAward, delAward, addAward, updateAward, audit } from "@/api/smartSchool/electronicArchives/teamAward";
export default { export default {
name: "Award", name: "Award",
dicts: ["teaching_subjects", 'semester_jsdzda', 'exam_typeda', 'grade_da', 'class_type', 'yearda', 'rankda'], dicts: ["teaching_subjects", 'semester_jsdzda', 'exam_typeda', 'grade_da', 'class_type', 'yearda', 'rankda', 'audit_states'],
data() { data() {
return { return {
// 遮罩层 // 遮罩层
......
ruoyi-ui/src/views/smartSchool/electronicArchives/professionalDevelopment/tutorAward/index.vue
...@@ -155,7 +155,7 @@ ...@@ -155,7 +155,7 @@
<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" prop="auditstate" sortable width="120"> <el-table-column label="审核状态" align="center" prop="auditstate" sortable width="120" fixed="right">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.audit_states" :value="scope.row.auditstate" /> <dict-tag :options="dict.type.audit_states" :value="scope.row.auditstate" />
</template> </template>
...@@ -764,6 +764,33 @@ export default { ...@@ -764,6 +764,33 @@ export default {
}; };
</script> </script>
<style scoped lang="scss" > <style scoped lang="scss" >
.avatar-uploader .el-upload {
border: 1px dashed #d9d9d9;
border-radius: 6px;
cursor: pointer;
position: relative;
overflow: hidden;
}
.avatar-uploader .el-upload:hover {
border-color: #409eff;
}
.avatar-uploader-icon {
font-size: 30px;
color: #8c939d;
width: 70px;
height: 70px;
line-height: 70px;
text-align: center;
}
.avatar {
width: 300px;
height: 220px;
display: block;
}
::v-deep .el-form-item { ::v-deep .el-form-item {
margin-bottom: 0px; margin-bottom: 0px;
} }
......
ruoyi-ui/src/views/smartSchool/electronicArchives/teacherAssessment/index.vue
...@@ -126,7 +126,8 @@ ...@@ -126,7 +126,8 @@
:default-sort="{ prop: 'schoolYear', order: 'descending' }" :row-style="{ height: '0' }" :default-sort="{ prop: 'schoolYear', order: 'descending' }" :row-style="{ height: '0' }"
: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"
show-overflow-tooltip />
<el-table-column label="学年" align="center" prop="schoolYear" sortable fixed="left" width="130px <el-table-column label="学年" align="center" prop="schoolYear" sortable fixed="left" width="130px
" show-overflow-tooltip /> " show-overflow-tooltip />
<el-table-column label="学期" align="center" prop="semester" sortable fixed="left" width="130px" <el-table-column label="学期" align="center" prop="semester" sortable fixed="left" width="130px"
...@@ -158,14 +159,14 @@ ...@@ -158,14 +159,14 @@
<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 width="130px"
width="130px" show-overflow-tooltip /> show-overflow-tooltip />
<el-table-column label="智育考核成绩" align="center" prop="intellEduCheckAchievement" sortable fixed="right" <el-table-column label="智育考核成绩" align="center" prop="intellEduCheckAchievement" sortable width="130px"
width="130px" show-overflow-tooltip /> show-overflow-tooltip />
<!-- <el-table-column label="总考核成绩" align="center" prop="totalCheckAchievement" sortable fixed="right" <!-- <el-table-column label="总考核成绩" align="center" prop="totalCheckAchievement" sortable fixed="right"
width="130px" /> --> width="130px" /> -->
<el-table-column label="备注" align="center" prop="remark" sortable fixed="right" /> <el-table-column label="备注" align="center" prop="remark" sortable show-overflow-tooltip />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" width="150px"> <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)"
...@@ -175,7 +176,6 @@ ...@@ -175,7 +176,6 @@
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<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" />
...@@ -185,7 +185,7 @@ ...@@ -185,7 +185,7 @@
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="学期" prop="semester"> <el-form-item label="学期" prop="semester">
<el-select v-model="form.semester" placeholder="请选择" style="width: 100%;"> <el-select v-model="form.semester" clearable 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>
...@@ -194,7 +194,7 @@ ...@@ -194,7 +194,7 @@
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="届别" prop="year"> <el-form-item label="届别" prop="year">
<el-select v-model="form.year" placeholder="请选择" style="width: 100%;"> <el-select v-model="form.year" clearable 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>
...@@ -205,7 +205,7 @@ ...@@ -205,7 +205,7 @@
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="学年" prop="schoolYear"> <el-form-item label="学年" prop="schoolYear">
<el-select v-model="form.schoolYear" placeholder="请选择" style="width: 100%;"> <el-select v-model="form.schoolYear" clearable placeholder="请选择" style="width: 100%;">
<el-option v-for="dict in dict.type.yearda" :key="dict.value" :label="dict.label" <el-option v-for="dict in dict.type.yearda" :key="dict.value" :label="dict.label"
:value="dict.value"> :value="dict.value">
</el-option> </el-option>
...@@ -214,7 +214,7 @@ ...@@ -214,7 +214,7 @@
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="年级" prop="grade"> <el-form-item label="年级" prop="grade">
<el-select v-model="form.grade" placeholder="请选择" style="width: 100%;"> <el-select v-model="form.grade" clearable placeholder="请选择" style="width: 100%;">
<el-option v-for="dict in dict.type.grade_da" :key="dict.value" :label="dict.label" <el-option v-for="dict in dict.type.grade_da" :key="dict.value" :label="dict.label"
:value="dict.value"> :value="dict.value">
</el-option> </el-option>
...@@ -225,7 +225,7 @@ ...@@ -225,7 +225,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" placeholder="请选择" style="width: 100%;"> <el-select v-model="form.className" clearable 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>
...@@ -234,7 +234,7 @@ ...@@ -234,7 +234,7 @@
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="教师姓名" prop="teacherName"> <el-form-item label="教师姓名" prop="teacherName">
<el-input v-model="form.teacherName" placeholder="请输入" /> <el-input v-model="form.teacherName" placeholder="请输入" clearable />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
...@@ -242,12 +242,12 @@ ...@@ -242,12 +242,12 @@
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="身份证号" prop="idCard"> <el-form-item label="身份证号" prop="idCard">
<el-input v-model="form.idCard" placeholder="请输入" /> <el-input v-model="form.idCard" placeholder="请输入" clearable />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="德育考核成绩" prop="moralEduCheckAchievement"> <el-form-item label="德育考核成绩" prop="moralEduCheckAchievement">
<el-input v-model="form.moralEduCheckAchievement" type="number" placeholder="请输入" /> <el-input v-model="form.moralEduCheckAchievement" type="number" placeholder="请输入" clearable />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
...@@ -255,12 +255,12 @@ ...@@ -255,12 +255,12 @@
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="智育考核成绩" prop="intellEduCheckAchievement"> <el-form-item label="智育考核成绩" prop="intellEduCheckAchievement">
<el-input v-model="form.intellEduCheckAchievement" type="number" placeholder="请输入" /> <el-input v-model="form.intellEduCheckAchievement" type="number" placeholder="请输入" clearable />
</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-form-item label="总考核成绩" prop="totalCheckAchievement">
<el-input v-model="form.totalCheckAchievement" type="number" placeholder="请输入" /> <el-input v-model="form.totalCheckAchievement" type="number" placeholder="请输入" clearable />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
...@@ -268,7 +268,7 @@ ...@@ -268,7 +268,7 @@
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="班级类型" prop="classType"> <el-form-item label="班级类型" prop="classType">
<el-select v-model="form.classType" placeholder="请选择" style="width: 100%"> <el-select v-model="form.classType" placeholder="请选择" clearable 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>
...@@ -277,7 +277,7 @@ ...@@ -277,7 +277,7 @@
</el-col> </el-col>
<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="请选择" clearable style="width: 100%">
<el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value" :label="dict.label" <el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value" :label="dict.label"
:value="dict.value"> :value="dict.value">
</el-option> </el-option>
...@@ -286,7 +286,7 @@ ...@@ -286,7 +286,7 @@
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="备注" prop="remark"> <el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" type="textarea" placeholder="请输入" /> <el-input v-model="form.remark" type="textarea" placeholder="请输入" clearable />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
...@@ -318,6 +318,12 @@ ...@@ -318,6 +318,12 @@
</el-upload> </el-upload>
</el-form-item> </el-form-item>
</el-form> </el-form>
<div class="mask" v-if="importing">
<div class="mask-content">
<i class="el-icon-loading"></i>
<span>正在导入，请稍候...</span>
</div>
</div>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitFileForm">确 定</el-button> <el-button type="primary" @click="submitFileForm">确 定</el-button>
<el-button @click="cancelFile">取 消</el-button> <el-button @click="cancelFile">取 消</el-button>
...@@ -334,6 +340,7 @@ export default { ...@@ -334,6 +340,7 @@ export default {
dicts: ["teaching_subjects", 'semester_jsdzda', 'exam_typeda', 'grade_da', 'class_type', 'yearda', 'rankda', 'appointment_situation', 'appointment_positions', 'class_num', 'audit_states'], dicts: ["teaching_subjects", 'semester_jsdzda', 'exam_typeda', 'grade_da', 'class_type', 'yearda', 'rankda', 'appointment_situation', 'appointment_positions', 'class_num', 'audit_states'],
data() { data() {
return { return {
importing: false,
uploadOpen: false, uploadOpen: false,
upload: { upload: {
// 是否显示弹出层（用户导入） // 是否显示弹出层（用户导入）
...@@ -465,7 +472,7 @@ export default { ...@@ -465,7 +472,7 @@ export default {
}, },
handleFileUploadProgress(event, file, fileList) { handleFileUploadProgress(event, file, fileList) {
this.upload.isUploading = true; this.upload.isUploading = true;
this.importing = true;
}, },
// 提交上传文件 // 提交上传文件
submitFileForm() { submitFileForm() {
...@@ -480,6 +487,7 @@ export default { ...@@ -480,6 +487,7 @@ export default {
handleFileSuccess(response, file, fileList) { handleFileSuccess(response, file, fileList) {
this.uploadOpen = false; this.uploadOpen = false;
this.upload.isUploading = false; this.upload.isUploading = false;
this.importing = false;
this.$refs.upload.clearFiles(); this.$refs.upload.clearFiles();
this.$alert( this.$alert(
"<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" + "<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" +
...@@ -616,4 +624,24 @@ export default { ...@@ -616,4 +624,24 @@ export default {
.search ::v-deep .el-form-item__content { .search ::v-deep .el-form-item__content {
width: 200px width: 200px
} }
.mask {
position: fixed;
top: 0;
left: 0;
width: 100%;
height: 100%;
background-color: rgba(0, 0, 0, 0.5);
display: flex;
align-items: center;
justify-content: center;
}
.mask-content {
display: flex;
align-items: center;
justify-content: center;
color: #1a74be;
font-size: 15px;
}
</style> </style>
\ No newline at end of file
ruoyi-ui/src/views/smartSchool/electronicArchives/workloadInformation/index.vue
...@@ -220,7 +220,7 @@ ...@@ -220,7 +220,7 @@
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="学年" prop="schoolYear"> <el-form-item label="学年" prop="schoolYear">
<el-select v-model="form.schoolYear" placeholder="请选择" style="width: 100%;"> <el-select v-model="form.schoolYear" placeholder="请选择" clearable style="width: 100%;">
<el-option v-for="dict in dict.type.yearda" :key="dict.value" :label="dict.label" <el-option v-for="dict in dict.type.yearda" :key="dict.value" :label="dict.label"
:value="dict.value"> :value="dict.value">
</el-option> </el-option>
...@@ -229,7 +229,7 @@ ...@@ -229,7 +229,7 @@
</el-col> </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="form.semester" placeholder="请选择" style="width: 100%;"> <el-select v-model="form.semester" placeholder="请选择" clearable 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>
...@@ -240,7 +240,7 @@ ...@@ -240,7 +240,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="form.year" placeholder="请选择" style="width: 100%;"> <el-select v-model="form.year" placeholder="请选择" clearable 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>
...@@ -249,7 +249,7 @@ ...@@ -249,7 +249,7 @@
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="年级" prop="grade"> <el-form-item label="年级" prop="grade">
<el-select v-model="form.grade" placeholder="请选择" style="width: 100%;"> <el-select v-model="form.grade" placeholder="请选择" clearable style="width: 100%;">
<el-option v-for="dict in dict.type.grade_da" :key="dict.value" :label="dict.label" <el-option v-for="dict in dict.type.grade_da" :key="dict.value" :label="dict.label"
:value="dict.value"> :value="dict.value">
</el-option> </el-option>
...@@ -260,12 +260,12 @@ ...@@ -260,12 +260,12 @@
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="姓名" prop="name"> <el-form-item label="姓名" prop="name">
<el-input v-model="form.name" placeholder="请输入" /> <el-input v-model="form.name" placeholder="请输入" clearable />
</el-form-item> </el-form-item>
</el-col> </el-col>
<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="请选择" clearable style="width: 100%">
<el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value" :label="dict.label" <el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value" :label="dict.label"
:value="dict.value"> :value="dict.value">
</el-option> </el-option>
...@@ -276,12 +276,12 @@ ...@@ -276,12 +276,12 @@
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="身份证号" prop="idCard"> <el-form-item label="身份证号" prop="idCard">
<el-input v-model="form.idCard" placeholder="请输入" /> <el-input v-model="form.idCard" placeholder="请输入" clearable />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="聘任岗位" prop="appointmentPost"> <el-form-item label="聘任岗位" prop="appointmentPost">
<el-select v-model="form.appointmentPost" placeholder="请选择" style="width: 100%"> <el-select v-model="form.appointmentPost" placeholder="请选择" clearable style="width: 100%">
<el-option v-for="dict in dict.type.appointment_positions" :key="dict.value" <el-option v-for="dict in dict.type.appointment_positions" :key="dict.value"
:label="dict.label" :value="dict.value"> :label="dict.label" :value="dict.value">
</el-option> </el-option>
...@@ -292,12 +292,12 @@ ...@@ -292,12 +292,12 @@
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="聘任职务" prop="appointmentPosition"> <el-form-item label="聘任职务" prop="appointmentPosition">
<el-input v-model="form.appointmentPosition" placeholder="请输入" /> <el-input v-model="form.appointmentPosition" placeholder="请输入" clearable />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="聘任情况" prop="appointmentSituation"> <el-form-item label="聘任情况" prop="appointmentSituation">
<el-select v-model="form.appointmentSituation" placeholder="请选择" style="width: 100%"> <el-select v-model="form.appointmentSituation" placeholder="请选择" clearable style="width: 100%">
<el-option v-for="dict in dict.type.appointment_situation" :key="dict.value" <el-option v-for="dict in dict.type.appointment_situation" :key="dict.value"
:label="dict.label" :value="dict.value"> :label="dict.label" :value="dict.value">
</el-option> </el-option>
...@@ -308,12 +308,12 @@ ...@@ -308,12 +308,12 @@
<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-input v-model="form.className" placeholder="请输入" /> <el-input v-model="form.className" placeholder="请输入" clearable />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <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" multiple clearable 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>
...@@ -324,31 +324,31 @@ ...@@ -324,31 +324,31 @@
<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" clearable 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" clearable 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" clearable 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="请输入" clearable />
</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="remark"> <el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" type="textarea" placeholder="请输入内容" /> <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" clearable />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
...@@ -364,7 +364,7 @@ ...@@ -364,7 +364,7 @@
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="学年" prop="schoolYear"> <el-form-item label="学年" prop="schoolYear">
<el-select v-model="form.schoolYear" placeholder="请选择" style="width: 100%;"> <el-select v-model="form.schoolYear" clearable placeholder="请选择" style="width: 100%;">
<el-option v-for="dict in dict.type.yearda" :key="dict.value" :label="dict.label" <el-option v-for="dict in dict.type.yearda" :key="dict.value" :label="dict.label"
:value="dict.value"> :value="dict.value">
</el-option> </el-option>
...@@ -373,7 +373,7 @@ ...@@ -373,7 +373,7 @@
</el-col> </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="form.semester" placeholder="请选择" style="width: 100%;"> <el-select v-model="form.semester" clearable 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>
...@@ -384,7 +384,7 @@ ...@@ -384,7 +384,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="form.year" placeholder="请选择" style="width: 100%;"> <el-select v-model="form.year" clearable 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>
...@@ -393,7 +393,7 @@ ...@@ -393,7 +393,7 @@
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="年级" prop="grade"> <el-form-item label="年级" prop="grade">
<el-select v-model="form.grade" placeholder="请选择" style="width: 100%;"> <el-select v-model="form.grade" clearable placeholder="请选择" style="width: 100%;">
<el-option v-for="dict in dict.type.grade_da" :key="dict.value" :label="dict.label" <el-option v-for="dict in dict.type.grade_da" :key="dict.value" :label="dict.label"
:value="dict.value"> :value="dict.value">
</el-option> </el-option>
...@@ -404,12 +404,12 @@ ...@@ -404,12 +404,12 @@
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="姓名" prop="name"> <el-form-item label="姓名" prop="name">
<el-input v-model="form.name" placeholder="请输入" /> <el-input v-model="form.name" placeholder="请输入" clearable />
</el-form-item> </el-form-item>
</el-col> </el-col>
<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="请选择" clearable style="width: 100%">
<el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value" :label="dict.label" <el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value" :label="dict.label"
:value="dict.value"> :value="dict.value">
</el-option> </el-option>
...@@ -420,12 +420,12 @@ ...@@ -420,12 +420,12 @@
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="身份证号" prop="idCard"> <el-form-item label="身份证号" prop="idCard">
<el-input v-model="form.idCard" placeholder="请输入" /> <el-input v-model="form.idCard" placeholder="请输入" clearable />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="聘任岗位" prop="appointmentPost"> <el-form-item label="聘任岗位" prop="appointmentPost">
<el-select v-model="form.appointmentPost" placeholder="请选择" style="width: 100%"> <el-select v-model="form.appointmentPost" placeholder="请选择" clearable style="width: 100%">
<el-option v-for="dict in dict.type.appointment_positions" :key="dict.value" <el-option v-for="dict in dict.type.appointment_positions" :key="dict.value"
:label="dict.label" :value="dict.value"> :label="dict.label" :value="dict.value">
</el-option> </el-option>
...@@ -436,12 +436,12 @@ ...@@ -436,12 +436,12 @@
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="聘任职务" prop="appointmentPosition"> <el-form-item label="聘任职务" prop="appointmentPosition">
<el-input v-model="form.appointmentPosition" placeholder="请输入" /> <el-input v-model="form.appointmentPosition" placeholder="请输入" clearable />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="聘任情况" prop="appointmentSituation"> <el-form-item label="聘任情况" prop="appointmentSituation">
<el-select v-model="form.appointmentSituation" placeholder="请选择" style="width: 100%"> <el-select v-model="form.appointmentSituation" placeholder="请选择" clearable style="width: 100%">
<el-option v-for="dict in dict.type.appointment_situation" :key="dict.value" <el-option v-for="dict in dict.type.appointment_situation" :key="dict.value"
:label="dict.label" :value="dict.value"> :label="dict.label" :value="dict.value">
</el-option> </el-option>
...@@ -452,12 +452,12 @@ ...@@ -452,12 +452,12 @@
<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-input v-model="form.className" placeholder="请输入" /> <el-input v-model="form.className" placeholder="请输入" clearable />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <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" multiple placeholder="请选择" clearable 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>
...@@ -468,36 +468,36 @@ ...@@ -468,36 +468,36 @@
<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="请输入" clearable />
</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="请输入" clearable />
</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="请输入" clearable />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="合计" prop="amountTo"> <el-form-item label="合计" prop="amountTo">
<el-input v-model="form.amountTo" placeholder="请输入合计" /> <el-input v-model="form.amountTo" placeholder="请输入合计" clearable />
</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="userName"> <el-form-item label="证明人" prop="userName">
<el-input v-model="form.userName" placeholder="请输入证明人" /> <el-input v-model="form.userName" placeholder="请输入证明人" clearable />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="备注" prop="remark"> <el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" type="textarea" placeholder="请输入内容" /> <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" clearable />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
...@@ -675,6 +675,12 @@ ...@@ -675,6 +675,12 @@
</el-upload> </el-upload>
</el-form-item> </el-form-item>
</el-form> </el-form>
<div class="mask" v-if="importing">
<div class="mask-content">
<i class="el-icon-loading"></i>
<span>正在导入，请稍候...</span>
</div>
</div>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitFileForm">确 定</el-button> <el-button type="primary" @click="submitFileForm">确 定</el-button>
<el-button @click="cancelFile">取 消</el-button> <el-button @click="cancelFile">取 消</el-button>
...@@ -693,6 +699,7 @@ export default { ...@@ -693,6 +699,7 @@ export default {
data() { data() {
return { return {
importing: false,
uploadOpen: false, uploadOpen: false,
upload: { upload: {
// 是否显示弹出层（用户导入） // 是否显示弹出层（用户导入）
...@@ -824,6 +831,7 @@ export default { ...@@ -824,6 +831,7 @@ export default {
}, },
handleFileUploadProgress(event, file, fileList) { handleFileUploadProgress(event, file, fileList) {
this.upload.isUploading = true; this.upload.isUploading = true;
this.importing = true;
}, },
// 提交上传文件 // 提交上传文件
...@@ -839,6 +847,7 @@ export default { ...@@ -839,6 +847,7 @@ export default {
handleFileSuccess(response, file, fileList) { handleFileSuccess(response, file, fileList) {
this.uploadOpen = false; this.uploadOpen = false;
this.upload.isUploading = false; this.upload.isUploading = false;
this.importing = false;
this.$refs.upload.clearFiles(); this.$refs.upload.clearFiles();
this.$alert( this.$alert(
"<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" + "<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" +
...@@ -1020,4 +1029,24 @@ export default { ...@@ -1020,4 +1029,24 @@ export default {
.search ::v-deep .el-form-item__content { .search ::v-deep .el-form-item__content {
width: 200px width: 200px
} }
.mask {
position: fixed;
top: 0;
left: 0;
width: 100%;
height: 100%;
background-color: rgba(0, 0, 0, 0.5);
display: flex;
align-items: center;
justify-content: center;
}
.mask-content {
display: flex;
align-items: center;
justify-content: center;
color: #1a74be;
font-size: 15px;
}
</style> </style>
\ No newline at end of file
ruoyi-ui/src/views/smartSchool/personWork/awardTutoringstu/index.vue
...@@ -138,7 +138,7 @@ ...@@ -138,7 +138,7 @@
<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" prop="auditstate" sortable width="120"> <el-table-column label="审核状态" align="center" prop="auditstate" sortable width="120" fixed="right">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.audit_states" :value="scope.row.auditstate" /> <dict-tag :options="dict.type.audit_states" :value="scope.row.auditstate" />
</template> </template>
...@@ -575,6 +575,33 @@ export default { ...@@ -575,6 +575,33 @@ export default {
}; };
</script> </script>
<style scoped lang="scss" > <style scoped lang="scss" >
.avatar-uploader .el-upload {
border: 1px dashed #d9d9d9;
border-radius: 6px;
cursor: pointer;
position: relative;
overflow: hidden;
}
.avatar-uploader .el-upload:hover {
border-color: #409eff;
}
.avatar-uploader-icon {
font-size: 30px;
color: #8c939d;
width: 70px;
height: 70px;
line-height: 70px;
text-align: center;
}
.avatar {
width: 300px;
height: 220px;
display: block;
}
::v-deep .el-form-item { ::v-deep .el-form-item {
margin-bottom: 0px; margin-bottom: 0px;
} }
......
ruoyi-ui/src/views/smartSchool/personWork/comprehensiveHonors/index.vue
...@@ -122,7 +122,7 @@ ...@@ -122,7 +122,7 @@
<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" prop="auditState" sortable width="120"> <el-table-column label="审核状态" align="center" prop="auditState" sortable width="120" fixed="right">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.audit_states" :value="scope.row.auditState" /> <dict-tag :options="dict.type.audit_states" :value="scope.row.auditState" />
</template> </template>
...@@ -592,6 +592,33 @@ export default { ...@@ -592,6 +592,33 @@ export default {
}; };
</script> </script>
<style scoped lang="scss" > <style scoped lang="scss" >
.avatar-uploader .el-upload {
border: 1px dashed #d9d9d9;
border-radius: 6px;
cursor: pointer;
position: relative;
overflow: hidden;
}
.avatar-uploader .el-upload:hover {
border-color: #409eff;
}
.avatar-uploader-icon {
font-size: 30px;
color: #8c939d;
width: 70px;
height: 70px;
line-height: 70px;
text-align: center;
}
.avatar {
width: 300px;
height: 220px;
display: block;
}
::v-deep .el-form-item { ::v-deep .el-form-item {
margin-bottom: 0px; margin-bottom: 0px;
} }
......
ruoyi-ui/src/views/smartSchool/personWork/essaysWritings/index.vue
...@@ -132,6 +132,12 @@ ...@@ -132,6 +132,12 @@
<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" prop="auditState" sortable width="120" fixed="right">
<template slot-scope="scope">
<dict-tag :options="dict.type.audit_states" :value="scope.row.auditState" />
</template>
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" width="150px"> <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']"
...@@ -261,7 +267,7 @@ export default { ...@@ -261,7 +267,7 @@ export default {
components: { components: {
SelectUser, SelectUser,
}, },
dicts: ["teaching_subjects", 'award_categories', 'awards_level', 'award_rank'], dicts: ["teaching_subjects", 'award_categories', 'awards_level', 'award_rank', 'audit_states'],
data() { data() {
return { return {
// 选择对应处理人 // 选择对应处理人
...@@ -588,6 +594,33 @@ export default { ...@@ -588,6 +594,33 @@ export default {
}; };
</script> </script>
<style scoped lang="scss" > <style scoped lang="scss" >
.avatar-uploader .el-upload {
border: 1px dashed #d9d9d9;
border-radius: 6px;
cursor: pointer;
position: relative;
overflow: hidden;
}
.avatar-uploader .el-upload:hover {
border-color: #409eff;
}
.avatar-uploader-icon {
font-size: 30px;
color: #8c939d;
width: 70px;
height: 70px;
line-height: 70px;
text-align: center;
}
.avatar {
width: 300px;
height: 220px;
display: block;
}
::v-deep .el-form-item { ::v-deep .el-form-item {
margin-bottom: 0px; margin-bottom: 0px;
} }
......
ruoyi-ui/src/views/smartSchool/personWork/examinationScore/index.vue
...@@ -121,7 +121,7 @@ ...@@ -121,7 +121,7 @@
<el-table-column label="增量情况" align="center" prop="incrementSituation" sortable width="150" /> <el-table-column label="增量情况" align="center" prop="incrementSituation" sortable width="150" />
<el-table-column label="有效数情况" align="center" prop="effectiveNumSituation" sortable width="180" /> <el-table-column label="有效数情况" align="center" prop="effectiveNumSituation" sortable width="180" />
<el-table-column label="其他情况" align="center" prop="other" sortable width="150" /> <el-table-column label="其他情况" align="center" prop="other" sortable width="150" />
<el-table-column label="审核状态" align="center" prop="auditState" sortable width="120"> <el-table-column label="审核状态" align="center" prop="auditState" sortable width="120" fixed="right">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.audit_states" :value="scope.row.auditState" /> <dict-tag :options="dict.type.audit_states" :value="scope.row.auditState" />
</template> </template>
......
ruoyi-ui/src/views/smartSchool/personWork/lectureAwards/index.vue
...@@ -132,6 +132,12 @@ ...@@ -132,6 +132,12 @@
<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" prop="auditState" sortable width="120" fixed="right">
<template slot-scope="scope">
<dict-tag :options="dict.type.audit_states" :value="scope.row.auditState" />
</template>
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" width="150px"> <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']"
...@@ -265,7 +271,7 @@ export default { ...@@ -265,7 +271,7 @@ export default {
components: { components: {
SelectUser, SelectUser,
}, },
dicts: ["teaching_subjects", 'award_categoriesjk', 'awards_level', 'award_rank'], dicts: ["teaching_subjects", 'award_categoriesjk', 'awards_level', 'award_rank', 'audit_states'],
data() { data() {
return { return {
isEdit: false, isEdit: false,
...@@ -591,6 +597,33 @@ export default { ...@@ -591,6 +597,33 @@ export default {
}; };
</script> </script>
<style scoped lang="scss" > <style scoped lang="scss" >
.avatar-uploader .el-upload {
border: 1px dashed #d9d9d9;
border-radius: 6px;
cursor: pointer;
position: relative;
overflow: hidden;
}
.avatar-uploader .el-upload:hover {
border-color: #409eff;
}
.avatar-uploader-icon {
font-size: 30px;
color: #8c939d;
width: 70px;
height: 70px;
line-height: 70px;
text-align: center;
}
.avatar {
width: 300px;
height: 220px;
display: block;
}
::v-deep .el-form-item { ::v-deep .el-form-item {
margin-bottom: 0px; margin-bottom: 0px;
} }
......
ruoyi-ui/src/views/smartSchool/personWork/projectResearch/index.vue
...@@ -131,7 +131,7 @@ ...@@ -131,7 +131,7 @@
<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" prop="auditState" sortable width="120"> <el-table-column label="审核状态" align="center" prop="auditState" sortable width="120" fixed="right">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.audit_states" :value="scope.row.auditState" /> <dict-tag :options="dict.type.audit_states" :value="scope.row.auditState" />
</template> </template>
...@@ -600,6 +600,33 @@ export default { ...@@ -600,6 +600,33 @@ export default {
}; };
</script> </script>
<style scoped lang="scss" > <style scoped lang="scss" >
.avatar-uploader .el-upload {
border: 1px dashed #d9d9d9;
border-radius: 6px;
cursor: pointer;
position: relative;
overflow: hidden;
}
.avatar-uploader .el-upload:hover {
border-color: #409eff;
}
.avatar-uploader-icon {
font-size: 30px;
color: #8c939d;
width: 70px;
height: 70px;
line-height: 70px;
text-align: center;
}
.avatar {
width: 300px;
height: 220px;
display: block;
}
::v-deep .el-form-item { ::v-deep .el-form-item {
margin-bottom: 0px; margin-bottom: 0px;
} }
......
ruoyi-ui/src/views/smartSchool/personWork/teacherAwards/index.vue
...@@ -133,6 +133,11 @@ ...@@ -133,6 +133,11 @@
<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" prop="auditState" sortable width="120" fixed="right">
<template slot-scope="scope">
<dict-tag :options="dict.type.audit_states" :value="scope.row.auditState" />
</template>
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" width="150px <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" width="150px
"> ">
<template slot-scope="scope"> <template slot-scope="scope">
...@@ -236,8 +241,7 @@ ...@@ -236,8 +241,7 @@
<el-upload v-loading="uploadLoading" class="avatar-uploader" action="#" accept="image/*" <el-upload v-loading="uploadLoading" class="avatar-uploader" action="#" accept="image/*"
:show-file-list="false" :on-success="handleAvatarSuccess" :show-file-list="false" :on-success="handleAvatarSuccess"
:before-upload="beforeAvatarUpload" :http-request="uploadImage"> :before-upload="beforeAvatarUpload" :http-request="uploadImage">
<img v-if="form.pictureUrl" :src="baseUrl + form.pictureUrl" <img v-if="form.pictureUrl" :src="baseUrl + form.pictureUrl" class="avatar" alt="" />
style="max-width: 100%; max-height: 100%" class="avatar" alt="" />
<i v-else class="el-icon-plus avatar-uploader-icon"></i> <i v-else class="el-icon-plus avatar-uploader-icon"></i>
</el-upload> </el-upload>
</el-form-item> </el-form-item>
...@@ -267,7 +271,7 @@ export default { ...@@ -267,7 +271,7 @@ export default {
components: { components: {
SelectUser, SelectUser,
}, },
dicts: ["teaching_subjects", 'award_categoriesjs', 'awards_level', 'award_rank'], dicts: ["teaching_subjects", 'award_categoriesjs', 'awards_level', 'award_rank', 'audit_states'],
data() { data() {
return { return {
// 选择对应处理人 // 选择对应处理人
...@@ -590,6 +594,33 @@ export default { ...@@ -590,6 +594,33 @@ export default {
}; };
</script> </script>
<style scoped lang="scss" > <style scoped lang="scss" >
.avatar-uploader .el-upload {
border: 1px dashed #d9d9d9;
border-radius: 6px;
cursor: pointer;
position: relative;
overflow: hidden;
}
.avatar-uploader .el-upload:hover {
border-color: #409eff;
}
.avatar-uploader-icon {
font-size: 30px;
color: #8c939d;
width: 70px;
height: 70px;
line-height: 70px;
text-align: center;
}
.avatar {
width: 300px;
height: 220px;
display: block;
}
::v-deep .el-form-item { ::v-deep .el-form-item {
margin-bottom: 0px; margin-bottom: 0px;
} }
......
ruoyi-ui/src/views/smartSchool/personWork/teamAward/index.vue
...@@ -112,12 +112,12 @@ ...@@ -112,12 +112,12 @@
width="180px" /> width="180px" />
<el-table-column label="团队成员贡献情况" align="center" prop="teamMembersContribution" sortable width="200" <el-table-column label="团队成员贡献情况" align="center" prop="teamMembersContribution" sortable width="200"
show-overflow-tooltip /> show-overflow-tooltip />
<el-table-column label="审核状态" align="center" prop="auditState" sortable width="120"> <el-table-column label="备注" align="center" prop="remark" sortable show-overflow-tooltip />
<el-table-column label="审核状态" align="center" prop="auditState" sortable width="120" fixed="right">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.audit_states" :value="scope.row.auditState" /> <dict-tag :options="dict.type.audit_states" :value="scope.row.auditState" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="备注" align="center" prop="remark" sortable />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="150" fixed="right"> <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)"
...@@ -200,12 +200,12 @@ ...@@ -200,12 +200,12 @@
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="团队成员贡献情况" prop="teamMembersContribution"> <el-form-item label="团队成员贡献情况" prop="teamMembersContribution">
<el-input v-model="form.teamMembersContribution" placeholder="请输入内容" /> <el-input v-model="form.teamMembersContribution" type="textarea" placeholder="请输入内容" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="备注" prop="remark"> <el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" placeholder="请输入内容" /> <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
......
ruoyi-ui/src/views/smartSchool/personWork/tutorAward/index.vue
...@@ -155,7 +155,7 @@ ...@@ -155,7 +155,7 @@
<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" prop="auditstate" sortable width="120"> <el-table-column label="审核状态" align="center" prop="auditstate" sortable width="120" fixed="right">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.audit_states" :value="scope.row.auditstate" /> <dict-tag :options="dict.type.audit_states" :value="scope.row.auditstate" />
</template> </template>
...@@ -648,6 +648,33 @@ export default { ...@@ -648,6 +648,33 @@ export default {
}; };
</script> </script>
<style scoped lang="scss" > <style scoped lang="scss" >
.avatar-uploader .el-upload {
border: 1px dashed #d9d9d9;
border-radius: 6px;
cursor: pointer;
position: relative;
overflow: hidden;
}
.avatar-uploader .el-upload:hover {
border-color: #409eff;
}
.avatar-uploader-icon {
font-size: 30px;
color: #8c939d;
width: 70px;
height: 70px;
line-height: 70px;
text-align: center;
}
.avatar {
width: 300px;
height: 220px;
display: block;
}
::v-deep .el-form-item { ::v-deep .el-form-item {
margin-bottom: 0px; margin-bottom: 0px;
} }
......
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