Skip to content

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

修改

parent 08b2be3a
Show whitespace changes
Inline Side-by-side
Showing with 728 additions and 760 deletions
src/components/sale/money-form.vue
View file @ e4ed9d52
...@@ -96,7 +96,7 @@ ...@@ -96,7 +96,7 @@
}) })
return return
} }
if (this.msg.ExtraDeductMoney == '') { if (this.msg.ExtraDeductMoney === '') {
this.$q.notify({ this.$q.notify({
icon: 'negative', icon: 'negative',
color: 'accent', color: 'accent',
......
src/components/sale/orderlist.vue
View file @ e4ed9d52
<template> <template>
<div class="classorder"> <div class="classorder">
<table class="enrollTotalSearchTable" border="0" cellspacing="0" cellpadding="0" style=""> <table class="enrollTotalSearchTable" border="0" cellspacing="0" cellpadding="0" style="">
<tr> <tr>
<th width="12%">单号</th> <th width="12%">单号</th>
...@@ -20,8 +20,7 @@ ...@@ -20,8 +20,7 @@
<tbody v-for="(item,index) in dataList" :key="index"> <tbody v-for="(item,index) in dataList" :key="index">
<tr> <tr>
<td :rowspan="3" style="text-align: left"> <td :rowspan="3" style="text-align: left">
<div style="font-size: 18px;color: #2961FE;margin-bottom: 20px;font-weight: bold;text-decoration: underline;cursor: pointer" <div style="font-size: 18px;color: #2961FE;margin-bottom: 20px;font-weight: bold;text-decoration: underline;cursor: pointer" @click="goOrderdetails(item,1)">{{item.OrderId}}</div>
@click="goOrderdetails(item,1)">{{item.OrderId}}</div>
<div>{{item.EnterName}}</div> <div>{{item.EnterName}}</div>
<div style="margin-top: 10px">{{item.CreateTime}}</div> <div style="margin-top: 10px">{{item.CreateTime}}</div>
<template v-if="isShowClass"> <template v-if="isShowClass">
...@@ -31,15 +30,16 @@ ...@@ -31,15 +30,16 @@
<template v-if="!isShowClass&&item.IsCommissionGive==1"> <template v-if="!isShowClass&&item.IsCommissionGive==1">
<div style="margin-top:30px;">提成：{{item.CommissionMoney}}</div> <div style="margin-top:30px;">提成：{{item.CommissionMoney}}</div>
</template> </template>
<template v-if="!isShowClass"> <template>
<div style="margin-top:30px;" v-if="item.ExtraRewardMoney>0">额外奖励：{{item.ExtraRewardMoney}}</div> <div style="margin-top:30px;color:red;" v-if="item.ExtraRewardMoney>0">额外奖励：{{item.ExtraRewardMoney}}</div>
<div style="margin-top:10px;" v-if="item.ExtraDeductMoney>0">额外扣除：{{item.ExtraDeductMoney}}</div> <div style="color:red" v-if="item.ExtraDeductMoney>0">额外扣除：{{item.ExtraDeductMoney}}</div>
</template> </template>
</td> </td>
<td style="border:none">{{item.GuestNum}}人</td> <td style="border:none">{{item.GuestNum}}人</td>
<td style="border:none">{{item.Class_Price.toFixed(2)}}</td> <td style="border:none">{{item.Class_Price.toFixed(2)}}</td>
<td :style="{color:item.Class_Price!=item.Unit_Price?'#f5576c':'','border':'none'}"> <td :style="{color:item.Class_Price!=item.Unit_Price?'#f5576c':'','border':'none'}">
{{item.Unit_Price.toFixed(2)}}</td> {{item.Unit_Price.toFixed(2)}}
</td>
<td style="border:none">{{item.PreferPrice.toFixed(2)}}</td> <td style="border:none">{{item.PreferPrice.toFixed(2)}}</td>
<td style="border:none">{{item.Income.toFixed(2)}}</td> <td style="border:none">{{item.Income.toFixed(2)}}</td>
<td style="color:#f5576c;border:none">{{item.DiscountMoney.toFixed(2)}}</td> <td style="color:#f5576c;border:none">{{item.DiscountMoney.toFixed(2)}}</td>
...@@ -51,8 +51,7 @@ ...@@ -51,8 +51,7 @@
</div> </div>
</td> </td>
<td style="border:none"> <td style="border:none">
<q-btn flat size="xs" icon="edit" color="accent" style="font-weight:400" label="编辑" <q-btn flat size="xs" icon="edit" color="accent" style="font-weight:400" label="编辑" @click="editOrder(item)" />
@click="editOrder(item)" />
<q-btn-dropdown flat size="xs" color="dark" label="更多" style="margin-left:10px;"> <q-btn-dropdown flat size="xs" color="dark" label="更多" style="margin-left:10px;">
<q-list> <q-list>
<q-item clickable v-close-popup> <q-item clickable v-close-popup>
...@@ -120,8 +119,7 @@ ...@@ -120,8 +119,7 @@
<tr> <tr>
<td :colspan="11" style="text-align: left"> <td :colspan="11" style="text-align: left">
学生名单： 学生名单：
<span v-for="(x,j) in item.GuestList" :index="j" v-if="item.GuestList.length>0" <span v-for="(x,j) in item.GuestList" :index="j" v-if="item.GuestList.length>0" style="color:#2961FE;">{{x.GuestName}} </span>
style="color:#2961FE;">{{x.GuestName}} </span>
<span v-if="item.GuestList.length==0">暂无</span> <span v-if="item.GuestList.length==0">暂无</span>
</td> </td>
</tr> </tr>
...@@ -134,14 +132,12 @@ ...@@ -134,14 +132,12 @@
<div v-if="item.SaleRemark!=null||item.SaleRemark!=''"> <div v-if="item.SaleRemark!=null||item.SaleRemark!=''">
<div>{{item.SaleRemark}}</div> <div>{{item.SaleRemark}}</div>
<div class="remarks-b-b"> <div class="remarks-b-b">
<span class="iconfont icon-xiangxia" style="color: #2961FE;font-size: 10px" <span class="iconfont icon-xiangxia" style="color: #2961FE;font-size: 10px" v-if="item.SaleRemarkList&&item.SaleRemarkList.length>0"></span>
v-if="item.SaleRemarkList&&item.SaleRemarkList.length>0"></span>
<q-popup-proxy> <q-popup-proxy>
<q-banner> <q-banner>
<div style="width: 500px;"> <div style="width: 500px;">
<div>销售备注</div> <div>销售备注</div>
<div v-for="(xq,jq) in item.SaleRemarkList" :index="jq" <div v-for="(xq,jq) in item.SaleRemarkList" :index="jq" style=" margin-top: 10px;background: #e6e6e6;padding: 5px;font-size: 12px">
style=" margin-top: 10px;background: #e6e6e6;padding: 5px;font-size: 12px">
<div>{{xq.Content}}</div> <div>{{xq.Content}}</div>
<div style="text-align: right">{{xq.CreateBy}} {{xq.CreateTime}}</div> <div style="text-align: right">{{xq.CreateBy}} {{xq.CreateTime}}</div>
</div> </div>
...@@ -159,14 +155,12 @@ ...@@ -159,14 +155,12 @@
<div v-if="item.TeacherRemark!=null||item.TeacherRemark!=''"> <div v-if="item.TeacherRemark!=null||item.TeacherRemark!=''">
<div>{{item.TeacherRemark}}</div> <div>{{item.TeacherRemark}}</div>
<div class="remarks-b-b"> <div class="remarks-b-b">
<span class="iconfont icon-xiangxia" style="color: #2961FE;font-size: 10px" <span class="iconfont icon-xiangxia" style="color: #2961FE;font-size: 10px" v-if="item.TeacherRemarkList&&item.TeacherRemarkList.length>0"></span>
v-if="item.TeacherRemarkList&&item.TeacherRemarkList.length>0"></span>
<q-popup-proxy> <q-popup-proxy>
<q-banner> <q-banner>
<div style="width: 500px;"> <div style="width: 500px;">
<div>教务备注</div> <div>教务备注</div>
<div v-for="(xq,jq) in item.TeacherRemarkList" :index="jq" <div v-for="(xq,jq) in item.TeacherRemarkList" :index="jq" style=" margin-top: 10px;background: #e6e6e6;padding: 5px;font-size: 12px">
style=" margin-top: 10px;background: #e6e6e6;padding: 5px;font-size: 12px">
<div>{{xq.Content}}</div> <div>{{xq.Content}}</div>
<div style="text-align: right">{{xq.CreateBy}} {{xq.CreateTime}}</div> <div style="text-align: right">{{xq.CreateBy}} {{xq.CreateTime}}</div>
</div> </div>
...@@ -184,14 +178,12 @@ ...@@ -184,14 +178,12 @@
<div v-if="item.RectorRemark!=null ||item.RectorRemark!=''"> <div v-if="item.RectorRemark!=null ||item.RectorRemark!=''">
<div>{{item.RectorRemark}}</div> <div>{{item.RectorRemark}}</div>
<div class="remarks-b-b"> <div class="remarks-b-b">
<span class="iconfont icon-xiangxia" style="color: #2961FE;font-size: 10px" <span class="iconfont icon-xiangxia" style="color: #2961FE;font-size: 10px" v-if="item.RectorRemarkList&&item.RectorRemarkList.length>0"></span>
v-if="item.RectorRemarkList&&item.RectorRemarkList.length>0"></span>
<q-popup-proxy> <q-popup-proxy>
<q-banner> <q-banner>
<div style="width: 500px;"> <div style="width: 500px;">
<div>校长备注</div> <div>校长备注</div>
<div v-for="(xq,jq) in item.RectorRemarkList" :index="jq" <div v-for="(xq,jq) in item.RectorRemarkList" :index="jq" style=" margin-top: 10px;background: #e6e6e6;padding: 5px;font-size: 12px">
style=" margin-top: 10px;background: #e6e6e6;padding: 5px;font-size: 12px">
<div>{{xq.Content}}</div> <div>{{xq.Content}}</div>
<div style="text-align: right">{{xq.CreateBy}} {{xq.CreateTime}}</div> <div style="text-align: right">{{xq.CreateBy}} {{xq.CreateTime}}</div>
</div> </div>
...@@ -209,14 +201,12 @@ ...@@ -209,14 +201,12 @@
<div v-if="item.DirectorRemark!=null||item.DirectorRemark!=''"> <div v-if="item.DirectorRemark!=null||item.DirectorRemark!=''">
<div>{{item.DirectorRemark}}</div> <div>{{item.DirectorRemark}}</div>
<div class="remarks-b-b"> <div class="remarks-b-b">
<span class="iconfont icon-xiangxia" style="color: #2961FE;font-size: 10px" <span class="iconfont icon-xiangxia" style="color: #2961FE;font-size: 10px" v-if="item.DirectorRemarkList&&item.DirectorRemarkList.length>0"></span>
v-if="item.DirectorRemarkList&&item.DirectorRemarkList.length>0"></span>
<q-popup-proxy> <q-popup-proxy>
<q-banner> <q-banner>
<div style="width: 500px;"> <div style="width: 500px;">
<div>总经理备注</div> <div>总经理备注</div>
<div v-for="(xq,jq) in item.DirectorRemarkList" :index="jq" <div v-for="(xq,jq) in item.DirectorRemarkList" :index="jq" style=" margin-top: 10px;background: #e6e6e6;padding: 5px;font-size: 12px">
style=" margin-top: 10px;background: #e6e6e6;padding: 5px;font-size: 12px">
<div>{{xq.Content}}</div> <div>{{xq.Content}}</div>
<div style="text-align: right">{{xq.CreateBy}} {{xq.CreateTime}}</div> <div style="text-align: right">{{xq.CreateBy}} {{xq.CreateTime}}</div>
</div> </div>
...@@ -231,13 +221,11 @@ ...@@ -231,13 +221,11 @@
<div class="col"> <div class="col">
<div class="row" style="justify-content: space-between"> <div class="row" style="justify-content: space-between">
<span>收款单据：</span> <span>收款单据：</span>
<q-btn flat size="xs" icon="edit" style="font-weight:400;color: #02C499" label="修改" <q-btn flat size="xs" icon="edit" v-if="isShowClass" style="font-weight:400;color: #02C499" label="修改" @click="chanceType(item,1)" />
@click="chanceType(item,1)" />
</div> </div>
<div class="row wrap"> <div class="row wrap">
<div class="finance row" v-for="(x,j) in item.FinanceList" :index="j" <div class="finance row" v-for="(x,j) in item.FinanceList" :index="j" :style="{
:style="{
background:x.ColorState==1 ? 'rgba(41, 97, 254, 0.2)':(x.ColorState==2 ? 'rgba(2, 196, 153, 0.2)':(x.ColorState==3 ? 'rgba(242, 140, 29, 0.2)':'rgba(63, 196, 255, 0.2)')), background:x.ColorState==1 ? 'rgba(41, 97, 254, 0.2)':(x.ColorState==2 ? 'rgba(2, 196, 153, 0.2)':(x.ColorState==3 ? 'rgba(242, 140, 29, 0.2)':'rgba(63, 196, 255, 0.2)')),
color: x.ColorState==1 ? '#2961FE':(x.ColorState==2 ? '#02C499':(x.ColorState==3 ? '#F28C1D':'#3FC4FF'))}"> color: x.ColorState==1 ? '#2961FE':(x.ColorState==2 ? '#02C499':(x.ColorState==3 ? '#F28C1D':'#3FC4FF'))}">
<span style="cursor: pointer" @click="goOrderdetails(item,4)">{{x.FrID}}</span> <span style="cursor: pointer" @click="goOrderdetails(item,4)">{{x.FrID}}</span>
...@@ -245,12 +233,10 @@ ...@@ -245,12 +233,10 @@
</div> </div>
<div class="row" style="justify-content: space-between"> <div class="row" style="justify-content: space-between">
<span>付款单据：</span> <span>付款单据：</span>
<q-btn flat size="xs" icon="edit" style="font-weight:400;color: #02C499" label="修改" <q-btn flat size="xs" icon="edit" v-if="isShowClass" style="font-weight:400;color: #02C499" label="修改" @click="chanceType(item,2)" />
@click="chanceType(item,2)" />
</div> </div>
<div class="row wrap"> <div class="row wrap">
<div class="finance row" v-for="(x,j) in item.RefundFinanceList" :index="j" <div class="finance row" v-for="(x,j) in item.RefundFinanceList" :index="j" :style="{
:style="{
background:x.ColorState==1 ? 'rgba(41, 97, 254, 0.2)':(x.ColorState==2 ? 'rgba(2, 196, 153, 0.2)':(x.ColorState==3 ? 'rgba(242, 140, 29, 0.2)':'rgba(63, 196, 255, 0.2)')), background:x.ColorState==1 ? 'rgba(41, 97, 254, 0.2)':(x.ColorState==2 ? 'rgba(2, 196, 153, 0.2)':(x.ColorState==3 ? 'rgba(242, 140, 29, 0.2)':'rgba(63, 196, 255, 0.2)')),
color: x.ColorState==1 ? '#2961FE':(x.ColorState==2 ? '#02C499':(x.ColorState==3 ? '#F28C1D':'#3FC4FF'))}"> color: x.ColorState==1 ? '#2961FE':(x.ColorState==2 ? '#02C499':(x.ColorState==3 ? '#F28C1D':'#3FC4FF'))}">
<span style="cursor: pointer" @click="goOrderdetails(item,4)">{{x.FrID}}</span> <span style="cursor: pointer" @click="goOrderdetails(item,4)">{{x.FrID}}</span>
...@@ -268,12 +254,10 @@ ...@@ -268,12 +254,10 @@
</td> </td>
</tr> </tr>
</tbody> </tbody>
<tbody v-if="cancelList&&cancelList.length>0 && isShowCancel" v-for="(item,index) in cancelList" <tbody v-if="cancelList&&cancelList.length>0 && isShowCancel" v-for="(item,index) in cancelList" :key="index+10000">
:key="index+10000">
<tr> <tr>
<td :rowspan="3" style="text-align: left"> <td :rowspan="3" style="text-align: left">
<div style="font-size: 18px;color: #2961FE;margin-bottom: 20px;font-weight: bold" <div style="font-size: 18px;color: #2961FE;margin-bottom: 20px;font-weight: bold" @click="goOrderdetails(item)">{{item.OrderId}}</div>
@click="goOrderdetails(item)">{{item.OrderId}}</div>
<div>{{item.EnterName}}</div> <div>{{item.EnterName}}</div>
<div style="margin-top: 10px">{{item.CreateTime}}</div> <div style="margin-top: 10px">{{item.CreateTime}}</div>
<div style="margin-top: 30px;margin-bottom: 10px">班级</div> <div style="margin-top: 30px;margin-bottom: 10px">班级</div>
...@@ -282,7 +266,8 @@ ...@@ -282,7 +266,8 @@
<td style="border:none">{{item.GuestNum}}人</td> <td style="border:none">{{item.GuestNum}}人</td>
<td style="border:none">{{item.Class_Price.toFixed(2)}}</td> <td style="border:none">{{item.Class_Price.toFixed(2)}}</td>
<td :style="{color:item.Class_Price!=item.Unit_Price?'#f5576c':'','border':'none'}"> <td :style="{color:item.Class_Price!=item.Unit_Price?'#f5576c':'','border':'none'}">
{{item.Unit_Price.toFixed(2)}}</td> {{item.Unit_Price.toFixed(2)}}
</td>
<td style="border:none">{{item.PreferPrice.toFixed(2)}}</td> <td style="border:none">{{item.PreferPrice.toFixed(2)}}</td>
<td style="border:none">{{item.Income.toFixed(2)}}</td> <td style="border:none">{{item.Income.toFixed(2)}}</td>
<td style="color:#f5576c;border:none">{{item.DiscountMoney.toFixed(2)}}</td> <td style="color:#f5576c;border:none">{{item.DiscountMoney.toFixed(2)}}</td>
...@@ -294,8 +279,7 @@ ...@@ -294,8 +279,7 @@
</div> </div>
</td> </td>
<td style="border:none"> <td style="border:none">
<q-btn flat size="xs" icon="edit" color="accent" style="font-weight:400" label="编辑" <q-btn flat size="xs" icon="edit" color="accent" style="font-weight:400" label="编辑" @click="editOrder(item)" />
@click="editOrder(item)" />
<q-btn-dropdown flat size="xs" color="dark" label="更多" style="margin-left:10px;"> <q-btn-dropdown flat size="xs" color="dark" label="更多" style="margin-left:10px;">
<q-list> <q-list>
<q-item clickable v-close-popup> <q-item clickable v-close-popup>
...@@ -310,8 +294,7 @@ ...@@ -310,8 +294,7 @@
<tr> <tr>
<td :colspan="11" style="text-align: left"> <td :colspan="11" style="text-align: left">
学生名单： 学生名单：
<span v-for="(x,j) in item.GuestList" :index="j" v-if="item.GuestList.length>0" <span v-for="(x,j) in item.GuestList" :index="j" v-if="item.GuestList.length>0" style="color:#2961FE;">{{x.GuestName}} </span>
style="color:#2961FE;">{{x.GuestName}} </span>
<span v-if="item.GuestList.length==0">暂无</span> <span v-if="item.GuestList.length==0">暂无</span>
</td> </td>
</tr> </tr>
...@@ -324,14 +307,12 @@ ...@@ -324,14 +307,12 @@
<div v-if="item.SaleRemark!=null||item.SaleRemark!=''"> <div v-if="item.SaleRemark!=null||item.SaleRemark!=''">
<div>{{item.SaleRemark}}</div> <div>{{item.SaleRemark}}</div>
<div class="remarks-b-b"> <div class="remarks-b-b">
<span class="iconfont icon-xiangxia" style="color: #2961FE;font-size: 10px" <span class="iconfont icon-xiangxia" style="color: #2961FE;font-size: 10px" v-if="item.SaleRemarkList&&item.SaleRemarkList.length>0"></span>
v-if="item.SaleRemarkList&&item.SaleRemarkList.length>0"></span>
<q-popup-proxy> <q-popup-proxy>
<q-banner> <q-banner>
<div style="width: 500px;"> <div style="width: 500px;">
<div>销售备注</div> <div>销售备注</div>
<div v-for="(xq,jq) in item.SaleRemarkList" :index="jq" <div v-for="(xq,jq) in item.SaleRemarkList" :index="jq" style=" margin-top: 10px;background: #e6e6e6;padding: 5px;font-size: 12px">
style=" margin-top: 10px;background: #e6e6e6;padding: 5px;font-size: 12px">
<div>{{xq.Content}}</div> <div>{{xq.Content}}</div>
<div style="text-align: right">{{xq.CreateBy}} {{xq.CreateTime}}</div> <div style="text-align: right">{{xq.CreateBy}} {{xq.CreateTime}}</div>
</div> </div>
...@@ -349,14 +330,12 @@ ...@@ -349,14 +330,12 @@
<div v-if="item.TeacherRemark!=null||item.TeacherRemark!=''"> <div v-if="item.TeacherRemark!=null||item.TeacherRemark!=''">
<div>{{item.TeacherRemark}}</div> <div>{{item.TeacherRemark}}</div>
<div class="remarks-b-b"> <div class="remarks-b-b">
<span class="iconfont icon-xiangxia" style="color: #2961FE;font-size: 10px" <span class="iconfont icon-xiangxia" style="color: #2961FE;font-size: 10px" v-if="item.TeacherRemarkList&&item.TeacherRemarkList.length>0"></span>
v-if="item.TeacherRemarkList&&item.TeacherRemarkList.length>0"></span>
<q-popup-proxy> <q-popup-proxy>
<q-banner> <q-banner>
<div style="width: 500px;"> <div style="width: 500px;">
<div>教务备注</div> <div>教务备注</div>
<div v-for="(xq,jq) in item.TeacherRemarkList" :index="jq" <div v-for="(xq,jq) in item.TeacherRemarkList" :index="jq" style=" margin-top: 10px;background: #e6e6e6;padding: 5px;font-size: 12px">
style=" margin-top: 10px;background: #e6e6e6;padding: 5px;font-size: 12px">
<div>{{xq.Content}}</div> <div>{{xq.Content}}</div>
<div style="text-align: right">{{xq.CreateBy}} {{xq.CreateTime}}</div> <div style="text-align: right">{{xq.CreateBy}} {{xq.CreateTime}}</div>
</div> </div>
...@@ -374,14 +353,12 @@ ...@@ -374,14 +353,12 @@
<div v-if="item.RectorRemark!=null ||item.RectorRemark!=''"> <div v-if="item.RectorRemark!=null ||item.RectorRemark!=''">
<div>{{item.RectorRemark}}</div> <div>{{item.RectorRemark}}</div>
<div class="remarks-b-b"> <div class="remarks-b-b">
<span class="iconfont icon-xiangxia" style="color: #2961FE;font-size: 10px" <span class="iconfont icon-xiangxia" style="color: #2961FE;font-size: 10px" v-if="item.RectorRemarkList&&item.RectorRemarkList.length>0"></span>
v-if="item.RectorRemarkList&&item.RectorRemarkList.length>0"></span>
<q-popup-proxy> <q-popup-proxy>
<q-banner> <q-banner>
<div style="width: 500px;"> <div style="width: 500px;">
<div>校长备注</div> <div>校长备注</div>
<div v-for="(xq,jq) in item.RectorRemarkList" :index="jq" <div v-for="(xq,jq) in item.RectorRemarkList" :index="jq" style=" margin-top: 10px;background: #e6e6e6;padding: 5px;font-size: 12px">
style=" margin-top: 10px;background: #e6e6e6;padding: 5px;font-size: 12px">
<div>{{xq.Content}}</div> <div>{{xq.Content}}</div>
<div style="text-align: right">{{xq.CreateBy}} {{xq.CreateTime}}</div> <div style="text-align: right">{{xq.CreateBy}} {{xq.CreateTime}}</div>
</div> </div>
...@@ -399,14 +376,12 @@ ...@@ -399,14 +376,12 @@
<div v-if="item.DirectorRemark!=null||item.DirectorRemark!=''"> <div v-if="item.DirectorRemark!=null||item.DirectorRemark!=''">
<div>{{item.DirectorRemark}}</div> <div>{{item.DirectorRemark}}</div>
<div class="remarks-b-b"> <div class="remarks-b-b">
<span class="iconfont icon-xiangxia" style="color: #2961FE;font-size: 10px" <span class="iconfont icon-xiangxia" style="color: #2961FE;font-size: 10px" v-if="item.DirectorRemarkList&&item.DirectorRemarkList.length>0"></span>
v-if="item.DirectorRemarkList&&item.DirectorRemarkList.length>0"></span>
<q-popup-proxy> <q-popup-proxy>
<q-banner> <q-banner>
<div style="width: 500px;"> <div style="width: 500px;">
<div>总经理备注</div> <div>总经理备注</div>
<div v-for="(xq,jq) in item.DirectorRemarkList" :index="jq" <div v-for="(xq,jq) in item.DirectorRemarkList" :index="jq" style=" margin-top: 10px;background: #e6e6e6;padding: 5px;font-size: 12px">
style=" margin-top: 10px;background: #e6e6e6;padding: 5px;font-size: 12px">
<div>{{xq.Content}}</div> <div>{{xq.Content}}</div>
<div style="text-align: right">{{xq.CreateBy}} {{xq.CreateTime}}</div> <div style="text-align: right">{{xq.CreateBy}} {{xq.CreateTime}}</div>
</div> </div>
...@@ -421,13 +396,11 @@ ...@@ -421,13 +396,11 @@
<div class="col"> <div class="col">
<div class="row" style="justify-content: space-between"> <div class="row" style="justify-content: space-between">
<span>收款单据：</span> <span>收款单据：</span>
<q-btn flat size="xs" icon="edit" style="font-weight:400;color: #02C499" label="修改" <q-btn flat size="xs" icon="edit" style="font-weight:400;color: #02C499" label="修改" @click="chanceType(item,1)" />
@click="chanceType(item,1)" />
</div> </div>
<div class="row wrap"> <div class="row wrap">
<div class="finance row" v-for="(x,j) in item.FinanceList" :index="j" <div class="finance row" v-for="(x,j) in item.FinanceList" :index="j" :style="{
:style="{
background:x.ColorState==1 ? 'rgba(41, 97, 254, 0.2)':(x.ColorState==2 ? 'rgba(2, 196, 153, 0.2)':(x.ColorState==3 ? 'rgba(242, 140, 29, 0.2)':'rgba(63, 196, 255, 0.2)')), background:x.ColorState==1 ? 'rgba(41, 97, 254, 0.2)':(x.ColorState==2 ? 'rgba(2, 196, 153, 0.2)':(x.ColorState==3 ? 'rgba(242, 140, 29, 0.2)':'rgba(63, 196, 255, 0.2)')),
color: x.ColorState==1 ? '#2961FE':(x.ColorState==2 ? '#02C499':(x.ColorState==3 ? '#F28C1D':'#3FC4FF'))}"> color: x.ColorState==1 ? '#2961FE':(x.ColorState==2 ? '#02C499':(x.ColorState==3 ? '#F28C1D':'#3FC4FF'))}">
<span style="cursor: pointer" @click="goOrderdetails(item,4)">{{x.FrID}}</span> <span style="cursor: pointer" @click="goOrderdetails(item,4)">{{x.FrID}}</span>
...@@ -435,12 +408,10 @@ ...@@ -435,12 +408,10 @@
</div> </div>
<div class="row" style="justify-content: space-between"> <div class="row" style="justify-content: space-between">
<span>付款单据：</span> <span>付款单据：</span>
<q-btn flat size="xs" icon="edit" style="font-weight:400;color: #02C499" label="修改" <q-btn flat size="xs" icon="edit" style="font-weight:400;color: #02C499" label="修改" @click="chanceType(item,2)" />
@click="chanceType(item,2)" />
</div> </div>
<div class="row wrap"> <div class="row wrap">
<div class="finance row" v-for="(x,j) in item.RefundFinanceList" :index="j" <div class="finance row" v-for="(x,j) in item.RefundFinanceList" :index="j" :style="{
:style="{
background:x.ColorState==1 ? 'rgba(41, 97, 254, 0.2)':(x.ColorState==2 ? 'rgba(2, 196, 153, 0.2)':(x.ColorState==3 ? 'rgba(242, 140, 29, 0.2)':'rgba(63, 196, 255, 0.2)')), background:x.ColorState==1 ? 'rgba(41, 97, 254, 0.2)':(x.ColorState==2 ? 'rgba(2, 196, 153, 0.2)':(x.ColorState==3 ? 'rgba(242, 140, 29, 0.2)':'rgba(63, 196, 255, 0.2)')),
color: x.ColorState==1 ? '#2961FE':(x.ColorState==2 ? '#02C499':(x.ColorState==3 ? '#F28C1D':'#3FC4FF'))}"> color: x.ColorState==1 ? '#2961FE':(x.ColorState==2 ? '#02C499':(x.ColorState==3 ? '#F28C1D':'#3FC4FF'))}">
<span style="cursor: pointer" @click="goOrderdetails(item,4)">{{x.FrID}}</span> <span style="cursor: pointer" @click="goOrderdetails(item,4)">{{x.FrID}}</span>
...@@ -454,45 +425,41 @@ ...@@ -454,45 +425,41 @@
<!--取消订单--> <!--取消订单-->
</table> </table>
<!--修改订单--> <!--修改订单-->
<editorder-form v-if="isShowEditOrderForm" :save-obj="orderObj" @close="closeOrderSaveForm" <editorder-form v-if="isShowEditOrderForm" :save-obj="orderObj" @close="closeOrderSaveForm" @success="refreshClassOrder"></editorder-form>
@success="refreshClassOrder"></editorder-form>
<!--修改订单备注--> <!--修改订单备注-->
<orderremark-form v-if="isShowRemarkOrderForm" :save-obj="orderObj" :remarkType="remarkType" <orderremark-form v-if="isShowRemarkOrderForm" :save-obj="orderObj" :remarkType="remarkType" @close="closeRemarkForm" @success="refreshClassOrder"></orderremark-form>
@close="closeRemarkForm" @success="refreshClassOrder"></orderremark-form>
<!--转交订单--> <!--转交订单-->
<transOrder-form v-if="isShowTransOrderForm" :save-obj="orderObj" :employeeList="EmployeeList" @close="closeTransOrderForm" <transOrder-form v-if="isShowTransOrderForm" :save-obj="orderObj" :employeeList="EmployeeList" @close="closeTransOrderForm" @success="refreshClassOrder"></transOrder-form>
@success="refreshClassOrder"></transOrder-form>
<myOrder-form v-if="isShowmyorderForm" :save-obj="myorderObjOption" @close="closeMOSaveForm"></myOrder-form> <myOrder-form v-if="isShowmyorderForm" :save-obj="myorderObjOption" @close="closeMOSaveForm"></myOrder-form>
<!--班级详情--> <!--班级详情-->
<classinfo-form v-if="isShowClassInfo" :seting-obj="classObjOption" @close="closeClass" @success="refreshClass"> <classinfo-form v-if="isShowClassInfo" :seting-obj="classObjOption" @close="closeClass" @success="refreshClass">
</classinfo-form> </classinfo-form>
<!--退课申请--> <!--退课申请-->
<backclass-form v-if="isShowBackClassForm" :save-obj="orderObj" @close="closeBackClassForm" <backclass-form v-if="isShowBackClassForm" :save-obj="orderObj" @close="closeBackClassForm" @success="refreshClassOrder"></backclass-form>
@success="refreshClassOrder"></backclass-form>
<!-- 修改提成和额外奖励 --> <!-- 修改提成和额外奖励 -->
<money-form v-if="isShowMoney" :data="moneyObj" :type="CommonType" @close="closeMoneyForm" @success="refreshMoney"></money-form> <money-form v-if="isShowMoney" :data="moneyObj" :type="CommonType" @close="closeMoneyForm" @success="refreshMoney"></money-form>
</div> </div>
</template> </template>
<script> <script>
import editorderForm from '../sale/editorder-form' //修改订单 import editorderForm from '../sale/editorder-form' //修改订单
import orderremarkForm from '../sale/orderremark-form' //订单备注 import orderremarkForm from '../sale/orderremark-form' //订单备注
import transOrderForm from '../sale/transOrder-form' //转交订单 import transOrderForm from '../sale/transOrder-form' //转交订单
import backclassForm from '../sale/backclass-form' //退课申请 import backclassForm from '../sale/backclass-form' //退课申请
import moneyForm from '../sale/money-form' //修改提成和额外奖励 import moneyForm from '../sale/money-form' //修改提成和额外奖励
import { import {
cancelClassOrder, //取消订单 cancelClassOrder, //取消订单
} from '../../api/sale/sale' } from '../../api/sale/sale'
import myOrderForm from '../../components/sale/myOrder-form' import myOrderForm from '../../components/sale/myOrder-form'
import classinfoForm from '../../components/course/classinfo-form'; import classinfoForm from '../../components/course/classinfo-form';
import { import {
queryEmployee //员工列表 queryEmployee //员工列表
} from '../../api/users/user' } from '../../api/users/user'
export default { export default {
components: { components: {
editorderForm, editorderForm,
orderremarkForm, orderremarkForm,
...@@ -513,8 +480,11 @@ ...@@ -513,8 +480,11 @@
type: Array, type: Array,
default: null default: null
}, },
isShowClass:{ isShowClass: {
type:Boolean type: Boolean
},
Comtype: {
type:Number
} }
}, },
data() { data() {
...@@ -530,17 +500,16 @@ ...@@ -530,17 +500,16 @@
myorderObjOption: {}, //详情的数据 myorderObjOption: {}, //详情的数据
classObjOption: null, classObjOption: null,
isShowClassInfo: false, //是否显示课程信息 isShowClassInfo: false, //是否显示课程信息
isShowMoney:false, //是否显示修改提成和额外奖励 isShowMoney: false, //是否显示修改提成和额外奖励
moneyObj:{}, moneyObj: {},
CommonType:-1, //用于判断是修改提成还是额外奖励 CommonType: -1, //用于判断是修改提成还是额外奖励
EmployeeList:[],//员工列表 EmployeeList: [], //员工列表
} }
}, },
created() { created() {
this.Employee() this.Employee()
}, },
mounted() { mounted() {},
},
methods: { methods: {
//显示退课申请 //显示退课申请
showBackClassForm(item) { showBackClassForm(item) {
...@@ -552,7 +521,7 @@ ...@@ -552,7 +521,7 @@
this.orderObj = {}; this.orderObj = {};
this.isShowBackClassForm = false; this.isShowBackClassForm = false;
}, },
Employee(){ Employee() {
var qMsg = { var qMsg = {
EmployeeName: '' EmployeeName: ''
} }
...@@ -609,8 +578,8 @@ ...@@ -609,8 +578,8 @@
this.isShowmyorderForm = false; this.isShowmyorderForm = false;
}, },
//订单转交 //订单转交
transferOrder(item,type) { transferOrder(item, type) {
item.type=type item.type = type
this.orderObj = item; this.orderObj = item;
this.isShowTransOrderForm = true; this.isShowTransOrderForm = true;
}, },
...@@ -623,8 +592,8 @@ ...@@ -623,8 +592,8 @@
var tempStr = '/sale/studentList?OrderId=' + item.OrderId + '&ClassId=' + item.ClassId; var tempStr = '/sale/studentList?OrderId=' + item.OrderId + '&ClassId=' + item.ClassId;
this.$router.push({ this.$router.push({
path: tempStr, path: tempStr,
query:{ query: {
isFrom:1 isShow: this.Comtype
} }
}); });
}, },
...@@ -659,8 +628,8 @@ ...@@ -659,8 +628,8 @@
this.isShowMoney = false; this.isShowMoney = false;
}, },
//修改提成和额外奖励后刷新 //修改提成和额外奖励后刷新
refreshMoney(){ refreshMoney() {
this.isShowMoney=false; this.isShowMoney = false;
this.$emit('success'); this.$emit('success');
}, },
//取消订单 //取消订单
...@@ -729,190 +698,188 @@ ...@@ -729,190 +698,188 @@
}, },
//修改提成-奖励 //修改提成-奖励
upDateMoney(item,type){ upDateMoney(item, type) {
this.moneyObj = item; this.moneyObj = item;
this.CommonType = type; this.CommonType = type;
this.isShowMoney = true; this.isShowMoney = true;
} }
} }
} }
</script> </script>
<style> <style>
li { li {
list-style-type: none; list-style-type: none;
} }
.classorder ul { .classorder ul {
padding: 0px padding: 0px
} }
.classorder .price-popup { .classorder .price-popup {
border-radius: 4px; border-radius: 4px;
} }
.classorder .el-range-editor .el-range-input { .classorder .el-range-editor .el-range-input {
background: none; background: none;
} }
.classorder .el-range-editor.el-input__inner { .classorder .el-range-editor.el-input__inner {
background-color: transparent; background-color: transparent;
} }
.classorder .q-mb-md { .classorder .q-mb-md {
margin-bottom: 0; margin-bottom: 0;
} }
.classorder .stics { .classorder .stics {
padding: 10px 20px; padding: 10px 20px;
background: #DDDEE0; background: #DDDEE0;
border-radius: 4px; border-radius: 4px;
font-size: 14px; font-size: 14px;
color: #000000; color: #000000;
font-weight: bold font-weight: bold
} }
.classorder .stics .stics-name { .classorder .stics .stics-name {
color: #2D2D2D; color: #2D2D2D;
font-weight: 600; font-weight: 600;
margin-right: 10px margin-right: 10px
} }
.classorder .tis { .classorder .tis {
margin: 10px 0; margin: 10px 0;
align-items: center align-items: center
} }
.classorder .tis .tis-k { .classorder .tis .tis-k {
width: 10px; width: 10px;
height: 10px; height: 10px;
margin-right: 8px margin-right: 8px
} }
.classorder .tis span { .classorder .tis span {
font-size: 14px; font-size: 14px;
color: #2D2D2D; color: #2D2D2D;
font-weight: 600; font-weight: 600;
margin-right: 20px margin-right: 20px
} }
.classorder table { .classorder table {
padding: 10px 0; padding: 10px 0;
width: 100%; width: 100%;
background-color: #ededed; background-color: #ededed;
border-collapse: collapse; border-collapse: collapse;
border: 1px solid #d2d2d2; border: 1px solid #d2d2d2;
font-size: 12px; font-size: 12px;
} }
.classorder table th { .classorder table th {
background-color: #ededed; background-color: #ededed;
height: 34px; height: 34px;
text-indent: 15px; text-indent: 15px;
} }
.classorder table td { .classorder table td {
background-color: #ffffff; background-color: #ffffff;
padding: 9px 15px; padding: 9px 15px;
color: #333333; color: #333333;
border: 1px solid rgba(138, 138, 138, 0.09); border: 1px solid rgba(138, 138, 138, 0.09);
text-align: center; text-align: center;
} }
.classorder table ._color_666 { .classorder table ._color_666 {
color: #666666; color: #666666;
} }
.classorder table tr._color_666 th { .classorder table tr._color_666 th {
padding: 9px 15px; padding: 9px 15px;
} }
.classorder table th { .classorder table th {
background-color: #ededed; background-color: #ededed;
height: 34px; height: 34px;
text-indent: 15px; text-indent: 15px;
} }
.classorder table td { .classorder table td {
background-color: #ffffff; background-color: #ffffff;
padding: 9px 15px; padding: 9px 15px;
color: #333333; color: #333333;
/*border: 1px solid #d2d2d2;*/ /*border: 1px solid #d2d2d2;*/
} }
.classorder table ._color_666 { .classorder table ._color_666 {
color: #666666; color: #666666;
} }
.classorder table tr._color_666 th { .classorder table tr._color_666 th {
padding: 9px 15px; padding: 9px 15px;
} }
.classorder .enrollTotalSearchTable { .classorder .enrollTotalSearchTable {
width: 100%; width: 100%;
font-size: 14px; font-size: 14px;
color: #333; color: #333;
border-bottom: 1px solid #cccccc; border-bottom: 1px solid #cccccc;
border-right: 1px solid #cccccc; border-right: 1px solid #cccccc;
border-collapse: collapse; border-collapse: collapse;
} }
.classorder .enrollTotalSearchTable tr { .classorder .enrollTotalSearchTable tr {
/* border-bottom: 2px solid #333; */ /* border-bottom: 2px solid #333; */
} }
.classorder .enrollTotalSearchTable tr th { .classorder .enrollTotalSearchTable tr th {
background: #bdbdbd; background: #DDDEE0;
height: 30px; height: 30px;
font-size: 12px; font-size: 12px;
text-align: center; text-align: center;
border-top: 1px solid #cccccc; }
border-left: 1px solid #cccccc;
}
.classorder .enrollTotalSearchTable tr { .classorder .enrollTotalSearchTable tr {
background: #fff; background: #fff;
text-align: left; text-align: left;
} }
.classorder .enrollTotalSearchTable tbody tr:last-child { .classorder .enrollTotalSearchTable tbody tr:last-child {
border-bottom: 2px solid #333; border-bottom: 2px solid #333;
} }
.classorder .enrollTotalSearchTable tr:first-child td:first-child { .classorder .enrollTotalSearchTable tr:first-child td:first-child {
border-bottom: 2px solid #333; border-bottom: 2px solid #333;
} }
.classorder .enrollTotalSearchTable tr td { .classorder .enrollTotalSearchTable tr td {
height: 66px; height: 66px;
padding: 10px; padding: 10px;
/*border-top: 1px solid #cccccc;*/ /*border-top: 1px solid #cccccc;*/
/*border-left: 1px solid #cccccc;*/ /*border-left: 1px solid #cccccc;*/
} }
.classorder .enrollTotalSearchTable tr td>img { .classorder .enrollTotalSearchTable tr td>img {
width: 32px; width: 32px;
height: 32px; height: 32px;
border-radius: 16px; border-radius: 16px;
vertical-align: middle; vertical-align: middle;
margin-right: 5px; margin-right: 5px;
} }
.classorder .enrollTotalSearchTable tr td p { .classorder .enrollTotalSearchTable tr td p {
line-height: 20px; line-height: 20px;
} }
.classorder .remarks { .classorder .remarks {
font-size: 14px; font-size: 14px;
color: #2D2D2D; color: #2D2D2D;
} }
.classorder .remarks-b { .classorder .remarks-b {
width: 100%; width: 100%;
height: 94px; height: 94px;
background: #F0F5FB; background: #F0F5FB;
margin-top: 20px; margin-top: 10px;
padding: 15px; padding: 15px;
font-size: 12px; font-size: 12px;
color: #999999; color: #999999;
...@@ -922,25 +889,24 @@ ...@@ -922,25 +889,24 @@
line-height: 20px; line-height: 20px;
-webkit-line-clamp: 4; -webkit-line-clamp: 4;
-webkit-box-orient: vertical; -webkit-box-orient: vertical;
} }
.classorder .remarks-b-b { .classorder .remarks-b-b {
text-align: right; text-align: right;
position: absolute; position: absolute;
right: 0px; right: 0px;
bottom: 0px bottom: 0px
} }
.classorder .on-left { .classorder .on-left {
margin-right: 5px; margin-right: 5px;
} }
.classorder .finance { .classorder .finance {
padding: 1px 10px; padding: 1px 10px;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
border-radius: 4px; border-radius: 4px;
margin: 5px 3px 3px 0; margin: 5px 3px 3px 0;
} }
</style> </style>
src/pages/course/classorder.vue
View file @ e4ed9d52
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
</div> </div>
</div> </div>
<div class="page-content"> <div class="page-content">
<orderlist :dataList="dataList" :isShowClass="false" ref="orderL" :cancelList="CancelList" @success="refreshClassOrder"></orderlist> <orderlist :dataList="dataList" :isShowClass="false" ref="orderL" :Comtype="2" :cancelList="CancelList" @success="refreshClassOrder"></orderlist>
</div> </div>
</div> </div>
</template> </template>
......
src/pages/sale/myOrder.vue
View file @ e4ed9d52
...@@ -100,7 +100,7 @@ ...@@ -100,7 +100,7 @@
</div> </div>
<div class="page-content" > <div class="page-content" >
<orderlist :dataList="data.List" :isShowClass="true" @success="refreshClassOrder" ref="orderL"></orderlist> <orderlist :dataList="data.List" :isShowClass="true" :Comtype="1" @success="refreshClassOrder" ref="orderL"></orderlist>
<div class="row" style="justify-content: flex-end;padding: 5px 20px"> <div class="row" style="justify-content: flex-end;padding: 5px 20px">
<q-pagination <q-pagination
v-model="msg.pageIndex" v-model="msg.pageIndex"
......
src/pages/sale/studentList.vue
View file @ e4ed9d52
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
<q-pagination class="full-width justify-end" v-model="msg.pageIndex" color="primary" :max="pageCount" <q-pagination class="full-width justify-end" v-model="msg.pageIndex" color="primary" :max="pageCount"
:input="true" @input="changePage" /> :input="true" @input="changePage" />
</template> </template>
<template v-slot:body-cell-optioned="props"> <template v-slot:body-cell-optioned="props" v-if="isShowBtn">
<q-td :props="props"> <q-td :props="props">
<q-btn flat size="xs" icon="edit" color="accent" style="font-weight:400" label="编辑" <q-btn flat size="xs" icon="edit" color="accent" style="font-weight:400" label="编辑"
@click="EditRole(props.row)" /> @click="EditRole(props.row)" />
...@@ -201,8 +201,10 @@ ...@@ -201,8 +201,10 @@
this.msg.OrderId =this.$route.query.OrderId; this.msg.OrderId =this.$route.query.OrderId;
this.addMsg.OrderId =this.$route.query.OrderId; this.addMsg.OrderId =this.$route.query.OrderId;
this.msg.ClassId =this.$route.query.ClassId this.msg.ClassId =this.$route.query.ClassId
if(this.$route.query.isFrom==1){ if(this.$route.query.isShow==1){
this.isShowBtn = false; this.isShowBtn = true;
}else{
this.isShowBtn=false
} }
} }
this.getRolelist(); this.getRolelist();
......
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