修改内容

This commit is contained in:
2025-09-23 15:48:38 +08:00
parent cb26ec9abe
commit baa8a81015
10 changed files with 90 additions and 98 deletions

View File

@@ -130,7 +130,7 @@
<el-upload center class="upload-demo" drag :auto-upload="false" :limit="1" :on-exceed="handleExceed" action="" <el-upload center class="upload-demo" drag :auto-upload="false" :limit="1" :on-exceed="handleExceed" action=""
:file-list="fileList" :on-change="fileChoose"> :file-list="fileList" :on-change="fileChoose">
<i class="el-icon-upload"></i> <i class="el-icon-upload"></i>
<div class="el-upload__text">将文件拖到此处<em>点击选择</em></div> <div class="el-upload__text">将文件拖到此处,<em>点击选择</em></div>
<div class="el-upload__tip" slot="tip">只能上传xlsx/xls文件 <el-link @click="downloadMode" type="primary" <div class="el-upload__tip" slot="tip">只能上传xlsx/xls文件 <el-link @click="downloadMode" type="primary"
size="mini">下载模板</el-link> size="mini">下载模板</el-link>
</div> </div>
@@ -285,7 +285,7 @@ export default {
// 下载申请信息模板 // 下载申请信息模板
downloadMode() { downloadMode() {
// 第一个sheet工作簿如果需要创建多个对应let多个sheetXdata即可 // 第一个sheet工作簿,如果需要创建多个,对应let多个sheetXdata即可
let sheet1data = [ let sheet1data = [
{ {
学号: "", 学号: "",
@@ -300,7 +300,7 @@ export default {
var sheet1 = XLSX.utils.json_to_sheet(sheet1data); var sheet1 = XLSX.utils.json_to_sheet(sheet1data);
// 创建一个新的空的workbook // 创建一个新的空的workbook
var wb = XLSX.utils.book_new(); var wb = XLSX.utils.book_new();
// 为每一个工作簿设置名称并添加到workbookexcel表 // 为每一个工作簿设置名称并添加到workbook(excel表)
XLSX.utils.book_append_sheet(wb, sheet1, "审核时间上传导入模板"); XLSX.utils.book_append_sheet(wb, sheet1, "审核时间上传导入模板");
const workbookBlob = workbook2blob(wb); // 辅助函数workbook2blob const workbookBlob = workbook2blob(wb); // 辅助函数workbook2blob
// 下载文档并添加文件名称 // 下载文档并添加文件名称
@@ -334,11 +334,11 @@ export default {
}, },
handleExceed(files, fileList) { handleExceed(files, fileList) {
this.$message.warning( this.$message.warning(
`当前限制选择 1 个文件本次选择了 ${files.length} 个文件共选择了 ${files.length + fileList.length} 个文件` `当前限制选择 1 个文件,本次选择了 ${files.length} 个文件,共选择了 ${files.length + fileList.length} 个文件`
); );
}, },
handleClose(done) { handleClose(done) {
this.$confirm('确认关闭').then(_ => { this.$confirm('确认关闭?').then(_ => {
this.tableData = []; this.tableData = [];
this.fileList = []; this.fileList = [];
done(); done();
@@ -446,7 +446,7 @@ export default {
/** 删除按钮操作 */ /** 删除按钮操作 */
handleDelete(row) { handleDelete(row) {
const ids = row.id || this.ids; const ids = row.id || this.ids;
this.$modal.confirm('是否确认删除困难认定审核时间编号为"' + ids + '"的数据项').then(function () { this.$modal.confirm('是否确认删除困难认定审核时间编号为"' + ids + '"的数据项?').then(function () {
return delKnrdtime(ids); return delKnrdtime(ids);
}).then(() => { }).then(() => {
this.getList(); this.getList();

View File

@@ -291,10 +291,10 @@
style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding:1.02pt 2.48pt; vertical-align:middle; width:197.8pt"> style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding:1.02pt 2.48pt; vertical-align:middle; width:197.8pt">
<p style="line-height:15pt; margin:0pt; orphans:0; text-align:justify; widows:0"><span <p style="line-height:15pt; margin:0pt; orphans:0; text-align:justify; widows:0"><span
style="font-family:仿宋; font-size:12pt">成绩排名</span><span style="font-family:仿宋; font-size:12pt">成绩排名</span><span
style="font-family:仿宋; font-size:12pt"></span><span style="font-family:仿宋; font-size:12pt">(</span><span
style="font-family:仿宋; font-size:12pt">专业</span><span style="font-family:仿宋; font-size:12pt">专业</span><span
style="font-family:仿宋; font-size:12pt"></span><span style="font-family:仿宋; font-size:12pt">)</span><span
style="font-family:仿宋; font-size:12pt"></span><span style="font-family:仿宋; font-size:12pt">:</span><span
style="font-family:仿宋; font-size:12pt; "> style="font-family:仿宋; font-size:12pt; ">
<input style="width: 60px;" v-model="formData.majorRank" type="text" <input style="width: 60px;" v-model="formData.majorRank" type="text"
class="underline-input" placeholder="请输入名次"> class="underline-input" placeholder="请输入名次">
@@ -302,13 +302,13 @@
<input style="width: 80px;" v-model="formData.majorNum" type="text" <input style="width: 80px;" v-model="formData.majorNum" type="text"
class="underline-input" placeholder="请输入总人数"> class="underline-input" placeholder="请输入总人数">
</span> </span>
<span style="font-family:仿宋; font-size:12pt">名次/总人数</span> <span style="font-family:仿宋; font-size:12pt">(名次/总人数)</span>
</p> </p>
</td> </td>
<td colspan="4" <td colspan="4"
style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding:1.02pt 2.48pt; vertical-align:middle; width:228.4pt"> style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding:1.02pt 2.48pt; vertical-align:middle; width:228.4pt">
<p style="line-height:15pt; margin:0pt; orphans:0; text-align:justify; widows:0"><span <p style="line-height:15pt; margin:0pt; orphans:0; text-align:justify; widows:0"><span
style="font-family:仿宋; font-size:12pt">实行综合考评排名 style="font-family:仿宋; font-size:12pt">实行综合考评排名:
<el-radio-group v-model="formData.isCph"> <el-radio-group v-model="formData.isCph">
<el-radio :label="'是'"></el-radio> <el-radio :label="'是'"></el-radio>
<el-radio :label="'否'"></el-radio> <el-radio :label="'否'"></el-radio>
@@ -324,18 +324,18 @@
style="font-family:仿宋; font-size:12pt">必修课 style="font-family:仿宋; font-size:12pt">必修课
<input style="width: 100px;" v-model="formData.bxk" type="text" class="underline-input" <input style="width: 100px;" v-model="formData.bxk" type="text" class="underline-input"
placeholder="请输入必修课门数"> placeholder="请输入必修课门数">
其中及格以上<input style="width: 110px;" v-model="formData.jg" type="text" ,其中及格以上<input style="width: 110px;" v-model="formData.jg" type="text"
class="underline-input" placeholder="请输入及格以上门数"> class="underline-input" placeholder="请输入及格以上门数">
</span></p> </span></p>
</td> </td>
<td colspan="4" <td colspan="4"
style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding:1.02pt 2.48pt; vertical-align:middle; width:228.4pt"> style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding:1.02pt 2.48pt; vertical-align:middle; width:228.4pt">
<p style="line-height:15pt; margin:0pt; orphans:0; text-align:justify; widows:0"><span <p style="line-height:15pt; margin:0pt; orphans:0; text-align:justify; widows:0"><span
style="font-family:仿宋; font-size:12pt">如是排名</span><span style="font-family:仿宋; font-size:12pt">如是,排名</span><span
style="font-family:仿宋; font-size:12pt"></span><span style="font-family:仿宋; font-size:12pt">(</span><span
style="font-family:仿宋; font-size:12pt">班级</span><span style="font-family:仿宋; font-size:12pt">班级</span><span
style="font-family:仿宋; font-size:12pt"></span><span style="font-family:仿宋; font-size:12pt">)</span><span
style="font-family:仿宋; font-size:12pt"></span></p> style="font-family:仿宋; font-size:12pt">:</span></p>
<p style="line-height:15pt; margin:0pt; orphans:0; text-align:justify; widows:0"><span <p style="line-height:15pt; margin:0pt; orphans:0; text-align:justify; widows:0"><span
style="font-family:仿宋; font-size:12pt;"> style="font-family:仿宋; font-size:12pt;">
<input style="width: 60px;" v-model="formData.classRank" type="text" <input style="width: 60px;" v-model="formData.classRank" type="text"
@@ -343,7 +343,7 @@
/ /
<input style="width: 80px;" v-model="formData.classNum" type="text" <input style="width: 80px;" v-model="formData.classNum" type="text"
class="underline-input" placeholder="请输入总人数"> class="underline-input" placeholder="请输入总人数">
</span><span style="font-family:仿宋; font-size:12pt">名次/总人数</span></p> </span><span style="font-family:仿宋; font-size:12pt">(名次/总人数)</span></p>
</td> </td>
</tr> </tr>
<tr style="height:109.55pt"> <tr style="height:109.55pt">
@@ -352,7 +352,7 @@
<p style="line-height:15pt; margin:0pt; orphans:0; text-align:center; widows:0"><span <p style="line-height:15pt; margin:0pt; orphans:0; text-align:center; widows:0"><span
style="font-family:仿宋; font-size:12pt">申请理由</span></p> style="font-family:仿宋; font-size:12pt">申请理由</span></p>
<p style="line-height:15pt; margin:0pt; orphans:0; text-align:center; widows:0"><span <p style="line-height:15pt; margin:0pt; orphans:0; text-align:center; widows:0"><span
style="font-family:仿宋; font-size:12pt">100-150</span></p> style="font-family:仿宋; font-size:12pt">(100-150)</span></p>
</td> </td>
<td colspan="12" <td colspan="12"
style="position: relative; border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:top; width:426.8pt"> style="position: relative; border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:top; width:426.8pt">
@@ -362,7 +362,7 @@
</span></p> </span></p>
<p <p
style="position: absolute;bottom: 0;right:0; line-height:15pt; margin:0pt; text-align:right; widows:0"> style="position: absolute;bottom: 0;right:0; line-height:15pt; margin:0pt; text-align:right; widows:0">
<span style="font-family:仿宋; font-size:12pt">申请人签名 <span style="font-family:仿宋; font-size:12pt">申请人签名:
<el-upload style="display: inline;" :before-upload="boolImg" <el-upload style="display: inline;" :before-upload="boolImg"
accept="image/jpg,image/jpeg,image/png,image/bmp" :limit="1" class="avatar-uploader" accept="image/jpg,image/jpeg,image/png,image/bmp" :limit="1" class="avatar-uploader"
:action="upload.url" :headers="upload.headers" :show-file-list="false" :action="upload.url" :headers="upload.headers" :show-file-list="false"
@@ -393,9 +393,9 @@
<p style="line-height:15pt; margin:0pt; orphans:0; text-align:center; widows:0"><span <p style="line-height:15pt; margin:0pt; orphans:0; text-align:center; widows:0"><span
style="font-family:仿宋; font-size:12pt">&#xa0;</span></p> --> style="font-family:仿宋; font-size:12pt">&#xa0;</span></p> -->
<p style="line-height:15pt; margin:0pt; orphans:0; text-align:center; widows:0"><span <p style="line-height:15pt; margin:0pt; orphans:0; text-align:center; widows:0"><span
style="font-family:仿宋; font-size:12pt">该同学符合申请条件同意推荐该同学申请国家励志奖学金</span></p> style="font-family:仿宋; font-size:12pt">该同学符合申请条件,同意推荐该同学申请国家励志奖学金</span></p>
<p style="line-height:15pt; margin:0pt; orphans:0; text-align:center; widows:0"><span <p style="line-height:15pt; margin:0pt; orphans:0; text-align:center; widows:0"><span
style="font-family:仿宋; font-size:12pt">辅导员签名</span></p> style="font-family:仿宋; font-size:12pt">辅导员(签名):</span></p>
<p style="line-height:15pt; margin:0pt; orphans:0; text-align:center; widows:0"><span <p style="line-height:15pt; margin:0pt; orphans:0; text-align:center; widows:0"><span
style="font-family:仿宋; font-size:12pt">  </span><span style="font-family:仿宋; font-size:12pt">  </span><span
style="font-family:仿宋; font-size:12pt">   </span><span style="font-family:仿宋; font-size:12pt">   </span><span
@@ -428,7 +428,7 @@
<p style="line-height:15pt; margin:0pt; orphans:0; text-align:center; widows:0"><span <p style="line-height:15pt; margin:0pt; orphans:0; text-align:center; widows:0"><span
style="font-family:仿宋; font-size:12pt">&#xa0;</span></p> style="font-family:仿宋; font-size:12pt">&#xa0;</span></p>
<p style="line-height:15pt; margin:0pt; orphans:0; text-align:center; widows:0"><span <p style="line-height:15pt; margin:0pt; orphans:0; text-align:center; widows:0"><span
style="font-family:仿宋; font-size:12pt">公章 </span><span style="font-family:仿宋; font-size:12pt">(公章) </span><span
style="font-family:仿宋; font-size:12pt"> </span><span style="font-family:仿宋; font-size:12pt"> </span><span
style="font-family:仿宋; font-size:12pt"></span><span style="font-family:仿宋; font-size:12pt"></span><span
style="font-family:仿宋; font-size:12pt"> </span><span style="font-family:仿宋; font-size:12pt"> </span><span
@@ -447,17 +447,17 @@
style="position: relative; border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:middle; width:426.8pt"> style="position: relative; border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:middle; width:426.8pt">
<p <p
style="line-height:25pt; margin:16.2pt 0pt 8.1pt; orphans:0; text-align:justify; text-indent:21pt; widows:0"> style="line-height:25pt; margin:16.2pt 0pt 8.1pt; orphans:0; text-align:justify; text-indent:21pt; widows:0">
<span style="font-family:仿宋; font-size:12pt">经评审并在校内公示</span><span <span style="font-family:仿宋; font-size:12pt">经评审,并在校内公示</span><span
style="font-family:仿宋; font-size:12pt; text-decoration:underline"> </span><span style="font-family:仿宋; font-size:12pt; text-decoration:underline"> </span><span
style="font-family:仿宋; font-size:12pt; text-decoration:underline">5 </span><span style="font-family:仿宋; font-size:12pt; text-decoration:underline">5 </span><span
style="font-family:仿宋; font-size:12pt">个工作日无异议现报请批准该同学获得国家</span><span style="font-family:仿宋; font-size:12pt">个工作日,无异议,现报请批准该同学获得国家</span><span
style="font-family:仿宋; font-size:12pt">励志</span><span style="font-family:仿宋; font-size:12pt">励志</span><span
style="font-family:仿宋; font-size:12pt">奖学金</span> style="font-family:仿宋; font-size:12pt">奖学金.</span>
</p> </p>
<p style="line-height:15pt; margin:0pt; orphans:0; text-align:center; widows:0"><span <p style="line-height:15pt; margin:0pt; orphans:0; text-align:center; widows:0"><span
style="font-family:仿宋; font-size:12pt"> </span><span style="font-family:仿宋; font-size:12pt"> </span><span
style="font-family:仿宋; font-size:12pt">                                  </span><span style="font-family:仿宋; font-size:12pt">                                  </span><span
style="font-family:仿宋; font-size:12pt">公章</span><span style="font-family:仿宋; font-size:12pt">(公章)</span><span
style="font-family:仿宋; font-size:12pt">  </span><span style="font-family:仿宋; font-size:12pt">  </span><span
style="font-family:仿宋; font-size:12pt"></span><span style="font-family:仿宋; font-size:12pt"></span><span
style="font-family:仿宋; font-size:12pt">  </span><span style="font-family:仿宋; font-size:12pt">  </span><span
@@ -484,7 +484,7 @@
</table> </table>
</div> </div>
<div style="margin: 0 auto;width: fit-content;"> <div style="margin: 0 auto;width: fit-content;">
证明材料1个人上学年成绩单2辅导员签字的综测排名截图 证明材料(1个人上学年成绩单;2辅导员签字的综测排名截图)
<FileUpload v-model="formData.hardFile" /> <FileUpload v-model="formData.hardFile" />
<el-button style="display: block;margin: 0 auto;width: fit-content;" type="success" plain <el-button style="display: block;margin: 0 auto;width: fit-content;" type="success" plain
@click="doApply">提交申请</el-button> @click="doApply">提交申请</el-button>
@@ -734,7 +734,7 @@ export default {
border-bottom-color: #007bff; border-bottom-color: #007bff;
} }
/* 可选禁用自动填充背景色 */ /* 可选:禁用自动填充背景色 */
.underline-inputt:-webkit-autofill, .underline-inputt:-webkit-autofill,
.underline-input:-webkit-autofill:focus { .underline-input:-webkit-autofill:focus {
-webkit-box-shadow: 0 0 0 1000px white inset !important; -webkit-box-shadow: 0 0 0 1000px white inset !important;

View File

@@ -1862,7 +1862,7 @@ import {mz_list} from "@/api/helpFunc";
}, },
fdySave(){ fdySave(){
// 添加保存确认提示 // 添加保存确认提示
this.$confirm('保存后还能继续修改表单信息是否继续', '提示', { this.$confirm('保存后,还能继续修改表单信息,是否继续?', '提示', {
confirmButtonText: '确定', confirmButtonText: '确定',
cancelButtonText: '取消', cancelButtonText: '取消',
type: 'info' type: 'info'
@@ -1895,11 +1895,11 @@ import {mz_list} from "@/api/helpFunc";
// 根据操作类型显示不同的确认提示 // 根据操作类型显示不同的确认提示
let confirmMessage = ''; let confirmMessage = '';
if (stu == 0) { if (stu == 0) {
confirmMessage = '保存后还能继续修改表单信息是否继续'; confirmMessage = '保存后,还能继续修改表单信息,是否继续?';
} else if (stu == 1) { } else if (stu == 1) {
confirmMessage = '即将提交提交后将不能修改是否继续'; confirmMessage = '即将提交,提交后,将不能修改,是否继续?';
} else { } else {
confirmMessage = '即将提交提交后将不能修改是否继续'; confirmMessage = '即将提交,提交后,将不能修改,是否继续?';
} }
this.$confirm(confirmMessage, '提示', { this.$confirm(confirmMessage, '提示', {

View File

@@ -143,7 +143,7 @@
<!-- 辅导员审核 --> <!-- 辅导员审核 -->
<el-table-column label="辅导员审批" align="center" prop="status"> <el-table-column label="辅导员审批" align="center" prop="status">
<template slot-scope="scope"> <template slot-scope="scope">
<!-- 审批状态0待审批1已通过 --> <!-- 审批状态(0待审批;1已通过; -->
<el-tag v-if="scope.row.status == 0">待审批</el-tag> <el-tag v-if="scope.row.status == 0">待审批</el-tag>
<el-tag type="success" v-else-if="scope.row.status == 1" <el-tag type="success" v-else-if="scope.row.status == 1"
>已通过</el-tag >已通过</el-tag
@@ -164,7 +164,7 @@
<!-- <el-table-column label="学工审批状态" align="center" prop="xgstatus" /> --> <!-- <el-table-column label="学工审批状态" align="center" prop="xgstatus" /> -->
<el-table-column label="学工审批状态" align="center" prop="xgstatus"> <el-table-column label="学工审批状态" align="center" prop="xgstatus">
<template slot-scope="scope"> <template slot-scope="scope">
<!-- 审批状态0待审批1已通过 --> <!-- 审批状态(0待审批;1已通过; -->
<el-tag v-if="scope.row.xgstatus == 0 || scope.row.xgstatus == null ">待审批</el-tag> <el-tag v-if="scope.row.xgstatus == 0 || scope.row.xgstatus == null ">待审批</el-tag>
<el-tag type="success" v-else-if="scope.row.xgstatus == 1" <el-tag type="success" v-else-if="scope.row.xgstatus == 1"
>已通过</el-tag >已通过</el-tag
@@ -257,25 +257,6 @@
/> />
</el-form-item> </el-form-item>
<!-- 学工姓名 -->
<el-form-item label="学工处" prop="xgname" :rules="rules.reason1">
<el-input
v-model="form.xgname"
placeholder="请输入学工处审批人名字"
/>
</el-form-item>
<el-form-item label="审批时间" prop="xgtime" :rules="rules.reason4">
<el-date-picker
clearable
v-model="form.xgtime"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择审批时间"
>
</el-date-picker>
</el-form-item>
<el-form-item label="学工意见" prop="xgopinion" :rules="rules.reason2"> <el-form-item label="学工意见" prop="xgopinion" :rules="rules.reason2">
<el-input <el-input
v-model="form.xgopinion" v-model="form.xgopinion"
@@ -503,7 +484,7 @@ export default {
handleDelete(row) { handleDelete(row) {
const ids = row.id || this.ids; const ids = row.id || this.ids;
this.$modal this.$modal
.confirm('是否确认删除测试编号为"' + ids + '"的数据项') .confirm('是否确认删除测试编号为"' + ids + '"的数据项?')
.then(function () { .then(function () {
return delSchool(ids); return delSchool(ids);
}) })

View File

@@ -20,6 +20,9 @@
<el-form-item label="班级名称" prop="className"> <el-form-item label="班级名称" prop="className">
<el-input v-model="queryParams.className" placeholder="请输入班级名称" clearable @keyup.enter.native="handleQuery" /> <el-input v-model="queryParams.className" placeholder="请输入班级名称" clearable @keyup.enter.native="handleQuery" />
</el-form-item> </el-form-item>
<el-form-item label="辅导员名" prop="teacherName">
<el-input v-model="queryParams.teacherName" placeholder="请输入辅导员名" clearable @keyup.enter.native="handleQuery" />
</el-form-item>
<!-- <el-form-item label="院系" prop="deptId"> <!-- <el-form-item label="院系" prop="deptId">
<el-input v-model="queryParams.deptId" placeholder="请输入院系" clearable @keyup.enter.native="handleQuery" /> <el-input v-model="queryParams.deptId" placeholder="请输入院系" clearable @keyup.enter.native="handleQuery" />
</el-form-item> --> </el-form-item> -->
@@ -290,7 +293,7 @@ export default {
/** 删除按钮操作 */ /** 删除按钮操作 */
handleDelete(row) { handleDelete(row) {
const classIds = row.classId || this.ids; const classIds = row.classId || this.ids;
this.$modal.confirm('是否确认删除班级信息编号为"' + classIds + '"的数据项').then(function () { this.$modal.confirm('是否确认删除班级信息编号为"' + classIds + '"的数据项?').then(function () {
return delClass(classIds); return delClass(classIds);
}).then(() => { }).then(() => {
this.getList(); this.getList();

View File

@@ -22,6 +22,10 @@
<el-input v-model="queryParams.className" placeholder="请输入班级名称" clearable <el-input v-model="queryParams.className" placeholder="请输入班级名称" clearable
@keyup.enter.native="handleQuery" /> @keyup.enter.native="handleQuery" />
</el-form-item> </el-form-item>
<el-form-item label="辅导员名" prop="teacherName">
<el-input v-model="queryParams.teacherName" placeholder="请输入辅导员名" clearable
@keyup.enter.native="handleQuery" />
</el-form-item>
<!-- <el-form-item label="院系" prop="deptId"> <!-- <el-form-item label="院系" prop="deptId">
<el-input v-model="queryParams.deptId" placeholder="请输入院系" clearable @keyup.enter.native="handleQuery" /> <el-input v-model="queryParams.deptId" placeholder="请输入院系" clearable @keyup.enter.native="handleQuery" />
</el-form-item> --> </el-form-item> -->
@@ -303,7 +307,7 @@ export default {
/** 删除按钮操作 */ /** 删除按钮操作 */
handleDelete(row) { handleDelete(row) {
const classIds = row.classId || this.ids; const classIds = row.classId || this.ids;
this.$modal.confirm('是否确认删除班级信息编号为"' + classIds + '"的数据项').then(function () { this.$modal.confirm('是否确认删除班级信息编号为"' + classIds + '"的数据项?').then(function () {
return delClass(classIds); return delClass(classIds);
}).then(() => { }).then(() => {
this.getList(); this.getList();

View File

@@ -8,14 +8,9 @@
<el-input size="mini" v-model="search.stuNo"></el-input> <el-input size="mini" v-model="search.stuNo"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4">
<el-form-item label-width="10px">
<el-button icon="el-icon-search" type="primary" size="mini" @click="doSearch">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="doRefresh">重置</el-button>
</el-form-item>
</el-col>
<el-col :span="10"> <el-col :span="10">
<el-form-item label="班级" label-width="40px"> <el-form-item label="班级" label-width="50px">
<el-select style="width: 100%;" size="mini" @change="changeSelect" <el-select style="width: 100%;" size="mini" @change="changeSelect"
v-model="search.className"> v-model="search.className">
<el-option v-for="(v, i) in class_list" :key="i" :label="v.className" <el-option v-for="(v, i) in class_list" :key="i" :label="v.className"
@@ -32,18 +27,25 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6">
<el-form-item label="学年" label-width="50px">
<el-select size="mini" @change="changeYear" v-model="search.stuYearName" placeholder="选择学年"
clearable>
<el-option :key="i" v-for="(v, i) in stu_year_list" :value="v.stuYearName"
:label="v.stuYearName"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="2"> <el-col :span="2">
<el-form-item label="" label-width="10px"> <el-form-item label="" label-width="10px">
<el-button type="success" size="mini" @click="exportV = true">导出</el-button> <el-button type="success" size="mini" @click="exportV = true">导出</el-button>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4"> <el-col :span="4">
<el-form-item label="学年" label-width="40px"> <el-form-item label-width="10px">
<el-select size="mini" @change="changeYear" v-model="search.stuYearName" placeholder="选择学年" <el-button icon="el-icon-search" type="primary" size="mini" @click="doSearch">搜索</el-button>
clearable> <el-button icon="el-icon-refresh" size="mini" @click="doRefresh">重置</el-button>
<el-option :key="i" v-for="(v, i) in stu_year_list" :value="v.stuYearName"
:label="v.stuYearName"></el-option>
</el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4"> <el-col :span="4">
@@ -322,7 +324,7 @@ export default {
// 创建一个新的空的workbook // 创建一个新的空的workbook
var wb = XLSX.utils.book_new(); var wb = XLSX.utils.book_new();
// 为每一个工作簿设置名称并添加到workbookexcel表 // 为每一个工作簿设置名称并添加到workbook(excel表)
XLSX.utils.book_append_sheet(wb, sheet1, "综合成绩"); XLSX.utils.book_append_sheet(wb, sheet1, "综合成绩");
const workbookBlob = workbook2blob(wb); // 辅助函数workbook2blob const workbookBlob = workbook2blob(wb); // 辅助函数workbook2blob
// 下载文档并添加文件名称 // 下载文档并添加文件名称
@@ -392,7 +394,7 @@ export default {
// 创建一个新的空的workbook // 创建一个新的空的workbook
var wb = XLSX.utils.book_new(); var wb = XLSX.utils.book_new();
// 为每一个工作簿设置名称并添加到workbookexcel表 // 为每一个工作簿设置名称并添加到workbook(excel表)
XLSX.utils.book_append_sheet(wb, sheet1, "综合成绩"); XLSX.utils.book_append_sheet(wb, sheet1, "综合成绩");
const workbookBlob = workbook2blob(wb); // 辅助函数workbook2blob const workbookBlob = workbook2blob(wb); // 辅助函数workbook2blob
// 下载文档并添加文件名称 // 下载文档并添加文件名称

View File

@@ -68,7 +68,7 @@
<el-upload center class="upload-demo" drag :auto-upload="false" :limit="1" :on-exceed="handleExceed" <el-upload center class="upload-demo" drag :auto-upload="false" :limit="1" :on-exceed="handleExceed"
action="" :file-list="fileList" :on-change="fileChoose"> action="" :file-list="fileList" :on-change="fileChoose">
<i class="el-icon-upload"></i> <i class="el-icon-upload"></i>
<div class="el-upload__text">将文件拖到此处<em>点击选择</em></div> <div class="el-upload__text">将文件拖到此处,<em>点击选择</em></div>
<div class="el-upload__tip" slot="tip">只能上传xlsx/xls文件 <el-link @click="downloadMode" type="primary" <div class="el-upload__tip" slot="tip">只能上传xlsx/xls文件 <el-link @click="downloadMode" type="primary"
size="mini">下载模板</el-link> size="mini">下载模板</el-link>
</div> </div>
@@ -192,12 +192,12 @@ export default {
// 下载申请信息模板 // 下载申请信息模板
downloadMode() { downloadMode() {
// 第一个sheet工作簿如果需要创建多个对应let多个sheetXdata即可 // 第一个sheet工作簿,如果需要创建多个,对应let多个sheetXdata即可
let sheet1data = [ let sheet1data = [
{ {
stuNo: "20210001", stuNo: "20210001",
ce_score: 96, ce_score: 96,
"操作提示": "第一条为样板数据stuNo表示学号ce_score表示学生的综合评价成绩" "操作提示": "第一条为样板数据,stuNo表示学号,ce_score表示学生的综合评价成绩"
}, },
]; ];
// let sheet2data = []; // 第二个sheet工作簿 // let sheet2data = []; // 第二个sheet工作簿
@@ -205,7 +205,7 @@ export default {
var sheet1 = XLSX.utils.json_to_sheet(sheet1data); var sheet1 = XLSX.utils.json_to_sheet(sheet1data);
// 创建一个新的空的workbook // 创建一个新的空的workbook
var wb = XLSX.utils.book_new(); var wb = XLSX.utils.book_new();
// 为每一个工作簿设置名称并添加到workbookexcel表 // 为每一个工作簿设置名称并添加到workbook(excel表)
XLSX.utils.book_append_sheet(wb, sheet1, "综合评价导入模板"); XLSX.utils.book_append_sheet(wb, sheet1, "综合评价导入模板");
const workbookBlob = workbook2blob(wb); // 辅助函数workbook2blob const workbookBlob = workbook2blob(wb); // 辅助函数workbook2blob
// 下载文档并添加文件名称 // 下载文档并添加文件名称
@@ -280,11 +280,11 @@ export default {
}, },
handleExceed(files, fileList) { handleExceed(files, fileList) {
this.$message.warning( this.$message.warning(
`当前限制选择 1 个文件本次选择了 ${files.length} 个文件共选择了 ${files.length + fileList.length} 个文件` `当前限制选择 1 个文件,本次选择了 ${files.length} 个文件,共选择了 ${files.length + fileList.length} 个文件`
); );
}, },
handleClose(done) { handleClose(done) {
this.$confirm('确认关闭').then(_ => { this.$confirm('确认关闭?').then(_ => {
this.excelData = []; this.excelData = [];
this.fileList = []; this.fileList = [];
done(); done();
@@ -457,7 +457,7 @@ export default {
// 创建一个新的空的workbook // 创建一个新的空的workbook
var wb = XLSX.utils.book_new(); var wb = XLSX.utils.book_new();
// 为每一个工作簿设置名称并添加到workbookexcel表 // 为每一个工作簿设置名称并添加到workbook(excel表)
XLSX.utils.book_append_sheet(wb, sheet1, "综合评价"); XLSX.utils.book_append_sheet(wb, sheet1, "综合评价");
const workbookBlob = workbook2blob(wb); // 辅助函数workbook2blob const workbookBlob = workbook2blob(wb); // 辅助函数workbook2blob
// 下载文档并添加文件名称 // 下载文档并添加文件名称

View File

@@ -185,13 +185,13 @@
<ol> <ol>
<h3>学业奖学金</h3> <h3>学业奖学金</h3>
<li> <li>
一等奖学金平均学分绩班级排名前3%学年综合素质测评班级排名前50% 一等奖学金:平均学分绩班级排名前3%,学年综合素质测评班级排名前50%;
</li> </li>
<li> <li>
二等奖学金平均学分绩级排名前6%学年综合素质测评班级排名前50% 二等奖学金:平均学分绩级排名前6%,学年综合素质测评班级排名前50%;
</li> </li>
<li> <li>
三等奖学金平均学分绩班级排名前9%学年综合素质测评班级排名前50% 三等奖学金:平均学分绩班级排名前9%,学年综合素质测评班级排名前50%
</li> </li>
</ol> </ol>
@@ -201,20 +201,20 @@
<ol> <ol>
<h3>三好学生</h3> <h3>三好学生</h3>
<li> <li>
劳全面发展平时注重道德修养勤俭节约弘扬正能量树立良好形象 劳全面发展,平时注重道德修养,勤俭节约,弘扬正能量,树立良好形象.
</li> </li>
<li> <li>
以身作则为人表率具有较强的集体观念和集体荣誉感热心为同学服务待人诚恳谦虚有礼貌 以身作则,为人表率,具有较强的集体观念和集体荣誉感.热心为同学服务,待人诚恳谦虚有礼貌.
</li> </li>
<li> <li>
积极参加学校开展的第二课堂活动第二课堂成绩单学分认定为优秀在各级各类活动竞赛中成绩突出 积极参加学校开展的第二课堂活动,第二课堂成绩单学分认定为优秀.在各级各类活动(竞赛)中成绩突出.
</li> </li>
<li> <li>
积极参加体育锻炼及其他文体活动身体健康体能考核成绩为良好及以上(体测成绩80分以上) 积极参加体育锻炼及其他文体活动,身体健康,体能考核成绩为良好及以上.(体测成绩80分以上)
</li> </li>
<li> <li>
参评学年各科平均学分绩75分以上含75分考查课中等及以上平均学分绩班级排名前30%学年综合素质测评班级排名前30% 参评学年各科平均学分绩75分以上(含75分),考查课"中等"及以上,平均学分绩班级排名前30%,学年综合素质测评班级排名前30%
<!-- 学年青年大学习学习率达100% --> <!-- ,学年青年大学习学习率达100%. -->
</li> </li>
</ol> </ol>
</div> </div>
@@ -223,20 +223,20 @@
<ol> <ol>
<h3>优秀学生干部</h3> <h3>优秀学生干部</h3>
<li> <li>
关心集体吃苦在前以身作则能起到模范带头作用 关心集体,吃苦在前,以身作则,能起到模范带头作用.
</li> </li>
<li> <li>
具有较强的工作能力和组织能力工作认真负责责任心强团结同学热心为同学服务工作效果好社会实践工作取得较好成绩在学生中有较高威信 具有较强的工作能力和组织能力,工作认真负责,责任心强,团结同学,热心为同学服务,工作效果好.社会实践工作取得较好成绩,在学生中有较高威信.
</li> </li>
<li> <li>
积极参加学校开展的第二课堂活动第二课堂成绩单学分认定为优秀在各级各类活动竞赛中成绩突出 积极参加学校开展的第二课堂活动,第二课堂成绩单学分认定为优秀.在各级各类活动(竞赛)中成绩突出.
</li> </li>
<li> <li>
积极参加体育锻炼及其他文体活动身体健康体能考核成绩为良好及以上 积极参加体育锻炼及其他文体活动,身体健康,体能考核成绩为良好及以上.
</li> </li>
<li> <li>
参评学年各科平均学分绩为70分以上含70分平均学分绩班级排名前40%学年综合素质测评班级排名前50% 参评学年各科平均学分绩为70分以上(含70分),平均学分绩班级排名前40%,学年综合素质测评班级排名前50%
<!-- 学年青年大学习学习率达100% --> <!-- ,学年青年大学习学习率达100%. -->
</li> </li>
<span @click="lookMore" <span @click="lookMore"
style="text-decoration: underline;color: lightskyblue;cursor: pointer;">查看更多</span> style="text-decoration: underline;color: lightskyblue;cursor: pointer;">查看更多</span>
@@ -319,7 +319,7 @@
<el-option v-for="(v, i) in class_list" :key="i" clearable :value="v.classId" <el-option v-for="(v, i) in class_list" :key="i" clearable :value="v.classId"
:label="v.className"></el-option> :label="v.className"></el-option>
</el-select> </el-select>
<div style="font-size: small;margin: 10px 0 10px 10px; color: red;">*学年奖项是必选项班级不选就默认导出全部</div> <div style="font-size: small;margin: 10px 0 10px 10px; color: red;">*学年奖项是必选项,班级不选就默认导出全部.</div>
<el-button @click="doExport">导出</el-button> <el-button @click="doExport">导出</el-button>
</el-dialog> </el-dialog>
@@ -587,7 +587,7 @@ export default {
// 创建一个新的空的workbook // 创建一个新的空的workbook
var wb = XLSX.utils.book_new(); var wb = XLSX.utils.book_new();
// 为每一个工作簿设置名称并添加到workbookexcel表 // 为每一个工作簿设置名称并添加到workbook(excel表)
XLSX.utils.book_append_sheet(wb, sheet1, fileName); XLSX.utils.book_append_sheet(wb, sheet1, fileName);
const workbookBlob = workbook2blob(wb); // 辅助函数workbook2blob const workbookBlob = workbook2blob(wb); // 辅助函数workbook2blob
// 下载文档并添加文件名称 // 下载文档并添加文件名称
@@ -595,7 +595,7 @@ export default {
} else { } else {
this.$message.info("出错啦刷新试试"); this.$message.info("出错啦,刷新试试");
} }

View File

@@ -39,12 +39,12 @@
</el-row> </el-row>
<el-table v-loading="loading" :data="itineraryList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="itineraryList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="20" align="center" /> <el-table-column type="selection" width="20" align="center" />
<el-table-column label="#" align="center" prop="returnSchoolId" /> <!-- <el-table-column label="#" align="center" prop="returnSchoolId" /> -->
<el-table-column label="主题" align="center" prop="surveyName" /> <el-table-column label="主题" align="center" prop="surveyName" />
<el-table-column label="学号" align="center" prop="stuNo" width="120" /> <el-table-column label="学号" align="center" prop="stuNo" width="120" />
<el-table-column label="姓名" align="center" prop="name" /> <el-table-column label="姓名" align="center" prop="name" />
<el-table-column label="班级" align="center" prop="className" width="200" /> <el-table-column label="班级" align="center" prop="className" width="200" />
<el-table-column label="联系电话" align="center" prop="phone" width="140" /> <!-- <el-table-column label="联系电话" align="center" prop="phone" width="120" /> -->
<el-table-column label="家长是否知晓" align="center" prop="famKnow" width="100" /> <el-table-column label="家长是否知晓" align="center" prop="famKnow" width="100" />
<el-table-column label="是否离校" align="center"> <el-table-column label="是否离校" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
@@ -52,6 +52,8 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="预计离校时间" align="center" prop="willLeaveTime" width="140" /> <el-table-column label="预计离校时间" align="center" prop="willLeaveTime" width="140" />
<el-table-column label="预计返校时间" align="center" prop="scheduledReturnTime" width="140" />
<el-table-column label="预计留校时间" align="center" prop="willStayTime" width="140" />
<el-table-column label="去向地" align="center" prop="willAddr" width="140" /> <el-table-column label="去向地" align="center" prop="willAddr" width="140" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope"> <template slot-scope="scope">