Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
D
dd_school
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wangqi
dd_school
Commits
85807a4a
Commit
85807a4a
authored
Oct 25, 2023
by
Cat
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
zd 教师电子档案
parent
ef905027
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
269 additions
and
32 deletions
+269
-32
ruoyi-ui/src/api/smartSchool/teacherFiles/teacherElectronicFile.js
+155
-7
ruoyi-ui/src/views/smartSchool/personWork/electronicRecord/index.vue
+0
-0
ruoyi-ui/src/views/smartSchool/teachAffairAdministration/electronicRecord/index.vue
+114
-25
No files found.
ruoyi-ui/src/api/smartSchool/teacherFiles/teacherElectronicFile.js
View file @
85807a4a
import
request
from
'@/utils/request'
import
request
from
'@/utils/request'
// 通知列表
// // 任务列表
// export function listTeacherNotice(query) {
// return request({
// url: '/teacherFiles/notice/list',
// method: 'get',
// params: query
// })
// }
// // 添加任务
// export function addTeacherNotice(data) {
// return request({
// url: '/teacherFiles/notice',
// method: 'post',
// data: data
// })
// }
// // 信息发布
// export function infoTeacherNotice(id) {
// return request({
// url: `/teacherFiles/notice/release/${id}`,
// method: 'put'
// })
// }
// // 通知下档案查看|数据维护
// export function getteacherNotice(query) {
// return request({
// url: '/teacherFiles/files/list',
// method: 'get',
// params: query
// })
// }
// //老师查看档案详情
// export function getNoticeInfo(query) {
// return request({
// url: '/teacherFiles/files/list',
// method: 'get',
// params: query
// })
// }
// //级部查看档案详情
// export function getDepInfo(query) {
// return request({
// url: '/teacherFiles/files/list',
// method: 'get',
// params: query
// })
// }
// //查看档案详情
// export function getFileTnfo(id) {
// return request({
// url: '/teacherFiles/files/'+id,
// method: 'get',
// })
// }
// // 同步档案
// export function syncNotice(id) {
// return request({
// url: '/teacherFiles/files/synchronous/' + id,
// method: 'put'
// })
// }
// 添加任务
export
function
addTeacherNotice
(
data
)
{
return
request
({
url
:
'/teacherFiles/notice'
,
method
:
'post'
,
data
:
data
})
}
// 任务列表
export
function
listTeacherNotice
(
query
)
{
export
function
listTeacherNotice
(
query
)
{
return
request
({
return
request
({
url
:
'/teacherFiles/notice/list'
,
url
:
'/teacherFiles/notice/list'
,
...
@@ -9,24 +88,54 @@ export function listTeacherNotice(query) {
...
@@ -9,24 +88,54 @@ export function listTeacherNotice(query) {
})
})
}
}
// 添加通知
// 任务详情
export
function
addTeacherNotice
(
data
)
{
export
function
infoTeaNotice
(
id
)
{
return
request
({
url
:
`/teacherFiles/notice/
${
id
}
`
,
method
:
'put'
})
}
// 任务修改
export
function
updateTask
(
data
)
{
return
request
({
return
request
({
url
:
'/teacherFiles/notice'
,
url
:
'/teacherFiles/notice'
,
method
:
'p
os
t'
,
method
:
'p
u
t'
,
data
:
data
data
:
data
})
})
}
}
//
信息发布
//
发布任务
export
function
infoTeacherNotice
(
id
)
{
export
function
infoTeacherNotice
(
id
)
{
return
request
({
return
request
({
url
:
`/teacherFiles/notice/release/
${
id
}
`
,
url
:
`/teacherFiles/notice/release/
${
id
}
`
,
method
:
'put'
method
:
'put'
})
})
}
// 任务撤回
export
function
taskRetracted
(
id
)
{
return
request
({
url
:
'/teacherFiles/notice/withdraw/'
+
id
,
method
:
'put'
})
}
// 任务完成
export
function
taskCompleted
(
id
)
{
return
request
({
url
:
'/teacherFiles/notice/complete/'
+
id
,
method
:
'put'
})
}
}
// 任务删除
export
function
delTaskInfo
(
id
)
{
return
request
({
url
:
'/teacherFiles/notice/'
+
id
,
method
:
'delete'
})
}
// 通知下档案查看|数据维护
// 通知下档案查看|数据维护
export
function
getteacherNotice
(
query
)
{
export
function
getteacherNotice
(
query
)
{
...
@@ -36,7 +145,6 @@ export function getteacherNotice(query) {
...
@@ -36,7 +145,6 @@ export function getteacherNotice(query) {
params
:
query
params
:
query
})
})
}
}
//老师查看档案详情
//老师查看档案详情
export
function
getNoticeInfo
(
query
)
{
export
function
getNoticeInfo
(
query
)
{
return
request
({
return
request
({
...
@@ -54,7 +162,6 @@ export function getDepInfo(query) {
...
@@ -54,7 +162,6 @@ export function getDepInfo(query) {
params
:
query
params
:
query
})
})
}
}
//查看档案详情
//查看档案详情
export
function
getFileTnfo
(
id
)
{
export
function
getFileTnfo
(
id
)
{
return
request
({
return
request
({
...
@@ -70,3 +177,43 @@ export function syncNotice(id) {
...
@@ -70,3 +177,43 @@ export function syncNotice(id) {
})
})
}
}
// 教师档案修改
export
function
updateInfo
(
data
)
{
return
request
({
url
:
'/teacherFiles/files'
,
method
:
'put'
,
data
:
data
})
}
// 教师档案删除
export
function
delInfo
(
id
)
{
return
request
({
url
:
'/teacherFiles/files'
+
id
,
method
:
'delete'
})
}
// 教师档案提交审核
// /teacherFiles/files/submitTo/29
export
function
fileSubReview
(
id
)
{
return
request
({
url
:
`/teacherFiles/files/submitTo/
${
id
}
`
,
method
:
'put'
})
}
// 教师档案提交通过
export
function
fileSubApproved
(
id
)
{
return
request
({
url
:
`/teacherFiles/files/reject/
${
id
}
`
,
method
:
'put'
})
}
// 教师档案提交驳回
export
function
fileSubRejected
(
id
)
{
return
request
({
url
:
`/teacherFiles/files/passThrough/
${
id
}
`
,
method
:
'put'
})
}
\ No newline at end of file
ruoyi-ui/src/views/smartSchool/personWork/electronicRecord/index.vue
View file @
85807a4a
This diff is collapsed.
Click to expand it.
ruoyi-ui/src/views/smartSchool/teachAffairAdministration/electronicRecord/index.vue
View file @
85807a4a
...
@@ -16,7 +16,7 @@
...
@@ -16,7 +16,7 @@
<el-select
v-model=
"queryForm.noticeState"
placeholder=
"请选择任务状态"
>
<el-select
v-model=
"queryForm.noticeState"
placeholder=
"请选择任务状态"
>
<el-option
label=
"未发布"
value=
"1"
></el-option>
<el-option
label=
"未发布"
value=
"1"
></el-option>
<el-option
label=
"已发布"
value=
"2"
></el-option>
<el-option
label=
"已发布"
value=
"2"
></el-option>
<el-option
label=
"已结束"
value=
"
3
"
></el-option>
<el-option
label=
"已结束"
value=
"
7
"
></el-option>
</el-select>
</el-select>
</el-form-item>
</el-form-item>
<el-form-item>
<el-form-item>
...
@@ -107,7 +107,13 @@
...
@@ -107,7 +107,13 @@
>
>
<template
slot-scope=
"
{ row }">
<template
slot-scope=
"
{ row }">
{{
{{
row
.
noticeState
==
1
?
"未发布"
:
2
?
"已发布"
:
3
?
"已结束"
:
""
row
.
noticeState
==
1
?
"未发布"
:
row
.
noticeState
==
2
?
"已发布"
:
row
.
noticeState
==
7
?
"已发布"
:
""
}}
}}
</
template
>
</
template
>
</el-table-column>
</el-table-column>
...
@@ -142,16 +148,19 @@
...
@@ -142,16 +148,19 @@
</el-button>
</el-button>
</div>
</div>
<div>
<div>
<!-- v-if="scope.row.noticeState == '2'" -->
<el-button
<el-button
size=
"mini"
type=
"text"
@
click=
"dataReceiver(scope.row)"
v-if=
"scope.row.noticeState == '2'"
size=
"mini"
type=
"text"
@
click=
"dataReceiver(scope.row)"
>
数据接收人员
>
数据接收人员
</el-button>
</el-button>
<el-button
<el-button
v-if=
"scope.row.noticeState == '2'"
size=
"mini"
size=
"mini"
type=
"text"
type=
"text"
@
click=
"dataMaintenance(scope.row)"
@
click=
"dataMaintenance(scope.row)"
>
数据维护
>
数据维护
<!-- v-if="scope.row.noticeState == '2'" -->
</el-button>
</el-button>
<el-button
<el-button
v-if=
"scope.row.noticeState == '2'"
v-if=
"scope.row.noticeState == '2'"
...
@@ -177,21 +186,21 @@
...
@@ -177,21 +186,21 @@
</div>
</div>
<div>
<div>
<el-button
<el-button
v-if=
"scope.row.noticeState == '
3
'"
v-if=
"scope.row.noticeState == '
7
'"
size=
"mini"
size=
"mini"
type=
"text"
type=
"text"
@
click=
"dataReceiver(scope.row)"
@
click=
"dataReceiver(scope.row)"
>
数据接收人员
>
数据接收人员
</el-button>
</el-button>
<el-button
<el-button
v-if=
"scope.row.noticeState == '
3
'"
v-if=
"scope.row.noticeState == '
7
'"
size=
"mini"
size=
"mini"
type=
"text"
type=
"text"
@
click=
"dataMaintenance(scope.row)"
@
click=
"dataMaintenance(scope.row)"
>
数据查看
>
数据查看
</el-button>
</el-button>
<el-button
<el-button
v-if=
"scope.row.noticeState == '
3
'"
v-if=
"scope.row.noticeState == '
7
'"
size=
"mini"
size=
"mini"
type=
"text"
type=
"text"
@
click=
"handleExport(scope.row)"
@
click=
"handleExport(scope.row)"
...
@@ -272,13 +281,24 @@
...
@@ -272,13 +281,24 @@
<
script
>
<
script
>
import
{
import
{
listTeacherNotice
,
// 通知列表
addTeacherNotice
,
//添加任务
addTeacherNotice
,
// 添加通知
listTeacherNotice
,
// 任务列表
infoTeacherNotice
,
// 信息发布
infoTeaNotice
,
//任务详情
updateTask
,
//添加修改
infoTeacherNotice
,
//发布任务
taskRetracted
,
//任务撤回
taskCompleted
,
//任务完成
delTaskInfo
,
//任务删除
getteacherNotice
,
// 通知下档案查看|数据维护
getteacherNotice
,
// 通知下档案查看|数据维护
getNoticeInfo
,
//查看档案详情//查看档案详情
getNoticeInfo
,
//老师查看档案详情
syncNotice
,
// 同步档案
getDepInfo
,
//级部查看档案详情
getDepInfo
,
//级部查询列表
getFileTnfo
,
//查看档案详情
syncNotice
,
//同步档案
updateInfo
,
//教师档案修改
delInfo
,
//教师档案删除
fileSubReview
,
//教师档案提交审核
fileSubApproved
,
//教师档案提交通过
fileSubRejected
,
//教师档案提交驳回
}
from
"@/api/smartSchool/teacherFiles/teacherElectronicFile"
;
}
from
"@/api/smartSchool/teacherFiles/teacherElectronicFile"
;
import
{
format
}
from
"@/utils/activiti/myUtil.js"
;
import
{
format
}
from
"@/utils/activiti/myUtil.js"
;
export
default
{
export
default
{
...
@@ -309,6 +329,7 @@ export default {
...
@@ -309,6 +329,7 @@ export default {
// 弹窗标题
// 弹窗标题
title
:
""
,
title
:
""
,
form
:
{
form
:
{
noticeYear
:
""
,
noticeSemester
:
""
,
noticeSemester
:
""
,
noticeRange
:
"全体教师"
,
noticeRange
:
"全体教师"
,
startTime
:
""
,
startTime
:
""
,
...
@@ -374,11 +395,30 @@ export default {
...
@@ -374,11 +395,30 @@ export default {
this
.
dialogVisible
=
true
;
this
.
dialogVisible
=
true
;
},
},
//弹窗确定按钮
//弹窗确定按钮
confirmDialog
()
{
confirmDialog
()
{
addTeacherNotice
(
this
.
form
).
then
((
res
)
=>
{
this
.
$refs
[
"form"
].
validate
((
valid
)
=>
{
console
.
log
(
res
,
"弹窗确定"
);
if
(
valid
)
{
if
(
this
.
form
.
id
!=
null
)
{
// 修改
updateTask
(
this
.
form
)
.
then
((
response
)
=>
{
this
.
getList
();
this
.
$message
.
success
(
"修改成功"
);
this
.
dialogVisible
=
false
;
this
.
dialogVisible
=
false
;
})
.
catch
((
err
)
=>
{});
}
else
{
// 新增
addTeacherNotice
(
this
.
form
)
.
then
((
response
)
=>
{
this
.
getList
();
this
.
getList
();
this
.
$message
.
success
(
"新增成功"
);
this
.
dialogVisible
=
false
;
})
.
catch
((
err
)
=>
{});
}
}
});
});
},
},
//多选删除按钮
//多选删除按钮
...
@@ -388,25 +428,39 @@ export default {
...
@@ -388,25 +428,39 @@ export default {
},
},
//修改按钮
//修改按钮
handleEdit
(
row
)
{
handleEdit
(
row
)
{
console
.
log
(
row
,
"row1"
);
this
.
title
=
"修改任务"
;
this
.
title
=
"修改任务"
;
this
.
dialogVisible
=
true
;
this
.
dialogVisible
=
true
;
this
.
form
=
row
;
},
},
// 删除按钮
// 删除按钮
handleDelete
(
row
)
{},
handleDelete
(
row
)
{
const
ids
=
row
.
id
;
this
.
$modal
.
confirm
(
"是否确认删除?"
)
.
then
(
function
()
{
return
delTaskInfo
(
ids
);
})
.
then
(()
=>
{
this
.
getList
();
this
.
$modal
.
msgSuccess
(
"删除成功"
);
})
.
catch
(()
=>
{});
},
// 发布按钮
// 发布按钮
handlePublish
(
row
)
{
handlePublish
(
row
)
{
this
.
$modal
this
.
$modal
.
confirm
(
"是否
确认发布此信息
?"
)
.
confirm
(
"是否
发布该活动
?"
)
.
then
(
()
=>
{
.
then
(
function
()
{
return
infoTeacherNotice
(
row
.
id
);
return
infoTeacherNotice
(
row
.
id
);
console
.
log
(
row
,
"发布按钮"
);
})
})
.
then
(()
=>
{
.
then
(()
=>
{
this
.
getList
();
this
.
getList
();
this
.
$modal
.
msgSuccess
(
"发布成功"
);
this
.
$modal
.
msgSuccess
(
"发布成功"
);
})
})
.
catch
((
e
xception
)
=>
{
.
catch
((
e
rr
)
=>
{
throw
new
Error
(
exception
);
console
.
error
(
err
);
});
});
},
},
// 数据接收人员按钮
// 数据接收人员按钮
...
@@ -442,11 +496,46 @@ export default {
...
@@ -442,11 +496,46 @@ export default {
console
.
log
(
pageSize
,
"数据维护按钮size"
);
console
.
log
(
pageSize
,
"数据维护按钮size"
);
},
},
// 导出按钮
// 导出按钮
handleExport
(
row
)
{},
handleExport
(
row
)
{
// this.download(`/artExam/exportAddress/${this.examId}`, {
// ...this.queryParams
// }, `教师电子档案${Date.now()}.xlsx`)
},
// 撤回按钮
// 撤回按钮
handleRevocation
(
row
)
{},
handleRevocation
(
row
)
{
// taskRetracted
this
.
$modal
.
confirm
(
"是否撤回该活动?"
)
.
then
(
function
()
{
return
taskRetracted
(
row
.
id
);
console
.
log
(
row
,
"撤回按钮"
);
})
.
then
(()
=>
{
this
.
getList
();
this
.
$modal
.
msgSuccess
(
"撤回成功"
);
})
.
catch
((
err
)
=>
{
console
.
error
(
err
);
});
},
// 结束按钮
// 结束按钮
handleFinish
(
row
)
{},
handleFinish
(
row
)
{
// taskCompleted
this
.
$modal
.
confirm
(
"是否结束该活动?"
)
.
then
(
function
()
{
return
taskCompleted
(
row
.
id
);
console
.
log
(
row
,
"结束按钮"
);
})
.
then
(()
=>
{
this
.
getList
();
this
.
$modal
.
msgSuccess
(
"任务结束"
);
})
.
catch
((
err
)
=>
{
console
.
error
(
err
);
});
},
},
},
};
};
</
script
>
</
script
>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment