Skip to content

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

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

parents fb1b8ce5 f5be70e8
Hide whitespace changes
Inline Side-by-side
Showing with 121 additions and 52 deletions
src/App.vue
View file @ d86276c8
......@@ -12,7 +12,7 @@ export default {
<style>
@import url('~assets/css/font.css');
@import url('//at.alicdn.com/t/font_2077629_9bdr67jqiee.css');
@import url('//at.alicdn.com/t/font_2077629_tknu7rklxe.css');
.q-scrollarea__thumb{
z-index: 999999!important;
}
......
src/components/course/classstu-form.vue
View file @ d86276c8
......@@ -8,8 +8,8 @@
<div class="dropClassDialog">
<div style="margin:10px 0 15px 0;">退课</div>
</div>
<q-input square filled v-model="dropMsg.DropOutRemark" borderless label="退课原因" ref="reason" type="textarea"
counter :rules="[val => !!val || '请填写退课原因']" maxlength="200" />
<q-input square filled v-model="dropMsg.DropOutRemark" borderless label="退课原因" ref="reason"
type="textarea" counter :rules="[val => !!val || '请填写退课原因']" maxlength="200" />
<div class="drop_NameDown">
<q-chip v-for="(item,index) in selectedStudent" :key="index">
<q-avatar rounded size="sm" v-if="item.UserIcon">
......@@ -21,7 +21,8 @@
</q-chip>
</div>
<q-card-actions align="right" class="bg-white">
<q-btn label="取消" flat color="grey-10" style="font-weight:400 !important" @click="isShowDropPop=false" />
<q-btn label="取消" flat color="grey-10" style="font-weight:400 !important"
@click="isShowDropPop=false" />
<q-btn label="确认" color="accent q-px-md" style="font-weight:400 !important" @click="saveDrop()" />
</q-card-actions>
</q-banner>
......@@ -80,8 +81,8 @@
</template>
<template v-slot:body-cell-StuType="props">
<q-td auto-width :props="props">
<span v-if="props.row.IsChaBan==0">正常报入</span>
<span style="color:red;" v-if="props.row.IsChaBan==1">
<span v-if="props.row.JoinType==1">正常报入</span>
<span style="color:red;cursor:pointer" v-if="props.row.JoinType==2">
插班报入
<q-tooltip :offset="[10, 10]">
开始课时:{{props.row.StartClassHours}}<br />
......@@ -93,6 +94,18 @@
</template>
</q-tooltip>
</span>
<span style="color:red;cursor:pointer" v-if="props.row.JoinType==3">
续费报入
<q-tooltip :offset="[10, 10]">
原订单{{props.row.SourceClassName}}班级续费。关联单号{{props.row.SourceOrderId}}
</q-tooltip>
</span>
<span style="color:red;cursor:pointer" v-if="props.row.JoinType==4">
转班报入
<q-tooltip :offset="[10, 10]">
从{{props.row.SourceClassName}}班级转入。关联单号{{props.row.SourceOrderId}}
</q-tooltip>
</span>
</q-td>
</template>
</q-table>
......@@ -201,15 +214,15 @@
InvitationList: [], //学员下拉数据
AllInvitationList: [],
checkedStudent: '', //选择学员
isShowBtn:true
isShowBtn: true
}
},
created() {
},
mounted() {
if(this.isShowMyBtn==1){
this.isShowBtn=false;
if (this.isShowMyBtn == 1) {
this.isShowBtn = false;
}
this.getStudentData();
this.getStudentList();
......
src/components/sale/continueclass-form.vue
View file @ d86276c8
......@@ -81,6 +81,7 @@
min-height: 90px;
border-right:1px dashed #d1d1d1;
padding:10px;
color:#000;
}
.continu_Div:last-child{
border-right:0;
......@@ -165,7 +166,7 @@
<template v-else>
<div class="contiue_Top">
<span class="backContius" @click="isShowTuike=true">
<返回</span> <span style="margin-left:20px;">班级选择
<i style="font-size:18px;margin-left:15px;" title="返回" class="iconfont icon-fanhui"></i></span> <span style="margin-left:20px;">班级选择
</span>
</div>
<div class="col row wrap q-mr-lg q-col-gutter-md" style="margin:10px;">
......
src/components/sale/orderlist.vue
View file @ d86276c8
......@@ -51,7 +51,7 @@
<col width="7%" />
<col width="7%" />
<col width="7%" />
<col width="7%" v-if="viewType==0"/>
<col width="7%" v-if="viewType==0" />
<col>
</colgroup>
<tr>
......@@ -62,8 +62,19 @@
<td :rowspan="3" style="text-align: left">
<div class="order_OfferId" @click="goOrderdetails(item,1)">{{item.OrderId}}
</div>
<div class="order_OfferId" v-if="item.RenewOrderId&&item.RenewOrderId>0">
原订单:{{item.RenewOrderId}}
<div class="order_OferTitle" v-if="item.TargetJoinType==1">
<template v-if="item.JoinType==3">
原订单:{{item.SourceOrderId}}
</template>
<template v-if="item.JoinType==4">
从【{{item.SourceClassName}}】转入。关联订单号{{item.SourceOrderId}}
</template>
</div>
<div class="order_OferTitle" v-if="item.TargetJoinType==3">
续费订单:{{item.TargetOrderId}}
</div>
<div class="order_OferTitle" v-if="item.TargetJoinType==4">
已转班【{{item.TargetClassName}}】,关联订单号{{item.TargetOrderId}}
</div>
<div>{{item.EnterName}}</div>
<div style="margin-top: 10px">{{item.CreateTime}}</div>
......@@ -90,16 +101,16 @@
</template>
<template v-if="item.OrderType==1">
<div v-if="item.CourseName">课程名称:{{item.CourseName}}</div>
<div v-if="item.IsChaBan==1" style="color:red;">
<div v-if="item.JoinType==2" style="color:red;cursor:pointer">
插班报入
  <q-tooltip :offset="[10, 10]">
              <div>开始课时：{{item.StartClassHours}}</div>
              <div>生效状态：{{item.EffectStatusStr}}</div>
              <div>生效时间：{{item.EffectTime}}</div>
              <template v-if="item.UpOrderId&&item.UpOrderId>0">
    <template v-if="item.UpOrderId&&item.UpOrderId>0">
<div>前置订单：{{item.UpOrderId}}</div>
</template>
            </q-tooltip>
</q-tooltip>
</div>
</template>
<div style="margin-top:10px;" v-if="item.OfferId>0">
......@@ -126,7 +137,8 @@
{{item.Class_Price.toFixed(2)}}
</template>
</td>
<td style="width:7%" :style="{color:item.Class_Price!=item.Unit_Price?'var(--q-color-negative)':'','border':'none'}">
<td style="width:7%"
:style="{color:item.Class_Price!=item.Unit_Price?'var(--q-color-negative)':'','border':'none'}">
<template v-if="item.Unit_Price>=0">
{{item.Unit_Price.toFixed(2)}}
</template>
......@@ -281,12 +293,11 @@
<q-item-label @click="showContinueClass(item)">续课</q-item-label>
</q-item-section>
</q-item>
<q-item clickable v-close-popup v-close-popup>
<q-item clickable v-close-popup v-close-popup v-if="AuthorityObj.isShowTransOrder">
<q-item-section>
<q-item-label @click="transferClass(item)">转班</q-item-label>
</q-item-section>
</q-item>
</q-list>
</q-btn-dropdown>
</td>
......@@ -780,7 +791,8 @@
<myOrder-form v-if="isShowmyorderForm" :save-obj="myorderObjOption" @close="closeMOSaveForm"></myOrder-form>
<!--班级详情-->
<classinfo-form v-if="isShowClassInfo" :seting-obj="classObjOption" :isShowEditBtn="isShowEditBtn" @close="closeClass" @success="refreshOrder">
<classinfo-form v-if="isShowClassInfo" :seting-obj="classObjOption" :isShowEditBtn="isShowEditBtn"
@close="closeClass" @success="refreshOrder">
</classinfo-form>
<!--退课申请-->
......@@ -794,7 +806,7 @@
<!--续课申请-->
<continueclass-form v-if="isShowContinueClass" :save-obj="orderObj" @close="closeContinueClassForm"
@success="refreshOrder"></continueclass-form>
<!-- 转班申请 -->
<transferclass-form v-if="isShowTransferClass" :save-obj="orderObj" @close="closeTransferClassForm"
@success="refreshOrder"></transferclass-form>
......@@ -872,13 +884,13 @@
type: Number,
default: 0, //1-销售修改，2-OP修改，3-总经理修改
},
isShowEditBtn:{
isShowEditBtn: {
type: Number,
default: null
},
viewType:{
type:Number,
default:0
viewType: {
type: Number,
default: 0
}
},
data() {
......@@ -919,6 +931,7 @@
isShowRenewClass: false, //是否显示续课按钮
isShowContract: true, //是否显示合同
isShowEdit: true, //是否显示修改订单按钮
isShowTransClassOrder: false, //是否显示转班按钮
},
isShowEduForm: false, //是否显示新增修改合同弹窗
......@@ -930,7 +943,7 @@
isEditOrder: false, //是否有【总经理】修改订单但权限
newModityOrderType: 0,
isChaBan: 0, //是否插班(0-正常报入，1-插班报入)
isShowTransferClass:false //是否显示转班
isShowTransferClass: false //是否显示转班
}
},
created() {
......@@ -971,8 +984,7 @@
immediate: true
}
},
mounted() {
},
mounted() {},
methods: {
//初始化权限信息
initAuth() {
......@@ -1019,6 +1031,9 @@
if (this.authObj.isShowEdit != null && !this.authObj.isShowEdit) {
this.AuthorityObj.isShowEdit = this.authObj.isShowEdit;
}
if (this.authObj.isShowTransClassOrder != null && this.authObj.isShowTransClassOrder) {
this.AuthorityObj.isShowTransClassOrder = this.authObj.isShowTransClassOrder;
}
}
},
//关闭报价单
......@@ -1071,13 +1086,13 @@
},
//转班
transferClass(item){
transferClass(item) {
this.orderObj = item;
this.isShowTransferClass = true;
},
//关闭转班
closeTransferClassForm(){
closeTransferClassForm() {
this.orderObj = {};
this.isShowTransferClass = false;
},
......@@ -1186,7 +1201,7 @@
} else { //留学就业订单
this.isShowStudyOrderForm = true;
}
this.isChaBan = item.IsChaBan;
this.isChaBan = item.JoinType == 2 ? 1 : 0;
},
//刷新页面
refreshOrder() {
......@@ -1607,7 +1622,7 @@
.classorder .order_OfferId {
font-size: 18px;
color: #2961FE;
margin-bottom: 20px;
margin-bottom: 10px;
font-weight: bold;
text-decoration: underline;
cursor: pointer
......@@ -1640,4 +1655,10 @@
color: var(--q-color-negative);
}
.order_OferTitle {
font-size: 14px;
color: #333333;
margin-bottom: 10px;
}
</style>
src/components/sale/stopbill-form.vue
View file @ d86276c8
......@@ -233,11 +233,13 @@
<div style="color:#666666;margin-top:5px;" class="q-mb-md">
{{handleDate(setingObj.DataObj.TakeEffectTime)}}
</div>
</div>
<div class="replayReason">
<div class="replay_Title">停课原因</div>
<div style="color:#666666;margin-top:5px;">
{{setingObj.DataObj.Remarks}}
</div>
</div>
</div>
<!-- <template v-if="setingObj.SpecialNode==1">
<span>
<q-input filled stack-label :dense="false" v-model="stopBillMsg.BackMoney" class="col-12"
......
src/components/sale/transferclass-form.vue
View file @ d86276c8
......@@ -87,6 +87,7 @@
min-height: 90px;
border-right: 1px dashed #d1d1d1;
padding: 10px;
color:#000;
}
.continu_Div:last-child {
......@@ -194,7 +195,7 @@
<template v-else>
<div class="contiue_Top">
<span class="backContius" @click="isShowTuike=true">
<返回</span> <span style="margin-left:20px;">班级选择
<i style="font-size:18px;margin-left:15px;" title="返回" class="iconfont icon-fanhui"></i></span> <span style="margin-left:20px;">班级选择
</span>
</div>
<div class="col row wrap q-mr-lg q-col-gutter-md" style="margin:10px;">
......
src/pages/activity/activeSignUpList.vue
View file @ d86276c8
......@@ -123,7 +123,6 @@
this.Error(res.data.message);
}
})
console.log(122, this.bdMsg,item)
},
jujueMsg(item){
this.bdMsg.Id = item.Id;
......
src/pages/administration/documentApproval.vue
View file @ d86276c8
......@@ -436,7 +436,6 @@ import{getConten} from '../../api/system/notiveSysSet'
}
this.approvalMsg.ReviewStatus=val
setReviewNotice(this.approvalMsg).then(res=>{
console.log(611,res)
if(res.Code===1){
this.$message.success("操作成功");
this.persistent3=false
......
src/pages/course/classManage.vue
View file @ d86276c8
......@@ -122,7 +122,12 @@
</template>
<template v-slot:body-cell-TeacherName="props">
<q-td auto-width :props="props">
<span style="color:#3FC4FF;">{{props.row.TeacherName}}</span>
<template v-if="props.row.Teacher_Id==0">
<span style="color:red">未指定</span>
</template>
<template v-else>
<span style="color:#3FC4FF;">{{props.row.TeacherName}}</span>
</template>
</q-td>
</template>
<template v-slot:body-cell-ClassPersion="props">
......
src/pages/financial/orderCompleteStatistics.vue
View file @ d86276c8
......@@ -52,7 +52,9 @@
td .border-b:last-child{
border:none;
}
.orderCompleteStatistics td{
color:#000;
}
</style>
<template>
<div class="page_EasyReport My_table_tell page-body" v-loading="AALloading">
......@@ -306,7 +308,6 @@
lazy-rules
step="0.000001"
type="number"
:rules="[(val) => (val&&val>=0) || '请输入协调金额']"
/>
<div style="display:flex; justify-content:flex-end">
<q-btn label="确认" type="Submit" color="primary" style="margin-right:10px"/>
......@@ -611,8 +612,12 @@
this.formHasError = true;
} else {
this.AdjustPriceMsg.ContractId=this.AdjustPriceMsg.ContractId.toString();
this.AdjustPriceMsg.AdjustPrice=this.AdjustPriceMsg. AdjustPrice.toString();
this.AdjustPriceMsg.AdjustPrice=this.AdjustPriceMsg.AdjustPrice.toString();
if(this.AdjustPriceMsg.AdjustPrice==''){
this.AdjustPriceMsg.AdjustPrice=0;
}
setContractAdjustPrice(this.AdjustPriceMsg).then((res)=>{
this.$q.notify({
type: "positive",
......
src/pages/financial/studentsClassfee.vue
View file @ d86276c8
......@@ -235,7 +235,6 @@
}
if(this.$route.query && this.$route.query.StartMonth){
console.log(this.$route.query.StartMonth,'this.$route.query.StartMonth')
this.msg.StartMonth = this.$route.query.StartMonth
}
if(this.$route.query && this.$route.query.comefrom){//来自用户提成明细页面
......
src/pages/financial/userCommissionDetails.vue
View file @ d86276c8
......@@ -317,7 +317,6 @@
});
},
goUrlkehao(path,row){//跳转到学生课耗
console.log(row)
let StartMonth = ''
let EndMonth = ''
if(row.IsFirstCommission == 1){
......
src/pages/sale/japaneseTrain.vue
View file @ d86276c8
......@@ -114,15 +114,20 @@
<div class="d2">
<div class="row" style="align-items: center ;margin:0;padding:0;">
<span class="d2-n">带课老师</span>
<q-avatar rounded size="sm" v-if="item.TeacherHead&&item.TeacherHead!=''">
<img :src="item.TeacherHead" />
</q-avatar>
<q-avatar v-else rounded size="sm" color="teal-10" text-color="white">
<template v-if="item.TeacherName&&item.TeacherName!=''">
{{item.TeacherName.substr(0,1)}}
</template>
</q-avatar>
&nbsp;{{item.TeacherName}}
<template v-if="item.Teacher_Id==0">
<span style="color:red">未指定</span>
</template>
<template v-else>
<q-avatar rounded size="sm" v-if="item.TeacherHead&&item.TeacherHead!=''">
<img :src="item.TeacherHead" />
</q-avatar>
<q-avatar v-else rounded size="sm" color="teal-10" text-color="white">
<template v-if="item.TeacherName&&item.TeacherName!=''">
{{item.TeacherName.substr(0,1)}}
</template>
</q-avatar>
&nbsp;{{item.TeacherName}}
</template>
</div>
<div><span class="d2-n">上课教室</span>{{item.RoomName}}</div>
<div><span class="d2-n">上课时间</span><span
......@@ -524,6 +529,14 @@
},
//立即报名和插班报名
placeAnorder(item, type) {
if(item.Teacher_Id==0){
this.$q.notify({
type: 'negative',
position: "top",
message: `请联系班级管理员，关联班级老师后报名`
})
return
}
this.isChaBan = type;
this.orderObj.ClassId = item.ClassId;
this.orderObj.Unit_Price = item.SellPrice;
......
src/pages/sale/myOrder.vue
View file @ d86276c8
......@@ -169,6 +169,7 @@
isShowSaleRemark: true, //显示修改销售备注
isShowBackClass: true, //显示退课按钮
isShowRenewClass: true, //显示续课按钮
isShowTransClassOrder:true,//现在转班按钮
}
}
},
......
src/pages/teacher/changeClassManager.vue
View file @ d86276c8
......@@ -60,7 +60,7 @@
<template v-slot:body-cell-ApplyReason="props">
<q-td :props="props">
<div class="bill_Rearsons">
<template v-if="props.row.ReceiptType==1">
<template v-if="props.row.ReceiptType==1||props.row.ReceiptType==5">
<span>
{{props.row.DataObj.Remarks}}
<q-tooltip :offset="[0, 10]">
......
src/pages/user/billquery.vue
View file @ d86276c8
......@@ -149,6 +149,9 @@
<changebill-form v-if="isShowChangeBillForm" :seting-obj="billObj" :showType="showType" @close="closeBillForm"
@success="refreshPage">
</changebill-form>
<ordertrans-form v-if="isShowTransForm" :seting-obj="billObj" :showType="showType" @close="closeBillForm"
@success="refreshPage">
</ordertrans-form>
</div>
</div>
</template>
......@@ -166,6 +169,7 @@
import backbillForm from '../../components/sale/backbill-form';
import changebillForm from '../../components/sale/changebill-form';
import ordertransForm from '../../components/sale/ordertrans-form'
export default {
meta: {
......@@ -174,6 +178,7 @@
components: {
backbillForm,
changebillForm,
ordertransForm
},
data() {
return {
......@@ -268,6 +273,7 @@
EmployeeList: [],
AllemployeeList: [],
IsEditEduReceipAudit: false, //是否有修改审核人权限
isShowTransForm:false
}
},
created() {
......@@ -307,6 +313,7 @@
closeBillForm() {
this.isShowBackBillForm = false;
this.isShowChangeBillForm = false;
this.isShowTransForm = false;
this.billObj = {};
},
//显示表单
......@@ -319,6 +326,10 @@
else if (item.ReceiptType == 2) {
this.isShowBackBillForm = true;
}
//转班
else if(item.ReceiptType == 5){
this.isShowTransForm = true;
}
this.showType = type;
this.billObj = item;
this.isShowEdit = false;
......
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