Skip to content

C
confucius
Commit 6b2bd6ae authored by 罗超's avatar 罗超
Browse files
Options

1

parent c7fffbd0
Hide whitespace changes
Inline Side-by-side
Showing with 169 additions and 128 deletions
src/components/sale/stopbill-form.vue
View file @ 6b2bd6ae
...@@ -201,8 +201,8 @@ ...@@ -201,8 +201,8 @@
</div> </div>
<div class="col-6"> <div class="col-6">
<span class="backInfo_Title">已学课时：</span> <span class="backInfo_Title">已学课时：</span>
<!-- <span class="backOtherInfo" style="color:#2961FE;cursor:pointer;" @click="goStudentsClassSee(setingObj.DataObj.Order_Guest_ViewModel)">{{setingObj.DataObj.Order_Guest_ViewModel.Ranks}} 课时</span> --> <span class="backOtherInfo" style="color:#2961FE;cursor:pointer;" @click="goStudentsClassSee(setingObj.DataObj.Order_Guest_ViewModel)">{{setingObj.DataObj.Order_Guest_ViewModel.Ranks}} 课时</span>
<span class="backOtherInfo">{{setingObj.DataObj.Order_Guest_ViewModel.Ranks}} 课时</span> <!-- <span class="backOtherInfo">{{setingObj.DataObj.Order_Guest_ViewModel.Ranks}} 课时</span> -->
</div> </div>
</div> </div>
<div class="row backInfo_One"> <div class="row backInfo_One">
......
src/components/sale/temporaryClassbill-form.vue
View file @ 6b2bd6ae
...@@ -129,7 +129,7 @@ ...@@ -129,7 +129,7 @@
<div class="drawerTop"> <div class="drawerTop">
<div style="display:flex;align-items:center;"> <div style="display:flex;align-items:center;">
<div class="className"> <div class="className">
<div class="classFirst">停课审批</div> <div class="classFirst">临时上课邀请审批</div>
</div> </div>
</div> </div>
</div> </div>
...@@ -146,7 +146,7 @@ ...@@ -146,7 +146,7 @@
</div> </div>
<div class="row backInfo_One"> <div class="row backInfo_One">
<div class="col-6"> <div class="col-6">
<span class="backInfo_Title">停课编号：</span> <span class="backInfo_Title">编号：</span>
<span class="backOtherInfo">{{setingObj.Id}}</span> <span class="backOtherInfo">{{setingObj.Id}}</span>
</div> </div>
<div class="col-6"> <div class="col-6">
...@@ -155,153 +155,128 @@ ...@@ -155,153 +155,128 @@
</div> </div>
</div> </div>
<div class="row backInfo_One"> <div class="row backInfo_One">
<div class="col-6">
<span class="backInfo_Title">学员姓名：</span>
<span class="backOtherInfo">{{setingObj.DataObj.Order_Guest_ViewModel.GuestName}}</span>
</div>
<div class="col-6"> <div class="col-6">
<span class="backInfo_Title">申请时间：</span> <span class="backInfo_Title">申请时间：</span>
<span class="backOtherInfo">{{setingObj.CreateTime}}</span> <span class="backOtherInfo">{{setingObj.CreateTime}}</span>
</div> </div>
</div> </div>
<div class="backinfo_Item"> <div class="backinfo_Item">
<span class="role_Line" style="background-color:#F28C1D"></span>教学信息 <span class="role_Line" style="background-color:#F28C1D"></span>目标班级
</div> </div>
<div class="row backInfo_One"> <div class="row backInfo_One">
<div class="col-6"> <div class="col-6">
<span class="backInfo_Title">校区：</span> <span class="backInfo_Title">校区：</span>
<span class="backOtherInfo">{{setingObj.DataObj.Order_Guest_ViewModel.SchoolName}}</span> <span class="backOtherInfo">{{setingObj.SchoolName}}</span>
</div> </div>
<div class="col-6"> <div class="col-6">
<span class="backInfo_Title">班级信息：</span> <span class="backInfo_Title">班级信息：</span>
<span class="backOtherInfo"> <span class="backOtherInfo">
{{setingObj.DataObj.ClassName}} {{setingObj.ClassName}}
<span style="color:#2961FE;cursor:pointer;" <span style="color:#2961FE;cursor:pointer;"
@click="goClassManage(setingObj.DataObj.ClassName)">{{setingObj.ClassNo}}</span> @click="goClassManage(setingObj.ClassName)">{{setingObj.ClassNo}}</span>
</span> </span>
</div> </div>
</div> </div>
<div class="row backInfo_One"> <div class="row backInfo_One">
<div class="col-6"> <div class="col-6">
<span class="backInfo_Title">带班老师：</span> <span class="backInfo_Title">带班老师：</span>
<span class="backOtherInfo">{{setingObj.DataObj.Order_Guest_ViewModel.TeacherName}}</span> <span class="backOtherInfo">{{setingObj.TeacherName}}</span>
</div> </div>
<div class="col-6"> <div class="col-6">
<span class="backInfo_Title">学习课程：</span> <span class="backInfo_Title">学习课程：</span>
<span class="backOtherInfo" style="color:#2961FE;cursor:pointer;" @click="goCourse(setingObj.DataObj.Order_Guest_ViewModel.CourseName)">{{setingObj.DataObj.Order_Guest_ViewModel.CourseName}}</span> <span class="backOtherInfo" style="color:#2961FE;cursor:pointer;"
</div> @click="goCourse(setingObj.CourseName)">{{setingObj.CourseName}}</span>
</div>
<div class="backinfo_Item">
<span class="role_Line" style="background-color:#02C499"></span>学习信息
</div>
<div class="row backInfo_One">
<div class="col-6">
<span class="backInfo_Title">总课时：</span>
<span class="backOtherInfo">{{setingObj.DataObj.Order_Guest_ViewModel.TotalPlanNum}} 课时</span>
</div>
<div class="col-6">
<span class="backInfo_Title">已学课时：</span>
<!-- <span class="backOtherInfo" style="color:#2961FE;cursor:pointer;" @click="goStudentsClassSee(setingObj.DataObj.Order_Guest_ViewModel)">{{setingObj.DataObj.Order_Guest_ViewModel.Ranks}} 课时</span> -->
<span class="backOtherInfo">{{setingObj.DataObj.Order_Guest_ViewModel.Ranks}} 课时</span>
</div>
</div>
<div class="row backInfo_One">
<div class="col-6">
<span class="backInfo_Title">剩余课时：</span>
<span
class="backOtherInfo">{{setingObj.DataObj.Order_Guest_ViewModel.TotalPlanNum-setingObj.DataObj.Order_Guest_ViewModel.Ranks}}
课时</span>
</div> </div>
</div> </div>
<div class="backinfo_Item"> <div class="backinfo_Item">
<span class="role_Line" style="background-color:#8175FB"></span>其他信息 <span class="role_Line" style="background-color:#02C499"></span>上课时间信息
</div>
<div class="row backInfo_One">
<div class="col-6">
<span class="backInfo_Title">关联单号：</span>
<span class="backOtherInfo" style="color:#2961FE;cursor:pointer"
@click="goOrderStatic(setingObj.DataObj.Order_Guest_ViewModel.OrderId)">{{setingObj.DataObj.Order_Guest_ViewModel.OrderId}}</span>
</div>
<div class="col-6">
<span class="backInfo_Title">关联销售：</span>
<span class="backOtherInfo">{{setingObj.DataObj.Order_Guest_ViewModel.EnterName}}</span>
</div>
</div> </div>
<q-table :pagination="msg" no-data-label="暂无相关数据" flat
class="sticky-column-table" separator="none" :data="setingObj.DataObj.ClassPlanTimeList"
:columns="columns" row-key="name">
<template v-slot:body-cell-time="props">
<td class="flex items-center full-height" style="height:100%">
{{props.row.StartTime}}-{{props.row.EndTime}}
</td>
</template>
<template v-slot:bottom>
</template>
</q-table>
</div> </div>
<div class="replayReason"> <div class="backinfo_Item">
<div class="replay_Title">生效日期</div> <span class="role_Line" style="background-color:#8175FB"></span>目标学员信息
<div style="color:#666666;margin-top:5px;" class="q-mb-md">
{{handleDate(setingObj.DataObj.TakeEffectTime)}}
</div>
<div class="replay_Title">停课原因</div>
<div style="color:#666666;margin-top:5px;">
{{setingObj.DataObj.Remarks}}
</div>
</div> </div>
<!-- <template v-if="setingObj.SpecialNode==1"> <q-table :pagination="msg" no-data-label="暂无相关数据" flat
<span> class="sticky-column-table" separator="none" :data="setingObj.DataObj.OrderGuestList"
<q-input filled stack-label :dense="false" v-model="stopBillMsg.BackMoney" class="col-12" :columns="columns2" row-key="name">
label="退课金额" /> <template v-slot:body-cell-process="props">
</span> <td>
<span> {{props.row.Ranks}}/{{props.row.TotalPlanNum}}
系统计算课时费为：{{(classPriceObj.ClassHours-classPriceObj.FinishHours)}}(课时)*{{classPriceObj.classHourPrice}}（课单价）={{classPriceObj.backMoney}}元，请你最终确认退款金额 </td>
</span> </template>
</template> --> <template v-slot:bottom>
<div v-if="showType==2"> </template>
<div style="display:flex;justify-content:space-between;align-items:center;margin-top:20px;"> </q-table>
<div>审批意见</div> </div>
<div> <div class="replayReason">
<q-radio v-model="stopBillMsg.AuditStatus" :val="2" label="通过" /> <div class="replay_Title">申请原因</div>
<q-radio v-model="stopBillMsg.AuditStatus" :val="3" label="驳回" /> <div style="color:#666666;margin-top:5px;">
</div> {{setingObj.DataObj.Remarks}}
</div>
</div>
<div v-if="showType==2">
<div style="display:flex;justify-content:space-between;align-items:center;margin-top:20px;">
<div>审批意见</div>
<div>
<q-radio v-model="billMsg.AuditStatus" :val="2" label="通过" />
<q-radio v-model="billMsg.AuditStatus" :val="3" label="驳回" />
</div> </div>
<q-input filled stack-label :dense="false" v-model="stopBillMsg.Description" type="textarea"
label="审批意见" />
</div> </div>
<div style="margin-top:20px;"> <q-input filled stack-label :dense="false" v-model="billMsg.Description" type="textarea" label="审批意见" />
<div class="row"> </div>
<div class="col-6" style="display:flex;align-items:top;"> <div style="margin-top:20px;">
<template v-if="tempPeople.length>0"> <div class="row">
<div style="display:inline-block;width:45px;">抄送:</div> <div class="col-6" style="display:flex;align-items:top;">
<!-- RecipientIds --> <template v-if="tempPeople.length>0">
<div style="display:inline-block;margin-left:5px;width:340px;"> <div style="display:inline-block;width:45px;">抄送:</div>
<span class="chaosong_Peo" v-for="(childItem,cindex) in tempPeople"> <!-- RecipientIds -->
{{getName(childItem)}} <div style="display:inline-block;margin-left:5px;width:340px;">
</span> <span class="chaosong_Peo" v-for="(childItem,cindex) in tempPeople">
</div> {{getName(childItem)}}
</template> </span>
</div> </div>
<div class="col-6" style="justify-content: flex-end;display:flex;align-items:center;"> </template>
<i class="iconfont icon-aite" style="font-size:20px;margin:7px 20px 0 0;cursor:pointer;" </div>
v-if="showType==2"> <div class="col-6" style="justify-content: flex-end;display:flex;align-items:center;">
<q-popup-proxy> <i class="iconfont icon-aite" style="font-size:20px;margin:7px 20px 0 0;cursor:pointer;"
<q-banner> v-if="showType==2">
<div style="width:350px;"> <q-popup-proxy>
<div style="margin:10px 0 15px 0;">抄送</div> <q-banner>
<q-select class="col-6 q-pb-lg q-pr-lg" multiple clearable filled stack-label use-input <div style="width:350px;">
option-value="Id" option-label="EmployeeName" v-model="tempPeople" ref="ManagerId" <div style="margin:10px 0 15px 0;">抄送</div>
:options="EmployeeList" label="选择人员" :dense="false" emit-value map-options <q-select class="col-6 q-pb-lg q-pr-lg" multiple clearable filled stack-label use-input
@filter="filterFn"> option-value="Id" option-label="EmployeeName" v-model="tempPeople" ref="ManagerId"
<template v-slot:no-option> :options="EmployeeList" label="选择人员" :dense="false" emit-value map-options @filter="filterFn">
<q-item> <template v-slot:no-option>
<q-item-section class="text-grey"> <q-item>
未找到相关数据 <q-item-section class="text-grey">
</q-item-section> 未找到相关数据
</q-item> </q-item-section>
</template> </q-item>
</q-select> </template>
</div> </q-select>
</q-banner> </div>
</q-popup-proxy> </q-banner>
</i> </q-popup-proxy>
<q-btn class="q-mr-md" label="关闭" @click="closeBackInfo" /> </i>
<q-btn v-if="showType==2" color="accent q-px-md" label="确认" @click="saveBackClassInfo()" /> <q-btn class="q-mr-md" label="关闭" @click="closeBackInfo" />
</div> <q-btn v-if="showType==2" color="accent q-px-md" label="确认" @click="saveBackClassInfo()" />
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</div>
<div v-if="tabCheck=='second'"> <div v-if="tabCheck=='second'">
 <flowinfoForm :seting-obj="setingObj" :showType="showType" @close="closeShenheForm" @success="refreshPage">  <flowinfoForm :seting-obj="setingObj" :showType="showType" @close="closeShenheForm" @success="refreshPage">
</flowinfoForm> </flowinfoForm>
...@@ -340,9 +315,13 @@ ...@@ -340,9 +315,13 @@
}, },
data() { data() {
return { return {
msg:{
rowsPerPage:0,
},
loading: false,
persistent: true, persistent: true,
tabCheck: 'first', //默认选第一个 tabCheck: 'first', //默认选第一个
stopBillMsg: { billMsg: {
Id: 0, Id: 0,
// BackMoney: 0, //实际退款金额 // BackMoney: 0, //实际退款金额
Description: "", //审批意见 Description: "", //审批意见
...@@ -354,15 +333,77 @@ ...@@ -354,15 +333,77 @@
EmployeeList: [], EmployeeList: [],
AllemployeeList: [], AllemployeeList: [],
tempPeople: [], //抄送人数组 tempPeople: [], //抄送人数组
columns: [{
name: 'ClassDate',
label: '上课日期',
field: 'ClassDate',
align: 'left',
},
{
name: 'time',
label: '上课时间',
field: 'time',
align: 'left'
},
{
name: 'TimeHour',
label: '消耗课时',
field: 'TimeHour',
align: 'left'
},
],
columns2: [{
name: 'GuestName',
label: '学员名称',
field: 'GuestName',
align: 'left',
},
{
name: 'ClassName',
label: '所属班级',
field: 'ClassName',
align: 'left'
},
{
name: 'TeacherName',
label: '带班老师',
field: 'TeacherName',
align: 'left'
},
{
name: 'process',
label: '学习进度',
field: 'process',
align: 'left'
},
{
name: 'CourseName',
label: '学习课程',
field: 'CourseName',
align: 'left'
},
{
name: 'OrderId',
label: '订单编号',
field: 'OrderId',
align: 'left'
},
{
name: 'EnterName',
label: '关联销售',
field: 'EnterName',
align: 'left'
},
],
} }
}, },
created() { created() {
this.getEmployee(); this.getEmployee();
}, },
mounted() { mounted() {
this.stopBillMsg.Id = this.setingObj.Id; this.billMsg.Id = this.setingObj.Id;
this.stopBillMsg.SpecialNode = this.setingObj.SpecialNode; this.billMsg.SpecialNode = this.setingObj.SpecialNode;
if (this.stopBillMsg.SpecialNode == 1) { if (this.billMsg.SpecialNode == 1) {
this.getBackBillMoney(); this.getBackBillMoney();
} }
...@@ -392,8 +433,8 @@ ...@@ -392,8 +433,8 @@
if (str && str != '') { if (str && str != '') {
str = str.substr(1); str = str.substr(1);
} }
this.stopBillMsg.RecipientIds = str; this.billMsg.RecipientIds = str;
saveBackBillAduit(this.stopBillMsg).then(res => { saveBackBillAduit(this.billMsg).then(res => {
if (res.Code == 1) { if (res.Code == 1) {
this.$q.notify({ this.$q.notify({
icon: 'iconfont icon-chenggong', icon: 'iconfont icon-chenggong',
...@@ -457,17 +498,17 @@ ...@@ -457,17 +498,17 @@
}) })
}, },
//跳转到课耗明细 //跳转到课耗明细
goStudentsClassSee(item){ goStudentsClassSee(item) {
this.OpenNewUrl('/teacher/studentsClassSee', { this.OpenNewUrl('/teacher/studentsClassSee', {
StudentId:item.Id, StudentId: item.Id,
TeacherId:item.Teacher_Id, TeacherId: item.Teacher_Id,
ClassId:item.ClassId, ClassId: item.ClassId,
}) })
}, },
//跳转到课程管理 //跳转到课程管理
goCourse(name){ goCourse(name) {
this.OpenNewUrl('/course/course', { this.OpenNewUrl('/course/course', {
Name:name Name: name
}) })
}, },
refreshPage() { refreshPage() {
...@@ -478,8 +519,8 @@ ...@@ -478,8 +519,8 @@
this.persistent = false; this.persistent = false;
this.$emit('close'); this.$emit('close');
}, },
handleDate(T){ handleDate(T) {
let date=T.split("T") let date = T.split("T")
return date[0] return date[0]
} }
} }
......
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