Skip to content

D
dd_school
Commit 663c2738 by zhaopanyu
Options

11.1 zpy

parent f7bc0052
Showing with 486 additions and 183 deletions
ruoyi-ui/src/api/smartSchool/gradeWork/courseSelection/performance.js
......@@ -9,10 +9,10 @@ export function performanceList(query) {
});
}
//根据身份证号获取学生信息
export function getInfoByIdCard(query) {
//根据学号获取学生信息
export function getInfoByschoolNo(query) {
return request({
url: `/curricula/studentScore/selectStudent?idCard=${query}`,
url: `/curricula/studentScore/selectStudent?schoolNo=${query}`,
method: "get",
});
}
......
ruoyi-ui/src/permission.js
......@@ -18,6 +18,7 @@ const whiteList = [
"/studentRegistra",
"/printBarcodes",
"/printLesson",
"/studentTable",
];
router.beforeEach((to, from, next) => {
......
ruoyi-ui/src/router/index.js
......@@ -69,6 +69,14 @@ export const constantRoutes = [
),
hidden: true,
},
{
path: "/studentTable",
component: () =>
import(
"@/views/smartSchool/teachAffairAdministration/affairStudentManage/studentTable"
),
hidden: true,
},
//设备台账
{
path: "/printBarcodes",
......
ruoyi-ui/src/views/smartSchool/gradeWork/courseSelection/performance/index.vue
......@@ -37,7 +37,7 @@
<el-table-column fixed="left" label="序号" type="index" width="55" align="center" />
<el-table-column fixed="left" label="学生姓名" align="center" prop="studentName" />
<el-table-column fixed="left" label="学号" align="center" prop="studentNumber" width="150" />
<el-table-column fixed="left" label="身份证号" align="center" prop="idCard" width="200" />
<!-- <el-table-column fixed="left" label="身份证号" align="center" prop="idCard" width="200" /> -->
<el-table-column fixed="left" label="班级" align="center" prop="className" />
<el-table-column fixed="left" label="考试类型" align="center" prop="examType">
<template slot-scope="{ row }">
......@@ -99,34 +99,28 @@
<el-form :model="achievementForm" :rules="achievementRules" ref="achievementForm" label-width="80px"
label-position="left">
<el-row :gutter="30">
<el-col :span="12">
<el-form-item label="身份证号" prop="idCard">
<el-input v-model="achievementForm.idCard" placeholder="请输入身份证号" @change="searchStudentInfo"
:disabled="nowType == 1 ? true : false"></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="学生姓名" prop="studentName">
<el-input v-model="achievementForm.studentName" placeholder="请输入学生姓名"
:disabled="nowType == 1 ? true : false"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="30">
<el-col :span="12">
<el-form-item label="班级" prop="className">
<el-input v-model="achievementForm.className" placeholder="请输入班级"
:disabled="nowType == 1 ? true : false"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="30">
<el-col :span="12">
<el-form-item label="学号" prop="studentNumber">
<el-input v-model="achievementForm.studentNumber" placeholder="请输入学号"
:disabled="nowType == 1 ? true : false"></el-input>
:disabled="nowType == 1 ? true : false" @change="searchStudentInfo"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="30">
<el-col :span="12">
<el-form-item label="考试类型" prop="examType">
<el-select v-model="achievementForm.examType" filterable placeholder="请选择考试类型" class="selectWidth"
......@@ -137,6 +131,7 @@
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="30">
<el-col :span="12">
<el-form-item label="语文" prop="language">
......@@ -188,7 +183,7 @@
<el-row :gutter="30">
<el-col :span="12">
<el-form-item label="化学" prop="chemistry">
<el-input v-model="achievementForm.chemistry" type="number" placeholder="请输入化学"></el-input>
<el-input v-model="achievementForm.chemistry" type="number" placeholder="请输入化学"></el-input>
</el-form-item>
</el-col>
</el-row>
......@@ -206,7 +201,7 @@
import { getToken } from "@/utils/auth";
import {
addPerformance, deletePerformance, editPerformance,
getInfoByIdCard,
getInfoByschoolNo,
performanceList
} from "../../../../../api/smartSchool/gradeWork/courseSelection/performance";
import { classList } from "../../../../../api/smartSchool/gradeWork/courseSelection/taskPublishing";
......@@ -249,7 +244,7 @@ export default {
classId: '',
studentName: '',
studentNumber: '',
idCard: '',
// idCard: '',
className: '',
examType: '',
language: '',
......@@ -263,8 +258,8 @@ export default {
biology: '',
},
achievementRules: {
idCard: [
{ required: true, message: '请输入身份证号', trigger: 'blur' }
studentNumber: [
{ required: true, message: '请输入', trigger: 'blur' }
],
// studentName: [
// { required: true, message: '请输入学生姓名', trigger: 'blur' }
......@@ -362,7 +357,7 @@ export default {
classId: '',
studentName: '',
studentNumber: '',
idCard: '',
// idCard: '',
className: '',
examType: '',
language: '',
......@@ -447,10 +442,11 @@ export default {
})
},
//根据身份证号获取学生信息
//根据学号获取学生信息
searchStudentInfo() {
const idCard = this.achievementForm.idCard
getInfoByIdCard(idCard).then(res => {
const schoolNo = this.achievementForm.studentNumber
console.log(schoolNo, 'schoolNo');
getInfoByschoolNo(schoolNo).then(res => {
if (res.code == 200) {
Object.keys(this.achievementForm).forEach(key => {
res.data[key] && (this.achievementForm[key] = res.data[key])
......
ruoyi-ui/src/views/smartSchool/logisticsManage/repairReport/index.vue
......@@ -478,13 +478,14 @@ export default {
handleUpdate(row) {
const id = row.id || this.ids;
this.title = "派单";
this.openpd = true;
getRepairs(id).then(response => {
this.formpd.id = response.data.id;
console.log('this.formpd.id', this.formpd.id);
}).catch(err => {
})
this.openpd = true;
},
/** 删除按钮操作 */
......@@ -500,33 +501,24 @@ export default {
// 派单按钮
submitFormpd() {
this.$refs.formpd.validate((valid) => {
if (valid) {
const newObj = {};
newObj.id = this.formpd.id;
newObj.maintainState = this.formpd.maintainState;
newObj.maintainName = this.formpd.maintainName;
newObj.maintainPhone = this.formpd.maintainPhone;
console.log('newObj', newObj);
console.log(newObj.maintainState);
dispatchRepairs(newObj)
.then((response) => {
this.$modal.closeLoading();
this.$modal.msgSuccess("派单成功");
this.getList();
this.openpd = false;
this.formpd.maintainResult = '';
})
.catch((error) => {
});
} else {
return false;
}
});
const newObj = {};
newObj.id = this.formpd.id;
newObj.maintainState = this.formpd.maintainState;
newObj.maintainName = this.formpd.maintainName;
newObj.maintainPhone = this.formpd.maintainPhone;
console.log('newObj', newObj);
console.log(newObj.maintainState);
dispatchRepairs(newObj)
.then((response) => {
// 派单成功，显示提示信息并刷新页面
this.$message.success("派单成功");
this.openpd = false;
this.formpd.maintainResult = '';
this.getList();
})
},
// 取消按钮
cancel() {
this.open = false;
......
ruoyi-ui/src/views/smartSchool/othersManage/teacherWages/index.vue
......@@ -3,13 +3,12 @@
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="老师姓名" prop="teacherName">
<el-input v-model="queryParams.teacherName" placeholder="请输入老师姓名" clearable
@keyup.enter.native="handleQuery"/>
<el-input v-model="queryParams.teacherName" placeholder="请输入老师姓名" clearable @keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item label="工资日期" prop="wagesTime">
<el-date-picker clearable v-model="queryParams.wagesTime" type="date" value-format="yyyy-MM-dd"
placeholder="请选择工资日期">
placeholder="请选择工资日期">
</el-date-picker>
</el-form-item>
<el-form-item>
......@@ -21,17 +20,17 @@
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
v-hasPermi="['system:teacherWages:add']">新增
v-hasPermi="['system:teacherWages:add']">新增
</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate"
v-hasPermi="['system:teacherWages:edit']">修改
v-hasPermi="['system:teacherWages:edit']">修改
</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
v-hasPermi="['system:teacherWages:remove']">删除
v-hasPermi="['system:teacherWages:remove']">删除
</el-button>
</el-col>
<el-col :span="1.5">
......@@ -40,12 +39,12 @@
</el-col>
<el-col :span="1.5">
<el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
v-hasPermi="['system:teacherWages:export']">导出
v-hasPermi="['system:teacherWages:export']">导出
</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="primary" plain icon="el-icon-printer" size="mini" :disabled="multiple" @click="print"
v-hasPermi="['system:teacherWages:export']">打印
v-hasPermi="['system:teacherWages:export']">打印
</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
......@@ -54,22 +53,21 @@
<div>
<el-table v-loading="loading" :data="teacherWagesList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center"/>
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="老师姓名" v-if="columns[0].visible" fixed align="center" prop="teacherName" width="120"
show-overflow-tooltip/>
<el-table-column label="身份证号" v-if="columns[1].visible" width="170" align="center" prop="idCard"/>
<el-table-column label="基本工资" v-if="columns[2].visible" align="center" prop="basePay" width="110"/>
<el-table-column label="奖金" v-if="columns[3].visible" align="center" prop="bonus" width="110"/>
<el-table-column label="养老金" v-if="columns[4].visible" align="center" prop="pension" width="110"/>
<el-table-column label="公积金" v-if="columns[5].visible" align="center" prop="accumulationFund" width="110"/>
<el-table-column label="医疗保险" v-if="columns[6].visible" align="center" prop="medicalInsurance" width="110"/>
<el-table-column label="车补" v-if="columns[7].visible" align="center" prop="fareSubsidy" width="110"/>
<el-table-column label="电话补贴" v-if="columns[8].visible" align="center" prop="telephoneSubsidy" width="110"/>
<el-table-column label="餐补" v-if="columns[9].visible" align="center" prop="mealAllowance" width="110"/>
<el-table-column label="个人所得税" v-if="columns[10].visible" width="100" align="center" prop="incomeTax"/>
<el-table-column label="失业保险" v-if="columns[11].visible" align="center" prop="unemploymentBenefits"
width="110"/>
<el-table-column label="加班费" v-if="columns[12].visible" align="center" prop="overtimePay" width="110"/>
show-overflow-tooltip />
<el-table-column label="手机号" v-if="columns[1].visible" width="170" align="center" prop="teacherTel" />
<el-table-column label="基本工资" v-if="columns[2].visible" align="center" prop="basePay" width="110" />
<el-table-column label="奖金" v-if="columns[3].visible" align="center" prop="bonus" width="110" />
<el-table-column label="养老金" v-if="columns[4].visible" align="center" prop="pension" width="110" />
<el-table-column label="公积金" v-if="columns[5].visible" align="center" prop="accumulationFund" width="110" />
<el-table-column label="医疗保险" v-if="columns[6].visible" align="center" prop="medicalInsurance" width="110" />
<el-table-column label="车补" v-if="columns[7].visible" align="center" prop="fareSubsidy" width="110" />
<el-table-column label="电话补贴" v-if="columns[8].visible" align="center" prop="telephoneSubsidy" width="110" />
<el-table-column label="餐补" v-if="columns[9].visible" align="center" prop="mealAllowance" width="110" />
<el-table-column label="个人所得税" v-if="columns[10].visible" width="100" align="center" prop="incomeTax" />
<el-table-column label="失业保险" v-if="columns[11].visible" align="center" prop="unemploymentBenefits" width="110" />
<el-table-column label="加班费" v-if="columns[12].visible" align="center" prop="overtimePay" width="110" />
<!-- <el-table-column label="工资条路径" v-if="columns[13].visible" align="center" prop="paySlipUrl"/>-->
<el-table-column label="工资日期" v-if="columns[13].visible" align="center" prop="wagesTime" width="120">
<template slot-scope="scope">
......@@ -77,15 +75,15 @@
</template>
</el-table-column>
<el-table-column label="备注" v-if="columns[14].visible" align="center" width="150" prop="remarks"
show-overflow-tooltip/>
show-overflow-tooltip />
<el-table-column label="操作" v-if="columns[15].visible" align="center" min-width="150"
class-name="small-padding fixed-width">
class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
v-hasPermi="['system:teacherWages:edit']">修改
v-hasPermi="['system:teacherWages:edit']">修改
</el-button>
<el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
v-hasPermi="['system:teacherWages:remove']">删除
v-hasPermi="['system:teacherWages:remove']">删除
</el-button>
</template>
</el-table-column>
......@@ -95,11 +93,11 @@
<pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
@pagination="getList"/>
@pagination="getList" />
<!-- 添加老师获奖情况对话框------老师信息 -->
<TeacherSelect v-if="teacherSelectDialog" :openSelect.sync="teacherSelectDialog" :title="teacherSelect"
@getTeacherList="getTeacherList" @setTeacherInfo="setTeacherInfo"></TeacherSelect>
@getTeacherList="getTeacherList" @setTeacherInfo="setTeacherInfo"></TeacherSelect>
<!-- 添加或修改教师工资对话框 -->
<el-dialog :title="title" :visible.sync="dialogTeacherWages" width="1000px" append-to-body>
......@@ -107,91 +105,91 @@
<el-row>
<el-col :span="12">
<el-form-item label="老师姓名" prop="teacherName">
<el-input v-model="form.teacherName" disabled placeholder="请输入老师姓名"/>
<el-input v-model="form.teacherName" disabled placeholder="请输入老师姓名" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="身份证号" prop="idCard">
<el-input v-model="form.idCard" disabled placeholder="请输入身份证号"/>
<el-form-item label="手机号" prop="teacherTel">
<el-input v-model="form.teacherTel" disabled placeholder="请输入身份证号" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="基本工资" prop="basePay">
<el-input v-model="form.basePay" placeholder="请输入基本工资"/>
<el-input v-model="form.basePay" placeholder="请输入基本工资" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="奖金" prop="bonus">
<el-input v-model="form.bonus" placeholder="请输入奖金"/>
<el-input v-model="form.bonus" placeholder="请输入奖金" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="养老金" prop="pension">
<el-input v-model="form.pension" placeholder="请输入养老金"/>
<el-input v-model="form.pension" placeholder="请输入养老金" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="公积金" prop="accumulationFund">
<el-input v-model="form.accumulationFund" placeholder="请输入公积金"/>
<el-input v-model="form.accumulationFund" placeholder="请输入公积金" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="医疗保险" prop="medicalInsurance">
<el-input v-model="form.medicalInsurance" placeholder="请输入医疗保险"/>
<el-input v-model="form.medicalInsurance" placeholder="请输入医疗保险" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="车补" prop="fareSubsidy">
<el-input v-model="form.fareSubsidy" placeholder="请输入车补"/>
<el-input v-model="form.fareSubsidy" placeholder="请输入车补" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="电话补贴" prop="telephoneSubsidy">
<el-input v-model="form.telephoneSubsidy" placeholder="请输入电话补贴"/>
<el-input v-model="form.telephoneSubsidy" placeholder="请输入电话补贴" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="餐补" prop="mealAllowance">
<el-input v-model="form.mealAllowance" placeholder="请输入餐补"/>
<el-input v-model="form.mealAllowance" placeholder="请输入餐补" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="个人所得税" prop="incomeTax">
<el-input v-model="form.incomeTax" placeholder="请输入个人所得税"/>
<el-input v-model="form.incomeTax" placeholder="请输入个人所得税" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="失业保险" prop="unemploymentBenefits">
<el-input v-model="form.unemploymentBenefits" placeholder="请输入失业保险"/>
<el-input v-model="form.unemploymentBenefits" placeholder="请输入失业保险" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="加班费" prop="overtimePay">
<el-input v-model="form.overtimePay" placeholder="请输入加班费"/>
<el-input v-model="form.overtimePay" placeholder="请输入加班费" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="工资日期" style="width: 100%" prop="wagesTime">
<el-date-picker clearable v-model="form.wagesTime" type="date" style="width: 100%"
value-format="yyyy-MM-dd" placeholder="请选择工资日期">
<el-date-picker clearable v-model="form.wagesTime" type="date" style="width: 100%" value-format="yyyy-MM-dd"
placeholder="请选择工资日期">
</el-date-picker>
</el-form-item>
</el-col>
</el-row>
<el-form-item label="备注" prop="remarks">
<el-input type="textarea" v-model="form.remarks" placeholder="请输入备注"/>
<el-input type="textarea" v-model="form.remarks" placeholder="请输入备注" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
......@@ -229,14 +227,14 @@
<!-- 导入 -->
<el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
<el-upload ref="upload" :limit="1" accept=".xlsx, .xls" :headers="upload.headers"
:action="upload.url + '?updateSupport=' + upload.updateSupport" :disabled="upload.isUploading"
:on-progress="handleFileUploadProgress" :on-success="handleFileSuccess" :auto-upload="false" drag>
:action="upload.url + '?updateSupport=' + upload.updateSupport" :disabled="upload.isUploading"
:on-progress="handleFileUploadProgress" :on-success="handleFileSuccess" :auto-upload="false" drag>
<i class="el-icon-upload"></i>
<div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
<div class="el-upload__tip text-center" slot="tip">
<span>仅允许导入xls、xlsx格式文件。</span>
<el-link type="primary" :underline="false" style="font-size:12px;vertical-align: baseline;"
@click="importTemplate">下载模板
@click="importTemplate">下载模板
</el-link>
</div>
</el-upload>
......@@ -302,7 +300,6 @@ export default {
pageSize: 10,
teacherId: null,
teacherName: null,
idCard: null,
basePay: null,
bonus: null,
pension: null,
......@@ -400,7 +397,6 @@ export default {
id: null,
teacherId: null,
teacherName: null,
idCard: null,
basePay: null,
bonus: null,
pension: null,
......@@ -473,16 +469,16 @@ export default {
/** 删除按钮操作 */
handleDelete(row) {
const ids = row.id || this.ids;
this.$modal.confirm(`是否确认删除选中的${ Object.hasOwnProperty.call(ids, "length") ? ids.length : 1
}条数据？`).then(() => {
this.loading = true;
return delTeacherWages(ids);
}).then(() => {
this.getList();
this.loading = false;
this.$modal.msgSuccess("删除成功");
}).catch(() => {
});
this.$modal.confirm(`是否确认删除选中的${Object.hasOwnProperty.call(ids, "length") ? ids.length : 1
}条数据？`).then(() => {
this.loading = true;
return delTeacherWages(ids);
}).then(() => {
this.getList();
this.loading = false;
this.$modal.msgSuccess("删除成功");
}).catch(() => {
});
},
/** 导出按钮操作 */
handleExport() {
......@@ -524,7 +520,7 @@ export default {
{ type: ExportType.SELECT, path: '/school/teacherWages/export/' + ids, params: {} },
{ type: ExportType.QUERY, path: '/school/teacherWages/export', params: this.queryParams },
]
callback(options, `老师工资${ new Date().getTime() }.xlsx`);
callback(options, `老师工资${new Date().getTime()}.xlsx`);
},
......@@ -541,7 +537,7 @@ export default {
this.teacherSelectDialog = false;
this.reset();
this.form.teacherName = data.teacherName;
this.form.idCard = data.idCard;
this.form.teacherTel = data.teacherTel;
this.form.teacherId = data.id;
this.dialogTeacherWages = true;
this.title = "教师工资信息";
......@@ -560,7 +556,7 @@ export default {
this.reset();
this.form.teacherName = data.teacherName;
this.form.teacherId = data.id;
this.form.idCard = data.idCard;
this.form.teacherTel = data.teacherTel;
this.dialogTeacherWages = true;
this.title = "老师工资信息";
},
......
ruoyi-ui/src/views/smartSchool/schoolProperty/collectionLedger/index.vue
......@@ -27,7 +27,11 @@
<el-table-column label="领用日期" align="center" prop="recipientTime" width="200" />
<el-table-column label="领用人" align="center" prop="recipientBy" />
<el-table-column label="退还日期" align="center" prop="returnTime" width="200" />
<el-table-column label="退还时设备情况" align="center" prop="returnEquipmentCondition" />
<el-table-column label="退还时设备情况" align="center" prop="returnEquipmentCondition">
<template slot-scope="{ row }">
<div>{{ selectDictLabel(dict.type.equipment_state, row.returnEquipmentCondition) }}</div>
</template>
</el-table-column>
<el-table-column label="接收人" align="center" prop="receivedBy" />
<el-table-column label="备注" align="center" prop="remark" />
<el-table-column label="操作" align="center" prop="orgname" width="150" fixed="right">
......@@ -70,9 +74,8 @@
<el-col :span="12">
<el-form-item label="领用人" prop="recipientById">
<el-select v-model="collectionForm.recipientById" filterable placeholder="请选择领用人" clearable
class="selectWidth" :disabled="nowType == 2 ? true : false">
<el-option v-for="(item, index) in userListly" :key="index"
:label="item.userName" :value="item.userId">
class="selectWidth" :disabled="nowType == 2 ? true : false">
<el-option v-for="(item, index) in userListly" :key="index" :label="item.userName" :value="item.userId">
</el-option>
</el-select>
</el-form-item>
......@@ -108,8 +111,11 @@
</el-col>
<el-col :span="12">
<el-form-item label="退还时设备情况" prop="returnEquipmentCondition">
<el-input v-model="collectionForm.returnEquipmentCondition" placeholder="请输入退还时设备情况"
:disabled="nowType == 2 ? true : false"></el-input>
<el-select v-model="collectionForm.returnEquipmentCondition" placeholder="请输入退还时设备情况" clearable
style="width: 100%;" :disabled="nowType == 2 ? true : false">
<el-option v-for="dict in dict.type.equipment_state" :key="dict.value" :label="dict.label"
:value="dict.value" />
</el-select>
</el-form-item>
</el-col>
</el-row>
......@@ -161,6 +167,7 @@ import {
getRepairencode,//根据自编码获取设备信息
} from '@/api/smartSchool/schoolProperty/repairApplicant.js'
export default {
dicts: ['equipment_state',],
data() {
return {
queryParams: {
......@@ -178,6 +185,7 @@ export default {
adminUserListjs: [],
//新增
collectionForm: {
equipmentId: '',
encode: '',
equipmentName: '',
model: '',
......@@ -188,8 +196,6 @@ export default {
receivedById: '',
receivedBy: '',
returnEquipmentCondition: '',
yjuseTime: '',
sjuseTime: '',
remark: '',
},
dialogVisible: false,
......@@ -213,12 +219,7 @@ export default {
receivedById: [
{ required: true, message: "接收人不能为空", trigger: "blur" }
],
yjuseTime: [
{ required: true, message: "预计使用时间不能为空", trigger: "blur" }
],
sjuseTime: [
{ required: true, message: "实际使用时间不能为空", trigger: "blur" }
]
},
isEditable: true,
}
......@@ -244,6 +245,7 @@ export default {
// 0新增、1编辑、2查看
handleOption(type, item) {
this.collectionForm = {
equipmentId: '',
id: '',
encode: '',
equipmentName: '',
......@@ -255,8 +257,6 @@ export default {
receivedById: '',
receivedBy: '',
returnEquipmentCondition: '',
yjuseTime: '',
sjuseTime: '',
remark: '',
}
this.nowType = type;
......@@ -355,8 +355,6 @@ export default {
returnTime: null,
receivedBy: null,
returnEquipmentCondition: null,
yjuseTime: null,
sjuseTime: null,
remark: null,
};
......
ruoyi-ui/src/views/smartSchool/schoolProperty/lendingReturn/index.vue
......@@ -21,14 +21,18 @@
<el-table v-loading="loading" :data="lendReturnData" stripe>
<el-table-column label="序号" type="index" width="55" align="center" />
<el-table-column label="自编码" align="center" prop="encode" width="140" />
<el-table-column label="设备名称" align="center" prop="equipmentName" />
<el-table-column label="设备名称" align="center" prop="equipmentName" width="130" />
<el-table-column label="型号" align="center" prop="model" />
<el-table-column label="借用日期" align="center" prop="borrowTime" width="160" />
<el-table-column label="借用人" align="center" prop="borrowBy" />
<el-table-column label="用途" align="center" prop="purpose" />
<el-table-column label="借用期限（天）" align="center" prop="deadline" width="140" />
<el-table-column label="归还日期" align="center" prop="returnTime" width="160" />
<el-table-column label="归还时设备情况" align="center" prop="returnEquipmentCondition" width="160" />
<el-table-column label="归还时设备情况" align="center" prop="returnEquipmentCondition" width="160">
<template slot-scope="{ row }">
<dict-tag :options="dict.type.equipment_state" :value="row.returnEquipmentCondition" />
</template>
</el-table-column>
<el-table-column label="接收人" align="center" prop="receivedBy" />
<el-table-column label="预计使用时间" align="center" prop="yjuseTime" width="160" />
<el-table-column label="实际使用时间" align="center" prop="sjuseTime" width="160" />
......
ruoyi-ui/src/views/smartSchool/teachAffairAdministration/affairStudentManage/components/studentTable/index.vue
......@@ -9,14 +9,16 @@
<el-button type="primary" plain size="mini" @click="printTable">打印
</el-button>
</div>
</div>
<el-card style="height: 100%;width: 900px;">
<br/> <br/>
<div style="width: 100%; margin: auto;" id="postFormContainer">
<br /> <br />
<div id="postFormContainer">
<div style="text-align: center; font-weight: 800; font-size: 35px">
学籍表
</div>
<br/>
<br />
<table border="1px solid black" cellspacing="0" style="width: 860px">
<tr>
<th rowspan="7" class="leftThree">
......@@ -26,15 +28,22 @@
学校
</th>
<td style="height: 40px" colspan="6">东营市第二中学</td>
<td rowspan="4" class="tdStyle"><img :src="baseUrl + studentInfo.avatar " width="130px" height="160px"
style="margin: 0 0 -3px 0;"></td>
<td rowspan="4" class="tdStyle">
<img v-if="studentInfo.avatar" :src="baseUrl + studentInfo.avatar" width="130px" height="160px"
style="margin: 0 0 -3px 0;">
<div v-else
style="width: 130px; height: 160px; border: 1px solid #ddd; display: flex; justify-content: center; align-items: center;"
:src="无照片">
</div>
</td>
</tr>
<tr>
<th>姓名</th>
<td colspan="2" class="tdStyle" width="220px" style="height: 40px">{{ studentInfo.studentName }}</td>
<th width="80px">性别</th>
<td width="100px" class="tdStyle">
<dict-tag :options="dict.type.sys_user_sex" :value="studentInfo.sex"/>
<dict-tag :options="dict.type.sys_user_sex" :value="studentInfo.sex" />
</td>
<th width="80px">民族</th>
<td class="tdStyle">{{ studentInfo.nation }}</td>
......@@ -97,44 +106,44 @@
</tr>
<tr>
<td class="tdStyle" style="height: 40px"><span
v-if="studentParents.length>0 && studentParents[0].parentName">{{ studentParents[0].parentName }}</span>
v-if="studentParents.length > 0 && studentParents[0].parentName">{{ studentParents[0].parentName }}</span>
</td>
<td class="tdStyle"><span v-if="studentParents.length>0 && studentParents[0].relationship ">
<dict-tag :options="dict.type.relationship" :value="studentParents[0].relationship"/>
<td class="tdStyle"><span v-if="studentParents.length > 0 && studentParents[0].relationship">
<dict-tag :options="dict.type.relationship" :value="studentParents[0].relationship" />
</span></td>
<td colspan="2"><span v-if="studentParents.length>0 && studentParents[0].workAddress ">{{
studentParents[0].workAddress
}}</span></td>
<td colspan="2"><span v-if="studentParents.length>0 && studentParents[0].contactAddress "> {{
studentParents[0].contactAddress
}}</span></td>
<td><span v-if="studentParents.length>0 && studentParents[0].telephone ">{{
studentParents[0].telephone
}}</span></td>
<td><span v-if="studentParents.length>0 && studentParents[0].postalCode "> {{
studentParents[0].postalCode
}}</span></td>
<td colspan="2"><span v-if="studentParents.length > 0 && studentParents[0].workAddress">{{
studentParents[0].workAddress
}}</span></td>
<td colspan="2"><span v-if="studentParents.length > 0 && studentParents[0].contactAddress"> {{
studentParents[0].contactAddress
}}</span></td>
<td><span v-if="studentParents.length > 0 && studentParents[0].telephone">{{
studentParents[0].telephone
}}</span></td>
<td><span v-if="studentParents.length > 0 && studentParents[0].postalCode"> {{
studentParents[0].postalCode
}}</span></td>
</tr>
<!-- 第二行-->
<tr>
<td class="tdStyle" style="height: 40px"><span
v-if="studentParents.length>1 && studentParents[1].parentName">{{ studentParents[1].parentName }}</span>
v-if="studentParents.length > 1 && studentParents[1].parentName">{{ studentParents[1].parentName }}</span>
</td>
<td class="tdStyle"><span v-if="studentParents.length>1 && studentParents[1].relationship ">
<dict-tag :options="dict.type.relationship" :value="studentParents[1].relationship"/>
<td class="tdStyle"><span v-if="studentParents.length > 1 && studentParents[1].relationship">
<dict-tag :options="dict.type.relationship" :value="studentParents[1].relationship" />
</span></td>
<td colspan="2"><span v-if="studentParents.length>1 && studentParents[1].workAddress ">{{
studentParents[1].workAddress
}}</span></td>
<td colspan="2"><span v-if="studentParents.length>1 && studentParents[1].contactAddress "> {{
studentParents[1].contactAddress
}}</span></td>
<td><span v-if="studentParents.length>1 && studentParents[1].telephone ">{{
studentParents[1].telephone
}}</span></td>
<td><span v-if="studentParents.length>1 && studentParents[1].postalCode "> {{
studentParents[1].postalCode
}}</span></td>
<td colspan="2"><span v-if="studentParents.length > 1 && studentParents[1].workAddress">{{
studentParents[1].workAddress
}}</span></td>
<td colspan="2"><span v-if="studentParents.length > 1 && studentParents[1].contactAddress"> {{
studentParents[1].contactAddress
}}</span></td>
<td><span v-if="studentParents.length > 1 && studentParents[1].telephone">{{
studentParents[1].telephone
}}</span></td>
<td><span v-if="studentParents.length > 1 && studentParents[1].postalCode"> {{
studentParents[1].postalCode
}}</span></td>
</tr>
<tr>
<th rowspan="7" class="leftThree">
......@@ -151,7 +160,7 @@
<tr>
<th style="height: 40px">政治面貌</th>
<td class="tdStyle" colspan="2">
<dict-tag :options="dict.type.politics_tatus" :value="studentInfo.appearance"/>
<dict-tag :options="dict.type.politics_tatus" :value="studentInfo.appearance" />
</td>
<th>血型</th>
<td class="tdStyle" colspan="4">{{ studentInfo.bloodType }}</td>
......@@ -166,7 +175,7 @@
<tr>
<th style="height: 40px">独生子女</th>
<td class="tdStyle" colspan="2">
<dict-tag :options="dict.type.only_child" :value="studentInfo.onlyChild"/>
<dict-tag :options="dict.type.only_child" :value="studentInfo.onlyChild" />
</td>
<th>流动人口状况</th>
<td class="tdStyle" colspan="4">{{ studentInfo.floatingPopulation }}</td>
......@@ -191,9 +200,9 @@
</template>
<script>
import printJS from "print-js";
import {closeCurrentTab} from "@/utils/utilLibrary/routerBatch/routerBatch.js";
import {getTableInfo} from '@/api/smartSchool/teachAffairAdministration/affairStudentManage'
import printJS from "print-js"
import { closeCurrentTab } from "@/utils/utilLibrary/routerBatch/routerBatch.js";
import { getTableInfo } from '@/api/smartSchool/teachAffairAdministration/affairStudentManage'
export default {
name: 'teachAffairStudentTable',
......@@ -214,7 +223,9 @@ export default {
let id = this.$route?.query?.id
getTableInfo(id).then((res) => {
this.studentInfo = res.data
console.log(this.studentInfo, 'this.studentInfo');
this.studentParents = res.studentParents
console.log(this.studentParents, 'this.studentParents');
})
},
closeCurrentTab,
......
ruoyi-ui/src/views/smartSchool/teachAffairAdministration/affairStudentManage/index.vue
......@@ -910,16 +910,35 @@ export default {
this.formDisabled = false;
},
// 学籍表
// studentTable(row) {
// this.$router.push({
// path: '/teachAffairAdministration/studentTable',
// query: {
// id: row.id,
// // name: row.studentName,
// // idCard: row.idCard,
// // schoolNo: row.schoolNo
// }
// })
// },
studentTable(row) {
this.$router.push({
path: '/teachAffairAdministration/studentTable',
query: {
id: row.id,
// name: row.studentName,
// idCard: row.idCard,
// schoolNo: row.schoolNo
console.log('准备跳转');
const baseUrl = window.location.origin; // 获取当前页面的协议、主机作为前缀URL
// const baseUrl = window.location.protocol + '//' + window.location.host; // 获取当前页面的协议、主机作为前缀URL
console.log('im_1_0', baseUrl);
// const url = `http://localhost:1024/studentRegistra?id=${row.id}&name=${row.studentName}&idCard=${row.idCard}&schoolNo=${row.schoolNo}`;
const newURL = `${baseUrl}/studentTable?id=${encodeURIComponent(row.id)}&name=${encodeURIComponent(row.studentName)}&idCard=${encodeURIComponent(row.idCard)}&schoolNo=${encodeURIComponent(row.schoolNo)}`;
dd.biz.util.openLink({
url: newURL,
// url: url,
onSuccess: () => {
console.log(newURL, 'newURL');
console.log('跳转成功，准备打印');
},
onFail: (err) => {
console.log('跳转失败', err);
}
})
});
},
// 学籍证明
// studentProve(row) {
......
ruoyi-ui/src/views/smartSchool/teachAffairAdministration/affairStudentManage/studentTable.vue 0 → 100644
<template>
<div class="app-container" style="width: 100%; display: flex; justify-content: center; flex-wrap: wrap">
<div style="width: 100%">
<div style="width: 200px; margin: auto">
<!-- <el-button type="primary" plain size="mini" @click="closeCurrentTab">关闭
</el-button> -->
<el-button type="primary" plain size="mini" @click="downloadProve">下载
</el-button>
<el-button type="primary" plain size="mini" @click="printTable">打印
</el-button>
</div>
</div>
<el-card style="height: 100%;width: 900px;">
<br /> <br />
<div id="postFormContainer">
<div style="text-align: center; font-weight: 800; font-size: 35px">
学籍表
</div>
<br />
<table border="1px solid black" cellspacing="0" style="width: 860px">
<tr>
<th rowspan="7" class="leftThree">
学生基本信息
</th>
<th width="80px">
学校
</th>
<td style="height: 40px" colspan="6">东营市第二中学</td>
<td rowspan="4" class="tdStyle">
<img v-if="studentInfo.avatar" :src="baseUrl + studentInfo.avatar" width="130px" height="160px"
style="margin: 0 0 -3px 0;">
<div v-else
style="width: 130px; height: 160px; border: 1px solid #ddd; display: flex; justify-content: center; align-items: center;"
:src="无照片">
</div>
</td>
</tr>
<tr>
<th>姓名</th>
<td colspan="2" class="tdStyle" width="220px" style="height: 40px">{{ studentInfo.studentName }}
</td>
<th width="80px">性别</th>
<td width="100px" class="tdStyle">
<dict-tag :options="dict.type.sys_user_sex" :value="studentInfo.sex" />
</td>
<th width="80px">民族</th>
<td class="tdStyle">{{ studentInfo.nation }}</td>
</tr>
<tr>
<th style="height: 40px">省学籍辅号</th>
<td colspan="2" class="tdStyle">{{ studentInfo.provincialNumber }}</td>
<th>出生日期</th>
<td class="tdStyle">{{ studentInfo.birthday }}</td>
<th>邮政编码</th>
<td colspan="1" class="tdStyle">{{ studentInfo.postalCode }}</td>
</tr>
<tr>
<th style="height: 40px">全国学籍号</th>
<td colspan="2" class="tdStyle">{{ studentInfo.nationalNumber }}</td>
<th>所在年级</th>
<td class="tdStyle">{{ studentInfo.currentGrade }}</td>
<th>联系电话</th>
<td colspan="1" class="tdStyle">{{ studentInfo.stuTelephone }}</td>
</tr>
<tr>
<th style="height: 40px">身份证号</th>
<td colspan="2" class="tdStyle">{{ studentInfo.idCard }}</td>
<th>通信地址</th>
<td colspan="5">{{ studentInfo.postalAddress }}</td>
</tr>
<tr>
<th style="height: 50px">籍贯</th>
<td colspan="3">{{ studentInfo.nativePlace }}</td>
<th width="80px">现住址</th>
<td colspan="5">{{ studentInfo.homeAddress }}</td>
</tr>
<tr>
<th style="height: 50px">出生地</th>
<td colspan="3">{{ studentInfo.birthAddress }}</td>
<th>户口所在地</th>
<td colspan="5">{{ studentInfo.registeredAddress }}</td>
</tr>
<tr>
<th rowspan="3" class="leftThree">监护人信息</th>
<th>
姓名
</th>
<th colspan="1" width="90px">
关系
</th>
<th colspan="2">
工作单位
</th>
<th colspan="2">
联系地址
</th>
<th>
联系电话
</th>
<th>
邮政编码
</th>
</tr>
<tr>
<td class="tdStyle" style="height: 40px"><span
v-if="studentParents.length > 0 && studentParents[0].parentName">{{
studentParents[0].parentName }}</span>
</td>
<td class="tdStyle"><span v-if="studentParents.length > 0 && studentParents[0].relationship">
<dict-tag :options="dict.type.relationship" :value="studentParents[0].relationship" />
</span></td>
<td colspan="2"><span v-if="studentParents.length > 0 && studentParents[0].workAddress">{{
studentParents[0].workAddress
}}</span></td>
<td colspan="2"><span v-if="studentParents.length > 0 && studentParents[0].contactAddress"> {{
studentParents[0].contactAddress
}}</span></td>
<td><span v-if="studentParents.length > 0 && studentParents[0].telephone">{{
studentParents[0].telephone
}}</span></td>
<td><span v-if="studentParents.length > 0 && studentParents[0].postalCode"> {{
studentParents[0].postalCode
}}</span></td>
</tr>
<!-- 第二行-->
<tr>
<td class="tdStyle" style="height: 40px"><span
v-if="studentParents.length > 1 && studentParents[1].parentName">{{
studentParents[1].parentName }}</span>
</td>
<td class="tdStyle"><span v-if="studentParents.length > 1 && studentParents[1].relationship">
<dict-tag :options="dict.type.relationship" :value="studentParents[1].relationship" />
</span></td>
<td colspan="2"><span v-if="studentParents.length > 1 && studentParents[1].workAddress">{{
studentParents[1].workAddress
}}</span></td>
<td colspan="2"><span v-if="studentParents.length > 1 && studentParents[1].contactAddress"> {{
studentParents[1].contactAddress
}}</span></td>
<td><span v-if="studentParents.length > 1 && studentParents[1].telephone">{{
studentParents[1].telephone
}}</span></td>
<td><span v-if="studentParents.length > 1 && studentParents[1].postalCode"> {{
studentParents[1].postalCode
}}</span></td>
</tr>
<tr>
<th rowspan="7" class="leftThree">
其他学籍信息
</th>
</tr>
<tr>
<th style="height: 40px">国家地区</th>
<td class="tdStyle" colspan="2">{{ studentInfo.region }}</td>
<th>外语语种</th>
<td class="tdStyle" colspan="4">{{ studentInfo.foreignLanguages }}</td>
</tr>
<tr>
<th style="height: 40px">政治面貌</th>
<td class="tdStyle" colspan="2">
<dict-tag :options="dict.type.politics_tatus" :value="studentInfo.appearance" />
</td>
<th>血型</th>
<td class="tdStyle" colspan="4">{{ studentInfo.bloodType }}</td>
</tr>
<tr>
<th style="height: 40px">健康状况</th>
<td class="tdStyle" colspan="2">{{ studentInfo.health }}</td>
<th>港澳台侨</th>
<td class="tdStyle" colspan="4">{{ studentInfo.otherRegions }}</td>
</tr>
<tr>
<th style="height: 40px">独生子女</th>
<td class="tdStyle" colspan="2">
<dict-tag :options="dict.type.only_child" :value="studentInfo.onlyChild" />
</td>
<th>流动人口状况</th>
<td class="tdStyle" colspan="4">{{ studentInfo.floatingPopulation }}</td>
</tr>
<tr>
<th style="height: 50px">接收资助状况</th>
<td colspan="7">{{ studentInfo.support }}</td>
</tr>
<tr style="height: 300px">
<td colspan="8">
<div style="height: 300px">
备注信息: {{ remark }}
</div>
</td>
</tr>
</table>
</div>
</el-card>
</div>
</template>
<script>
import printJS from "print-js"
import { closeCurrentTab } from "@/utils/utilLibrary/routerBatch/routerBatch.js";
import { getTableInfo } from '@/api/smartSchool/teachAffairAdministration/affairStudentManage'
export default {
name: 'teachAffairStudentTable',
dicts: ['only_child', 'politics_tatus', 'sys_user_sex', 'Grade', 'Class', 'student_type', 'Whether_Delete', 'child_state', 'student_nature', "change_type", 'relationship'],
data() {
return {
baseUrl: process.env.VUE_APP_BASE_API,
studentInfo: {},
studentParents: [],
url: '',
father: {},
mother: {},
remark: " ",
}
},
methods: {
getInfo() {
let id = this.$route?.query?.id
getTableInfo(id).then((res) => {
this.studentInfo = res.data
console.log(this.studentInfo, 'this.studentInfo');
this.studentParents = res.studentParents
console.log(this.studentParents, 'this.studentParents');
})
},
closeCurrentTab,
// 打印
printTable() {
printJS({
printable: 'postFormContainer',
targetStyles: ['*'],
type: "html",
})
},
downloadProve() {
this.download(`/school/studentStatus/exportStatus/${this.$route.query.id}`, {}, `${this.studentInfo.studentName}.xlsx`)
},
},
created() {
this.getInfo()
},
activated() {
this.getInfo()
},
}
</script>
<style scoped>
.tdStyle {
text-align: center;
}
.leftThree {
width: 20px;
margin: 0 auto;
line-height: 24px;
font-size: 20px;
}
.my-label {
width: 50px;
}
/* .el-descriptions__body .el-descriptions__table.is-bordered .el-descriptions__cell {
border: var(--el-descriptions-table-border);
padding: 7px 11px;
} */
</style>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment