5.4
This commit is contained in:
@@ -1,8 +1,8 @@
|
||||
import request from '@/utils/request'
|
||||
|
||||
export function listPage(data) {
|
||||
export function saveSysPlanSchedule(data) {
|
||||
return request({
|
||||
url: '/portal/v1/sysmapping/listPage',
|
||||
url: 'v1/sysPlanSchedule/saveSysPlanSchedule',
|
||||
method: 'post',
|
||||
data: data,
|
||||
headers: { 'Content-Type': 'application/json' }
|
||||
@@ -14,10 +14,21 @@ export function listPage(data) {
|
||||
|
||||
export function selectSysPlanStudent (data) {
|
||||
return request({
|
||||
url: '/v1/sysPlan/selectSysPlanStudent',
|
||||
url: `v1/sysPlan/selectSysPlanStudent/${data.userName}`,
|
||||
method: 'post',
|
||||
data: data,
|
||||
headers: { 'Content-Type': 'application/json' }
|
||||
})
|
||||
|
||||
headers: {
|
||||
'Content-Type': 'application/json'
|
||||
}
|
||||
})
|
||||
}
|
||||
export function selectSysPlanComment (data) {
|
||||
return request({
|
||||
url: `v1/sysPlan/selectSysPlanComment/${data.sid}`,
|
||||
method: 'post',
|
||||
data: data,
|
||||
headers: {
|
||||
'Content-Type': 'application/json'
|
||||
}
|
||||
})
|
||||
}
|
||||
@@ -85,21 +85,9 @@ export default {
|
||||
// 自主学姐计划
|
||||
|
||||
// 分页列表
|
||||
selectSysPlan: function(params) {
|
||||
selectSysPlanXs: function (data) {
|
||||
return request({
|
||||
url: '/v1/sysPlan/selectSysPlan',
|
||||
method: 'post',
|
||||
params: params,
|
||||
headers: {
|
||||
'Content-Type': 'application/json'
|
||||
}
|
||||
})
|
||||
},
|
||||
|
||||
// 新增保存
|
||||
saveSysPlan: function(data) {
|
||||
return request({
|
||||
url: '/v1/sysPlan/saveSysPlan',
|
||||
url: `v1/sysPlan/selectSysPlanXs/${data.userName}`,
|
||||
method: 'post',
|
||||
data: data,
|
||||
headers: {
|
||||
@@ -107,6 +95,23 @@ export default {
|
||||
}
|
||||
})
|
||||
},
|
||||
// 新增保存
|
||||
saveSysPlan: function (data) {
|
||||
return request({
|
||||
url: 'v1/sysPlanSchedule/saveSysPlanSchedule',
|
||||
method: 'post',
|
||||
data: data,
|
||||
headers: {
|
||||
'Content-Type': 'application/json'
|
||||
}
|
||||
})
|
||||
},
|
||||
selectSysPlanComment: function (sid) {
|
||||
return request({
|
||||
url: 'v1/sysPlan/selectSysPlanComment/' + sid,
|
||||
method: 'post'
|
||||
})
|
||||
},
|
||||
|
||||
// 删除
|
||||
deleteSysPlan: function (sid) {
|
||||
@@ -128,17 +133,6 @@ export default {
|
||||
})
|
||||
},
|
||||
|
||||
//提交数据
|
||||
upSysPlan: function(data) {
|
||||
return request({
|
||||
url: 'v1/sysPlan/upSysPlan',
|
||||
method: 'post',
|
||||
data: data,
|
||||
headers: {
|
||||
'Content-Type': 'application/json'
|
||||
}
|
||||
})
|
||||
},
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -49,6 +49,7 @@ const actions = {
|
||||
}
|
||||
commit('SET_UESRINFO', user)
|
||||
window.sessionStorage.setItem('userSid', user.userSid)
|
||||
window.sessionStorage.setItem('userName', user.userName)
|
||||
window.sessionStorage.setItem('Orgname', user.Orgname)
|
||||
window.sessionStorage.setItem('departmentName', user.departmentName)
|
||||
window.sessionStorage.setItem('name', user.name)
|
||||
|
||||
@@ -21,7 +21,7 @@
|
||||
<el-table-column prop="studentNo" label="学生学号" align="center" />
|
||||
<el-table-column prop="planContent" label="学习计划" align="center" />
|
||||
<el-table-column prop="stateChinese" label="数据状态" align="center" />
|
||||
<el-table-column prop="plan0pinion" label="反馈意见" align="center" />
|
||||
<el-table-column prop="planOpinion" label="反馈意见" align="center" />
|
||||
</el-table>
|
||||
</div>
|
||||
</el-tab-pane>
|
||||
@@ -36,22 +36,22 @@
|
||||
<el-option v-for="item in typeList" :key="item.dictKey" :label="item.dictValue"
|
||||
:value="item.dictKey" />
|
||||
</el-select> -->
|
||||
<span>{{form.teacherNo}}</span>
|
||||
<!-- <el-input v-model="form.teacherNo" style="width: 300px"></el-input> -->
|
||||
<!-- <span>{{form.teacherNo}}</span> -->
|
||||
<el-input v-model="form.teacherNo" style="width: 300px"></el-input>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>学生学号</td>
|
||||
<td>
|
||||
<span>{{form.studentNo}}</span>
|
||||
<!-- <el-input v-model="form.studentNo" style="width: 300px"></el-input> -->
|
||||
<!-- <span>{{form.studentNo}}</span> -->
|
||||
<el-input v-model="form.studentNo" style="width: 300px"></el-input>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>学习计划内容</td>
|
||||
<td>
|
||||
<span>{{form.planContent}}</span>
|
||||
<!-- <el-input v-model="form.planContent" style="width: 300px"></el-input> -->
|
||||
<!-- <span>{{form.planContent}}</span> -->
|
||||
<el-input v-model="form.planContent" style="width: 300px"></el-input>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
@@ -74,7 +74,7 @@
|
||||
|
||||
<script>
|
||||
import {
|
||||
selectSysPlanStudent,
|
||||
selectSysPlanStudent,alterSysPlan
|
||||
} from "@/api/system/datamapping/datamapping.js";
|
||||
// import organizationManageInfo from './organizationManageInfo.vue'
|
||||
export default {
|
||||
@@ -90,6 +90,7 @@
|
||||
form: {},
|
||||
formBackup: Object.assign({}, this.form),
|
||||
tableData: [],
|
||||
userName: window.sessionStorage.getItem("userName"),
|
||||
}
|
||||
},
|
||||
mounted() {
|
||||
@@ -98,8 +99,9 @@
|
||||
methods: {
|
||||
getPageList() {
|
||||
// 获取列表
|
||||
selectSysPlanStudent().then((res) => {
|
||||
selectSysPlanStudent({userName:this.userName}).then((res) => {
|
||||
this.tableData = res.data;
|
||||
console.log(res);
|
||||
});
|
||||
},
|
||||
handleClick(tab, event) {
|
||||
@@ -112,7 +114,14 @@
|
||||
},
|
||||
save() {
|
||||
console.log("form", this.form)
|
||||
|
||||
alterSysPlan(this.form).then((res)=>{
|
||||
this.editDialog = false;
|
||||
this.getPageList();
|
||||
this.$message({
|
||||
message: res.msg,
|
||||
type: "success",
|
||||
});
|
||||
})
|
||||
|
||||
this.reset();
|
||||
},
|
||||
|
||||
@@ -1,90 +1,116 @@
|
||||
<template>
|
||||
<div class="app-container">
|
||||
<div v-show="viewState == 1">
|
||||
<el-tabs class="my-tabs" v-model="activeName" type="card" @tab-click="handleClick">
|
||||
<el-tab-pane label="论坛信息" name="roleList">
|
||||
<el-tabs
|
||||
class="my-tabs"
|
||||
v-model="activeName"
|
||||
type="card"
|
||||
@tab-click="handleClick"
|
||||
>
|
||||
<el-tab-pane label="自主学习计划实施指导" name="roleList">
|
||||
<div class="container">
|
||||
<el-table :data="tableData" border style="width: 100%">
|
||||
<el-table-column label="序号" width="70px" type="index" align="center">
|
||||
<el-table-column
|
||||
label="序号"
|
||||
width="70px"
|
||||
type="index"
|
||||
align="center"
|
||||
>
|
||||
</el-table-column>
|
||||
<el-table-column label="操作" width="150px" align="center">
|
||||
<template slot-scope="scope">
|
||||
<el-table-column
|
||||
prop="teacherNo"
|
||||
label="教师工号"
|
||||
align="center"
|
||||
/>
|
||||
<el-table-column
|
||||
prop="studentNo"
|
||||
label="学生学号"
|
||||
align="center"
|
||||
/>
|
||||
<el-table-column
|
||||
prop="planContent"
|
||||
label="学习计划"
|
||||
align="center"
|
||||
/>
|
||||
<el-table-column
|
||||
prop="planOpinion"
|
||||
label="反馈意见"
|
||||
align="center"
|
||||
/>
|
||||
<el-table-column label="查看进度" width="200px" align="center">
|
||||
<!-- <template slot-scope="scope">
|
||||
<el-button type="primary" size="mini" @click="editRow(scope.row)">
|
||||
评论
|
||||
</el-button>
|
||||
<el-button type="danger" size="mini" @click.native.prevent="detail(scope.row)">
|
||||
查看
|
||||
查看进度
|
||||
</el-button>
|
||||
</template> -->
|
||||
<template slot-scope="scope">
|
||||
<el-button type="text" @click="lookstuder(scope.row)"
|
||||
>查看学生</el-button
|
||||
>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="type" label="论坛类别" align="center" />
|
||||
<el-table-column prop="title" label="论坛标题" align="center" />
|
||||
<el-table-column prop="content" label="论坛内容" align="center" />
|
||||
</el-table>
|
||||
</div>
|
||||
</el-tab-pane>
|
||||
|
||||
<el-tab-pane label="论坛发布" name="addrole">
|
||||
<!-- 查看学生 -->
|
||||
<el-dialog title="学生" :visible.sync="lookstuders">
|
||||
<el-table
|
||||
ref="multipleTable"
|
||||
:data="gridData"
|
||||
row-key="sid"
|
||||
:tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
|
||||
border
|
||||
>
|
||||
<el-table-column
|
||||
property="studentNo"
|
||||
label="学号"
|
||||
></el-table-column>
|
||||
<el-table-column
|
||||
property="planContent"
|
||||
label="学习计划"
|
||||
width="200"
|
||||
></el-table-column>
|
||||
<el-table-column
|
||||
property="planContentJd"
|
||||
label="学习进度"
|
||||
></el-table-column>
|
||||
<el-table-column label="操作" align="center">
|
||||
<template slot-scope="scope">
|
||||
<el-button
|
||||
type="primary"
|
||||
size="mini"
|
||||
@click.native.prevent="deleteRow(scope.row)"
|
||||
>
|
||||
删除
|
||||
</el-button>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
</el-dialog>
|
||||
<!-- 管理计划 -->
|
||||
<el-dialog
|
||||
:title="dialogTitle + '学习计划'"
|
||||
:visible.sync="editDialog"
|
||||
width="40%"
|
||||
>
|
||||
<table class="e-table" cellspacing="0">
|
||||
<tr>
|
||||
<td>论坛类别</td>
|
||||
<td>学习计划内容</td>
|
||||
<td>
|
||||
<el-select v-model="form.type" class="addinputw" placeholder="请选择论坛类别" style="width:300px"
|
||||
@change="getType">
|
||||
<el-option v-for="item in typeList" :key="item.dictKey" :label="item.dictValue"
|
||||
:value="item.dictKey" />
|
||||
</el-select>
|
||||
<el-input
|
||||
v-model="form.planContent"
|
||||
style="width: 300px"
|
||||
></el-input>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>论坛标题</td>
|
||||
<td>反馈意见</td>
|
||||
<td>
|
||||
<el-input v-model="form.title" style="width: 300px"></el-input>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>论坛内容</td>
|
||||
<td>
|
||||
<el-input v-model="form.content" style="width: 300px"></el-input>
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
<div style="margin-top: 20px; text-align: center">
|
||||
<el-button type="primary" @click="save()">保存</el-button>
|
||||
</div>
|
||||
</el-tab-pane>
|
||||
<el-dialog :title="dialogTitle + '论坛信息'" :visible.sync="editDialog" width="40%">
|
||||
<table class="e-table" cellspacing="0">
|
||||
<tr>
|
||||
<td>论坛类别</td>
|
||||
<td>
|
||||
<!-- <el-select v-model="form.type" class="addinputw" placeholder="请选择论坛类别" style="width:300px"
|
||||
@change="getType">
|
||||
<el-option v-for="item in typeList" :key="item.dictKey" :label="item.dictValue"
|
||||
:value="item.dictKey" />
|
||||
</el-select> -->
|
||||
<span>{{form.type}}</span>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>论坛标题</td>
|
||||
<td>
|
||||
<span>{{form.title}}</span>
|
||||
<!-- <el-input v-model="form.title" style="width: 300px"></el-input> -->
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>论坛内容</td>
|
||||
<td>
|
||||
<span>{{form.content}}</span>
|
||||
<!-- <el-input v-model="form.content" style="width: 300px"></el-input> -->
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>评论内容</td>
|
||||
<td>
|
||||
<!-- <span>{{form.content}}</span> -->
|
||||
<el-input v-model="commentContent"></el-input>
|
||||
<!-- <span>{{form.planContent}}</span> -->
|
||||
<el-input
|
||||
v-model="form.planOpinion"
|
||||
style="width: 300px"
|
||||
></el-input>
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
@@ -94,22 +120,20 @@
|
||||
</el-dialog>
|
||||
</el-tabs>
|
||||
</div>
|
||||
<organizationManageInfo v-show="viewState ==4" ref="divInfo" @doback="resetState" />
|
||||
<!-- <organizationManageInfo v-show="viewState ==4" ref="divInfo" @doback="resetState" /> -->
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import {
|
||||
selectSysForum,
|
||||
saveSysForum,
|
||||
alterSysForum,
|
||||
deleteSysForum,
|
||||
saveSysForumComment,
|
||||
} from "@/api/system/copyofprocess/liuchengchasongguanli.js";
|
||||
import organizationManageInfo from './organizationManageInfo.vue'
|
||||
selectSysPlanStudent,
|
||||
saveSysPlanSchedule,
|
||||
selectSysPlanComment,
|
||||
} from "@/api/system/datamapping/datamapping.js";
|
||||
// import organizationManageInfo from './organizationManageInfo.vue'
|
||||
export default {
|
||||
components: {
|
||||
organizationManageInfo,
|
||||
// organizationManageInfo,
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
@@ -117,48 +141,26 @@
|
||||
activeName: "roleList",
|
||||
dialogTitle: "",
|
||||
editDialog: false,
|
||||
form: {},
|
||||
form: {
|
||||
sid:''
|
||||
},
|
||||
formBackup: Object.assign({}, this.form),
|
||||
tableData: [],
|
||||
commentContent: "", // 评论内容
|
||||
typeList: [{
|
||||
dictKey: "1",
|
||||
dictValue: "JAVA",
|
||||
}, {
|
||||
dictKey: "2",
|
||||
dictValue: "Python",
|
||||
}, {
|
||||
dictKey: "3",
|
||||
dictValue: "C++",
|
||||
}, {
|
||||
dictKey: "4",
|
||||
dictValue: "Excel",
|
||||
}, {
|
||||
dictKey: "5",
|
||||
dictValue: "英语四六级考试",
|
||||
}, {
|
||||
dictKey: "6",
|
||||
dictValue: "计算机等级考试",
|
||||
}
|
||||
|
||||
]
|
||||
userName: window.sessionStorage.getItem("userName"),
|
||||
sid: "",
|
||||
lookstuders: false,
|
||||
gridData: [],
|
||||
};
|
||||
},
|
||||
mounted() {
|
||||
this.getPageList();
|
||||
console.log("sssssssssss", window.sessionStorage.getItem('userSid'))
|
||||
},
|
||||
methods: {
|
||||
getType(value) {
|
||||
console.log(">>>>>>>>>getType", value)
|
||||
const choose = this.typeList.filter((item) => item.dictKey === value)
|
||||
this.form.type = choose[0].dictValue
|
||||
// this.form.typeSid = choose[0].dictKey
|
||||
},
|
||||
getPageList() {
|
||||
// 获取列表
|
||||
selectSysForum().then((res) => {
|
||||
selectSysPlanStudent({ userName: this.userName }).then((res) => {
|
||||
this.tableData = res.data;
|
||||
console.log(res);
|
||||
});
|
||||
},
|
||||
handleClick(tab, event) {
|
||||
@@ -170,18 +172,8 @@
|
||||
}
|
||||
},
|
||||
save() {
|
||||
console.log("form", this.form)
|
||||
|
||||
saveSysForumComment(
|
||||
|
||||
{
|
||||
forumSid: this.form.sid,
|
||||
content: this.commentContent,
|
||||
createBySid: window.sessionStorage.getItem('userSid')
|
||||
}
|
||||
|
||||
).then((res) => {
|
||||
this.commentContent = ""
|
||||
console.log("form", this.form);
|
||||
saveSysPlanSchedule(this.form).then((res) => {
|
||||
this.editDialog = false;
|
||||
this.getPageList();
|
||||
this.$message({
|
||||
@@ -189,19 +181,30 @@
|
||||
type: "success",
|
||||
});
|
||||
});
|
||||
|
||||
this.reset();
|
||||
},
|
||||
resetState() {
|
||||
this.viewState = 1
|
||||
reset() {
|
||||
this.form = {};
|
||||
},
|
||||
editRow(row) {
|
||||
this.dialogTitle = "评论";
|
||||
this.dialogTitle = "反馈";
|
||||
this.editDialog = true;
|
||||
this.form = Object.assign({}, row);
|
||||
},
|
||||
detail(row) {
|
||||
this.viewState = 4
|
||||
this.$refs['divInfo'].showAdd(row)
|
||||
|
||||
// 查看学生
|
||||
lookstuder(row) {
|
||||
this.lookstuders = true;
|
||||
selectSysPlanComment({ sid: row.sid }).then((res) => {
|
||||
console.log(res.data);
|
||||
this.gridData = res.data;
|
||||
});
|
||||
},
|
||||
deleteRow(row) {
|
||||
this.form.sid=row.sid
|
||||
this.editDialog=true
|
||||
this.lookstuders = false;
|
||||
this.form = Object.assign({}, row);
|
||||
},
|
||||
},
|
||||
};
|
||||
|
||||
@@ -1,504 +1,288 @@
|
||||
<template>
|
||||
<el-tabs class="my-tabs" v-model="activeName" type="card" @tab-click="handleClick">
|
||||
<el-tab-pane label="岗位列表" name="roleList">
|
||||
|
||||
<div class="container">
|
||||
<div class="tab-header">
|
||||
<el-form ref="form" :inline="true" :model="search" label-width="80px">
|
||||
<el-row :gutter="20">
|
||||
<el-col :span="24">
|
||||
<el-form-item label="岗位名称">
|
||||
<el-input v-model="search.name" clearable></el-input>
|
||||
</el-form-item>
|
||||
<!-- <el-form-item label="所属部门">
|
||||
<el-select v-model="search.orgSid" placeholder="请选择" clearable @clear="handleClear">
|
||||
<el-option hidden :key="search.orgSid" :label="orgName" :value="search.orgSid"></el-option>
|
||||
<el-tree v-loading="loading" :data="treedata" ref="Tree" show-checkbox accordion node-key="sid"
|
||||
:default-checked-keys="checkedId"
|
||||
:default-expand-all='true' :check-strictly='true' :props="defaultProps"
|
||||
@check-change="checkchange"
|
||||
<div class="app-container">
|
||||
<div v-show="viewState == 1">
|
||||
<el-tabs
|
||||
class="my-tabs"
|
||||
v-model="activeName"
|
||||
type="card"
|
||||
@tab-click="handleClick"
|
||||
>
|
||||
</el-tree>
|
||||
<el-tab-pane label="自主学习计划" name="roleList">
|
||||
<el-select
|
||||
v-model="sid"
|
||||
class="addinputw"
|
||||
placeholder="请选择论坛类别"
|
||||
style="width: 300px"
|
||||
>
|
||||
<el-option
|
||||
v-for="(item,i) in formList"
|
||||
:key="i"
|
||||
:label="item.planContent"
|
||||
:value="item.sid"
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item> -->
|
||||
<el-button @click="getList(1)">查询</el-button>
|
||||
</el-col>
|
||||
</el-row>
|
||||
</el-form>
|
||||
</div>
|
||||
<!-- table -->
|
||||
<el-table :data="roleTable" border style="width: 100%;">
|
||||
<el-table-column label="序号" width="50px" type="index" align="center">
|
||||
<el-button style="margin-left: 20px" type="primary" @click="toLook()"
|
||||
>查询</el-button
|
||||
>
|
||||
<div class="container">
|
||||
<el-table :data="tableData" border style="width: 100%">
|
||||
<el-table-column
|
||||
label="序号"
|
||||
width="70px"
|
||||
type="index"
|
||||
align="center"
|
||||
>
|
||||
</el-table-column>
|
||||
<el-table-column label="操作" width="220px" align="center">
|
||||
<el-table-column label="操作" width="150px" align="center">
|
||||
<template slot-scope="scope">
|
||||
<el-button @click="editRow(scope.row)" type="primary" size="mini"> 修改</el-button>
|
||||
<el-button @click="delRow(scope.row)" type="danger" size="mini"> 删除</el-button>
|
||||
<el-button
|
||||
type="primary"
|
||||
size="mini"
|
||||
@click="editRow(scope.row)"
|
||||
>
|
||||
编辑
|
||||
</el-button>
|
||||
<!-- <el-button type="primary" size="mini" @click="detail(scope.row)">
|
||||
查看
|
||||
</el-button> -->
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="name" label="岗位名称" align="center"></el-table-column>
|
||||
<el-table-column prop="parentName" label="上级岗位名称" align="center"></el-table-column>
|
||||
<el-table-column prop="postCode" label="岗位编码" align="center"></el-table-column>
|
||||
<el-table-column prop="postLevel" label="职级" align="center"></el-table-column>
|
||||
<!-- <el-table-column prop="orgName" label="所属部门" align="center"></el-table-column> -->
|
||||
<el-table-column
|
||||
prop="studentNo"
|
||||
label="学生学号"
|
||||
align="center"
|
||||
/>
|
||||
<el-table-column
|
||||
prop="planContent"
|
||||
label="学习计划"
|
||||
align="center"
|
||||
/>
|
||||
<el-table-column
|
||||
prop="planContentJd"
|
||||
label="学习进度"
|
||||
align="center"
|
||||
/>
|
||||
<el-table-column
|
||||
prop="planOpinionYj"
|
||||
label="反馈意见"
|
||||
align="center"
|
||||
/>
|
||||
</el-table>
|
||||
<pagination :total="page.total" :page.sync="page.current" :limit.sync="page.size" @pagination="pagination"/>
|
||||
|
||||
<!-- 编辑岗位信息 -->
|
||||
<el-dialog :title="dialogTitle + '岗位信息'" :visible.sync="editDialog" width="40%">
|
||||
</div>
|
||||
</el-tab-pane>
|
||||
<!-- 新增进度 -->
|
||||
<el-tab-pane label="进度管理" name="addrole">
|
||||
<table class="e-table" cellspacing="0">
|
||||
<tr>
|
||||
<td>上级岗位</td>
|
||||
<td> <!-- @change="changeParentSid" -->
|
||||
<el-select v-model="roleForm.parentSid" filterable clearable placeholder="请选择"
|
||||
style="width:300px">
|
||||
<el-option v-for="item in parentSidList" :key="item.sid" :label="item.name"
|
||||
:value="item.sid">
|
||||
</el-option>
|
||||
</el-select>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>岗位名称</td>
|
||||
<td>学习计划</td>
|
||||
<td>
|
||||
<el-input v-model="roleForm.name" style="width:300px"></el-input>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>岗位职级</td>
|
||||
<td>
|
||||
<el-select v-model="roleForm.postLevel" @change="changeUPpostLevel" filterable placeholder="请选择" style="width:300px">
|
||||
<el-option v-for="item in postLevelList" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey">
|
||||
</el-option>
|
||||
</el-select>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>岗位编码</td>
|
||||
<td>
|
||||
<el-input v-model="roleForm.postCode" style="width:300px"></el-input>
|
||||
</td>
|
||||
</tr>
|
||||
<!--<tr>
|
||||
<td>备注</td>
|
||||
<td>
|
||||
<el-input type="textarea" :autosize="{ minRows: 4, maxRows: 6}" v-model="roleForm.remarks"></el-input>
|
||||
</td>
|
||||
</tr>-->
|
||||
<!-- <tr>
|
||||
<td>选择部门(单选)</td>
|
||||
<td>
|
||||
<el-tree
|
||||
:data="treedata1"
|
||||
show-checkbox
|
||||
node-key="sid"
|
||||
ref="Tree1"
|
||||
:default-expand-all='true'
|
||||
:check-strictly='true'
|
||||
:default-checked-keys="checkedId1"
|
||||
:props="defaultProps"
|
||||
@check-change="checkchange1"
|
||||
<el-select
|
||||
v-model="form.planSid"
|
||||
class="addinputw"
|
||||
placeholder="请选择论坛类别"
|
||||
style="width: 300px"
|
||||
>
|
||||
</el-tree>
|
||||
<el-option
|
||||
v-for="(item, i) in formList"
|
||||
:key="i"
|
||||
:label="item.planContent"
|
||||
:value="item.sid"
|
||||
/>
|
||||
</el-select>
|
||||
</td>
|
||||
</tr> -->
|
||||
</tr>
|
||||
<tr>
|
||||
<td>进度内容</td>
|
||||
<td>
|
||||
<el-input
|
||||
v-model="form.planContent"
|
||||
style="width: 300px"
|
||||
></el-input>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>反馈意见</td>
|
||||
<td>
|
||||
<el-input
|
||||
type="textarea"
|
||||
:autosize="{ minRows: 4, maxRows: 6 }"
|
||||
v-model="form.planOpinion"
|
||||
></el-input>
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
<div style="margin-top: 20px; text-align: center;">
|
||||
<div style="margin-top: 20px; text-align: center">
|
||||
<el-button type="primary" @click="save()">保存</el-button>
|
||||
<el-button @click="editDialog = false">关 闭</el-button>
|
||||
</div>
|
||||
</el-tab-pane>
|
||||
|
||||
<!-- 编辑进度 -->
|
||||
<el-dialog
|
||||
:title="dialogTitle + '学习计划'"
|
||||
:visible.sync="editDialog"
|
||||
width="40%"
|
||||
>
|
||||
<table class="e-table" cellspacing="0">
|
||||
<tr>
|
||||
<td>学习计划</td>
|
||||
<td>
|
||||
<el-select
|
||||
v-model="form.planSid"
|
||||
class="addinputw"
|
||||
placeholder="请选择论坛类别"
|
||||
style="width: 300px"
|
||||
>
|
||||
<el-option
|
||||
v-for="(item, i) in formList"
|
||||
:key="i"
|
||||
:label="item.planContent"
|
||||
:value="item.sid"
|
||||
/>
|
||||
</el-select>
|
||||
<!-- <span>{{form.teacherNo}}</span> -->
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>学习进度</td>
|
||||
<td>
|
||||
<!-- <span>{{form.studentNo}}</span> -->
|
||||
<el-input
|
||||
v-model="form.planContent"
|
||||
style="width: 300px"
|
||||
></el-input>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>反馈意见</td>
|
||||
<td>
|
||||
<!-- <span>{{form.planContent}}</span> -->
|
||||
<el-input
|
||||
v-model="form.planOpinion"
|
||||
style="width: 300px"
|
||||
></el-input>
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
<div style="margin-top: 20px; text-align: center">
|
||||
<el-button type="primary" @click="save1()">保存</el-button>
|
||||
</div>
|
||||
</el-dialog>
|
||||
</div>
|
||||
</el-tab-pane>
|
||||
<!-- 新增岗位信息 -->
|
||||
<el-tab-pane label="新增岗位" name="addrole">
|
||||
<el-card class="box-card">
|
||||
<table class="e-table" cellspacing="0">
|
||||
<tr>
|
||||
<td>上级岗位</td>
|
||||
<td> <!-- @change="changeParentSid" -->
|
||||
<el-select v-model="roleForm.parentSid" filterable clearable placeholder="请选择"
|
||||
style="width:300px">
|
||||
<el-option v-for="item in parentSidList" :key="item.sid" :label="item.name"
|
||||
:value="item.sid">
|
||||
</el-option>
|
||||
</el-select>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>岗位名称</td>
|
||||
<td>
|
||||
<el-input v-model="roleForm.name" style="width:300px"></el-input>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>岗位职级</td>
|
||||
<td>
|
||||
<el-select v-model="roleForm.postLevel" @change="changePostLevel" filterable placeholder="请选择"
|
||||
style="width:300px">
|
||||
<el-option v-for="item in postLevelList" :key="item.dictKey" :label="item.dictValue"
|
||||
:value="item.dictKey">
|
||||
</el-option>
|
||||
</el-select>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>岗位编码</td>
|
||||
<td>
|
||||
<el-input v-model="roleForm.postCode" style="width:300px"></el-input>
|
||||
</td>
|
||||
</tr>
|
||||
<!--<tr>
|
||||
<td>备注</td>
|
||||
<td> <el-input type="textarea" :autosize="{ minRows: 4, maxRows: 6}" v-model="roleForm.remarks"></el-input></td>
|
||||
</tr>-->
|
||||
<!-- <tr>
|
||||
<td>选择部门(单选)</td>
|
||||
<td>
|
||||
<el-tree
|
||||
:data="treedata2"
|
||||
show-checkbox
|
||||
node-key="sid"
|
||||
ref="Tree2"
|
||||
:default-expand-all='true'
|
||||
:check-strictly='true'
|
||||
:default-checked-keys="checkedId2"
|
||||
:props="defaultProps"
|
||||
@check-change="checkchange2"
|
||||
>
|
||||
</el-tree>
|
||||
</td>
|
||||
</tr> -->
|
||||
</table>
|
||||
<div style="margin-top: 20px; text-align: center;">
|
||||
<el-button type="primary" @click="save()">保 存</el-button>
|
||||
</div>
|
||||
</el-card>
|
||||
</el-tab-pane>
|
||||
</el-tabs>
|
||||
</div>
|
||||
<!-- <organizationManageInfo v-show="viewState ==4" ref="divInfo" @doback="resetState" /> -->
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import {delOrgroles, orgList, pageList, pullDown, putOrgroles, savePost,selectList} from '@/api/system/postManage/index.js'
|
||||
|
||||
import req from "@/api/system/region/region.js";
|
||||
// import organizationManageInfo from './organizationManageInfo.vue'
|
||||
export default {
|
||||
components: {
|
||||
// organizationManageInfo,
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
dialogTitle: '',
|
||||
activeName: 'roleList',
|
||||
roleForm: {
|
||||
remarks: "",
|
||||
roleName: "",
|
||||
postCode: '',
|
||||
orgSid: '',
|
||||
postLevel: '',
|
||||
postLevelKey: '',
|
||||
parentSid:''
|
||||
},
|
||||
formBackup: {},
|
||||
search: {
|
||||
name: '',
|
||||
orgSid: ''
|
||||
},
|
||||
orgName: '',
|
||||
page: {
|
||||
total: 0, // 默认数据总数
|
||||
current: 1, // 默认开始页面
|
||||
size: 10, // 每页的数据条数
|
||||
},
|
||||
roleTable: [],
|
||||
viewState: 1,
|
||||
activeName: "roleList",
|
||||
dialogTitle: "",
|
||||
editDialog: false,
|
||||
// 树形
|
||||
loading: false,
|
||||
defaultProps: {
|
||||
children: 'children',
|
||||
label: 'name'
|
||||
},
|
||||
// orgdata:[], // 部门
|
||||
checkedId: [],
|
||||
checkedId1: [],
|
||||
checkedId2: [],
|
||||
treedata: [],
|
||||
treedata1: [],
|
||||
treedata2: [],
|
||||
postLevelList: [],
|
||||
parentSidList: [],
|
||||
// chace: [],
|
||||
// roleDialog: false,
|
||||
// Thisrow: {},
|
||||
// orgListAll:[]
|
||||
form: {},
|
||||
formBackup: Object.assign({}, this.form),
|
||||
tableData: [],
|
||||
formList: [],
|
||||
sid: "",
|
||||
};
|
||||
},
|
||||
mounted() {
|
||||
this.formBackup = Object.assign({}, this.roleForm),
|
||||
this.getList()
|
||||
this.getOrgList()
|
||||
this.postLevel()
|
||||
this.getParent()
|
||||
this.getPageList();
|
||||
},
|
||||
methods: {
|
||||
pagination(val) { // 分页函数
|
||||
this.page.current = val.pageNum
|
||||
this.page.size = val.pageSize
|
||||
this.getList()
|
||||
getPageList() {
|
||||
// 获取列表
|
||||
req.selectSysPlan().then((res) => {
|
||||
this.formList = res.data;
|
||||
});
|
||||
},
|
||||
// 分页列表
|
||||
getList(flag) {
|
||||
if (flag == '1') {
|
||||
this.page.current = 1
|
||||
toLook() {
|
||||
console.log(this.sid);
|
||||
if (this.sid.length>=1) {
|
||||
req.selectSysPlanComment(this.sid).then((res) => {
|
||||
console.log(res);
|
||||
this.tableData = res.data;
|
||||
});
|
||||
} else {
|
||||
this.$message({
|
||||
message: "请选择你要查询的学习计划",
|
||||
type: "warning",
|
||||
});
|
||||
}
|
||||
let params = this.page
|
||||
params.params = this.search
|
||||
pageList(params).then(res => {
|
||||
this.page.total = res.data.total
|
||||
this.roleTable = res.data.records
|
||||
})
|
||||
},
|
||||
postLevel(){
|
||||
pullDown({ psid: 0, type: 'postLevel' }).then((res)=>{
|
||||
if(res.code==='200'){
|
||||
this.postLevelList=res.data
|
||||
}
|
||||
})
|
||||
},
|
||||
getParent(){
|
||||
selectList().then((res)=>{
|
||||
if(res.code==='200'){
|
||||
this.parentSidList=res.data
|
||||
}
|
||||
})
|
||||
},
|
||||
changePostLevel(value){
|
||||
let bb = null
|
||||
this.postLevelList.forEach((e) => {
|
||||
if (e.dictKey == value) {
|
||||
bb = {
|
||||
name: e.dictValue,
|
||||
value: e.dictKey
|
||||
}
|
||||
}
|
||||
})
|
||||
this.roleForm.postLevel=bb.name
|
||||
this.roleForm.postLevelKey=bb.value
|
||||
},
|
||||
changeUPpostLevel(value){
|
||||
let bb = null
|
||||
this.postLevelList.forEach((e) => {
|
||||
if (e.dictKey == value) {
|
||||
bb = {
|
||||
name: e.dictValue,
|
||||
value: e.dictKey
|
||||
}
|
||||
}
|
||||
})
|
||||
this.roleForm.postLevel=bb.name
|
||||
this.roleForm.postLevelKey=bb.value
|
||||
},
|
||||
handleClick(tab, event) {
|
||||
if (tab.name == 'addrole') {
|
||||
this.dialogTitle = '新增'
|
||||
this.roleForm = Object.assign({}, this.formBackup)
|
||||
if (tab.name == "addrole") {
|
||||
this.dialogTitle = "新增";
|
||||
this.roleForm = Object.assign({}, this.formBackup);
|
||||
} else {
|
||||
this.getList()
|
||||
this.getPageList();
|
||||
}
|
||||
},
|
||||
editRow(row) {
|
||||
this.dialogTitle = '编辑'
|
||||
this.editDialog = true
|
||||
console.log(row)
|
||||
this.roleForm = Object.assign({}, row)
|
||||
this.checkedId1 = [this.roleForm.orgSid]
|
||||
},
|
||||
delRow(row) {
|
||||
this.$confirm('确定要删除该岗位吗, 是否继续?', '提示', {
|
||||
confirmButtonText: '确定',
|
||||
cancelButtonText: '取消',
|
||||
type: 'warning'
|
||||
}).then(() => {
|
||||
let params = {
|
||||
sids: row.sid
|
||||
}
|
||||
delOrgroles(params).then(res => {
|
||||
this.getList()
|
||||
this.$message({
|
||||
type: 'success',
|
||||
message: '删除成功!'
|
||||
});
|
||||
})
|
||||
})
|
||||
},
|
||||
// 保存角色
|
||||
save() {
|
||||
if (this.roleForm.sid) {
|
||||
// let orgSid = this.$refs.Tree1.getCheckedKeys()
|
||||
// this.roleForm.orgSid = orgSid.toString()
|
||||
putOrgroles(this.roleForm).then(res => {
|
||||
if (res.code == '200') {
|
||||
this.getList()
|
||||
this.editDialog = false
|
||||
console.log("form", this.form);
|
||||
if (this.form.planSid!=null){
|
||||
req.saveSysPlan(this.form).then((res) => {
|
||||
this.activeName = "roleList";
|
||||
this.getPageList();
|
||||
this.$message({
|
||||
message: res.msg,
|
||||
type: 'success'
|
||||
})
|
||||
}
|
||||
})
|
||||
type: "success",
|
||||
});
|
||||
});
|
||||
}else{
|
||||
// let orgSid = this.$refs.Tree2.getCheckedKeys()
|
||||
// this.roleForm.orgSid = orgSid.toString()
|
||||
savePost(this.roleForm).then(res => {
|
||||
if (res.code == '200') {
|
||||
this.getList()
|
||||
this.activeName = "roleList"
|
||||
this.$message({
|
||||
message: "请选择学习计划",
|
||||
type: "warning",
|
||||
});
|
||||
}
|
||||
|
||||
this.reset();
|
||||
},
|
||||
save1() {
|
||||
if (this.form.planSid!=null){
|
||||
req.saveSysPlan(this.form).then((res) => {
|
||||
this.editDialog = false;
|
||||
this.getPageList();
|
||||
this.$message({
|
||||
message: res.msg,
|
||||
type: 'success'
|
||||
})
|
||||
let arr = []
|
||||
// this.$refs.Tree2.setCheckedKeys(arr);
|
||||
type: "success",
|
||||
});
|
||||
});
|
||||
}else{
|
||||
this.$message({
|
||||
message: "请选择学习计划",
|
||||
type: "warning",
|
||||
});
|
||||
}
|
||||
})
|
||||
}
|
||||
this.reset()
|
||||
},
|
||||
reset() {
|
||||
this.roleForm = {
|
||||
remarks: "",
|
||||
roleName: "",
|
||||
orgSid: ''
|
||||
};
|
||||
this.search = {
|
||||
name: '',
|
||||
orgSid: ''
|
||||
}
|
||||
this.form = {};
|
||||
},
|
||||
|
||||
// 获取部门树形
|
||||
getOrgList(row) {
|
||||
this.roleDialog = true
|
||||
this.checkedId = []
|
||||
// this.roleForm.roleName = row.roleName
|
||||
this.Thisrow = row
|
||||
this.loading = true
|
||||
let params = {
|
||||
// roleSid: row.sid,
|
||||
// userType: '2'
|
||||
}
|
||||
|
||||
orgList(params).then(res => {
|
||||
this.treedata = res.data
|
||||
this.treedata1 = res.data
|
||||
this.treedata2 = res.data
|
||||
// this.getTreeParentNode(res.data, this.checkedId)
|
||||
// this.getTreeParentid(res.data)
|
||||
this.loading = false
|
||||
})
|
||||
|
||||
resetState() {
|
||||
this.viewState = 1;
|
||||
},
|
||||
// // 递归查询所有上级数据
|
||||
// getTreeParentNode(menus, ids) {
|
||||
// for (var i = 0; i < menus.length; i++) {
|
||||
// if (menus[i].children && menus[i].children.length != 0) {
|
||||
// this.getTreeParentNode(menus[i].children, ids)
|
||||
// } else if (menus[i].isCheck) {
|
||||
// ids.push(menus[i].sid)
|
||||
// }
|
||||
// }
|
||||
// },
|
||||
// // 所有一级菜单ID
|
||||
// getTreeParentid(menus) {
|
||||
// for (var i = 0; i < menus.length; i++) {
|
||||
// this.chace.push(menus[i].sid)
|
||||
// }
|
||||
// },
|
||||
// getCheckedKeys() {
|
||||
// let _this = this
|
||||
// let roleMenus = []
|
||||
// this.$refs.Tree.getCheckedKeys().forEach(val => {
|
||||
// roleMenus.push({
|
||||
// menuSid: val,
|
||||
// orgSid: _this.$store.getters.userInfo.orgSid,
|
||||
// roleSid: _this.Thisrow.sid
|
||||
// })
|
||||
// })
|
||||
// let parentTrue = this.$refs.Tree.getHalfCheckedKeys()
|
||||
// for (let i = 0; i < parentTrue.length; i++) {
|
||||
// for (let j = 0; j < this.chace.length; j++) {
|
||||
// if (parentTrue[i] == this.chace[j]) {
|
||||
// parentTrue.splice(i, 1);
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
// parentTrue.forEach(val => {
|
||||
// roleMenus.push({
|
||||
// menuSid: val,
|
||||
// orgSid: _this.$store.getters.userInfo.orgSid,
|
||||
// roleSid: _this.Thisrow.sid
|
||||
// })
|
||||
// })
|
||||
// saveorgrolemenus({
|
||||
// roleSid: _this.Thisrow.sid,
|
||||
// roleMenus: roleMenus
|
||||
// }).then(res => {
|
||||
// this.roleDialog = false
|
||||
// this.$message({
|
||||
// message: res.msg,
|
||||
// type: 'success'
|
||||
// })
|
||||
// })
|
||||
// },
|
||||
checkchange(data, checked, indeterminate) {
|
||||
if (checked) {
|
||||
|
||||
this.search.orgSid = data.sid
|
||||
this.orgName = data.name
|
||||
|
||||
let arr = []
|
||||
arr = [data.sid];
|
||||
this.$refs.Tree.setCheckedKeys(arr);
|
||||
return;
|
||||
}
|
||||
editRow(row) {
|
||||
this.dialogTitle = "编辑";
|
||||
this.editDialog = true;
|
||||
console.log(row);
|
||||
// this.form = Object.assign({}, row);
|
||||
},
|
||||
checkchange1(data, checked, indeterminate) {
|
||||
if (checked) {
|
||||
this.roleForm.orgSid = data.sid
|
||||
// this.orgName = data.name
|
||||
let arr = []
|
||||
arr = [data.sid];
|
||||
this.$refs.Tree1.setCheckedKeys(arr);
|
||||
return;
|
||||
}
|
||||
detail(row) {
|
||||
this.viewState = 4;
|
||||
this.$refs["divInfo"].showAdd(row);
|
||||
},
|
||||
checkchange2(data, checked, indeterminate) {
|
||||
if (checked) {
|
||||
this.roleForm.orgSid = data.sid
|
||||
// this.orgName = data.name
|
||||
let arr = []
|
||||
arr = [data.sid];
|
||||
this.$refs.Tree2.setCheckedKeys(arr);
|
||||
return;
|
||||
}
|
||||
},
|
||||
handleClear() {
|
||||
// 将选择器的值置空
|
||||
this.orgName = ''
|
||||
this.search.orgSid = ''
|
||||
let arr = []
|
||||
this.$refs.Tree.setCheckedKeys(arr);
|
||||
}
|
||||
}
|
||||
};
|
||||
</script>
|
||||
|
||||
<style scoped>
|
||||
.el-select > .el-input {
|
||||
display: block;
|
||||
width: 300px;
|
||||
}
|
||||
|
||||
/deep/ .tab-header .el-select {
|
||||
width: 180px;
|
||||
}
|
||||
|
||||
<style scoped="scoped" lang="scss">
|
||||
.my-tabs {
|
||||
margin-top: 10px;
|
||||
}
|
||||
|
||||
@@ -9,10 +9,10 @@
|
||||
</el-table-column>
|
||||
<el-table-column label="操作" width="150px" align="center">
|
||||
<template slot-scope="scope">
|
||||
<el-button :disabled=' scope.row.state!= 0' type="primary" size="mini" @click="editRow(scope.row)">
|
||||
<el-button type="primary" size="mini" @click="editRow(scope.row)">
|
||||
编辑
|
||||
</el-button>
|
||||
<el-button :disabled=' scope.row.state!= 0' type="danger" size="mini" @click.native.prevent="deleteRow(scope.row)">
|
||||
<el-button type="danger" size="mini" @click.native.prevent="deleteRow(scope.row)">
|
||||
删除
|
||||
</el-button>
|
||||
<!-- <el-button type="primary" size="mini" @click="detail(scope.row)">
|
||||
@@ -24,7 +24,7 @@
|
||||
<el-table-column prop="studentNo" label="学生学号" align="center" />
|
||||
<el-table-column prop="planContent" label="学习计划" align="center" />
|
||||
<el-table-column prop="stateChinese" label="数据状态" align="center" />
|
||||
<el-table-column prop="plan0pinion" label="反馈意见" align="center" />
|
||||
<el-table-column prop="planOpinionYj" label="反馈意见" align="center" />
|
||||
</el-table>
|
||||
</div>
|
||||
</el-tab-pane>
|
||||
@@ -90,7 +90,6 @@
|
||||
</table>
|
||||
<div style="margin-top: 20px; text-align: center">
|
||||
<el-button type="primary" @click="save()">保存</el-button>
|
||||
<el-button type="primary" @click="submit()">提交</el-button>
|
||||
</div>
|
||||
</el-dialog>
|
||||
</el-tabs>
|
||||
@@ -115,6 +114,7 @@
|
||||
form: {},
|
||||
formBackup: Object.assign({}, this.form),
|
||||
tableData: [],
|
||||
userName: window.sessionStorage.getItem("userName"),
|
||||
}
|
||||
},
|
||||
mounted() {
|
||||
@@ -123,9 +123,10 @@
|
||||
methods: {
|
||||
getPageList() {
|
||||
// 获取列表
|
||||
req.selectSysPlan().then((res) => {
|
||||
req.selectSysPlanXs({userName:this.userName}).then((res) => {
|
||||
this.tableData = res.data;
|
||||
});
|
||||
console.log(this.userName);
|
||||
},
|
||||
handleClick(tab, event) {
|
||||
if (tab.name == "addrole") {
|
||||
@@ -159,17 +160,6 @@
|
||||
}
|
||||
this.reset();
|
||||
},
|
||||
submit(){
|
||||
req.upSysPlan(this.form).then((res) => {
|
||||
this.getPageList();
|
||||
this.editDialog = false;
|
||||
this.$message({
|
||||
message: res.msg,
|
||||
type: "success",
|
||||
});
|
||||
});
|
||||
this.reset();
|
||||
},
|
||||
reset() {
|
||||
this.form = {};
|
||||
},
|
||||
|
||||
Reference in New Issue
Block a user