Skip to content

D
dd_school
Commit 0d8d87b8 by Cat
Options

zd 教师电子档案 修改

parent 67725b50
Showing with 133 additions and 60 deletions
ruoyi-ui/src/views/smartSchool/gradeWork/electronicRecord/index.vue
...@@ -73,11 +73,7 @@ ...@@ -73,11 +73,7 @@
<template slot-scope="{ row }"> <template slot-scope="{ row }">
{{ {{
row.state == 1 row.state == 1
? "未发布" ? "编辑"
: row.state == 2
? "已发布"
: row.state == 3
? "已填写"
: row.state == 4 : row.state == 4
? "已提交" ? "已提交"
: row.state == 5 : row.state == 5
...@@ -157,37 +153,30 @@ ...@@ -157,37 +153,30 @@
> >
<template slot-scope="scope"> <template slot-scope="scope">
<!-- 已发布 --> <!-- 已发布 -->
<div> <div v-if="scope.row.state == '4'">
<el-button <el-button size="mini" type="text" @click="handleSubmit(scope.row)"
v-if="scope.row.state <= 3"
size="mini"
type="text"
@click="handleSubmit(scope.row)"
>提交 >提交
</el-button> </el-button>
<el-button <el-button size="mini" type="text" @click="handleReject(scope.row)"
v-if="scope.row.state <= 3"
size="mini"
type="text"
@click="handleReject(scope.row)"
>驳回 >驳回
</el-button> </el-button>
<el-button <!-- <el-button size="mini" type="text" @click="handleEdit(scope.row)"
v-if="scope.row.state <= 3"
size="mini"
type="text"
@click="handleEdit(scope.row)"
>修改 >修改
</el-button> </el-button> -->
</div> </div>
<!--已提交--> <!--已提交-->
<div> <div v-if="scope.row.state == '1'">
<!-- v-if="scope.row.state == '5'" --> <el-button size="mini" type="text" @click="handleCheck(scope.row)"
<el-button >查看
v-if="scope.row.state >= 3" </el-button>
size="mini" </div>
type="text" <div v-if="scope.row.state == '5'">
@click="handleCheck(scope.row)" <el-button size="mini" type="text" @click="handleCheck(scope.row)"
>查看
</el-button>
</div>
<div v-if="scope.row.state == '9'">
<el-button size="mini" type="text" @click="handleCheck(scope.row)"
>查看 >查看
</el-button> </el-button>
</div> </div>
...@@ -234,11 +223,31 @@ ...@@ -234,11 +223,31 @@
v-model="dialogForm.teacherName" v-model="dialogForm.teacherName"
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="性别:" style="padding-right: 10px"> <!-- <el-form-item label="性别:" style="padding-right: 10px">
<el-input <el-input
:readonly="check == true ? true : false" :readonly="check == true ? true : false"
v-model="dialogForm.sex" v-model="dialogForm.sex"
></el-input> ></el-input>
</el-form-item> -->
<el-form-item
:disabled="true"
label="性别："
style="padding-right: 10px"
>
<el-select
:readonly="check == true ? true : false"
v-model="dialogForm.sex"
placeholder="请输入性别"
style="width: 100%"
>
<el-option
v-for="dict in dict.type.sys_user_sex"
:key="dict.value"
:label="dict.label"
:value="dict.value"
>
</el-option>
</el-select>
</el-form-item> </el-form-item>
<el-form-item label="年龄:" style="padding-right: 10px"> <el-form-item label="年龄:" style="padding-right: 10px">
<el-input <el-input
...@@ -252,11 +261,31 @@ ...@@ -252,11 +261,31 @@
v-model="dialogForm.title" v-model="dialogForm.title"
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="学历:" style="padding-right: 10px"> <!-- <el-form-item label="学历:" style="padding-right: 10px">
<el-input <el-input
:readonly="check == true ? true : false" :readonly="check == true ? true : false"
v-model="dialogForm.education" v-model="dialogForm.education"
></el-input> ></el-input>
</el-form-item> -->
<el-form-item
:disabled="true"
label="学历:"
style="padding-right: 10px"
>
<el-select
:readonly="check == true ? true : false"
v-model="dialogForm.education"
style="width: 100%"
placeholder="请选择学历"
>
<el-option
v-for="dict in dict.type.education"
:key="dict.value"
:label="dict.label"
:value="dict.value"
>
</el-option>
</el-select>
</el-form-item> </el-form-item>
<el-form-item label="政治面貌:" style="padding-right: 10px"> <el-form-item label="政治面貌:" style="padding-right: 10px">
<el-input <el-input
...@@ -604,6 +633,8 @@ import { ...@@ -604,6 +633,8 @@ import {
} from "@/api/smartSchool/teacherFiles/teacherElectronicFile"; } from "@/api/smartSchool/teacherFiles/teacherElectronicFile";
export default { export default {
name: "gradeElectronicRecord", name: "gradeElectronicRecord",
dicts: ["sys_user_sex", "education"],
data() { data() {
return { return {
completedCount: "", //填写 completedCount: "", //填写
...@@ -688,6 +719,7 @@ export default { ...@@ -688,6 +719,7 @@ export default {
getGradeTnfo(params).then((res) => { getGradeTnfo(params).then((res) => {
this.tableData = res.rows; this.tableData = res.rows;
console.log(res, 11111111);
this.total = res.total; this.total = res.total;
this.yfb = res.yfb; this.yfb = res.yfb;
this.yqr = res.yqr; this.yqr = res.yqr;
...@@ -752,6 +784,7 @@ export default { ...@@ -752,6 +784,7 @@ export default {
const id = row.id; const id = row.id;
getFileTnfo(id).then((res) => { getFileTnfo(id).then((res) => {
this.dialogForm = res.data; this.dialogForm = res.data;
console.log(this.dialogForm, 2222222);
this.title = "基本信息查看"; this.title = "基本信息查看";
this.tableFirstData = res.data.thesisList; this.tableFirstData = res.data.thesisList;
this.tableSecondData = res.data.materialList; this.tableSecondData = res.data.materialList;
......
ruoyi-ui/src/views/smartSchool/personWork/electronicRecord/index.vue
...@@ -61,17 +61,11 @@ ...@@ -61,17 +61,11 @@
<template slot-scope="{ row }"> <template slot-scope="{ row }">
{{ {{
row.state == 1 row.state == 1
? "未发布" ? "编辑"
: row.state == 2
? "已发布"
: row.state == 3
? "已填写"
: row.state == 4 : row.state == 4
? "已提交" ? "已提交"
: row.state == 5 : row.state == 5
? "已确认" ? "已确认"
: row.state == 7
? "已结束"
: row.state == 9 : row.state == 9
? "驳回" ? "驳回"
: "" : ""
...@@ -90,15 +84,21 @@ ...@@ -90,15 +84,21 @@
min-width="150" min-width="150"
prop="endTime" prop="endTime"
/> />
<el-table-column <el-table-column fixed="right" label="操作" align="center">
fixed="right"
label="操作"
align="center"
min-width="200"
>
<template slot-scope="scope"> <template slot-scope="scope">
<!-- 未填写 --> <!-- 未填写 -->
<div v-if="scope.row.state === 4"> <div v-if="scope.row.state == '1'">
<el-button size="mini" type="text" @click="handleEdit(scope.row)"
>填写
</el-button>
<el-button size="mini" type="text" @click="handleEdit(scope.row)"
>修改
</el-button>
<el-button size="mini" type="text" @click="handleSubmit(scope.row)"
>提交
</el-button>
</div>
<div v-if="scope.row.state == '9'">
<el-button size="mini" type="text" @click="handleEdit(scope.row)" <el-button size="mini" type="text" @click="handleEdit(scope.row)"
>填写 >填写
</el-button> </el-button>
...@@ -109,7 +109,18 @@ ...@@ -109,7 +109,18 @@
>提交 >提交
</el-button> </el-button>
</div> </div>
<el-button size="mini" type="text" @click="handleCheck(scope.row)" <el-button
v-if="scope.row.state == '4'"
size="mini"
type="text"
@click="handleCheck(scope.row)"
>查看
</el-button>
<el-button
v-if="scope.row.state == '5'"
size="mini"
type="text"
@click="handleCheck(scope.row)"
>查看 >查看
</el-button> </el-button>
<div></div> <div></div>
...@@ -217,10 +228,20 @@ ...@@ -217,10 +228,20 @@
label="学历:" label="学历:"
style="padding-right: 10px" style="padding-right: 10px"
> >
<el-input <el-select
v-model="form.education"
:disabled="form.state == '4' ? true : false" :disabled="form.state == '4' ? true : false"
></el-input> v-model="form.education"
style="width: 100%"
placeholder="请选择学历"
>
<el-option
v-for="dict in dict.type.education"
:key="dict.value"
:label="dict.label"
:value="dict.value"
>
</el-option>
</el-select>
</el-form-item> </el-form-item>
<el-form-item <el-form-item
:disabled="true" :disabled="true"
...@@ -611,7 +632,7 @@ import { ...@@ -611,7 +632,7 @@ import {
} from "@/api/smartSchool/teacherFiles/teacherElectronicFile"; } from "@/api/smartSchool/teacherFiles/teacherElectronicFile";
export default { export default {
name: "personElectronicRecord", name: "personElectronicRecord",
dicts: ["sys_user_sex"], dicts: ["sys_user_sex", "education"],
data() { data() {
return { return {
// 遮罩层 // 遮罩层
...@@ -684,6 +705,7 @@ export default { ...@@ -684,6 +705,7 @@ export default {
}; };
getTeacherTnfo(params).then((res) => { getTeacherTnfo(params).then((res) => {
this.tableData = res.rows; this.tableData = res.rows;
console.log(this.tableData, "this.tableData11111");
this.tableDataInfo = res.rows.map((item) => { this.tableDataInfo = res.rows.map((item) => {
return item.fid; // 如果需要将 fid 属性单独提取出来，可以返回一个包含 fid 的新数组 return item.fid; // 如果需要将 fid 属性单独提取出来，可以返回一个包含 fid 的新数组
}); });
...@@ -820,9 +842,9 @@ export default { ...@@ -820,9 +842,9 @@ export default {
this.title = "基本信息修改"; this.title = "基本信息修改";
this.dialogVisible = true; this.dialogVisible = true;
const id = row.fid; const id = row.fid;
console.log(id, 33333333333333);
getFileTnfo(id).then((res) => { getFileTnfo(id).then((res) => {
this.form = res.data; this.form = res.data;
console.log(res.data, "填写按钮");
this.title = "基本信息查看"; this.title = "基本信息查看";
this.tableFirstData = res.data.thesisList; this.tableFirstData = res.data.thesisList;
this.tableSecondData = res.data.materialList; this.tableSecondData = res.data.materialList;
...@@ -868,6 +890,7 @@ export default { ...@@ -868,6 +890,7 @@ export default {
}, },
//提交按钮 //提交按钮
handleSubmit(row) { handleSubmit(row) {
console.log(row, "提交row");
const id = row.fid; const id = row.fid;
this.$modal this.$modal
.confirm("是否提交该活动？") .confirm("是否提交该活动？")
...@@ -883,6 +906,7 @@ export default { ...@@ -883,6 +906,7 @@ export default {
console.error(err); console.error(err);
}); });
}, },
//弹窗确定按钮 //弹窗确定按钮
confirmDialog(row) { confirmDialog(row) {
this.$refs["form"].validate((valid) => { this.$refs["form"].validate((valid) => {
......
ruoyi-ui/src/views/smartSchool/teachAffairAdministration/electronicRecord/dataMaintenance.vue
...@@ -68,11 +68,7 @@ ...@@ -68,11 +68,7 @@
<template slot-scope="{ row }"> <template slot-scope="{ row }">
{{ {{
row.state == 1 row.state == 1
? "未发布" ? "编辑"
: row.state == 2
? "已发布"
: row.state == 3
? "已填写"
: row.state == 4 : row.state == 4
? "已提交" ? "已提交"
: row.state == 5 : row.state == 5
...@@ -206,7 +202,7 @@ ...@@ -206,7 +202,7 @@
:disabled="status == '7' ? true : false" :disabled="status == '7' ? true : false"
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item <!-- <el-form-item
:disabled="true" :disabled="true"
label="学历:" label="学历:"
style="padding-right: 10px" style="padding-right: 10px"
...@@ -215,6 +211,26 @@ ...@@ -215,6 +211,26 @@
v-model="form.education" v-model="form.education"
:disabled="status == '7' ? true : false" :disabled="status == '7' ? true : false"
></el-input> ></el-input>
</el-form-item> -->
<el-form-item
:disabled="true"
label="学历:"
style="padding-right: 10px"
>
<el-select
:disabled="status == '7' ? true : false"
v-model="form.education"
style="width: 100%"
placeholder="请选择学历"
>
<el-option
v-for="dict in dict.type.education"
:key="dict.value"
:label="dict.label"
:value="dict.value"
>
</el-option>
</el-select>
</el-form-item> </el-form-item>
<el-form-item <el-form-item
:disabled="true" :disabled="true"
...@@ -607,7 +623,7 @@ import { ...@@ -607,7 +623,7 @@ import {
export default { export default {
name: "dataReceiver", name: "dataReceiver",
dicts: ["sys_user_sex"], dicts: ["sys_user_sex", "education"],
data() { data() {
return { return {
// 遮罩层 // 遮罩层
......
ruoyi-ui/src/views/smartSchool/teachAffairAdministration/electronicRecord/index.vue
...@@ -406,7 +406,6 @@ export default { ...@@ -406,7 +406,6 @@ export default {
}, },
//弹窗确定按钮 //弹窗确定按钮
confirmDialog() { confirmDialog() {
this.loading = true;
this.$refs["form"].validate((valid) => { this.$refs["form"].validate((valid) => {
if (valid) { if (valid) {
if (this.form.id != null) { if (this.form.id != null) {
...@@ -422,9 +421,10 @@ export default { ...@@ -422,9 +421,10 @@ export default {
// 新增 // 新增
addTeacherNotice(this.form) addTeacherNotice(this.form)
.then((response) => { .then((response) => {
this.getList(); this.$modal.loading("正在加载数据，请稍等...");
this.$message.success("新增成功"); this.$message.success("新增成功");
this.dialogVisible = false; this.dialogVisible = false;
this.getList();
}) })
.catch((err) => {}); .catch((err) => {});
} }
......
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