Skip to content

C
confucius
Commit 7361ee93 authored by 黄奎's avatar 黄奎
Browse files
Options

Merge branch 'master' of http://gitlab.oytour.com/luochao/confucius

parents 26846795 575e38eb
Hide whitespace changes
Inline Side-by-side
Showing with 394 additions and 13 deletions
src/App.vue
View file @ 7361ee93
......@@ -12,7 +12,7 @@ export default {
<style>
@import url("~assets/css/font.css");
@import url("//at.alicdn.com/t/font_2077629_9tmhtn2zdwi.css");
@import url("//at.alicdn.com/t/font_2077629_204ipdftgho.css");
.q-scrollarea__thumb {
z-index: 999999 !important;
}
......
src/components/sale/backbill-form.vue
View file @ 7361ee93
......@@ -189,7 +189,8 @@
._addUpload_box .icon-txt,
._addUpload_box .icon-wenjian,
._addUpload_box .icon-yasuobao,
._addUpload_box .icon-shipin {
._addUpload_box .icon-shipin,
._addUpload_box .icon-word {
text-align: center;
font-size: 38px;
color: green;
......@@ -407,6 +408,8 @@
? 'icon-pdf'
: item.suffix == 'TXT'
? 'icon-txt'
: item.suffix == 'DOCX' || item.suffix == 'DOC'
? 'icon-word'
: 'icon-excel'
"
></span>
......
src/components/sale/backclass-form.vue
View file @ 7361ee93
......@@ -80,7 +80,8 @@
._addUpload_box .icon-txt,
._addUpload_box .icon-wenjian,
._addUpload_box .icon-yasuobao,
._addUpload_box .icon-shipin {
._addUpload_box .icon-shipin,
._addUpload_box .icon-word {
text-align: center;
font-size: 38px;
color: green;
......@@ -220,6 +221,15 @@
file.Content.length
).toUpperCase() == 'TXT'
? 'icon-txt'
: file.Content.substring(
file.Content.lastIndexOf('.') + 1,
file.Content.length
).toUpperCase() == 'DOCX' ||
file.Content.substring(
file.Content.lastIndexOf('.') + 1,
file.Content.length
).toUpperCase() == 'DOC'
? 'icon-word'
: 'icon-excel'
"
@click="showUpLoadFile(file)"
......
src/components/sale/changebill-form.vue
View file @ 7361ee93
......@@ -160,7 +160,8 @@
._addUpload_box .icon-txt,
._addUpload_box .icon-wenjian,
._addUpload_box .icon-yasuobao,
._addUpload_box .icon-shipin {
._addUpload_box .icon-shipin,
._addUpload_box .icon-word {
text-align: center;
font-size: 38px;
color: green;
......@@ -592,6 +593,8 @@
? 'icon-pdf'
: item.suffix == 'TXT'
? 'icon-txt'
: item.suffix == 'DOCX' || item.suffix == 'DOC'
? 'icon-word'
: 'icon-excel'
"
></span>
......
src/components/sale/ordertrans-form.vue
View file @ 7361ee93
......@@ -160,7 +160,8 @@
._addUpload_box .icon-txt,
._addUpload_box .icon-wenjian,
._addUpload_box .icon-yasuobao,
._addUpload_box .icon-shipin {
._addUpload_box .icon-shipin,
._addUpload_box .icon-word {
text-align: center;
font-size: 38px;
color: green;
......@@ -315,8 +316,10 @@
? 'icon-pdf'
: item.suffix == 'TXT'
? 'icon-txt'
: 'icon-excel'
"
: item.suffix == 'DOCX' || item.suffix == 'DOC'
? 'icon-word'
: 'icon-excel'
"
></span>
<span
v-if="item.type === 3"
......
src/components/sale/stopbill-form.vue
View file @ 7361ee93
......@@ -190,7 +190,8 @@
._addUpload_box .icon-txt,
._addUpload_box .icon-wenjian,
._addUpload_box .icon-yasuobao,
._addUpload_box .icon-shipin {
._addUpload_box .icon-shipin,
._addUpload_box .icon-word {
text-align: center;
font-size: 38px;
color: green;
......@@ -428,6 +429,8 @@
? 'icon-pdf'
: item.suffix == 'TXT'
? 'icon-txt'
: item.suffix == 'DOCX' || item.suffix == 'DOC'
? 'icon-word'
: 'icon-excel'
"
></span>
......
src/components/sale/temporaryClassbill-form.vue
View file @ 7361ee93
......@@ -190,7 +190,8 @@
._addUpload_box .icon-txt,
._addUpload_box .icon-wenjian,
._addUpload_box .icon-yasuobao,
._addUpload_box .icon-shipin {
._addUpload_box .icon-shipin,
._addUpload_box .icon-word {
text-align: center;
font-size: 38px;
color: green;
......@@ -388,6 +389,8 @@
? 'icon-pdf'
: item.suffix == 'TXT'
? 'icon-txt'
: item.suffix == 'DOCX' || item.suffix == 'DOC'
? 'icon-word'
: 'icon-excel'
"
></span>
......
src/components/sale/transferclass-form.vue
View file @ 7361ee93
......@@ -164,7 +164,8 @@
._addUpload_box .icon-txt,
._addUpload_box .icon-wenjian,
._addUpload_box .icon-yasuobao,
._addUpload_box .icon-shipin {
._addUpload_box .icon-shipin,
._addUpload_box .icon-word {
text-align: center;
font-size: 38px;
color: green;
......@@ -394,6 +395,15 @@
file.Content.length
).toUpperCase() == 'TXT'
? 'icon-txt'
: file.Content.substring(
file.Content.lastIndexOf('.') + 1,
file.Content.length
).toUpperCase() == 'DOCX' ||
file.Content.substring(
file.Content.lastIndexOf('.') + 1,
file.Content.length
).toUpperCase() == 'DOC'
? 'icon-word'
: 'icon-excel'
"
@click="showUpLoadFile(file)"
......
src/components/teacher/changeClassForm.vue
View file @ 7361ee93
......@@ -112,7 +112,8 @@
._addUpload_box .icon-txt,
._addUpload_box .icon-wenjian,
._addUpload_box .icon-yasuobao,
._addUpload_box .icon-shipin {
._addUpload_box .icon-shipin,
._addUpload_box .icon-word {
text-align: center;
font-size: 38px;
color: green;
......@@ -935,6 +936,15 @@
file.Content.length
).toUpperCase() == 'TXT'
? 'icon-txt'
: file.Content.substring(
file.Content.lastIndexOf('.') + 1,
file.Content.length
).toUpperCase() == 'DOCX' ||
file.Content.substring(
file.Content.lastIndexOf('.') + 1,
file.Content.length
).toUpperCase() == 'DOC'
? 'icon-word'
: 'icon-excel'
"
@click="showUpLoadFile(file)"
......
src/components/teacher/provisionalInviteForm.vue
View file @ 7361ee93
......@@ -112,7 +112,8 @@
._addUpload_box .icon-txt,
._addUpload_box .icon-wenjian,
._addUpload_box .icon-yasuobao,
._addUpload_box .icon-shipin {
._addUpload_box .icon-shipin,
._addUpload_box .icon-word {
text-align: center;
font-size: 38px;
color: green;
......@@ -325,6 +326,15 @@
file.Content.length
).toUpperCase() == 'TXT'
? 'icon-txt'
: file.Content.substring(
file.Content.lastIndexOf('.') + 1,
file.Content.length
).toUpperCase() == 'DOCX' ||
file.Content.substring(
file.Content.lastIndexOf('.') + 1,
file.Content.length
).toUpperCase() == 'DOC'
? 'icon-word'
: 'icon-excel'
"
@click="showUpLoadFile(file)"
......
src/components/teacher/stopLessonForm.vue
View file @ 7361ee93
......@@ -71,6 +71,15 @@
file.Content.length
).toUpperCase() == 'TXT'
? 'icon-txt'
: file.Content.substring(
file.Content.lastIndexOf('.') + 1,
file.Content.length
).toUpperCase() == 'DOCX' ||
file.Content.substring(
file.Content.lastIndexOf('.') + 1,
file.Content.length
).toUpperCase() == 'DOC'
? 'icon-word'
: 'icon-excel'
"
@click="showUpLoadFile(file)"
......@@ -427,7 +436,8 @@ export default {
._addUpload_box .icon-txt,
._addUpload_box .icon-wenjian,
._addUpload_box .icon-yasuobao,
._addUpload_box .icon-shipin {
._addUpload_box .icon-shipin,
._addUpload_box .icon-word {
text-align: center;
font-size: 38px;
color: green;
......
src/pages/stuMan/classRecord.vue
View file @ 7361ee93
<template>
<div class="page-body MainPlan xg">
<div class="col row wrap q-col-gutter-md">
<div class="col-2 flex">
<el-select
v-model="msg.TeacherId"
style="width: 100%"
placeholder="教师"
size="small"
@change="getPlanList()"
>
<el-option
v-for="item in TeacherList"
:key="item.TeacherName"
:label="item.TeacherName"
:value="item.TId"
>
</el-option>
<div
slot="prefix"
class="full-height flex items-center"
style="color: #000; padding-right: 10px"
>
教师:
</div>
</el-select>
</div>
<div class="col-2">
<el-select
v-model="msg.ClassRoomId"
style="width: 100%"
placeholder="教室"
size="small"
@change="getTypeWay()"
>
<el-option
v-for="item in ClassRoomList"
:key="item.RoomName"
:label="item.RoomName"
:value="item.RoomId"
>
</el-option>
<div
slot="prefix"
class="full-height flex items-center"
style="color: #000; padding-right: 10px"
>
教室:
</div>
</el-select>
</div>
<div class="col-2">
<el-date-picker
v-model="msg.StartTime"
type="date"
value-format="yyyy-MM-dd"
placeholder="开始日期"
size="small"
style="width: 100%"
@change="getTypeWay()"
:picker-options="picker"
>
</el-date-picker>
</div>
<div class="col-2">
<el-date-picker
v-model="msg.EndTime"
type="date"
value-format="yyyy-MM-dd"
placeholder="结束日期"
size="small"
style="width: 100%"
@change="getTypeWay()"
clear-icon="iconfont icon-guanbi"
:picker-options="pickerEnd"
>
</el-date-picker>
</div>
<div class="col-2">
<el-select
v-model="msg.ClassType"
style="width: 100%"
placeholder="类型"
size="small"
@change="getTypeWay()"
>
<el-option :key="0" label="全部" :value="0"> </el-option>
<el-option :key="1" label="正常" :value="1"> </el-option>
<el-option :key="2" label="试听课" :value="2"> </el-option>
<div
slot="prefix"
class="full-height flex items-center"
style="color: #000; padding-right: 10px"
>
状态:
</div>
</el-select>
</div>
<div class="col-2">
<!-- <q-btn
color="accent"
size="sm"
class="q-mr-md"
style="margin-top: 2px"
@click="exchangeType"
:label="typeName"
/> -->
<!-- <q-btn
color="negative"
size="sm"
label="调课申请"
@click="openForm"
></q-btn> -->
</div>
</div>
<!-- <classmateForm :dataList="dataList" v-if="commonType == 1"></classmateForm> -->
<!-- <change-class-form
v-if="persistent"
@close="closeSaveForm"
@success="refreshPage"
></change-class-form> -->
<teachTable
v-if="commonType == 2"
:tableData="tableData"
:PageCount="PageCount"
:setMsg="tabMsg"
:showCZ="false"
@getChange="getChange"
></teachTable>
</div>
</template>
<script>
import {
getTeacherDropDownList,
queryClassRoomList,
} from "../../api/school/index";
import {
GetClassPlanStatistical,
GetClassPlanStatisticalPage,
} from "../../api/teacher/index";
import classmateForm from "../../components/course/classmate-form";
import teachTable from "../teacher/components/teachTable";
import changeClassForm from "../../components/teacher/changeClassForm.vue";
export default {
meta: {
title: "我的课表",
},
components: {
classmateForm,
teachTable,
changeClassForm,
},
data() {
return {
persistent: false,
TeacherList: [], //教师团队
ClassRoomList: [], //
StartTime: "",
EndTime: "",
TeacherId: 0,
ClassRoomId: 0,
dataList: {},
activeNames: [1],
msg: {
StartTime: "",
EndTime: "",
TeacherId: 0,
ClassRoomId: 0,
ClassType: 0,
},
commonType: 2, //1日历模式 2列表模式
typeName: "列表模式",
tabMsg: {
PageIndex: 1,
PageSize: 12,
rowsPerPage: 12,
StartTime: "",
EndTime: "",
TeacherId: 0,
ClassRoomId: 0,
ClassType: 0,
},
tableData: [], //表格数据
PageCount: 0,
picker: {
disabledDate: (time) => {
let endTime = this.msg.EndTime;
if (endTime) {
return time.getTime() >= new Date(endTime).getTime() - 8.64e6;
} else {
return time.getTime() >= Date.now() - 8.64e6;
}
},
},
pickerEnd: {
disabledDate: (time) => {
return time.getTime() >= Date.now() - 8.64e6;
},
},
};
},
created() {
if (this.$route.query && this.$route.query.ClassType) {
this.msg.ClassType = this.$route.query.ClassType;
}
let date = new Date();
let today =
date.getFullYear() +
"-" +
(date.getMonth() < 9
? "0" + (date.getMonth() + 1)
: date.getMonth() + 1) +
"-" +
(date.getDate() < 10 ? "0" + date.getDate() < 10 : date.getDate());
this.msg.StartTime = today;
this.tabMsg.StartTime = today;
this.msg.EndTime = today;
this.tabMsg.EndTime = today;
// let userinfo = this.getLocalStorage();
// this.msg.TeacherId = userinfo.AccountId;
// this.tabMsg.TeacherId = userinfo.AccountId;
this.getClassRoomList();
},
mounted() {
this.GetTeacherList();
this.getPlanList();
},
methods: {
refreshPage() {
this.getPlanList();
},
openForm() {
this.persistent = true;
},
closeSaveForm() {
this.persistent = false;
},
// 获取校区教室导航列表
getPlanList() {
GetClassPlanStatistical(this.msg)
.then((res) => {
if (res.Code == 1) {
this.dataList = res.Data;
}
})
.catch(() => {});
},
//获取教师下拉
GetTeacherList() {
getTeacherDropDownList({}).then((res) => {
if (res.Code == 1) {
this.TeacherList = res.Data;
var obj = {
TeacherName: "请选择",
TId: 0,
};
this.TeacherList.unshift(obj);
}
});
},
//获取教室下拉
getClassRoomList() {
queryClassRoomList({}).then((res) => {
if (res.Code == 1) {
this.ClassRoomList = res.Data;
var obj = {
RoomName: "请选择",
RoomId: 0,
};
this.ClassRoomList.unshift(obj);
}
});
},
exchangeType() {
if (this.commonType == 1) {
this.commonType = 2;
this.typeName = "日历模式";
this.getTableList();
} else {
this.commonType = 1;
this.typeName = "列表模式";
this.getPlanList();
}
},
getTableList() {
this.tabMsg.StartTime = this.msg.StartTime;
this.tabMsg.EndTime = this.msg.EndTime;
this.tabMsg.ClassRoomId = this.msg.ClassRoomId;
this.tabMsg.ClassType = this.msg.ClassType;
GetClassPlanStatisticalPage(this.tabMsg).then((res) => {
if (res.Code == 1) {
this.tableData = res.Data.PageData;
this.PageCount = res.Data.PageCount;
}
});
},
getChange(val) {
this.tabMsg.PageIndex = val;
this.getTableList();
},
getTypeWay() {
if (this.commonType == 2) {
this.getTableList();
} else {
this.getPlanList();
}
},
},
};
</script>
<style lang="scss">
.xg .el-input--prefix .el-input__inner {
padding-left: 50px;
}
</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