Skip to content

D
dd_school
Commit 468160d3 by 朱莹
Options

Merge remote-tracking branch 'origin/master'

parents 118b24bb b17d2ea4
Showing with 190 additions and 115 deletions
ruoyi-ui/src/views/smartSchool/gradeWork/electronicRecord/index.vue
...@@ -10,7 +10,6 @@ ...@@ -10,7 +10,6 @@
<el-form-item label="姓名"> <el-form-item label="姓名">
<el-input v-model="form.name"></el-input> <el-input v-model="form.name"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="任务名称"> </el-form-item>
<el-form-item> <el-form-item>
<el-button <el-button
size="mini" size="mini"
...@@ -411,6 +410,8 @@ export default { ...@@ -411,6 +410,8 @@ export default {
// 总条数 // 总条数
total: 0, total: 0,
queryForm: { queryForm: {
pageSize: 10,
pageNum: 1,
level: "", level: "",
name: "", name: "",
region: "", region: "",
...@@ -449,16 +450,16 @@ export default { ...@@ -449,16 +450,16 @@ export default {
const params = { const params = {
pageNum: this.queryForm.pageNum, pageNum: this.queryForm.pageNum,
pageSize: this.queryForm.pageSize, pageSize: this.queryForm.pageSize,
gradeId: this.$store.state.user.userId, // gradeId: this.$store.state.user,
// noticeId: // noticeId: this.$store.state.user.noticeId,
}; };
// getDepInfo().then((res) => {}); const gradeId = this.$store.state.user;
//接口
// listUser(this.addDateRange(this.queryParams, this.dateRange)).then(response => { console.log(gradeId, "gradeId");
// this.userList = response.rows; getNoticeInfo(params).then((res) => {
// this.total = response.total; console.log(params, "params");
// this.loading = false; console.log(res, "查询res");
// } });
}, },
// 搜索按钮 // 搜索按钮
handleQuery() { handleQuery() {
......
ruoyi-ui/src/views/smartSchool/teachAffairAdministration/electronicRecord/dataReceiver.vue
<!-- 数据接收人员 -->
<template> <template>
<div> <div>
<el-form style="margin-top: 20px;margin-left: 20px;" :inline="true" :model="queryForm" class="demo-form-inline"> <el-form
style="margin-top: 20px; margin-left: 20px"
:inline="true"
:model="queryForm"
class="demo-form-inline"
>
<el-form-item label="级部:"> <el-form-item label="级部:">
<el-input v-model="queryForm.level" placeholder="请输入级部"></el-input> <el-input
v-model="queryForm.gradeName"
placeholder="请输入级部"
></el-input>
</el-form-item> </el-form-item>
<el-form-item label="姓名:"> <el-form-item label="姓名:">
<el-input v-model="queryForm.name" placeholder="请输入姓名"></el-input> <el-input
v-model="queryForm.teacherName"
placeholder="请输入姓名"
></el-input>
</el-form-item> </el-form-item>
<el-form-item label="进度:"> <el-form-item label="进度:">
<el-select v-model="queryForm.region" placeholder="请选择进度"> <el-select v-model="queryForm.state" placeholder="请选择进度">
<el-option label="区域一" value="shanghai"></el-option> <!-- 状态 (1未发布 2已发布 3已填写 4已提交 5已确认 9驳回) -->
<el-option label="区域二" value="beijing"></el-option> <el-option label="未发布" value="1"></el-option>
<el-option label="已发布" value="2"></el-option>
<el-option label="已填写" value="3"></el-option>
<el-option label="已提交" value="4"></el-option>
<el-option label="已确认" value="5"></el-option>
<el-option label="驳回" value="9"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button size="mini" icon="el-icon-search" type="primary" @click="handleQuery">搜索</el-button> <el-button
<el-button size="mini" icon="el-icon-refresh" @click="resetQuery">重置</el-button> size="mini"
<el-button size="mini" icon="el-icon-plus" :disabled="status == '已结束' ? true:false" type="success" @click="handleAdd">新增</el-button> icon="el-icon-search"
type="primary"
@click="handleQuery"
>搜索</el-button
>
<el-button size="mini" icon="el-icon-refresh" @click="resetQuery"
>重置</el-button
>
<el-button
size="mini"
icon="el-icon-plus"
:disabled="status == '已结束' ? true : false"
type="success"
@click="handleAdd"
>新增</el-button
>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-table style="margin-top: 20px;" border :data="tableData"> <el-table style="margin-top: 20px" border :data="tableData">
<el-table-column type="index" label="序号" width="55" align="center"/> <el-table-column type="index" label="序号" width="55" align="center" />
<el-table-column label="学年学期" align="center" prop="schoolYear" min-width="200"/> <el-table-column
<el-table-column label="级部" align="center" prop="level" min-width="150"/> label="学年学期"
<el-table-column label="姓名" align="center" min-width="150" prop="name"/> align="center"
<el-table-column label="身份证号" align="center" min-width="200" prop="IDNum"/> prop="filesSemester"
<el-table-column label="进度" align="center" min-width="150" prop="schedule"/> min-width="200"
/>
<el-table-column
label="级部"
align="center"
prop="gradeName"
min-width="150"
/>
<el-table-column
label="姓名"
align="center"
min-width="150"
prop="teacherName"
/>
<el-table-column
label="身份证号"
align="center"
min-width="200"
prop="idCard
"
/>
<el-table-column label="进度" align="center" min-width="150" prop="state">
<template slot-scope="{ row }">
<!-- 状态 (1未发布 2已发布 3已填写 4已提交 5已确认 9驳回) -->
{{
row.state == 1
? "未发布"
: row.state == 2
? "已发布"
: row.state == 3
? "已填写"
: row.state == 4
? "已提交"
: row.state == 5
? "已确认"
: row.state == 9
? "驳回"
: ""
}}
</template>
</el-table-column>
<el-table-column fixed="right" label="操作" align="center"> <el-table-column fixed="right" label="操作" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
:disabled="status == '已结束' ? true:false" :disabled="status == '已结束' ? true : false"
size="mini" size="mini"
type="text" type="text"
@click="handleDelete(scope.row)">删除 @click="handleDelete(scope.row)"
>删除
</el-button> </el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<pagination <pagination
v-show="total>0" v-show="total > 0"
:total="total" :total="total"
:page.sync="queryForm.pageNum" :page.sync="queryForm.pageNum"
:limit.sync="queryForm.pageSize" :limit.sync="queryForm.pageSize"
@pagination="getList" @pagination="getList"
/> />
<!--弹窗--> <!--弹窗-->
<el-dialog <el-dialog title="新增接收人" :visible.sync="dialogVisible" width="60%">
title='新增接收人'
:visible.sync="dialogVisible"
width="60%">
<el-table <el-table
ref="multipleTable" ref="multipleTable"
:data="dialogTableData" :data="dialogTableData"
tooltip-effect="dark" tooltip-effect="dark"
@selection-change="handleSelectionChange"> @selection-change="handleSelectionChange"
<el-table-column >
align="center" <el-table-column align="center" type="selection"> </el-table-column>
type="selection"> <el-table-column align="center" label="级部" prop="gradeName">
</el-table-column>
<el-table-column
align="center"
label="级部"
prop="level">
</el-table-column> </el-table-column>
<el-table-column <el-table-column align="center" prop="teacherName" label="姓名">
align="center"
prop="name"
label="姓名">
</el-table-column> </el-table-column>
<el-table-column <el-table-column align="center" prop="ID" label="身份证号">
align="center"
prop="ID"
label="身份证号">
</el-table-column> </el-table-column>
</el-table> </el-table>
<span style="display: flex;justify-content: center" slot="footer" class="dialog-footer"> <span
style="display: flex; justify-content: center"
slot="footer"
class="dialog-footer"
>
<el-button @click="dialogVisible = false">取 消</el-button> <el-button @click="dialogVisible = false">取 消</el-button>
<el-button type="primary" @click="confirmDialog">确 定</el-button> <el-button type="primary" @click="confirmDialog">确 定</el-button>
</span> </span>
...@@ -84,6 +146,26 @@ ...@@ -84,6 +146,26 @@
</template> </template>
<script> <script>
import {
addTeacherNotice, //添加任务
listTeacherNotice, // 任务列表
infoTeaNotice, //任务详情
updateTask, //添加修改
infoTeacherNotice, //发布任务
taskRetracted, //任务撤回
taskCompleted, //任务完成
delTaskInfo, //任务删除
getteacherNotice, // 通知下档案查看|数据维护
getNoticeInfo, //老师查看档案详情
getDepInfo, //级部查看档案详情
getFileTnfo, //查看档案详情
syncNotice, //同步档案
updateInfo, //教师档案修改
delInfo, //教师档案删除
fileSubReview, //教师档案提交审核
fileSubApproved, //教师档案提交通过
fileSubRejected, //教师档案提交驳回
} from "@/api/smartSchool/teacherFiles/teacherElectronicFile";
export default { export default {
name: "dataReceiver", name: "dataReceiver",
data() { data() {
...@@ -93,96 +175,82 @@ export default { ...@@ -93,96 +175,82 @@ export default {
// 总条数 // 总条数
total: 0, total: 0,
queryForm: { queryForm: {
level: '', pageNum: 1,
name: '', pageSize: 10,
region: '' gradeName: "",
teacherName: "",
state: "",
}, },
tableData: [{ tableData: [],
schoolYear: '2022学年上学期',
level: '2022级部',
name: '张三',
IDNum: '121212121212121212',
schedule: '未填写'
}],
dialogVisible: false, dialogVisible: false,
form: {}, form: {},
status : this.$route.query.status, status: this.$route.query.status,
dialogTableData:[{ dialogTableData: [],
level:'2022', };
name:'李四',
ID:'12121212121212'
}]
}
}, },
mounted() { mounted() {
console.log('id', this.$route.query.id) this.getList();
console.log('status',this.status)
}, },
methods: { methods: {
/** 查询信息列表 */ /** 查询信息列表 */
getList() { getList() {
this.loading = true; const params = {
//接口 pageNum: this.queryForm.pageNum,
// listUser(this.addDateRange(this.queryParams, this.dateRange)).then(response => { pageSize: this.queryForm.pageSize,
// this.userList = response.rows; noticeId: this.$route.query.noticeId,
// this.total = response.total; gradeName: this.queryForm.gradeName,
// this.loading = false; teacherName: this.queryForm.teacherName,
// } state: this.queryForm.state,
};
getteacherNotice(params).then((res) => {
this.tableData = res.rows;
this.total = res.total;
});
}, },
// 搜索按钮 // 搜索按钮
handleQuery() { handleQuery() {
this.queryParams.pageNum = 1; this.getList();
this.getList()
}, },
// 重置按钮 // 重置按钮
resetQuery() { resetQuery() {
this.queryForm = { this.queryForm = {
pageNum: 1, pageNum: 1,
pageSize: 10, pageSize: 10,
level: '', gradeName: "",
name: '', teacherName: "",
region: '' state: "",
} };
this.handleQuery() this.handleQuery();
}, },
// 新增按钮 // 新增按钮
handleAdd() { handleAdd() {
this.dialogVisible = true this.dialogVisible = true;
}, },
//弹窗确定按钮 //弹窗确定按钮
confirmDialog() { confirmDialog() {
this.dialogVisible = false this.dialogVisible = false;
}, },
//多选按钮 //多选按钮
handleSelectionChange(select){ handleSelectionChange(select) {
console.log('select',select) // console.log("select", select);
}, },
// 删除按钮 // 删除按钮
handleDelete(row) { handleDelete(row) {
//判断，如果进度是未填写可以直接删除不需要提醒 const ids = row.id || this.ids;
//如果是其他状态需要提示相应的状态 this.$modal
this.$confirm('此操作将永久删除该文件, 是否继续?', '提示', { .confirm("是否确认删除？")
confirmButtonText: '确定', .then(function () {
cancelButtonText: '取消', return delInfo(ids);
type: 'warning' })
}).then(() => { .then(() => {
this.$message({ this.getList();
type: 'success', this.$modal.msgSuccess("删除成功");
message: '删除成功!' })
}); .catch(() => {});
}).catch(() => { },
this.$message({ },
type: 'info', };
message: '已取消删除'
});
});
}
}
}
</script> </script>
<style scoped> <style scoped></style>
</style>
ruoyi-ui/src/views/smartSchool/teachAffairAdministration/electronicRecord/index.vue
...@@ -470,11 +470,17 @@ export default { ...@@ -470,11 +470,17 @@ export default {
dataReceiver(row) { dataReceiver(row) {
//传值状态，如果是已结束跳过去只能查看，已发布可以新增或者删除 //传值状态，如果是已结束跳过去只能查看，已发布可以新增或者删除
console.log("row", row); console.log("row", row);
const noticeId = row.id;
const pageNum = this.queryForm.pageNum;
const pageSize = this.queryForm.pageSize;
const status = row.noticeState;
this.$router.push({ this.$router.push({
path: "/teachAffairAdministration/smartSchool/teachAffairAdministration/electronicRecord/dataReceiver", path: "/teachAffairAdministration/smartSchool/teachAffairAdministration/electronicRecord/dataReceiver",
query: { query: {
id: row.id, noticeId,
status: row.noticeState, pageNum,
pageSize,
status,
}, },
}); });
}, },
......
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