Skip to content

C
confucius
Commit 826f47e1 authored by 黄奎's avatar 黄奎
Browse files
Options

页面修改

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