Skip to content

C
confucius
Commit 46c55fb4 authored by 黄奎's avatar 黄奎
Browse files
Options

页面修改

parent 20acf0c7
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 2836 additions and 2936 deletions
src/components/school/student/monthStatisticslist.vue
View file @ 46c55fb4
...@@ -59,6 +59,7 @@ ...@@ -59,6 +59,7 @@
cursor: pointer; cursor: pointer;
color: #2961FE; color: #2961FE;
} }
</style> </style>
<template> <template>
<div class="monthStatisticslist"> <div class="monthStatisticslist">
...@@ -67,17 +68,17 @@ ...@@ -67,17 +68,17 @@
cellpadding="0" v-loading="loading"> cellpadding="0" v-loading="loading">
<tr> <tr>
<th width="120" style="min-width: 110px;">学生</th> <th width="120" style="min-width: 110px;">学生</th>
<th width="200" style="min-width: 110px;z-index: 999;">时间</th> <th width="200" style="min-width: 110px;z-index: 999;">时间</th>
<th width="120" style="min-width: 110px;">类型</th> <th width="120" style="min-width: 110px;">类型</th>
<th width="120" style="min-width: 110px;">学历</th> <th width="120" style="min-width: 110px;">学历</th>
<th width="100" style="min-width: 100px;">目的</th> <th width="100" style="min-width: 100px;">目的</th>
<th width="200" style="min-width: 200px;">是否签合同</th> <th width="200" style="min-width: 200px;">是否签合同</th>
<th width="200" style="min-width: 200px;">来源</th> <th width="200" style="min-width: 200px;">来源</th>
<th width="200" style="min-width: 200px;">来源人</th> <th width="200" style="min-width: 200px;">来源人</th>
<th width="200" style="min-width: 200px;">课程名称</th> <th width="200" style="min-width: 200px;">课程名称</th>
<th width="200" style="min-width: 80px;">订单金额</th> <th width="200" style="min-width: 80px;">订单金额</th>
</tr> </tr>
<template v-if='dataObj&&dataObj.list && dataObj.list.length>0'> <template v-if='dataObj&&dataObj.list && dataObj.list.length>0'>
<tr v-for=" ( item , index ) in dataObj.list " :key="index"> <tr v-for=" ( item , index ) in dataObj.list " :key="index">
<td style=" border: 1px solid #d2d2d2;"> <td style=" border: 1px solid #d2d2d2;">
...@@ -90,7 +91,7 @@ ...@@ -90,7 +91,7 @@
</td> </td>
<td> <td>
<span>{{ item.JoinType==3?"内产":"新生" }}</span> <span>{{ item.JoinType==3?"内产":"新生" }}</span>
</td> </td>
<td> <td>
<span>{{item.StuEducationName}}</span> <span>{{item.StuEducationName}}</span>
...@@ -187,11 +188,8 @@ ...@@ -187,11 +188,8 @@
} }
return managerName; return managerName;
}, },
//点击学生姓名弹出 //点击学生姓名弹出
getStuRight(obj) { getStuRight(obj) {
console.log("我进来啦",obj);
if (obj) { if (obj) {
this.stuOption = obj; this.stuOption = obj;
this.BelongType = 3; this.BelongType = 3;
...@@ -205,4 +203,5 @@ ...@@ -205,4 +203,5 @@
}, },
} }
}; };
</script>
\ No newline at end of file </script>
src/components/school/student/studentStudyAddForm.vue
View file @ 46c55fb4
...@@ -4,30 +4,34 @@ ...@@ -4,30 +4,34 @@
<div class="text-h6">{{saveObj==2?'新增考试':"月度总结"}}</div> <div class="text-h6">{{saveObj==2?'新增考试':"月度总结"}}</div>
<template v-if="saveObj==2"> <template v-if="saveObj==2">
<div class="row q-col-gutter-md"> <div class="row q-col-gutter-md">
<q-input class="col-6" filled v-model="SaveMsg.StudyValue" dense label="时间"></q-input> <q-input class="col-6" filled v-model="SaveMsg.StudyValue" dense label="时间"></q-input>
<q-input class="col-6" filled v-model="SaveMsg.Words" type="number" dense label="单词背诵"></q-input> <q-input class="col-6" filled v-model="SaveMsg.Words" type="number" dense label="单词背诵"></q-input>
</div> </div>
<div class="q-mt-xs row q-col-gutter-md"> <div class="q-mt-xs row q-col-gutter-md">
<q-input class="col-6" filled v-model="SaveMsg.Practice" type="number" dense label="练习题"></q-input> <q-input class="col-6" filled v-model="SaveMsg.Practice" type="number" dense label="练习题"></q-input>
<q-input class="col-6" filled v-model="SaveMsg.ReadingAloud" type="number" dense label="朗读/背诵"></q-input> <q-input class="col-6" filled v-model="SaveMsg.ReadingAloud" type="number" dense label="朗读/背诵"></q-input>
</div> </div>
<div class="q-mt-xs row q-col-gutter-md"> <div class="q-mt-xs row q-col-gutter-md">
<p>其他 <i class="el-icon-plus text-blue cursor-pointer" @click="SetStudentStudyOther"></i></p> <p>其他 <i class="el-icon-plus text-blue cursor-pointer" @click="SetStudentStudyOther"></i></p>
</div> </div>
<div class="q-mt-xs row q-col-gutter-md" v-if='SaveMsg.Other&& SaveMsg.Other.length>0' v-for=" ( itemOther, indexOther ) in SaveMsg.Other " :key="indexOther"> <template v-if='SaveMsg.Other&& SaveMsg.Other.length>0'>
<el-input class="col-6" placeholder="请输入" filled v-model="itemOther.Name" autofocus/> <div class="q-mt-xs row q-col-gutter-md" v-for=" ( itemOther, indexOther ) in SaveMsg.Other "
<el-input class="col-4" placeholder="请输入" filled v-model="itemOther.Score" type="number" autofocus/> :key="indexOther">
<i class="el-icon-delete text-blue cursor-pointer col-2" @click="DelStudentStudyOther(indexOther)" style="margin-top:11px;"></i> <q-input class="col-6" placeholder="请输入项目名称" filled v-model="itemOther.Name" autofocus :dense="true" />
</div> <q-input class="col-4" placeholder="请输入得分" filled v-model="itemOther.Score" type="number" :dense="true"
autofocus />
</template> <i class="el-icon-delete text-blue cursor-pointer col-2" @click="DelStudentStudyOther(indexOther)"
style="margin-top:11px;"></i>
</div>
</template>
</template>
<template v-if="saveObj==3"> <template v-if="saveObj==3">
<div class="q-mt-xs row q-col-gutter-md"> <div class="q-mt-xs row q-col-gutter-md">
<q-input class="col-12" filled v-model="SaveMsg.StudyValue" dense label="月份"></q-input> <q-input class="col-12" filled v-model="SaveMsg.StudyValue" dense label="月份"></q-input>
</div> </div>
<div class="q-mt-xs row q-col-gutter-md"> <div class="q-mt-xs row q-col-gutter-md">
<q-input class="col-12" filled v-model="SaveMsg.Remarks" type="textarea" dense label="请输入学校情况"></q-input> <q-input class="col-12" filled v-model="SaveMsg.Remarks" type="textarea" dense label="请输入学校情况"></q-input>
</div> </div>
</template> </template>
<q-separator class="q-my-md" /> <q-separator class="q-my-md" />
<div class="text-right q-py-xs"> <div class="text-right q-py-xs">
...@@ -45,15 +49,14 @@ ...@@ -45,15 +49,14 @@
meta: { meta: {
title: "学员考试信息" title: "学员考试信息"
}, },
components: {}, components: {},
props: { props: {
saveObj: { saveObj: {
type: Number, type: Number,
default: null default: null
}, },
//数据 //数据
BaseInfo: { BaseInfo: {
type: Object, type: Object,
default: null default: null
}, },
...@@ -62,99 +65,94 @@ ...@@ -62,99 +65,94 @@
return { return {
//客户对象 //客户对象
SaveMsg: { SaveMsg: {
CourseId: 0, CourseId: 0,
StuId:0, StuId: 0,
GuestId:0, GuestId: 0,
ClassScrollType:0, ClassScrollType: 0,
OrderId:0, OrderId: 0,
StudyID:0, StudyID: 0,
Words:'', Words: '',
Practice:'', Practice: '',
ReadingAloud:'', ReadingAloud: '',
Other:[], Other: [],
ChapterId:0, ChapterId: 0,
StudyType:0, StudyType: 0,
Remarks:'', Remarks: '',
StudyValue:'', StudyValue: '',
}, },
nowOther:{ nowOther: {
Name:"", Name: "",
Score:"", Score: "",
}, },
}; };
}, },
created() { created() {},
},
mounted() {}, mounted() {},
methods: { methods: {
SetStudentStudyOther(){ SetStudentStudyOther() {
this.SaveMsg.Other.push(JSON.parse(JSON.stringify(this.nowOther))) this.SaveMsg.Other.push(JSON.parse(JSON.stringify(this.nowOther)))
}, },
DelStudentStudyOther(indexOther){ DelStudentStudyOther(indexOther) {
if( this.SaveMsg.Other&& this.SaveMsg.Other.length>0){ if (this.SaveMsg.Other && this.SaveMsg.Other.length > 0) {
this.SaveMsg.Other.splice(indexOther, 1); this.SaveMsg.Other.splice(indexOther, 1);
} }
}, },
//保存信息 //保存信息
SaveStudentStudy(){ SaveStudentStudy() {
this.SaveMsg.CourseId=this.BaseInfo.CourseId, this.SaveMsg.CourseId = this.BaseInfo.CourseId;
this.SaveMsg.StuId=this.BaseInfo.StuId, this.SaveMsg.StuId = this.BaseInfo.StuId;
this.SaveMsg.GuestId=this.BaseInfo.GuestId, this.SaveMsg.GuestId = this.BaseInfo.GuestId;
this.SaveMsg.OrderId=this.BaseInfo.OrderId; this.SaveMsg.OrderId = this.BaseInfo.OrderId;
if(this.saveObj==3){ if (this.saveObj == 3) {
this.SaveMsg.Words=0; this.SaveMsg.Words = 0;
this.SaveMsg.Practice=0; this.SaveMsg.Practice = 0;
this.SaveMsg.ReadingAloud=0; this.SaveMsg.ReadingAloud = 0;
this.SaveMsg.ChapterId=0; this.SaveMsg.ChapterId = 0;
this.SaveMsg.Other=''; this.SaveMsg.Other = '';
} }
this.SaveMsg.StudyType=this.saveObj; this.SaveMsg.StudyType = this.saveObj;
SetStuStudyInfo(this.SaveMsg).then(res => { SetStuStudyInfo(this.SaveMsg).then(res => {
if (res.Code == 1) { if (res.Code == 1) {
this.$q.notify({ this.$q.notify({
icon: 'iconfont icon-chenggong', icon: 'iconfont icon-chenggong',
color: 'accent', color: 'accent',
timeout: 2000, timeout: 2000,
message: '数据保存成功！', message: '数据保存成功！',
position: 'top' position: 'top'
}) })
} }
this.$emit("success"); this.$emit("success");
this.closeSaveForm(); this.closeSaveForm();
}) })
.catch(() => { .catch(() => {
this.loading = false; this.loading = false;
}); });
// this.SaveMsg.Remarks=this.obj.Remarks,
// this.SaveMsg.StudyValue=this.obj.StudyValue,
}, },
closeSaveForm() { closeSaveForm() {
this.$emit("close"); this.$emit("close");
this.persistent = false; this.persistent = false;
}, },
clearSaveMsg(){ clearSaveMsg() {
this.SaveMsg.CourseId= 0, this.SaveMsg.CourseId = 0;
this.SaveMsg.StuId=0, this.SaveMsg.StuId = 0;
this.SaveMsg.GuestId=0, this.SaveMsg.GuestId = 0;
this.SaveMsg.ClassScrollType=0, this.SaveMsg.ClassScrollType = 0;
this.SaveMsg.OrderId=0, this.SaveMsg.OrderId = 0;
this.SaveMsg.StudyID=0, this.SaveMsg.StudyID = 0;
this.SaveMsg.Words=0, this.SaveMsg.Words = 0;
this.SaveMsg.Practice=0, this.SaveMsg.Practice = 0;
this.SaveMsg.ReadingAloud=0, this.SaveMsg.ReadingAloud = 0;
this.SaveMsg.Other=[], this.SaveMsg.Other = [];
this.SaveMsg.ChapterId=0, this.SaveMsg.ChapterId = 0;
this.SaveMsg.StudyType=0, this.SaveMsg.StudyType = 0;
this.SaveMsg.Remarks='', this.SaveMsg.Remarks = '';
this.SaveMsg.StudyValue='' this.SaveMsg.StudyValue = '';
}, },
closeForm() { closeForm() {
this.clearSaveMsg(); this.clearSaveMsg();
this.$emit("close"); this.$emit("close");
}, },
} }
}; };
</script>
\ No newline at end of file </script>
src/components/school/student/stufollowlistNew.vue
View file @ 46c55fb4
...@@ -171,9 +171,9 @@ ...@@ -171,9 +171,9 @@
<td> <td>
{{ item.CreateByName?item.CreateByName:'-' }} {{ item.CreateByName?item.CreateByName:'-' }}
</td> </td>
<td > <td>
<div class="text-blue cursor-pointer" @click="getStudentStudy(item)"> <div class="text-blue cursor-pointer" @click="getStudentStudy(item)">
学习情况 学习情况
</div> </div>
</td> </td>
</tr> </tr>
...@@ -216,7 +216,7 @@ ...@@ -216,7 +216,7 @@
</div> </div>
</div> </div>
<div style="width:100%;margin-bottom:15px;" v-if="customObj.EditType==3"> <div style="width:100%;margin-bottom:15px;" v-if="customObj.EditType==3">
<div style="width:13%;display:inline-block;vertical-align:top;">基本<br/>情况：</div> <div style="width:13%;display:inline-block;vertical-align:top;">基本<br />情况：</div>
<div style="width:86%;display:inline-block;"> <div style="width:86%;display:inline-block;">
<UeEditor v-model="customObj.Remark" class="q-pb-sm" :config="config"></UeEditor> <UeEditor v-model="customObj.Remark" class="q-pb-sm" :config="config"></UeEditor>
</div> </div>
...@@ -337,15 +337,15 @@ ...@@ -337,15 +337,15 @@
} }
this.isShowStuRight = true; this.isShowStuRight = true;
}, },
//点击学生跳转到学习情况 //点击学生跳转到学习情况
getStudentStudy(obj) { getStudentStudy(obj) {
var qObj = { var qObj = {
StuId: obj.StuId, StuId: obj.StuId,
StuName: obj.StuName, StuName: obj.StuName,
GuestId:obj.GuestId, GuestId: obj.GuestId,
CourseRateName:obj.CourseRateName, CourseRateName: obj.CourseRateName,
}; };
this.OpenNewUrl('/teacher/studentStudy', qObj) this.OpenNewUrl('/teacher/studentStudy', qObj)
}, },
//清除 //清除
clearMsg() { clearMsg() {
......
src/layouts/MainLayout.vue
View file @ 46c55fb4
This diff is collapsed.
src/pages/financial/Kingdee/currency.vue
View file @ 46c55fb4
This diff is collapsed.
src/pages/financial/Kingdee/project.vue
View file @ 46c55fb4
This diff is collapsed.
src/pages/sale/monthStatistics.vue
View file @ 46c55fb4
This diff is collapsed.
src/pages/school/sysuser.vue
View file @ 46c55fb4
...@@ -552,12 +552,10 @@ ...@@ -552,12 +552,10 @@
this.orderHandoverMsg.UserId = row.EmAccountId this.orderHandoverMsg.UserId = row.EmAccountId
this.orderIsDetails = true this.orderIsDetails = true
}, },
// 协助老师交接 // 协助老师交接
teacherHandover(row) { teacherHandover(row) {
console.log("row", row);
this.teacherHandoverMsg.UserId = row.EmAccountId; this.teacherHandoverMsg.UserId = row.EmAccountId;
this.teacherHandoverMsg.EmployeeName=row.EmployeeName; this.teacherHandoverMsg.EmployeeName = row.EmployeeName;
this.teacherIsDetails = true this.teacherIsDetails = true
}, },
saveOrderHandoverInfo() { //保存 saveOrderHandoverInfo() { //保存
...@@ -639,7 +637,6 @@ ...@@ -639,7 +637,6 @@
UserId: this.teacherHandoverMsg.UserId, UserId: this.teacherHandoverMsg.UserId,
ReceiveId: this.teacherHandoverMsg.ReceiveId ReceiveId: this.teacherHandoverMsg.ReceiveId
} }
console.log("开始保存咔咔咔咔咔咔");
SetUserLeaveTearchCareOf(msg).then(res => { SetUserLeaveTearchCareOf(msg).then(res => {
if (res.Code == 1) if (res.Code == 1)
this.$q.notify({ this.$q.notify({
......
src/pages/teacher/studentStudy.vue
View file @ 46c55fb4
This diff is collapsed.
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