Commit 826f47e1 authored by 黄奎's avatar 黄奎

页面修改

parent cb105912
...@@ -869,7 +869,6 @@ export default { ...@@ -869,7 +869,6 @@ export default {
} }
}, },
downloadFile(i) { downloadFile(i) {
console.log(846, i);
const a = document.createElement("a"); const a = document.createElement("a");
a.setAttribute("download", ""); a.setAttribute("download", "");
a.setAttribute("href", i.url); a.setAttribute("href", i.url);
......
...@@ -132,7 +132,6 @@ export default { ...@@ -132,7 +132,6 @@ export default {
}; };
}, },
mounted() { mounted() {
console.log(85, this.setObj);
if (this.setObj) { if (this.setObj) {
if (this.setObj.STUID) { if (this.setObj.STUID) {
this.msg.StuId = this.setObj.STUID; this.msg.StuId = this.setObj.STUID;
...@@ -168,7 +167,6 @@ export default { ...@@ -168,7 +167,6 @@ export default {
this.msg.EventContent = ""; this.msg.EventContent = "";
this.msg.EventPicList = []; this.msg.EventPicList = [];
} }
console.log(109, this.msg);
this.$forceUpdate(); this.$forceUpdate();
}, },
methods: { methods: {
...@@ -177,7 +175,6 @@ export default { ...@@ -177,7 +175,6 @@ export default {
this.persistent = false; this.persistent = false;
}, },
save() { save() {
console.log(89, this.msg);
this.saveLoading = true; this.saveLoading = true;
addEvent(this.msg) addEvent(this.msg)
.then((res) => { .then((res) => {
......
...@@ -175,7 +175,6 @@ export default { ...@@ -175,7 +175,6 @@ export default {
}, },
getList() { getList() {
getClassCheckPageList(this.msg).then((res) => { getClassCheckPageList(this.msg).then((res) => {
console.log(83, res);
if (res.Code === 1) { if (res.Code === 1) {
this.data = res.Data.PageData; this.data = res.Data.PageData;
this.pageCount = res.Data.PageCount; this.pageCount = res.Data.PageCount;
......
...@@ -563,20 +563,6 @@ export default { ...@@ -563,20 +563,6 @@ export default {
initialIndex: 0, initialIndex: 0,
}; };
}, },
// watch: {
// selected: {
// handler(val) {
// console.log(302, val)
// },
// deep: true
// },
// selectedStu: {
// handler(val) {
// console.log(353, val)
// },
// deep: true
// }
// },
mounted() { mounted() {
let u = Lockr.get("loginUserInfo"); let u = Lockr.get("loginUserInfo");
if (u) { if (u) {
......
...@@ -345,14 +345,11 @@ export default { ...@@ -345,14 +345,11 @@ export default {
fileTypeNumber = x.type; fileTypeNumber = x.type;
} }
}); });
// let newArr = [];
// newArr.push(file.file);
this.$message.info(this.$t("tips.shangchuanzhong")); this.$message.info(this.$t("tips.shangchuanzhong"));
UploadSelfFile( UploadSelfFile(
"Temporary", "Temporary",
file.file, file.file,
(x) => { (x) => {
console.log(306, x);
if (x.Code == 1) { if (x.Code == 1) {
this.saveMsg.push({ this.saveMsg.push({
Content: x.FileUrl, Content: x.FileUrl,
......
...@@ -2108,12 +2108,9 @@ ...@@ -2108,12 +2108,9 @@
let minute = myDate.getMinutes() < 10 ? "0" + myDate.getMinutes() : myDate.getMinutes(); let minute = myDate.getMinutes() < 10 ? "0" + myDate.getMinutes() : myDate.getMinutes();
let second = myDate.getSeconds() < 10 ? "0" + myDate.getSeconds() : myDate.getSeconds(); let second = myDate.getSeconds() < 10 ? "0" + myDate.getSeconds() : myDate.getSeconds();
this.timer = hour + ':' + minute + ':' + second; this.timer = hour + ':' + minute + ':' + second;
// this.financeinfo_post_GetList(TCID);
if (this.$route.query.edit) { if (this.$route.query.edit) {
// 编辑 // 编辑
this.msg.FrID = this.$route.query.FrID; this.msg.FrID = this.$route.query.FrID;
console.log(this.$route.query.FrID,'财务单据id')
if( this.msg.FrID>0){ if( this.msg.FrID>0){
this.costmode= false this.costmode= false
} }
......
...@@ -4,7 +4,6 @@ ...@@ -4,7 +4,6 @@
border: none; border: none;
background-color: transparent; background-color: transparent;
} }
.studentManage .el-input__inner { .studentManage .el-input__inner {
width: 100%; width: 100%;
border: none; border: none;
...@@ -13,16 +12,16 @@ ...@@ -13,16 +12,16 @@
</style> </style>
<template> <template>
<div class="page-body studentManage"> <div class="page-body studentManage">
<div class="page-search row items-center " > <div class="page-search row items-center ">
<div class="col row wrap q-mr-lg q-col-gutter-md"> <div class="col row wrap q-mr-lg q-col-gutter-md">
<div class="col-3"> <div class="col-3">
<q-select @input="getClass" standout="bg-primary text-white" option-value="SId" option-label="SName" <q-select @input="getClass" standout="bg-primary text-white" option-value="SId" option-label="SName"
v-model="msg.School_Id" :options="schoolList" emit-value map-options label="关联校区" /> v-model="msg.School_Id" :options="schoolList" emit-value map-options label="关联校区" />
</div> </div>
<div class="col-3"> <div class="col-3">
<q-select @input="getClass" standout="bg-primary text-white" option-value="CourseId" <q-select @input="getClass" standout="bg-primary text-white" option-value="CourseId" option-label="CourseName"
option-label="CourseName" v-model="msg.CouseId" :options="CourseList" emit-value map-options label="课程" @change="" v-model="msg.CouseId" :options="CourseList" emit-value map-options label="课程" use-input
use-input @filter="filterCourse"> @filter="filterCourse">
<template v-slot:no-option> <template v-slot:no-option>
<q-item> <q-item>
<q-item-section class="text-grey"> <q-item-section class="text-grey">
...@@ -41,8 +40,8 @@ ...@@ -41,8 +40,8 @@
<div class="col-3 Sysuser_Date"> <div class="col-3 Sysuser_Date">
<q-field filled> <q-field filled>
 <template v-slot:control>  <template v-slot:control>
<el-date-picker v-model="msg.StartDate" type="date" placeholder="开始日期" value-format="yyyy-MM-dd" :picker-options="option" :clearable ='false' <el-date-picker v-model="msg.StartDate" type="date" placeholder="开始日期" value-format="yyyy-MM-dd"
@change="resetSearch"> :picker-options="option" :clearable='false' @change="resetSearch">
</el-date-picker>     </el-date-picker>    
</template> </template>
</q-field> </q-field>
...@@ -71,7 +70,7 @@ ...@@ -71,7 +70,7 @@
<template v-slot:body-cell-GuestName="props"> <template v-slot:body-cell-GuestName="props">
<q-td :props="props" style="padding-right:0px"> <q-td :props="props" style="padding-right:0px">
<div v-for="x in props.row.GuestList"> <div v-for="x in props.row.GuestList">
<div class="border-bottom" > <div class="border-bottom">
{{ x.GuestName }} {{ x.GuestName }}
</div> </div>
</div> </div>
...@@ -81,9 +80,9 @@ ...@@ -81,9 +80,9 @@
</q-td> </q-td>
</template> </template>
<template v-slot:body-cell-CurrentDeductionHours="props"> <template v-slot:body-cell-CurrentDeductionHours="props">
<q-td :props="props" > <q-td :props="props">
<div v-for="x in props.row.GuestList"> <div v-for="x in props.row.GuestList">
<div class="border-bottom" > <div class="border-bottom">
{{ x.CurrentDeductionHours }} {{ x.CurrentDeductionHours }}
</div> </div>
</div> </div>
...@@ -93,9 +92,9 @@ ...@@ -93,9 +92,9 @@
</q-td> </q-td>
</template> </template>
<template v-slot:body-cell-CheckStatus="props"> <template v-slot:body-cell-CheckStatus="props">
<q-td :props="props" > <q-td :props="props">
<div v-for="x in props.row.GuestList"> <div v-for="x in props.row.GuestList">
<div class="border-bottom" > <div class="border-bottom">
<span v-if="x.CheckStatus == 0">正常</span> <span v-if="x.CheckStatus == 0">正常</span>
<span v-if="x.CheckStatus == 1">缺席</span> <span v-if="x.CheckStatus == 1">缺席</span>
<span v-if="x.CheckStatus == 2">请假</span> <span v-if="x.CheckStatus == 2">请假</span>
...@@ -111,30 +110,26 @@ ...@@ -111,30 +110,26 @@
:input="true" @input="changePage" /> --> :input="true" @input="changePage" /> -->
</template> </template>
<template v-slot:body-cell-optioned="props"> <template v-slot:body-cell-optioned="props">
<q-td :props="props" > <q-td :props="props">
<div v-for="x in props.row.GuestList"> <div v-for="x in props.row.GuestList">
<div class="border-bottom" > <div class="border-bottom">
<q-btn flat size="xs" icon="edit" color="accent" style="font-weight:400" label="编辑" <q-btn flat size="xs" icon="edit" color="accent" style="font-weight:400" label="编辑"
@click="EditCourse(x,props.row)" /> @click="EditCourse(x,props.row)" />
</div> </div>
</div> </div>
</q-td> </q-td>
</template> </template>
</q-table> </q-table>
</div> </div>
<!-- 修改状态 --> <!-- 修改状态 -->
<q-dialog v-model="IsShowDialog" persistent transition-show="scale" <q-dialog v-model="IsShowDialog" persistent transition-show="scale" transition-hide="scale">
transition-hide="scale">
<q-card style="width: 400px;max-width:500px;"> <q-card style="width: 400px;max-width:500px;">
<q-card-section> <q-card-section>
<div class="text-h6">修改出勤状态</div> <div class="text-h6">修改出勤状态</div>
</q-card-section> </q-card-section>
<q-card-section class="q-pt-none scroll" style="max-height: 70vh"> <q-card-section class="q-pt-none scroll" style="max-height: 70vh">
<q-select standout="bg-primary text-white" option-value="Id" option-label="Name" <q-select standout="bg-primary text-white" option-value="Id" option-label="Name" v-model="editMsg.CheckStatus"
v-model="editMsg.CheckStatus" :options="AttendanceList" emit-value map-options label="出勤状态" /> :options="AttendanceList" emit-value map-options label="出勤状态" />
</q-card-section> </q-card-section>
<q-separator /> <q-separator />
<q-card-actions align="right" class="bg-white"> <q-card-actions align="right" class="bg-white">
...@@ -145,8 +140,8 @@ ...@@ -145,8 +140,8 @@
</q-card> </q-card>
</q-dialog> </q-dialog>
</div> </div>
</template> </template>
<script> <script>
import { import {
addClassCheck addClassCheck
...@@ -160,11 +155,13 @@ ...@@ -160,11 +155,13 @@
deleteClass, deleteClass,
getClassDropDownList getClassDropDownList
} from '../../api/school/index'; } from '../../api/school/index';
import{ import {
getStudentAttendanceDayStatistics getStudentAttendanceDayStatistics
} from "../../api/stuMan/index" } from "../../api/stuMan/index"
import selectTree from "../../components/common/select-tree"; import selectTree from "../../components/common/select-tree";
import { openURL } from "quasar"; import {
openURL
} from "quasar";
import { import {
EduDownLoad, EduDownLoad,
} from '../../api/common/common'; } from '../../api/common/common';
...@@ -178,7 +175,6 @@ ...@@ -178,7 +175,6 @@
data() { data() {
return { return {
columns: [ columns: [
{ {
name: "ClassName", name: "ClassName",
required: true, required: true,
...@@ -221,7 +217,6 @@ ...@@ -221,7 +217,6 @@
align: "left", align: "left",
field: row => row.GuestName field: row => row.GuestName
}, },
{ {
name: "CurrentDeductionHours", name: "CurrentDeductionHours",
required: true, required: true,
...@@ -259,15 +254,15 @@ ...@@ -259,15 +254,15 @@
} }
], ],
msg: { msg: {
StartDate:'2021-07-20', StartDate: '2021-07-20',
School_Id:-1, School_Id: -1,
CouseId:0, CouseId: 0,
ClassId:0, ClassId: 0,
OrderGuestId:'', OrderGuestId: '',
GuestName:'', GuestName: '',
CheckStatus:-1, CheckStatus: -1,
}, },
IsShowDialog:false, IsShowDialog: false,
//课程分类树形列表 //课程分类树形列表
TreeCategoryList: [], TreeCategoryList: [],
returnString: [], //默认值 returnString: [], //默认值
...@@ -275,29 +270,45 @@ ...@@ -275,29 +270,45 @@
AllCourseList: [], AllCourseList: [],
ClassList: [], //班级下拉 ClassList: [], //班级下拉
allClassList: [], allClassList: [],
AttendanceList2:[{Name:'全部',Id:-1},{Name:'缺席',Id:1},{Name:'请假',Id:2},], AttendanceList2: [{
AttendanceList:[{Name:'正常',Id:0},{Name:'缺席',Id:1},{Name:'请假',Id:2},], Name: '全部',
option:{ Id: -1
disabledDate:(time)=> { }, {
Name: '缺席',
Id: 1
}, {
Name: '请假',
Id: 2
}, ],
AttendanceList: [{
Name: '正常',
Id: 0
}, {
Name: '缺席',
Id: 1
}, {
Name: '请假',
Id: 2
}, ],
option: {
disabledDate: (time) => {
return time.getTime() > Date.now() return time.getTime() > Date.now()
} }
}, },
schoolList: [], schoolList: [],
editMsg:{//修改的对象 editMsg: { //修改的对象
CheckStatus:0, CheckStatus: 0,
StudyNum:0, StudyNum: 0,
}, },
iseditjurisdiction:false, iseditjurisdiction: false,
}; };
}, },
mounted() { mounted() {
let userinfo = this.getLocalStorage(); let userinfo = this.getLocalStorage();
userinfo.ActionMenuList.map(x=>{//判断权限 userinfo.ActionMenuList.map(x => { //判断权限
if(x.FunctionCode == "Student_Attendance"){//判断是否有修改状态的权限 if (x.FunctionCode == "Student_Attendance") { //判断是否有修改状态的权限
this.iseditjurisdiction = true; this.iseditjurisdiction = true;
} }
}) })
let d = new Date(); let d = new Date();
let year = d.getFullYear(); let year = d.getFullYear();
...@@ -358,10 +369,9 @@ ...@@ -358,10 +369,9 @@
}, },
//获取班级下拉 //获取班级下拉
getClass() { getClass() {
getClassDropDownList({ getClassDropDownList({
CourseId: this.msg.CouseId, CourseId: this.msg.CouseId,
SchoolId:this.msg.School_Id, SchoolId: this.msg.School_Id,
IsAddDefault: 0, //添加默认选项 IsAddDefault: 0, //添加默认选项
}).then(res => { }).then(res => {
if (res.Code == 1) { if (res.Code == 1) {
...@@ -390,12 +400,10 @@ ...@@ -390,12 +400,10 @@
} }
}) })
}, },
//重新查询 //重新查询
resetSearch() { resetSearch() {
this.getlist(); this.getlist();
}, },
//获取菜单分页列表 //获取菜单分页列表
getlist() { getlist() {
this.loading = true; this.loading = true;
...@@ -412,27 +420,24 @@ ...@@ -412,27 +420,24 @@
refreshPage() { refreshPage() {
this.getlist(); this.getlist();
}, },
EditCourse(x,row){ EditCourse(x, row) {
console.log(row)
this.editMsg.CheckStatus = x.CheckStatus; this.editMsg.CheckStatus = x.CheckStatus;
this.editMsg.StudyNum = x.StudyNum; this.editMsg.StudyNum = x.StudyNum;
this.editMsg.ClassDate = row.ClassDate ; this.editMsg.ClassDate = row.ClassDate;
this.editMsg.ClassRoomId = row.ClassRoomId ; this.editMsg.ClassRoomId = row.ClassRoomId;
this.editMsg.ClassTimeId = x.ClassTimeId ; this.editMsg.ClassTimeId = x.ClassTimeId;
this.editMsg.OrderGuestId = x.OrderGuestId ; this.editMsg.OrderGuestId = x.OrderGuestId;
this.editMsg.School_Id = row.School_Id ; this.editMsg.School_Id = row.School_Id;
this.editMsg.TeacherId = row.TeacherId ; this.editMsg.TeacherId = row.TeacherId;
this.editMsg.classId = row.ClassId ; this.editMsg.classId = row.ClassId;
this.IsShowDialog = true this.IsShowDialog = true
}, },
//跳转至我的课程 //跳转至我的课程
goMycourse(obj) { goMycourse(obj) {
var tempStr = window.location.origin +"/#/course/courseinfo?CourseId=" + obj.CourseId; var tempStr = window.location.origin + "/#/course/courseinfo?CourseId=" + obj.CourseId;
openURL(tempStr) openURL(tempStr)
}, },
saveAttendance(){//修改出勤状态 saveAttendance() { //修改出勤状态
let signMsg = [] let signMsg = []
signMsg.push(this.editMsg) signMsg.push(this.editMsg)
addClassCheck(signMsg).then(res => { addClassCheck(signMsg).then(res => {
...@@ -449,25 +454,23 @@ ...@@ -449,25 +454,23 @@
} }
}) })
}, },
getexport(){//导出 getexport() { //导出
var msg = JSON.parse(JSON.stringify(this.msg)); var msg = JSON.parse(JSON.stringify(this.msg));
EduDownLoad("/stu/GetStudentAttendanceDayStatisticsToExcel", msg, '学员出勤管理') EduDownLoad("/stu/GetStudentAttendanceDayStatisticsToExcel", msg, '学员出勤管理')
}, },
} }
}; };
</script> </script>
<style scoped> <style scoped>
.border-bottom { .border-bottom {
border-bottom: 1px dashed #EEE; border-bottom: 1px dashed #EEE;
padding-bottom: 5px; padding-bottom: 5px;
margin-bottom: 5px; margin-bottom: 5px;
} }
</style> </style>
<style lang="sass"> <style lang="sass">
@import url('~assets/css/table.sass') @import url('~assets/css/table.sass')
</style>
</style>
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