Commit bee348e6 authored by 黄奎's avatar 黄奎

页面修改

parent cfa28aab
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
</template> </template>
</q-field> </q-field>
</div> </div>
<div class="col-2"> <div class="col-2" v-if="isHaveEdit">
<q-select filled v-model="msg.TeacherAccountId" dense use-input label="教师" :options="MyTeacherListData" <q-select filled v-model="msg.TeacherAccountId" dense use-input label="教师" :options="MyTeacherListData"
option-label="EmployeeName" @input="refreshPage" clearable option-value="Id" emit-value map-options /> option-label="EmployeeName" @input="refreshPage" clearable option-value="Id" emit-value map-options />
</div> </div>
...@@ -30,19 +30,11 @@ ...@@ -30,19 +30,11 @@
<div class="col-2 q-table__title">教师月度考核列表</div> <div class="col-2 q-table__title">教师月度考核列表</div>
<q-space /> <q-space />
<div class="page-option"> <div class="page-option">
<q-btn color="accent" size="sm" class="q-mr-md" icon="add" label="考核" @click="goAssessTable()" /> <q-btn v-if="isHaveEdit" color="accent" size="sm" class="q-mr-md" icon="add" label="考核"
@click="goAssessTable()" />
</div> </div>
</template> </template>
<!-- <template v-slot:body-cell-AuditStatus="props">
<q-td :props="props">
<template v-if="props.row.AuditStatus==0">
待提交
</template>
<template v-else>
{{props.row.AuditStatusName}}
</template>
</q-td>
</template> -->
<template v-slot:body-cell-OptionId="props"> <template v-slot:body-cell-OptionId="props">
<q-td :props="props"> <q-td :props="props">
<!-- <q-btn flat size="xs" icon="edit" color="accent" style="font-weight:400" @click="submitApproval(props.row)" <!-- <q-btn flat size="xs" icon="edit" color="accent" style="font-weight:400" @click="submitApproval(props.row)"
...@@ -51,6 +43,8 @@ ...@@ -51,6 +43,8 @@
label="评价" /> label="评价" />
<q-btn flat size="xs" icon="edit" color="accent" style="font-weight:400" @click="showForm(props.row,2)" <q-btn flat size="xs" icon="edit" color="accent" style="font-weight:400" @click="showForm(props.row,2)"
label="建议" /> --> label="建议" /> -->
<q-btn v-if="isHaveEdit" flat size="xs" icon="edit" color="accent" style="font-weight:400"
@click="goAssessTable(props.row)" label="修改" />
<q-btn flat size="xs" icon="edit" color="accent" style="font-weight:400" @click="gotoDetail(props.row)" <q-btn flat size="xs" icon="edit" color="accent" style="font-weight:400" @click="gotoDetail(props.row)"
label="详情" /> label="详情" />
</q-td> </q-td>
...@@ -76,6 +70,9 @@ ...@@ -76,6 +70,9 @@
} from "../../api/users/user"; } from "../../api/users/user";
import behaviorForm from "../../components/teacher/behavior-form.vue"; import behaviorForm from "../../components/teacher/behavior-form.vue";
import helpForm from "../../components/teacher/help-form.vue"; import helpForm from "../../components/teacher/help-form.vue";
import {
mapState
} from "vuex";
export default { export default {
meta: { meta: {
title: "教师月度考评" title: "教师月度考评"
...@@ -132,12 +129,6 @@ ...@@ -132,12 +129,6 @@
field: "TotalScore", field: "TotalScore",
align: "left" align: "left"
}, },
// {
// name: "AuditStatus",
// label: "审核状态",
// field: "AuditStatus",
// align: "left"
// },
{ {
name: 'OptionId', name: 'OptionId',
label: '操作', label: '操作',
...@@ -152,12 +143,31 @@ ...@@ -152,12 +143,31 @@
MyTeacherListData: [], //教师列表 MyTeacherListData: [], //教师列表
} }
}, },
computed: mapState({
//是否有下载权限
isHaveEdit(state) {
if (state.user.userInfo && state.user.userInfo.ActionMenuList && state.user.userInfo.ActionMenuList.length >
0) {
let action = state.user.userInfo.ActionMenuList.find(x => {
if (x.FunctionCode == "Edit_TeacherAssessment") {
return x;
}
});
return action && action.FunctionCode;
}
return false;
}
}),
created() { created() {
let today = new Date(); let today = new Date();
this.msg.YearStr = today.getFullYear().toString(); this.msg.YearStr = today.getFullYear().toString();
this.msg.MonthStr = (today.getMonth() + 1).toString(); this.msg.MonthStr = (today.getMonth() + 1).toString();
this.queryDate = this.msg.YearStr + '-' + this.msg.MonthStr; this.queryDate = this.msg.YearStr + '-' + this.msg.MonthStr;
this.findData(); this.findData();
if (!this.isHaveEdit) {
let userinfo = this.getLocalStorage();
this.msg.TeacherAccountId = userinfo.Id;
}
}, },
mounted() { mounted() {
this.getTeacherAssessmentPage() this.getTeacherAssessmentPage()
...@@ -197,8 +207,12 @@ ...@@ -197,8 +207,12 @@
this.getTeacherAssessmentPage(); this.getTeacherAssessmentPage();
}, },
//跳转考核新增修改页面 //跳转考核新增修改页面
goAssessTable() { goAssessTable(item) {
this.OpenNewUrl('/teacher/jobEvaluation', {}); var qObj = {};
if (item) {
qObj.Id = item.Id;
}
this.OpenNewUrl('/teacher/jobEvaluation', qObj);
}, },
//跳转到考核详情页面 //跳转到考核详情页面
gotoDetail(item) { gotoDetail(item) {
......
...@@ -34,7 +34,8 @@ ...@@ -34,7 +34,8 @@
<div class="col-2 jobEvaluationDate q-mr-lg"> <div class="col-2 jobEvaluationDate q-mr-lg">
<q-field filled stack-label dense label="考核月份"> <q-field filled stack-label dense label="考核月份">
<template v-slot:control> <template v-slot:control>
<el-date-picker v-model="teacherDate" value-format="yyyy-MM" size="mini" type="month" placeholder="选择考核月份"> <el-date-picker v-model="teacherDate" value-format="yyyy-MM" size="mini" type="month"
placeholder="选择考核月份">
</el-date-picker> </el-date-picker>
</template> </template>
</q-field> </q-field>
...@@ -107,8 +108,8 @@ ...@@ -107,8 +108,8 @@
TotalScore: 0, //总分 TotalScore: 0, //总分
DetailsList: [], DetailsList: [],
CheckType: 0, //1-教学主管,2-教务主管 CheckType: 0, //1-教学主管,2-教务主管
IsJiaoWuFinish:0,//教务主管是否完成打分 IsJiaoWuFinish: 0, //教务主管是否完成打分
IsTeacherFinish:0,//教学主管是否完成打分 IsTeacherFinish: 0, //教学主管是否完成打分
}, },
isAuth: false, //是否有权限 isAuth: false, //是否有权限
saveLoading: false, saveLoading: false,
...@@ -122,7 +123,10 @@ ...@@ -122,7 +123,10 @@
this.GetTeacherList(); this.GetTeacherList();
}, },
mounted() { mounted() {
if (this.$route.query && this.$route.query.Id) {
this.saveObj.Id = this.$route.query.Id;
this.getInfo();
}
}, },
methods: { methods: {
changeStatus(subItem, optionItem) { changeStatus(subItem, optionItem) {
...@@ -161,6 +165,7 @@ ...@@ -161,6 +165,7 @@
TeacherAccountId: this.saveObj.TeacherAccountId, TeacherAccountId: this.saveObj.TeacherAccountId,
YearStr: this.saveObj.YearStr, YearStr: this.saveObj.YearStr,
MonthStr: this.saveObj.MonthStr, MonthStr: this.saveObj.MonthStr,
Id:this.saveObj.Id,
}; };
queryTeacherAssessmentInfo(qMsg).then(res => { queryTeacherAssessmentInfo(qMsg).then(res => {
if (res.Code == 1) { if (res.Code == 1) {
...@@ -176,8 +181,8 @@ ...@@ -176,8 +181,8 @@
this.saveObj.TotalScore = tempData.TotalScore; this.saveObj.TotalScore = tempData.TotalScore;
this.saveObj.CheckType = tempData.CheckType; this.saveObj.CheckType = tempData.CheckType;
this.saveObj.DetailsList = tempData.DetailsList; this.saveObj.DetailsList = tempData.DetailsList;
this.saveObj.IsTeacherFinish=tempData.IsTeacherFinish; this.saveObj.IsTeacherFinish = tempData.IsTeacherFinish;
this.saveObj.IsJiaoWuFinish=tempData.IsJiaoWuFinish; this.saveObj.IsJiaoWuFinish = tempData.IsJiaoWuFinish;
} else { } else {
this.$q.notify({ this.$q.notify({
type: 'negative', type: 'negative',
......
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