Skip to content

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

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

parents fe8bf76e b40c1136
Hide whitespace changes
Inline Side-by-side
Showing with 127 additions and 110 deletions
src/components/course/classstu-form.vue
View file @ b79ae291
......@@ -62,6 +62,16 @@
<span style="color:green;" v-if="props.row.IsRenew==1">是</span>
</q-td>
</template>
<template v-slot:body-cell-GuestName="props">
<q-td auto-width :props="props">
<span v-if="props.row.GuestState==1">{{props.row.GuestName}}</span>
<span style="color:red;cursor:pointer" v-else>{{props.row.GuestName}}
<q-tooltip :offset="[10, 10]">
{{props.row.GuestStateStr}}
</q-tooltip>
</span>
</q-td>
</template>
<template v-slot:body-cell-StuType="props">
<q-td auto-width :props="props">
<span v-if="props.row.IsChaBan==0">正常报入</span>
......@@ -202,14 +212,13 @@
}
})
},
//获取学员信息
getStudentData() {
this.studentList = [];
queryClassStudent({
ClassId: this.setingObj.ClassId,
School_Id: this.setingObj.School_Id
School_Id: this.setingObj.School_Id,
QEffectStatus: 2,
}).then(res => {
if (res.Code == 1) {
this.studentList = res.Data;
......
src/components/course/lesson-form.vue
View file @ b79ae291
......@@ -39,6 +39,7 @@
margin-left: -7px;
align-items: center;
transform: scale(0.9);
height:24px;
}
.lesson_Form .calendarInner {
......@@ -281,63 +282,65 @@
</q-td>
</template>
<template v-slot:body-cell-optioned="props">
<q-td :props="props" style="width:10%;">
<q-btn flat size="xs" icon="edit" color="accent" style="font-weight:400" label="编辑"
@click="getInfo(props.row)">
<q-popup-proxy>
<q-banner v-if="isShowEdit">
<div class="calenderDialog">
<div style="margin:10px 0 15px 0;">{{props.row.ClassDateStr}}课程安排</div>
<q-select filled stack-label option-value="TId" option-label="TeacherName"
v-model="addMsg.TeacherId" ref="Teacher_Id" :options="TeacherList" label="关联教师" :dense="false"
class="col-6 q-pb-lg" emit-value map-options />
<q-input filled v-model="addMsg.ClassDate" class="col-6 q-pb-lg" mask="date" label="上课时间">
<template v-slot:append>
<q-icon name="event" class="cursor-pointer">
<q-popup-proxy ref="qDateProxy3" transition-show="scale" transition-hide="scale">
<q-date v-model="addMsg.ClassDate" @input=' () => $refs.qDateProxy3[0].hide()' />
</q-popup-proxy>
</q-icon>
</template>
</q-input>
<q-toggle size="md" label="更多设置" left-label color="primary" :false-value="0" :true-value="1"
v-model="isSetMoreTwo" />
<template v-if="isSetMoreTwo==1">
<q-select filled stack-label option-value="RoomId" option-label="RoomName"
v-model="addMsg.ClassRoomId" ref="ClassRoomId" :options="ClassRoomList" label="关联教室"
:dense="false" class="col-6 q-pb-lg" emit-value map-options />
<div style="display:flex;justify-content:flex-end;margin-bottom:20px;">
<q-btn @click="addStep()" size="10px" round color="primary" icon="iconfont icon-img_haha" />
</div>
<div class="row wrap" style="position:relative;"
v-for="(subItem,subIndex) in addMsg.PlanTimeList">
<div class="col-6">
<q-input filled stack-label maxlength="20" :dense="false" v-model="subItem.StartTime"
ref="StartTime" class="col-6 q-pr-lg q-pb-lg" label=""
:rules="[val => !!val || '请填写开始时间']" />
</div>
<div class="col-6">
<q-input filled stack-label maxlength="20" :dense="false" v-model="subItem.EndTime"
ref="EndTime" class="col-6 q-pr-lg q-pb-lg" label=""
:rules="[val => !!val || '请填写开始时间']" />
<q-td :props="props" style="width:130px;">
<template v-if="!props.row.IsEndDate">
<q-btn flat size="xs" icon="edit" color="accent" style="font-weight:400" label="编辑"
@click="getInfo(props.row)">
<q-popup-proxy>
<q-banner v-if="isShowEdit">
<div class="calenderDialog">
<div style="margin:10px 0 15px 0;">{{props.row.ClassDateStr}}课程安排</div>
<q-select filled stack-label option-value="TId" option-label="TeacherName"
v-model="addMsg.TeacherId" ref="Teacher_Id" :options="TeacherList" label="关联教师" :dense="false"
class="col-6 q-pb-lg" emit-value map-options />
<q-input filled v-model="addMsg.ClassDate" class="col-6 q-pb-lg" mask="date" label="上课时间">
<template v-slot:append>
<q-icon name="event" class="cursor-pointer">
<q-popup-proxy ref="qDateProxy3" transition-show="scale" transition-hide="scale">
<q-date v-model="addMsg.ClassDate" @input=' () => $refs.qDateProxy3[0].hide()' />
</q-popup-proxy>
</q-icon>
</template>
</q-input>
<q-toggle size="md" label="更多设置" left-label color="primary" :false-value="0" :true-value="1"
v-model="isSetMoreTwo" />
<template v-if="isSetMoreTwo==1">
<q-select filled stack-label option-value="RoomId" option-label="RoomName"
v-model="addMsg.ClassRoomId" ref="ClassRoomId" :options="ClassRoomList" label="关联教室"
:dense="false" class="col-6 q-pb-lg" emit-value map-options />
<div style="display:flex;justify-content:flex-end;margin-bottom:20px;">
<q-btn @click="addStep()" size="10px" round color="primary" icon="iconfont icon-img_haha" />
</div>
<div class="delBtnStyle">
<i @click="delStep(subIndex)" class="iconfont icon-guanbi"></i>
<div class="row wrap" style="position:relative;"
v-for="(subItem,subIndex) in addMsg.PlanTimeList">
<div class="col-6">
<q-input filled stack-label maxlength="20" :dense="false" v-model="subItem.StartTime"
ref="StartTime" class="col-6 q-pr-lg q-pb-lg" label=""
:rules="[val => !!val || '请填写开始时间']" />
</div>
<div class="col-6">
<q-input filled stack-label maxlength="20" :dense="false" v-model="subItem.EndTime"
ref="EndTime" class="col-6 q-pr-lg q-pb-lg" label=""
:rules="[val => !!val || '请填写开始时间']" />
</div>
<div class="delBtnStyle">
<i @click="delStep(subIndex)" class="iconfont icon-guanbi"></i>
</div>
</div>
</div>
</template>
<q-card-actions align="right" class="bg-white">
<q-btn label="取消" flat color="grey-10" @click="isShowEdit=false"
style="font-weight:400 !important" />
<q-btn label="确认" color="accent q-px-md" style="font-weight:400 !important"
@click="saveSteps" />
</q-card-actions>
</div>
</q-banner>
</q-popup-proxy>
</q-btn>
<q-btn flat size="xs" icon="delete" color="negative" style="font-weight:400" label="删除"
@click.stop="delInfo(props.row)"></q-btn>
</template>
<q-card-actions align="right" class="bg-white">
<q-btn label="取消" flat color="grey-10" @click="isShowEdit=false"
style="font-weight:400 !important" />
<q-btn label="确认" color="accent q-px-md" style="font-weight:400 !important"
@click="saveSteps" />
</q-card-actions>
</div>
</q-banner>
</q-popup-proxy>
</q-btn>
<q-btn flat size="xs" icon="delete" color="negative" style="font-weight:400" label="删除"
@click.stop="delInfo(props.row)"></q-btn>
</template>
</q-td>
</template>
<template v-slot:bottom>
......@@ -354,7 +357,7 @@
<div v-if="item.ClassDateStr==data.day">
<div class="calendarTop">
<div>{{item.RoomName}}</div>
<div>
<div v-if="!item.IsEndDate">
<i class="iconfont icon-edit Lessicon_Edit" @click.stop="getInfo(item)">
<q-popup-proxy>
<q-banner v-if="isShowEdit">
......
src/components/sale/eduinfo-form.vue
View file @ b79ae291
......@@ -115,7 +115,7 @@
<tr>
<td>培训课程内容</td>
<td>
<q-input filled v-model="objOption.CourseName" />
<q-input filled disable v-model="objOption.CourseName" />
</td>
<td>校区名称</td>
<td>
......@@ -155,15 +155,15 @@
<tr>
<td>培训课时数</td>
<td>
<q-input filled @keyup.native="checkPrice(objOption,'FirstClassHours')" @input="calcTotal()"
<q-input filled disable @keyup.native="checkPrice(objOption,'FirstClassHours')" @input="calcTotal()"
v-model="objOption.FirstClassHours" />
</td>
<td>
<q-input filled @keyup.native="checkPrice(objOption,'SecondClassHours')" @input="calcTotal()"
<q-input filled disable @keyup.native="checkPrice(objOption,'SecondClassHours')" @input="calcTotal()"
v-model="objOption.SecondClassHours" />
</td>
<td>
<q-input filled @keyup.native="checkPrice(objOption,'ThirdClassHours')" @input="calcTotal()"
<q-input filled disable @keyup.native="checkPrice(objOption,'ThirdClassHours')" @input="calcTotal()"
v-model="objOption.ThirdClassHours" />
</td>
<td>
......@@ -173,15 +173,15 @@
<tr>
<td>培训课程费</td>
<td>
<q-input filled @keyup.native="checkPrice(objOption,'FirstCourseFee')" @input="calcTotal()"
<q-input filled disable @keyup.native="checkPrice(objOption,'FirstCourseFee')" @input="calcTotal()"
v-model="objOption.FirstCourseFee" />
</td>
<td>
<q-input filled @keyup.native="checkPrice(objOption,'SecondCourseFee')" @input="calcTotal()"
<q-input filled disable @keyup.native="checkPrice(objOption,'SecondCourseFee')" @input="calcTotal()"
v-model="objOption.SecondCourseFee" />
</td>
<td>
<q-input filled @keyup.native="checkPrice(objOption,'ThirdCourseFee')" @input="calcTotal()"
<q-input filled disable @keyup.native="checkPrice(objOption,'ThirdCourseFee')" @input="calcTotal()"
v-model="objOption.ThirdCourseFee" />
</td>
<td>
......@@ -191,15 +191,15 @@
<tr>
<td>培训教材费</td>
<td>
<q-input filled @keyup.native="checkPrice(objOption,'FirstBookFee')" @input="calcTotal()"
<q-input filled disable @keyup.native="checkPrice(objOption,'FirstBookFee')" @input="calcTotal()"
v-model="objOption.FirstBookFee" />
</td>
<td>
<q-input filled @keyup.native="checkPrice(objOption,'SecondBookFee')" @input="calcTotal()"
<q-input filled disable @keyup.native="checkPrice(objOption,'SecondBookFee')" @input="calcTotal()"
v-model="objOption.SecondBookFee" />
</td>
<td>
<q-input filled @keyup.native="checkPrice(objOption,'ThirdBookFee')" @input="calcTotal()"
<q-input filled disable @keyup.native="checkPrice(objOption,'ThirdBookFee')" @input="calcTotal()"
v-model="objOption.ThirdBookFee" />
</td>
<td>
......@@ -209,15 +209,15 @@
<tr>
<td>培训课件费</td>
<td>
<q-input filled @keyup.native="checkPrice(objOption,'FirstClassFee')" @input="calcTotal()"
<q-input filled disable @keyup.native="checkPrice(objOption,'FirstClassFee')" @input="calcTotal()"
v-model="objOption.FirstClassFee" />
</td>
<td>
<q-input filled @keyup.native="checkPrice(objOption,'SecondClassFee')" @input="calcTotal()"
<q-input filled disable @keyup.native="checkPrice(objOption,'SecondClassFee')" @input="calcTotal()"
v-model="objOption.SecondClassFee" />
</td>
<td>
<q-input filled @keyup.native="checkPrice(objOption,'ThirdClassFee')" @input="calcTotal()"
<q-input filled disable @keyup.native="checkPrice(objOption,'ThirdClassFee')" @input="calcTotal()"
v-model="objOption.ThirdClassFee" />
</td>
<td>
......@@ -242,15 +242,15 @@
<tr>
<td>折让价格</td>
<td>
<q-input filled @keyup.native="checkPrice(objOption,'FirstDiscountMoney')" @input="calcTotal()"
<q-input filled disable @keyup.native="checkPrice(objOption,'FirstDiscountMoney')" @input="calcTotal()"
v-model="objOption.FirstDiscountMoney" />
</td>
<td>
<q-input filled @keyup.native="checkPrice(objOption,'SecondDiscountMoney')" @input="calcTotal()"
<q-input filled disable @keyup.native="checkPrice(objOption,'SecondDiscountMoney')" @input="calcTotal()"
v-model="objOption.SecondDiscountMoney" />
</td>
<td>
<q-input filled @keyup.native="checkPrice(objOption,'ThirdDiscountMoney')" @input="calcTotal()"
<q-input filled disable @keyup.native="checkPrice(objOption,'ThirdDiscountMoney')" @input="calcTotal()"
v-model="objOption.ThirdDiscountMoney" />
</td>
<td>
......
src/components/sale/orderlist.vue
View file @ b79ae291
......@@ -106,7 +106,8 @@
</div>
<template v-if="item.IsCommissionGive==1">
<div style="color:red" v-if="item.YFCommissionMoney>0">应发提成：{{item.YFCommissionMoney}}</div>
<div style="color:red;cursor: pointer;text-decoration: underline;" @click='gourltx(item.OrderId)'>已发提成：{{item.CommissionMoney}}</div>
<div style="color:red;cursor: pointer;text-decoration: underline;" @click='gourltx(item.OrderId)'>
已发提成：{{item.CommissionMoney}}</div>
<div style="color:red" v-if="item.ExtraCommissionMoney>0">额外奖励实发：{{item.ExtraCommissionMoney}}</div>
<div style="color:red;" v-if="item.ExtraRewardMoney>0">额外奖励：{{item.ExtraRewardMoney}}</div>
<div style="color:red" v-if="item.ExtraDeductMoney>0">额外扣除：{{item.ExtraDeductMoney}}</div>
......@@ -165,12 +166,10 @@
</div>
</td>
<td style="border:none">
<template v-if="isEditOrder||AuthorityObj.isShowEdit">
<q-btn flat size="xs" icon="edit" color="accent" style="font-weight:400" label="编辑"
@click="editOrder(item)" />
<q-btn flat size="xs" icon="edit" color="accent" style="font-weight:400" label="编辑"
@click="editOrder(item)" />
</template>
<q-btn-dropdown flat size="xs" color="dark" label="更多" style="margin-left:10px;">
<q-list>
<q-item clickable v-close-popup>
......@@ -259,8 +258,15 @@
<td :colspan="12" style="text-align: left">
<div class="row" v-if="item.GuestList&&item.GuestList.length>0">
学生名单：
<span v-for="(x,j) in item.GuestList" :index="j" v-if="x.GuestState==1"
style="color:#2961FE;margin-right: 5px">{{x.GuestName}} </span>
<template v-for="(x,j) in item.GuestList" :index="j">
<span v-if="x.GuestState==1" style="color:#2961FE;margin-right: 5px">{{x.GuestName}} </span>
<span v-else style="color:red;margin-right: 5px">
{{x.GuestName}}
<q-tooltip :offset="[10, 10]">
{{x.GuestStateStr}}
</q-tooltip>
</span>
</template>
</div>
<div v-if="AuthorityObj.isShowContract&&item.GuestList&&item.GuestList.length>0" class="takeContract">
<span @click="isShowPop=true">查看合同</span>
......@@ -283,7 +289,7 @@
<q-btn color="accent" size="sm" @click="takeContractTwo(item,subItem)" label="领取合同" />
</template>
<template v-else>
<q-btn color="secondary" size="sm" @click="goContractMannage()" label="查看合同" />
<q-btn color="secondary" size="sm" @click="goContractMannage(subItem)" label="查看合同" />
</template>
</td>
</tr>
......@@ -970,7 +976,7 @@
});
},
//跳转到预约单号
goVisitorReser(Id){
goVisitorReser(Id) {
this.OpenNewUrl("/sale/appointManagement", {
Id: Id
});
......@@ -1204,16 +1210,16 @@
}
})
}
// if (obj.OrderType == 1 && ContractNo == '') {
// this.$q.notify({
// icon: 'close',
// color: 'accent',
// timeout: 2000,
// message: '请完善合同信息',
// position: 'top'
// })
// return
// }
if (obj.OrderType == 1 && ContractNo == '') {
this.$q.notify({
icon: 'close',
color: 'accent',
timeout: 2000,
message: '请完善合同信息',
position: 'top'
})
return
}
//留学就业订单
if (obj && obj.OrderType == 2) {
//财务单据类型【教育留学】
......@@ -1292,13 +1298,12 @@
this.isShowEduForm = true;
},
//跳转至合同管理
goContractMannage() {
this.$router.push({
path: '/sale/contractManage',
query: {}
goContractMannage(subItem) {
this.OpenNewUrl("/contractView", {
ContractId: subItem.ContractId
});
},
gourltx(OrderId){
gourltx(OrderId) {
this.OpenNewUrl("/financial/cycleOrderList", {
OrderId: OrderId
});
......
src/pages/financial/lessonCostStatistics.vue
View file @ b79ae291
......@@ -49,7 +49,7 @@
background-color: transparent;
}
.lessonCostStatistics .el-input__inner {
.lessonCostStatistics .items-center .el-input__inner {
width: 100%;
border: none;
background-color: transparent;
......
src/pages/financial/studentsClassfee.vue
View file @ b79ae291
......@@ -48,7 +48,7 @@
background-color: transparent;
}
.studentsClassfee .el-input__inner {
.studentsClassfee .items-center .el-input__inner {
width: 100%;
border: none;
background-color: transparent;
......@@ -110,9 +110,9 @@
<q-btn  color="primary" size="11px" label="导出" @click="txexport" style="margin-left:10px"/>
</div>
<template>
<el-table ref="filterTable" :data="tableData" v-loading='loading'
<el-table ref="filterTable" :data="tableData" v-loading='loading'
:header-cell-style="{backgroundColor:'#f5f6f7', color: '#a8a8b3'}" border style="width: 100%">
<el-table-column prop="OrderId" label="订单号">
<el-table-column prop="OrderId" label="订单号" width='90'>
<template slot-scope="scope">
<div style="text-decoration: underline;cursor: pointer;" @click='gobaoming(scope.row.OrderId)'>
{{scope.row.OrderId}}
......@@ -123,11 +123,11 @@
<el-table-column prop="ClassDate" label="上课日期"></el-table-column>
<el-table-column prop="TimeBucket" label="上课时间段"> </el-table-column>
<el-table-column prop="GuestName" label="学生名称"> </el-table-column>
<el-table-column prop="ClassName" label="上课班级"> </el-table-column>
<el-table-column prop="CourseName" label="课程"></el-table-column>
<el-table-column prop="ClassName" label="上课班级" width='200'> </el-table-column>
<el-table-column prop="CourseName" label="课程" width='200'></el-table-column>
<el-table-column prop="TeacherName" label="老师名称"></el-table-column>
<el-table-column prop="CurrentDeductionHours" label="课时"></el-table-column>
<el-table-column prop="CurrentDeductionHours" label="课时" width='60'></el-table-column>
<el-table-column prop="UnitPrice">
<template slot="header">
<div>合同单价</div>
......
src/pages/financial/teacherclassfee.vue
View file @ b79ae291
......@@ -48,7 +48,7 @@
background-color: transparent;
}
.teacherclassfee .el-input__inner {
.teacherclassfee .items-center .el-input__inner {
width: 100%;
border: none;
background-color: transparent;
......@@ -103,8 +103,8 @@
<el-table-column prop="ClassDate" label="上课日期"></el-table-column>
<el-table-column prop="TimeBucket" label="上课时间段"> </el-table-column>
<el-table-column prop="TeacherName" label="老师名称"></el-table-column>
<el-table-column prop="ClassName" label="上课班级"> </el-table-column>
<el-table-column prop="CourseName" label="课程"></el-table-column>
<el-table-column prop="ClassName" label="上课班级" width='200'> </el-table-column>
<el-table-column prop="CourseName" label="课程" width='230'></el-table-column>
<el-table-column prop="KSNum" label="上课课时"></el-table-column>
<el-table-column prop="Hours" label="课时转换/小时"> </el-table-column>
<el-table-column prop="HourMoney" label="课时费单价元/小时"></el-table-column>
......
src/pages/sale/studentList.vue
View file @ b79ae291
......@@ -75,7 +75,7 @@
</template>
</q-input>
<q-input clearable filled class="col-6 q-pb-lg q-pr-lg" maxlength="5" v-model="addMsg.TotalHours"
<q-input clearable filled class="col-6 q-pb-lg q-pr-lg" maxlength="5" disable v-model="addMsg.TotalHours"
label="总课时" :rules="[val => !!val || '请填写总课时']" @keyup.native="checkInteger(addMsg,'TotalHours')" />
<q-input clearable filled class="col-6 q-pb-lg" ref="Mobile" maxlength="20" v-model="addMsg.Mobile"
label="电话" :rules="[val => !!val || '电话']" />
......
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