Skip to content

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

页面修改

parent 22f2ba1e
Show whitespace changes
Inline Side-by-side
Showing with 1066 additions and 1495 deletions
src/components/sale/activeOrder-item.vue
View file @ b5834441
...@@ -2,12 +2,7 @@ ...@@ -2,12 +2,7 @@
<template> <template>
<div class="classorder"> <div class="classorder">
<div class="table-head"> <div class="table-head">
<table <table class="enrollTotalSearchTable" border="0" cellspacing="0" cellpadding="0">
class="enrollTotalSearchTable"
border="0"
cellspacing="0"
cellpadding="0"
>
<colgroup> <colgroup>
<col width="12%" /> <col width="12%" />
<col width="7%" /> <col width="7%" />
...@@ -36,13 +31,8 @@ ...@@ -36,13 +31,8 @@
</thead> </thead>
</table> </table>
</div> </div>
<div class="table-body"> <div class="table-body" v-loading="loading">
<table <table class="enrollTotalSearchTable" border="0" cellspacing="0" cellpadding="0">
class="enrollTotalSearchTable"
border="0"
cellspacing="0"
cellpadding="0"
>
<colgroup> <colgroup>
<col width="12%" /> <col width="12%" />
<col width="7%" /> <col width="7%" />
...@@ -57,11 +47,7 @@ ...@@ -57,11 +47,7 @@
<col /> <col />
</colgroup> </colgroup>
<tr> <tr>
<td <td v-show="dataList && dataList.length == 0" :colspan="12" align="center">
v-show="dataList && dataList.length == 0"
:colspan="12"
align="center"
>
暂无数据 暂无数据
</td> </td>
</tr> </tr>
...@@ -81,18 +67,12 @@ ...@@ -81,18 +67,12 @@
<div>{{ item.StartTime }}</div> <div>{{ item.StartTime }}</div>
<div>活动结束时间：</div> <div>活动结束时间：</div>
<div>{{ item.EndTime }}</div> <div>{{ item.EndTime }}</div>
<div <div v-if="item.IsCommission == 2" style="color: #f00; cursor: pointer; text-decoration: underline"
v-if="item.IsCommission == 2" @click="gourlactive(item)">
style="color: #f00; cursor: pointer; text-decoration: underline"
@click="gourlactive(item)"
>
提成金额:{{ item.CommissionPrice }} 提成金额:{{ item.CommissionPrice }}
</div> </div>
<template v-if="AuthorityObj.isShowName"> <template v-if="AuthorityObj.isShowName">
<div <div style="font-weight: bold; color: #2961fe; cursor: pointer" @click="getClassInfo(item)">
style="font-weight: bold; color: #2961fe; cursor: pointer"
@click="getClassInfo(item)"
>
{{ item.ClassName }} {{ item.ClassName }}
</div> </div>
<div v-if="item.HelpEnterName"> <div v-if="item.HelpEnterName">
...@@ -118,43 +98,29 @@ ...@@ -118,43 +98,29 @@
<div>生效状态：{{ item.EffectStatusStr }}</div> <div>生效状态：{{ item.EffectStatusStr }}</div>
                             
<div>生效时间：{{ item.EffectTime }}</div> <div>生效时间：{{ item.EffectTime }}</div>
              <template               <template v-if="item.UpOrderId && item.UpOrderId > 0">
v-if="item.UpOrderId && item.UpOrderId > 0"
>
<div>前置订单：{{ item.UpOrderId }}</div> <div>前置订单：{{ item.UpOrderId }}</div>
</template> </template>
            </q-tooltip             </q-tooltip>
>
</div> </div>
</template> </template>
<div style="margin-top: 10px" v-if="item.OfferId > 0"> <div style="margin-top: 10px" v-if="item.OfferId > 0">
报价单：<span 报价单：<span class="order_OfferId" @click="goQuotation(item.OfferId)"
class="order_OfferId" style="font-size: 14px">{{ item.OfferId }}</span>
@click="goQuotation(item.OfferId)"
style="font-size: 14px"
>{{ item.OfferId }}</span
>
</div> </div>
<div style="margin-top: 10px" v-if="item.VisitorReserveId > 0"> <div style="margin-top: 10px" v-if="item.VisitorReserveId > 0">
预约单号：<span 预约单号：<span class="order_OfferId" @click="goVisitorReser(item.VisitorReserveId)"
class="order_OfferId" style="font-size: 14px">{{ item.VisitorReserveId }}</span>
@click="goVisitorReser(item.VisitorReserveId)"
style="font-size: 14px"
>{{ item.VisitorReserveId }}</span
>
</div> </div>
<template v-if="item.IsCommissionGive == 1"> <template v-if="item.IsCommissionGive == 1">
<div style="color: red" v-if="item.YFCommissionMoney > 0"> <div style="color: red" v-if="item.YFCommissionMoney > 0">
应发提成：{{ item.YFCommissionMoney }} 应发提成：{{ item.YFCommissionMoney }}
</div> </div>
<div <div style="
style="
color: red; color: red;
cursor: pointer; cursor: pointer;
text-decoration: underline; text-decoration: underline;
" " @click="gourltx(item.OrderId)">
@click="gourltx(item.OrderId)"
>
已发提成：{{ item.CommissionMoney }} 已发提成：{{ item.CommissionMoney }}
</div> </div>
<div style="color: red" v-if="item.ExtraCommissionMoney > 0"> <div style="color: red" v-if="item.ExtraCommissionMoney > 0">
...@@ -248,211 +214,85 @@ ...@@ -248,211 +214,85 @@
<template> <template>
<span v-if="item.WeiXinType == 0"> <span v-if="item.WeiXinType == 0">
甲鹤 甲鹤
<span v-if="item.EduStudentId > 0" <span v-if="item.EduStudentId > 0">-{{ item.EduStudentName }}</span>
>-{{ item.EduStudentName }}</span
>
</span> </span>
<span v-if="item.WeiXinType == 1"> <span v-if="item.WeiXinType == 1">
甲小鹤 甲小鹤
<span v-if="item.EduStudentId > 0" <span v-if="item.EduStudentId > 0">-{{ item.EduStudentName }}</span>
>-{{ item.EduStudentName }}</span
>
</span> </span>
</template> </template>
</td> </td>
<!-- 状态 --> <!-- 状态 -->
<td style="border: none"> <td style="border: none">
<div <div style="
style="
background: rgba(2, 196, 153, 0.2); background: rgba(2, 196, 153, 0.2);
width: 80px; width: 80px;
border-radius: 2px; border-radius: 2px;
text-align: center; text-align: center;
" ">
>
<!-- <span style="color: #02C499">{{item.OrderStateName}}</span> --> <!-- <span style="color: #02C499">{{item.OrderStateName}}</span> -->
<span style="color: #02c499" v-if="item.Status === 0" <span style="color: #02c499" v-if="item.Status === 0">正常</span>
>正常</span <span style="color: #02c499" v-if="item.Status === 1">取消</span>
>
<span style="color: #02c499" v-if="item.Status === 1"
>取消</span
>
</div> </div>
</td> </td>
<td style="border: none"> <td style="border: none">
<template <template v-if="
v-if="
(isEditOrder || AuthorityObj.isShowEdit) && !formActiveMan (isEditOrder || AuthorityObj.isShowEdit) && !formActiveMan
" ">
> <q-btn flat size="xs" icon="edit" color="accent" style="font-weight: 400" label="编辑"
<q-btn @click="editOrder(item)" v-if="item.EduUserId === loginId && item.PaymentWay !== 1" />
flat
size="xs"
icon="edit"
color="accent"
style="font-weight: 400"
label="编辑"
@click="editOrder(item)"
v-if="item.EduUserId === loginId && item.PaymentWay !== 1"
/>
</template> </template>
<template <template v-if="
v-if="
formActiveMan && formActiveMan &&
item.IsApplyForCancel == 1 && item.IsApplyForCancel == 1 &&
item.Status === 0 item.Status === 0
" ">
> <q-btn flat size="xs" icon="edit" color="accent" style="font-weight: 400" label="同意"
<q-btn @click="handleApply(1, item)" />
flat <q-btn flat size="xs" icon="edit" color="accent" style="font-weight: 400" label="拒绝"
size="xs" @click="handleApply(2, item)" />
icon="edit"
color="accent"
style="font-weight: 400"
label="同意"
@click="handleApply(1, item)"
/>
<q-btn
flat
size="xs"
icon="edit"
color="accent"
style="font-weight: 400"
label="拒绝"
@click="handleApply(2, item)"
/>
</template> </template>
<q-btn-dropdown <q-btn-dropdown flat size="xs" color="dark" label="更多" v-if="
flat
size="xs"
color="dark"
label="更多"
v-if="
item.EduUserId === loginId && item.EduUserId === loginId &&
item.PaymentWay !== 1 && item.PaymentWay !== 1 &&
!formActiveMan !formActiveMan
" " style="margin-left: 10px">
style="margin-left: 10px"
>
<q-list> <q-list>
<!-- <q-item clickable v-close-popup> <q-item clickable v-close-popup disabled v-if="
<q-item-section @click="gostudent(item)">
<q-item-label>学生名单</q-item-label>
</q-item-section>
</q-item> -->
<!-- <q-item clickable v-close-popup v-if="AuthorityObj.isShowTransOrder">
<q-item-section @click="transferOrder(item,1)">
<q-item-label>转交订单</q-item-label>
</q-item-section>
</q-item> -->
<!-- <q-item clickable v-close-popup v-if="AuthorityObj.isShowEditSale">
<q-item-section @click="transferOrder(item,2)">
<q-item-label>修改销售</q-item-label>
</q-item-section>
</q-item> -->
<!-- <q-item clickable v-close-popup v-if="AuthorityObj.isShowSaleRemark">
<q-item-section @click="editOrderRemark(item,1)">
<q-item-label>销售备注</q-item-label>
</q-item-section>
</q-item>
<q-item clickable v-close-popup v-if="AuthorityObj.isShowEducationRemark">
<q-item-section @click="editOrderRemark(item,2)">
<q-item-label>教务备注</q-item-label>
</q-item-section>
</q-item>
<q-item clickable v-close-popup v-if="AuthorityObj.isShowPrincipalRemark">
<q-item-section @click="editOrderRemark(item,3)">
<q-item-label>校长备注</q-item-label>
</q-item-section>
</q-item>
<q-item clickable v-close-popup v-if="isEditOrder">
<q-item-section @click="editOrder(item)">
<q-item-label>总经理修改</q-item-label>
</q-item-section>
</q-item>
<q-item clickable v-close-popup v-if="AuthorityObj.isShowManagerRemark">
<q-item-section @click="editOrderRemark(item,4)">
<q-item-label>总经理备注</q-item-label>
</q-item-section>
</q-item> -->
<!-- <q-item clickable v-close-popup v-if="AuthorityObj.isShowCommissionEdit&&item.IsCommissionGive==1">
<q-item-section @click="upDateMoney(item,1)">
<q-item-label>修改提成</q-item-label>
</q-item-section>
</q-item> -->
<!-- <q-item clickable v-close-popup v-if="AuthorityObj.isShowRewardEdit&&isShowReward">
<q-item-section @click="upDateMoney(item,2)">
<q-item-label>额外奖励</q-item-label>
</q-item-section>
</q-item> -->
<q-item
clickable
v-close-popup
disabled
v-if="
(item.IncomeFinanceList && (item.IncomeFinanceList &&
item.IncomeFinanceList.length > 0) || item.IncomeFinanceList.length > 0) ||
(item.ExpendFinanceList && (item.ExpendFinanceList &&
item.ExpendFinanceList.length > 0) item.ExpendFinanceList.length > 0)
" ">
>
<q-item-section> <q-item-section>
<q-item-label> 取消订单 </q-item-label> <q-item-label> 取消订单 </q-item-label>
<q-tooltip <q-tooltip anchor="center left" self="center right" content-class="bg-red">
anchor="center left"
self="center right"
content-class="bg-red"
>
已有财务单据无法取消 已有财务单据无法取消
</q-tooltip> </q-tooltip>
</q-item-section> </q-item-section>
</q-item> </q-item>
<q-item <q-item clickable v-close-popup disabled v-else-if="
clickable
v-close-popup
disabled
v-else-if="
item.Status === 0 && item.Status === 0 &&
item.IsApplyForCancel === 1 && item.IsApplyForCancel === 1 &&
item.ApplyForCancelStatus === 0 item.ApplyForCancelStatus === 0
" ">
>
<q-item-section> <q-item-section>
<q-item-label> 取消订单 </q-item-label> <q-item-label> 取消订单 </q-item-label>
<q-tooltip <q-tooltip anchor="center left" self="center right" content-class="bg-red">
anchor="center left"
self="center right"
content-class="bg-red"
>
取消审核中 取消审核中
</q-tooltip> </q-tooltip>
</q-item-section> </q-item-section>
</q-item> </q-item>
<q-item <q-item clickable v-close-popup v-else-if="
clickable
v-close-popup
v-else-if="
item.Status === 0 && item.Status === 0 &&
item.IsApplyForCancel === 0 && item.IsApplyForCancel === 0 &&
item.ApplyForCancelStatus === 0 item.ApplyForCancelStatus === 0
" ">
>
<q-item-section @click="CancelOrder(item)"> <q-item-section @click="CancelOrder(item)">
<q-item-label>取消订单</q-item-label> <q-item-label>取消订单</q-item-label>
</q-item-section> </q-item-section>
</q-item> </q-item>
<!-- <q-item clickable v-close-popup v-close-popup v-if="AuthorityObj.isShowBackClass">
<q-item-section>
<q-item-label @click="showBackClassForm(item)">退课</q-item-label>
</q-item-section>
</q-item> -->
<!-- <q-item clickable v-close-popup v-close-popup v-if="AuthorityObj.isShowRenewClass">
<q-item-section>
<q-item-label @click="showContinueClass(item)">续课</q-item-label>
</q-item-section>
</q-item> -->
</q-list> </q-list>
</q-btn-dropdown> </q-btn-dropdown>
</td> </td>
...@@ -466,101 +306,43 @@ ...@@ -466,101 +306,43 @@
<div class="remarks-b"> <div class="remarks-b">
<div v-if="item.Remark != null || item.Remark != ''"> <div v-if="item.Remark != null || item.Remark != ''">
<div>{{ item.Remark }}</div> <div>{{ item.Remark }}</div>
<!-- <div class="remarks-b-b">
<span class="iconfont icon-xiangxia" style="color: #2961FE;font-size: 10px"
v-if="item.Remark&&item.Remark.length>0"></span>
<q-popup-proxy>
<q-banner>
<div style="width: 500px;">
<div>客户备注</div>
<div v-for="(xq,jq) in item.Remark" :index="jq"
style=" margin-top: 10px;background: #e6e6e6;padding: 5px;font-size: 12px">
<div>{{xq.Content}}</div>
<div style="text-align: right">{{xq.CreateBy}} {{xq.CreateTime}}</div>
</div> </div>
</div> <span v-if="item.Remark == null || item.Remark == ''">暂无</span>
</q-banner>
</q-popup-proxy>
</div> -->
</div>
<span v-if="item.Remark == null || item.Remark == ''"
>暂无</span
>
</div> </div>
</div> </div>
<div class="col"> <div class="col">
<div>取消备注：</div> <div>取消备注：</div>
<div class="remarks-b"> <div class="remarks-b">
<div <div v-if="
v-if="
item.CancelRemark != null || item.CancelRemark != '' item.CancelRemark != null || item.CancelRemark != ''
" ">
>
<div>{{ item.CancelRemark }}</div> <div>{{ item.CancelRemark }}</div>
<!-- <div class="remarks-b-b">
<span class="iconfont icon-xiangxia" style="color: #2961FE;font-size: 10px"
v-if="item.CancelRemark&&item.CancelRemark.length>0"></span>
<q-popup-proxy>
<q-banner>
<div style="width: 500px;">
<div>取消备注：</div>
<div v-for="(xq,jq) in item.CancelRemark" :index="jq"
style=" margin-top: 10px;background: #e6e6e6;padding: 5px;font-size: 12px">
<div>{{xq.Content}}</div>
<div style="text-align: right">{{xq.CreateBy}} {{xq.CreateTime}}</div>
</div>
</div>
</q-banner>
</q-popup-proxy>
</div> -->
</div> </div>
<span <span v-if="
v-if="
item.CancelRemark == null || item.CancelRemark == '' item.CancelRemark == null || item.CancelRemark == ''
" ">暂无</span>
>暂无</span
>
</div> </div>
</div> </div>
<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 <q-btn flat size="xs" icon="edit" v-if="item.UserId === 0" style="font-weight: 400; color: #02c499"
flat label="修改" @click="goShoukuan(item, 1)" />
size="xs" <template v-if="
icon="edit"
v-if="item.UserId === 0"
style="font-weight: 400; color: #02c499"
label="修改"
@click="goShoukuan(item, 1)"
/>
<!-- <q-btn flat size="xs" icon="edit"
v-if="AuthorityObj.isShowFinanceBtn&&AuthorityObj.isShowEdit&&item.OrderType==2"
style="font-weight:400;color: #02C499" label="修改" @click="chanceType(item,1)" /> -->
<template
v-if="
AuthorityObj.isShowFinanceBtn && AuthorityObj.isShowFinanceBtn &&
AuthorityObj.isShowEdit && AuthorityObj.isShowEdit &&
item.OrderType == 1 item.OrderType == 1
" ">
> <q-btn flat size="xs" icon="edit" style="font-weight: 400; color: #02c499" label="修改"
<q-btn @click="showChooseStudent = true" />
flat
size="xs"
icon="edit"
style="font-weight: 400; color: #02c499"
label="修改"
@click="showChooseStudent = true"
/>
<q-popup-proxy v-if="showChooseStudent"> <q-popup-proxy v-if="showChooseStudent">
<q-banner> <q-banner>
<div <div style="
style="
width: 500px; width: 500px;
max-height: 400px; max-height: 400px;
overflow-y: auto; overflow-y: auto;
" ">
>
<table class="Contract_Table"> <table class="Contract_Table">
<tr> <tr>
<th>选择</th> <th>选择</th>
...@@ -570,11 +352,7 @@ ...@@ -570,11 +352,7 @@
</tr> </tr>
<tr v-for="subItem in item.GuestList"> <tr v-for="subItem in item.GuestList">
<td> <td>
<q-radio <q-radio dense v-model="chooseStudent" :val="subItem.Id" />
dense
v-model="chooseStudent"
:val="subItem.Id"
/>
</td> </td>
<td>{{ subItem.GuestName }}</td> <td>{{ subItem.GuestName }}</td>
...@@ -583,28 +361,17 @@ ...@@ -583,28 +361,17 @@
</tr> </tr>
</table> </table>
</div> </div>
<q-btn <q-btn color="accent" size="sm" class="q-mr-md" @click="chanceType(item, 1)" label="制单" style="
color="accent"
size="sm"
class="q-mr-md"
@click="chanceType(item, 1)"
label="制单"
style="
min-width: 70px; min-width: 70px;
float: right; float: right;
margin-top: 10px; margin-top: 10px;
" " />
/>
</q-banner> </q-banner>
</q-popup-proxy> </q-popup-proxy>
</template> </template>
</div> </div>
<div class="row wrap"> <div class="row wrap">
<div <div class="finance row" v-for="(x, j) in item.IncomeFinanceList" :index="j" :style="{
class="finance row"
v-for="(x, j) in item.IncomeFinanceList"
:index="j"
:style="{
background: background:
x.ColorType == 1 x.ColorType == 1
? 'rgba(41, 97, 254, 0.2)' ? 'rgba(41, 97, 254, 0.2)'
...@@ -621,53 +388,31 @@ ...@@ -621,53 +388,31 @@
: x.ColorType == 3 : x.ColorType == 3
? '#F28C1D' ? '#F28C1D'
: '#3FC4FF', : '#3FC4FF',
}" }">
> <span style="cursor: pointer" @click="goOrderdetails(item, 4)">{{ x.FrID }}</span>
<span
style="cursor: pointer"
@click="goOrderdetails(item, 4)"
>{{ x.FrID }}</span
>
</div> </div>
</div> </div>
<div class="row" style="justify-content: space-between"> <div class="row" style="justify-content: space-between">
<span>付款单据：</span> <span>付款单据：</span>
<q-btn <q-btn flat size="xs" icon="edit" v-if="item.UserId === 0" style="font-weight: 400; color: #02c499"
flat label="修改" @click="goShoukuan(item, 2)" />
size="xs"
icon="edit"
v-if="item.UserId === 0"
style="font-weight: 400; color: #02c499"
label="修改"
@click="goShoukuan(item, 2)"
/>
<!-- <q-btn flat size="xs" icon="edit" <!-- <q-btn flat size="xs" icon="edit"
v-if="AuthorityObj.isShowFinanceBtn&&AuthorityObj.isShowEdit&&item.OrderType==2" v-if="AuthorityObj.isShowFinanceBtn&&AuthorityObj.isShowEdit&&item.OrderType==2"
style="font-weight:400;color: #02C499" label="修改" @click="chanceType(item,2)" /> --> style="font-weight:400;color: #02C499" label="修改" @click="chanceType(item,2)" /> -->
<template <template v-if="
v-if="
AuthorityObj.isShowFinanceBtn && AuthorityObj.isShowFinanceBtn &&
AuthorityObj.isShowEdit && AuthorityObj.isShowEdit &&
item.OrderType == 1 item.OrderType == 1
" ">
> <q-btn flat size="xs" icon="edit" style="font-weight: 400; color: #02c499" label="修改"
<q-btn @click="showChooseStudent = true" />
flat
size="xs"
icon="edit"
style="font-weight: 400; color: #02c499"
label="修改"
@click="showChooseStudent = true"
/>
<q-popup-proxy v-if="showChooseStudent"> <q-popup-proxy v-if="showChooseStudent">
<q-banner> <q-banner>
<div <div style="
style="
width: 500px; width: 500px;
max-height: 400px; max-height: 400px;
overflow-y: auto; overflow-y: auto;
" ">
>
<table class="Contract_Table"> <table class="Contract_Table">
<tr> <tr>
<th>选择</th> <th>选择</th>
...@@ -677,11 +422,7 @@ ...@@ -677,11 +422,7 @@
</tr> </tr>
<tr v-for="subItem in item.GuestList"> <tr v-for="subItem in item.GuestList">
<td> <td>
<q-radio <q-radio dense v-model="chooseStudent" :val="subItem.Id" />
dense
v-model="chooseStudent"
:val="subItem.Id"
/>
</td> </td>
<td>{{ subItem.GuestName }}</td> <td>{{ subItem.GuestName }}</td>
...@@ -690,28 +431,17 @@ ...@@ -690,28 +431,17 @@
</tr> </tr>
</table> </table>
</div> </div>
<q-btn <q-btn color="accent" size="sm" class="q-mr-md" @click="chanceType(item, 2)" label="制单" style="
color="accent"
size="sm"
class="q-mr-md"
@click="chanceType(item, 2)"
label="制单"
style="
min-width: 70px; min-width: 70px;
float: right; float: right;
margin-top: 10px; margin-top: 10px;
" " />
/>
</q-banner> </q-banner>
</q-popup-proxy> </q-popup-proxy>
</template> </template>
</div> </div>
<div class="row wrap"> <div class="row wrap">
<div <div class="finance row" v-for="(x, j) in item.ExpendFinanceList" :index="j" :style="{
class="finance row"
v-for="(x, j) in item.ExpendFinanceList"
:index="j"
:style="{
background: background:
x.ColorType == 1 x.ColorType == 1
? 'rgba(41, 97, 254, 0.2)' ? 'rgba(41, 97, 254, 0.2)'
...@@ -728,13 +458,8 @@ ...@@ -728,13 +458,8 @@
: x.ColorType == 3 : x.ColorType == 3
? '#F28C1D' ? '#F28C1D'
: '#3FC4FF', : '#3FC4FF',
}" }">
> <span style="cursor: pointer" @click="goOrderdetails(item, 4)">{{ x.FrID }}</span>
<span
style="cursor: pointer"
@click="goOrderdetails(item, 4)"
>{{ x.FrID }}</span
>
</div> </div>
</div> </div>
</div> </div>
...@@ -746,39 +471,27 @@ ...@@ -746,39 +471,27 @@
<tbody v-if="cancelList && cancelList.length > 0"> <tbody v-if="cancelList && cancelList.length > 0">
<tr> <tr>
<td :colspan="13"> <td :colspan="13">
<span <span style="color: red; cursor: pointer; font-weight: bold"
style="color: red; cursor: pointer; font-weight: bold" @click="isShowCancel = !isShowCancel">取消订单</span>
@click="isShowCancel = !isShowCancel"
>取消订单</span
>
</td> </td>
</tr> </tr>
</tbody> </tbody>
<tbody <tbody v-if="cancelList && cancelList.length > 0 && isShowCancel" v-for="(item, index) in cancelList"
v-if="cancelList && cancelList.length > 0 && isShowCancel" :key="index + 10000">
v-for="(item, index) in cancelList"
:key="index + 10000"
>
<tr> <tr>
<td :rowspan="3" style="text-align: left"> <td :rowspan="3" style="text-align: left">
<div <div style="
style="
font-size: 18px; font-size: 18px;
color: #2961fe; color: #2961fe;
margin-bottom: 20px; margin-bottom: 20px;
font-weight: bold; font-weight: bold;
" " @click="goOrderdetails(item)">
@click="goOrderdetails(item)"
>
{{ item.OrderId }} {{ item.OrderId }}
</div> </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>
<div <div style="font-weight: bold; color: #2961fe" @click="getClassInfo(item)">
style="font-weight: bold; color: #2961fe"
@click="getClassInfo(item)"
>
{{ item.ClassName }} {{ item.ClassName }}
</div> </div>
</td> </td>
...@@ -788,15 +501,13 @@ ...@@ -788,15 +501,13 @@
{{ item.Class_Price }} {{ item.Class_Price }}
</template> </template>
</td> </td>
<td <td :style="{
:style="{
color: color:
item.Class_Price != item.UnitPrice item.Class_Price != item.UnitPrice
? 'var(--q-color-negative)' ? 'var(--q-color-negative)'
: '', : '',
border: 'none', border: 'none',
}" }">
>
<template v-if="item.UnitPrice >= 0"> <template v-if="item.UnitPrice >= 0">
{{ item.UnitPrice }} {{ item.UnitPrice }}
</template> </template>
...@@ -837,34 +548,19 @@ ...@@ -837,34 +548,19 @@
</template> </template>
</td> </td>
<td style="border: none"> <td style="border: none">
<div <div style="
style="
background: rgba(2, 196, 153, 0.2); background: rgba(2, 196, 153, 0.2);
width: 80px; width: 80px;
border-radius: 2px; border-radius: 2px;
text-align: center; text-align: center;
" ">
>
<span style="color: #02c499">{{ item.OrderStateName }}</span> <span style="color: #02c499">{{ item.OrderStateName }}</span>
</div> </div>
</td> </td>
<td style="border: none" v-if="AuthorityObj.isShowEdit"> <td style="border: none" v-if="AuthorityObj.isShowEdit">
<q-btn <q-btn flat size="xs" icon="edit" color="accent" style="font-weight: 400; display: none" label="编辑"
flat @click="editOrder(item)" />
size="xs" <q-btn-dropdown flat size="xs" color="dark" label="更多" style="margin-left: 10px; display: none">
icon="edit"
color="accent"
style="font-weight: 400; display: none"
label="编辑"
@click="editOrder(item)"
/>
<q-btn-dropdown
flat
size="xs"
color="dark"
label="更多"
style="margin-left: 10px; display: none"
>
<q-list> <q-list>
<q-item clickable v-close-popup> <q-item clickable v-close-popup>
<q-item-section @click="gostudent(item)"> <q-item-section @click="gostudent(item)">
...@@ -877,39 +573,23 @@ ...@@ -877,39 +573,23 @@
</tr> </tr>
<tr> <tr>
<td :colspan="12" style="text-align: left"> <td :colspan="12" style="text-align: left">
<div <div class="row" v-if="item.GuestList && item.GuestList.length > 0">
class="row"
v-if="item.GuestList && item.GuestList.length > 0"
>
学生名单： 学生名单：
<span <span v-for="(x, j) in item.GuestList" :index="j" v-if="x.GuestState == 1"
v-for="(x, j) in item.GuestList" style="color: #2961fe; margin-right: 5px">{{ x.GuestName }}
:index="j"
v-if="x.GuestState == 1"
style="color: #2961fe; margin-right: 5px"
>{{ x.GuestName }}
</span> </span>
</div> </div>
<div <div class="row" v-if="
class="row"
v-if="
item.GuestList && item.GuestList &&
item.GuestList.length > 0 && item.GuestList.length > 0 &&
getTkshow(item.GuestList) getTkshow(item.GuestList)
" ">
>
退课名单： 退课名单：
<span <span v-for="(x, j) in item.GuestList" :index="j" v-if="x.GuestState == 2"
v-for="(x, j) in item.GuestList" style="color: var(--q-color-negative); margin-right: 5px">{{ x.GuestName }}
:index="j"
v-if="x.GuestState == 2"
style="color: var(--q-color-negative); margin-right: 5px"
>{{ x.GuestName }}
</span> </span>
</div> </div>
<span v-if="item.GuestList && item.GuestList.length == 0" <span v-if="item.GuestList && item.GuestList.length == 0">暂无</span>
>暂无</span
>
</td> </td>
</tr> </tr>
<tr> <tr>
...@@ -918,33 +598,23 @@ ...@@ -918,33 +598,23 @@
<div class="col"> <div class="col">
<div>销售备注：</div> <div>销售备注：</div>
<div class="remarks-b"> <div class="remarks-b">
<div <div v-if="item.SaleRemark != null || item.SaleRemark != ''">
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 <span class="iconfont icon-xiangxia" style="color: #2961fe; font-size: 10px" v-if="
class="iconfont icon-xiangxia"
style="color: #2961fe; font-size: 10px"
v-if="
item.SaleRemarkList && item.SaleRemarkList &&
item.SaleRemarkList.length > 0 item.SaleRemarkList.length > 0
" "></span>
></span>
<q-popup-proxy> <q-popup-proxy>
<q-banner> <q-banner>
<div style="width: 500px"> <div style="width: 500px">
<div>销售备注</div> <div>销售备注</div>
<div <div v-for="(xq, jq) in item.SaleRemarkList" :index="jq" style="
v-for="(xq, jq) in item.SaleRemarkList"
:index="jq"
style="
margin-top: 10px; margin-top: 10px;
background: #e6e6e6; background: #e6e6e6;
padding: 5px; padding: 5px;
font-size: 12px; font-size: 12px;
" ">
>
<div>{{ xq.Content }}</div> <div>{{ xq.Content }}</div>
<div style="text-align: right"> <div style="text-align: right">
{{ xq.CreateBy }} {{ xq.CreateTime }} {{ xq.CreateBy }} {{ xq.CreateTime }}
...@@ -955,44 +625,31 @@ ...@@ -955,44 +625,31 @@
</q-popup-proxy> </q-popup-proxy>
</div> </div>
</div> </div>
<span <span v-if="item.SaleRemark == null || item.SaleRemark == ''">暂无</span>
v-if="item.SaleRemark == null || item.SaleRemark == ''"
>暂无</span
>
</div> </div>
</div> </div>
<div class="col"> <div class="col">
<div>教务备注：</div> <div>教务备注：</div>
<div class="remarks-b"> <div class="remarks-b">
<div <div v-if="
v-if="
item.TeacherRemark != null || item.TeacherRemark != '' item.TeacherRemark != null || item.TeacherRemark != ''
" ">
>
<div>{{ item.TeacherRemark }}</div> <div>{{ item.TeacherRemark }}</div>
<div class="remarks-b-b"> <div class="remarks-b-b">
<span <span class="iconfont icon-xiangxia" style="color: #2961fe; font-size: 10px" v-if="
class="iconfont icon-xiangxia"
style="color: #2961fe; font-size: 10px"
v-if="
item.TeacherRemarkList && item.TeacherRemarkList &&
item.TeacherRemarkList.length > 0 item.TeacherRemarkList.length > 0
" "></span>
></span>
<q-popup-proxy> <q-popup-proxy>
<q-banner> <q-banner>
<div style="width: 500px"> <div style="width: 500px">
<div>教务备注</div> <div>教务备注</div>
<div <div v-for="(xq, jq) in item.TeacherRemarkList" :index="jq" style="
v-for="(xq, jq) in item.TeacherRemarkList"
:index="jq"
style="
margin-top: 10px; margin-top: 10px;
background: #e6e6e6; background: #e6e6e6;
padding: 5px; padding: 5px;
font-size: 12px; font-size: 12px;
" ">
>
<div>{{ xq.Content }}</div> <div>{{ xq.Content }}</div>
<div style="text-align: right"> <div style="text-align: right">
{{ xq.CreateBy }} {{ xq.CreateTime }} {{ xq.CreateBy }} {{ xq.CreateTime }}
...@@ -1003,46 +660,33 @@ ...@@ -1003,46 +660,33 @@
</q-popup-proxy> </q-popup-proxy>
</div> </div>
</div> </div>
<span <span v-if="
v-if="
item.TeacherRemark == null || item.TeacherRemark == '' item.TeacherRemark == null || item.TeacherRemark == ''
" ">暂无</span>
>暂无</span
>
</div> </div>
</div> </div>
<div class="col"> <div class="col">
<div>校长备注：</div> <div>校长备注：</div>
<div class="remarks-b"> <div class="remarks-b">
<div <div v-if="
v-if="
item.RectorRemark != null || item.RectorRemark != '' item.RectorRemark != null || item.RectorRemark != ''
" ">
>
<div>{{ item.RectorRemark }}</div> <div>{{ item.RectorRemark }}</div>
<div class="remarks-b-b"> <div class="remarks-b-b">
<span <span class="iconfont icon-xiangxia" style="color: #2961fe; font-size: 10px" v-if="
class="iconfont icon-xiangxia"
style="color: #2961fe; font-size: 10px"
v-if="
item.RectorRemarkList && item.RectorRemarkList &&
item.RectorRemarkList.length > 0 item.RectorRemarkList.length > 0
" "></span>
></span>
<q-popup-proxy> <q-popup-proxy>
<q-banner> <q-banner>
<div style="width: 500px"> <div style="width: 500px">
<div>校长备注</div> <div>校长备注</div>
<div <div v-for="(xq, jq) in item.RectorRemarkList" :index="jq" style="
v-for="(xq, jq) in item.RectorRemarkList"
:index="jq"
style="
margin-top: 10px; margin-top: 10px;
background: #e6e6e6; background: #e6e6e6;
padding: 5px; padding: 5px;
font-size: 12px; font-size: 12px;
" ">
>
<div>{{ xq.Content }}</div> <div>{{ xq.Content }}</div>
<div style="text-align: right"> <div style="text-align: right">
{{ xq.CreateBy }} {{ xq.CreateTime }} {{ xq.CreateBy }} {{ xq.CreateTime }}
...@@ -1053,46 +697,33 @@ ...@@ -1053,46 +697,33 @@
</q-popup-proxy> </q-popup-proxy>
</div> </div>
</div> </div>
<span <span v-if="
v-if="
item.RectorRemark == null || item.RectorRemark == '' item.RectorRemark == null || item.RectorRemark == ''
" ">暂无</span>
>暂无</span
>
</div> </div>
</div> </div>
<div class="col"> <div class="col">
<div>总经理备注：</div> <div>总经理备注：</div>
<div class="remarks-b"> <div class="remarks-b">
<div <div v-if="
v-if="
item.DirectorRemark != null || item.DirectorRemark != '' item.DirectorRemark != null || item.DirectorRemark != ''
" ">
>
<div>{{ item.DirectorRemark }}</div> <div>{{ item.DirectorRemark }}</div>
<div class="remarks-b-b"> <div class="remarks-b-b">
<span <span class="iconfont icon-xiangxia" style="color: #2961fe; font-size: 10px" v-if="
class="iconfont icon-xiangxia"
style="color: #2961fe; font-size: 10px"
v-if="
item.DirectorRemarkList && item.DirectorRemarkList &&
item.DirectorRemarkList.length > 0 item.DirectorRemarkList.length > 0
" "></span>
></span>
<q-popup-proxy> <q-popup-proxy>
<q-banner> <q-banner>
<div style="width: 500px"> <div style="width: 500px">
<div>总经理备注</div> <div>总经理备注</div>
<div <div v-for="(xq, jq) in item.DirectorRemarkList" :index="jq" style="
v-for="(xq, jq) in item.DirectorRemarkList"
:index="jq"
style="
margin-top: 10px; margin-top: 10px;
background: #e6e6e6; background: #e6e6e6;
padding: 5px; padding: 5px;
font-size: 12px; font-size: 12px;
" ">
>
<div>{{ xq.Content }}</div> <div>{{ xq.Content }}</div>
<div style="text-align: right"> <div style="text-align: right">
{{ xq.CreateBy }} {{ xq.CreateTime }} {{ xq.CreateBy }} {{ xq.CreateTime }}
...@@ -1103,12 +734,9 @@ ...@@ -1103,12 +734,9 @@
</q-popup-proxy> </q-popup-proxy>
</div> </div>
</div> </div>
<span <span v-if="
v-if="
item.DirectorRemark == null || item.DirectorRemark == '' item.DirectorRemark == null || item.DirectorRemark == ''
" ">暂无</span>
>暂无</span
>
</div> </div>
</div> </div>
<div class="col"> <div class="col">
...@@ -1129,16 +757,8 @@ ...@@ -1129,16 +757,8 @@
</table> </table>
</div> </div>
<!--修改课程订单--> <!--修改课程订单-->
<editorder-form <editorder-form v-if="isShowEditOrderForm" :save-obj="orderObj" :orderType="orderObj.OrderType" :sourceType="2"
v-if="isShowEditOrderForm" @close="closeOrderSaveForm" @success="refreshOrder" :isChaBan="isChaBan" :modityOrderType="newModityOrderType">
:save-obj="orderObj"
:orderType="orderObj.OrderType"
:sourceType="2"
@close="closeOrderSaveForm"
@success="refreshOrder"
:isChaBan="isChaBan"
:modityOrderType="newModityOrderType"
>
</editorder-form> </editorder-form>
<!--修改留学就业订单--> <!--修改留学就业订单-->
...@@ -1147,112 +767,68 @@ ...@@ -1147,112 +767,68 @@
</studyorder-form> --> </studyorder-form> -->
<!--修改订单备注--> <!--修改订单备注-->
<orderremark-form <orderremark-form v-if="isShowRemarkOrderForm" :save-obj="orderObj" :remarkType="remarkType"
v-if="isShowRemarkOrderForm" @close="closeRemarkForm" @success="refreshOrder"></orderremark-form>
:save-obj="orderObj"
:remarkType="remarkType"
@close="closeRemarkForm"
@success="refreshOrder"
></orderremark-form>
<!--转交订单--> <!--转交订单-->
<transOrder-form <transOrder-form v-if="isShowTransOrderForm" :save-obj="orderObj" :employeeList="EmployeeList"
v-if="isShowTransOrderForm" @close="closeTransOrderForm" @success="refreshOrder"></transOrder-form>
:save-obj="orderObj"
:employeeList="EmployeeList" <myOrder-form v-if="isShowmyorderForm" :save-obj="myorderObjOption" @close="closeMOSaveForm"></myOrder-form>
@close="closeTransOrderForm"
@success="refreshOrder"
></transOrder-form>
<myOrder-form
v-if="isShowmyorderForm"
:save-obj="myorderObjOption"
@close="closeMOSaveForm"
></myOrder-form>
<!--班级详情--> <!--班级详情-->
<classinfo-form <classinfo-form v-if="isShowClassInfo" :seting-obj="classObjOption" @close="closeClass" @success="refreshOrder">
v-if="isShowClassInfo"
:seting-obj="classObjOption"
@close="closeClass"
@success="refreshOrder"
>
</classinfo-form> </classinfo-form>
<!--退课申请--> <!--退课申请-->
<backclass-form <backclass-form v-if="isShowBackClassForm" :save-obj="orderObj" @close="closeBackClassForm" @success="refreshOrder">
v-if="isShowBackClassForm"
:save-obj="orderObj"
@close="closeBackClassForm"
@success="refreshOrder"
>
</backclass-form> </backclass-form>
<!-- 修改提成和额外奖励 --> <!-- 修改提成和额外奖励 -->
<money-form <money-form v-if="isShowMoney" :data="moneyObj" :type="CommonType" @close="closeMoneyForm" @success="refreshOrder">
v-if="isShowMoney"
:data="moneyObj"
:type="CommonType"
@close="closeMoneyForm"
@success="refreshOrder"
>
</money-form> </money-form>
<!--续课申请--> <!--续课申请-->
<continueclass-form <continueclass-form v-if="isShowContinueClass" :save-obj="orderObj" @close="closeContinueClassForm"
v-if="isShowContinueClass" @success="refreshOrder"></continueclass-form>
:save-obj="orderObj"
@close="closeContinueClassForm"
@success="refreshOrder"
></continueclass-form>
<!-- 查看报价单 --> <!-- 查看报价单 -->
<viewquotation-form <viewquotation-form v-if="isShowviewQuo" :rId="offerId" :isShowCancle="1" @close="closeQuota"
v-if="isShowviewQuo" @success="refreshOrder">
:rId="offerId"
:isShowCancle="1"
@close="closeQuota"
@success="refreshOrder"
>
</viewquotation-form> </viewquotation-form>
<!--合同信息--> <!--合同信息-->
<eduinfo-form <eduinfo-form v-if="isShowEduForm" :seting-obj="eduObj" @close="closeEdudia" @success="refreshPage">
v-if="isShowEduForm"
:seting-obj="eduObj"
@close="closeEdudia"
@success="refreshPage"
>
</eduinfo-form> </eduinfo-form>
</div> </div>
</template> </template>
<script> <script>
import editorderForm from "./activeOrder-form.vue"; //修改订单/ import editorderForm from "./activeOrder-form.vue"; //修改订单/
import studyorderForm from "../sale/studyOrder-form"; //留学就业订单 import studyorderForm from "../sale/studyOrder-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 myOrderForm from "../../components/sale/myActiveOrder-form"; import myOrderForm from "../../components/sale/myActiveOrder-form";
import classinfoForm from "../../components/course/classinfo-form"; //班级信息 import classinfoForm from "../../components/course/classinfo-form"; //班级信息
import continueclassForm from "../sale/continueclass-form"; //续课申请 import continueclassForm from "../sale/continueclass-form"; //续课申请
import viewquotationForm from "../sale/viewquotation-form"; //报价单信息 import viewquotationForm from "../sale/viewquotation-form"; //报价单信息
import eduinfoForm from "../sale/eduinfo-form"; import eduinfoForm from "../sale/eduinfo-form";
import { import {
cancelClassOrder, //取消订单 cancelClassOrder, //取消订单
} from "../../api/sale/sale"; } from "../../api/sale/sale";
import { import {
queryEmployee, //员工列表 queryEmployee, //员工列表
} from "../../api/users/user"; } from "../../api/users/user";
import { import {
SetOrderReceiveContract, //领取合同 SetOrderReceiveContract, //领取合同
} from "../../api/sale/contract"; } from "../../api/sale/contract";
export default { export default {
components: { components: {
editorderForm, editorderForm,
orderremarkForm, orderremarkForm,
...@@ -1295,6 +871,10 @@ export default { ...@@ -1295,6 +871,10 @@ export default {
type: Boolean, type: Boolean,
default: false, default: false,
}, },
loading: {
type: Boolean,
default: false,
}
}, },
data() { data() {
return { return {
...@@ -1543,8 +1123,7 @@ export default { ...@@ -1543,8 +1123,7 @@ export default {
//获取财务单据 //获取财务单据
getOrderFinanceList(msg, type) { getOrderFinanceList(msg, type) {
this.apipost( this.apipost(
"sellorder_post_GetOrderFinanceListForEdu", "sellorder_post_GetOrderFinanceListForEdu", {
{
OrderIds: msg, OrderIds: msg,
}, },
(res) => { (res) => {
...@@ -1659,8 +1238,7 @@ export default { ...@@ -1659,8 +1238,7 @@ export default {
this.$q this.$q
.dialog({ .dialog({
title: "取消此订单", title: "取消此订单",
message: message: '<span style="color: var(--q-color-negative)">请输入取消备注</span>',
'<span style="color: var(--q-color-negative)">请输入取消备注</span>',
prompt: { prompt: {
model: "", model: "",
isValid: (val) => !!val, // << here is the magic isValid: (val) => !!val, // << here is the magic
...@@ -1887,177 +1465,177 @@ export default { ...@@ -1887,177 +1465,177 @@ export default {
}); });
}, },
}, },
}; };
</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: #dddee0; background: #dddee0;
height: 30px; height: 30px;
font-size: 12px; font-size: 12px;
text-align: center; text-align: center;
} }
.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;
...@@ -2071,60 +1649,60 @@ li { ...@@ -2071,60 +1649,60 @@ li {
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;
} }
.classorder .order_OfferId { .classorder .order_OfferId {
font-size: 18px; font-size: 18px;
color: #2961fe; color: #2961fe;
margin-bottom: 10px; margin-bottom: 10px;
font-weight: bold; font-weight: bold;
text-decoration: underline; text-decoration: underline;
cursor: pointer; cursor: pointer;
} }
.takeContract { .takeContract {
cursor: pointer; cursor: pointer;
color: rgb(41, 97, 254); color: rgb(41, 97, 254);
} }
.Contract_Table { .Contract_Table {
width: 100%; width: 100%;
border-collapse: collapse; border-collapse: collapse;
} }
.Contract_Table th, .Contract_Table th,
.Contract_Table td { .Contract_Table td {
padding: 5px; padding: 5px;
color: #000; color: #000;
text-align: center; text-align: center;
} }
.table-body { .table-body {
height: 590px; height: 590px;
overflow-x: hidden; overflow-x: hidden;
overflow-y: auto; overflow-y: auto;
} }
.classorder .redstyle { .classorder .redstyle {
color: var(--q-color-negative); color: var(--q-color-negative);
} }
</style> </style>
\ No newline at end of file
src/components/sale/orderlist.vue
View file @ b5834441
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
</thead> </thead>
</table> </table>
</div> </div>
<div class="table-body"> <div class="table-body" v-loading="loading">
<table class="enrollTotalSearchTable" border="0" cellspacing="0" cellpadding="0"> <table class="enrollTotalSearchTable" border="0" cellspacing="0" cellpadding="0">
<colgroup> <colgroup>
<col width="12%" /> <col width="12%" />
...@@ -1267,6 +1267,10 @@ ...@@ -1267,6 +1267,10 @@
//来自 1是来自 学管今日订单 //来自 1是来自 学管今日订单
type: Number, type: Number,
default: 0 default: 0
},
loading:{
type:Boolean,
default:false,
} }
}, },
data() { data() {
......
src/components/schedul/reservelist.vue
View file @ b5834441
...@@ -110,7 +110,7 @@ ...@@ -110,7 +110,7 @@
}, },
loading: { loading: {
type: Boolean, type: Boolean,
default: null default: false
}, },
authObj: { authObj: {
type: Object, type: Object,
......
src/pages/sale/activeOrderStatistics.vue
View file @ b5834441
...@@ -104,7 +104,7 @@ ...@@ -104,7 +104,7 @@
</div> </div>
<div class="page-content"> <div class="page-content">
<activeOrder :dataList="data.List" :authObj="authObj" @success="refreshClassOrder" :modityOrderType="1" <activeOrder :dataList="data.List" :authObj="authObj" @success="refreshClassOrder" :modityOrderType="1"
ref="orderL"> ref="orderL" :loading="loading">
</activeOrder> </activeOrder>
<div class="row" style="justify-content: flex-end;padding: 5px 20px"> <div class="row" style="justify-content: flex-end;padding: 5px 20px">
<q-pagination v-model="msg.pageIndex" :max="pageCount" @input="changePage" class="full-width justify-end" <q-pagination v-model="msg.pageIndex" :max="pageCount" @input="changePage" class="full-width justify-end"
......
src/pages/sale/auditionList.vue
View file @ b5834441
...@@ -10,8 +10,8 @@ ...@@ -10,8 +10,8 @@
<div class="col row wrap q-mr-lg q-col-gutter-md"> <div class="col row wrap q-mr-lg q-col-gutter-md">
<div class="col-3"> <div class="col-3">
<div class="col-4 Sysuser_Date"> <div class="col-4 Sysuser_Date">
<q-field filled> <q-field filled>
 <template v-slot:control> <template v-slot:control>
<el-date-picker v-model="msg.StartClassDate" value-format="yyyy-MM-dd" type="date" placeholder="开始时间" <el-date-picker v-model="msg.StartClassDate" value-format="yyyy-MM-dd" type="date" placeholder="开始时间"
size="small" style="width:47%;" @change="resetSearch" clear-icon="iconfont icon-guanbi"> size="small" style="width:47%;" @change="resetSearch" clear-icon="iconfont icon-guanbi">
</el-date-picker>至 </el-date-picker>至
...@@ -32,14 +32,14 @@ ...@@ -32,14 +32,14 @@
class="col-6 q-pb-lg" emit-value map-options /> class="col-6 q-pb-lg" emit-value map-options />
</div> </div>
<div class="col-3"> <div class="col-3">
<q-input @input="resetSearch" clearable filled v-model="msg.LessonName" <q-input @input="resetSearch" clearable filled v-model="msg.LessonName" label="试听课程名称" @clear="resetSearch"
label="试听课程名称" @clear="resetSearch" maxlength="20" /> maxlength="20" />
</div> </div>
</div> </div>
</div> </div>
<reservelist :data="dataList" :authObj="authObj" :loading="loading" @success="refreshPage"></reservelist> <reservelist :data="dataList" :authObj="authObj" :loading="loading" @success="refreshPage"></reservelist>
<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="true" @input="changePage" /> @input="changePage" />
</div> </div>
</template> </template>
...@@ -71,16 +71,15 @@ ...@@ -71,16 +71,15 @@
EndClassDate: "", //结束时间 EndClassDate: "", //结束时间
TeacherId: "", //教师编号 TeacherId: "", //教师编号
ClassRoomId: "", //教室编号 ClassRoomId: "", //教室编号
LessonName:'' //课程名称 LessonName: '' //课程名称
}, },
dataList: [], dataList: [],
loading: false, loading: false,
PageCount: 0, PageCount: 0,
TeacherList: [], TeacherList: [],
ClassRoomList: [], ClassRoomList: [],
authObj:{ authObj: {
isShowEdit:false isShowEdit: false
} }
} }
}, },
...@@ -107,7 +106,9 @@ ...@@ -107,7 +106,9 @@
}, },
//获取课程系列分页列表 //获取课程系列分页列表
getList() { getList() {
this.loading=true;
GetReserveClassPage(this.msg).then(res => { GetReserveClassPage(this.msg).then(res => {
this.loading=false;
if (res.Code == 1) { if (res.Code == 1) {
this.dataList = res.Data.PageData; this.dataList = res.Data.PageData;
this.PageCount = res.Data.PageCount; this.PageCount = res.Data.PageCount;
......
src/pages/sale/b2bcustomerapprove.vue
View file @ b5834441
...@@ -77,8 +77,7 @@ ...@@ -77,8 +77,7 @@
"WeChatNo", "WeChatNo",
], ],
//审核状态列表 //审核状态列表
ApproveStateList: [ ApproveStateList: [{
{
label: "待审核", label: "待审核",
value: "3" value: "3"
}, },
...@@ -118,6 +117,7 @@ ...@@ -118,6 +117,7 @@
}, },
//获取分页数据 //获取分页数据
getList() { getList() {
this.loading = true;
GetCustomerPage(this.msg) GetCustomerPage(this.msg)
.then(res => { .then(res => {
this.dataList = res.Data.PageData; this.dataList = res.Data.PageData;
......
src/pages/sale/myActiveOrder.vue
View file @ b5834441
...@@ -23,20 +23,18 @@ ...@@ -23,20 +23,18 @@
v-model="msg.EnrollState" :options="EnrollStateOpt" emit-value map-options label="报名状态" /> v-model="msg.EnrollState" :options="EnrollStateOpt" emit-value map-options label="报名状态" />
</div> </div>
<div class="col-3"> <div class="col-3">
<q-field filled> <q-field filled>
 <template v-slot:control> <template v-slot:control>
<el-date-picker v-model="dateList" @change="resetSearch()" value-format="yyyy-MM-dd" type="daterange" style="border:none;" <el-date-picker v-model="dateList" @change="resetSearch()" value-format="yyyy-MM-dd" type="daterange" style="border:none;"
 range-separator="至"  start-placeholder="报名开始时间"  end-placeholder="报名结束时间">  range-separator="至"  start-placeholder="报名开始时间"  end-placeholder="报名结束时间" />
 </el-date-picker>       
</template> </template>
</q-field> </q-field>
</div> </div>
<div class="col-3"> <div class="col-3">
<q-field filled> <q-field filled>
 <template v-slot:control> <template v-slot:control>
<el-date-picker v-model="dateList2" @change="resetSearch()" value-format="yyyy-MM-dd" type="daterange" style="border:none;" <el-date-picker v-model="dateList2" @change="resetSearch()" value-format="yyyy-MM-dd" type="daterange" style="border:none;"
 range-separator="至"  start-placeholder="活动开始时间"  end-placeholder="活动结束时间">  range-separator="至"  start-placeholder="活动开始时间"  end-placeholder="活动结束时间" />
 </el-date-picker>       
</template> </template>
</q-field> </q-field>
</div> </div>
...@@ -63,14 +61,6 @@ ...@@ -63,14 +61,6 @@
<span class="stics-name">取消人数</span> <span class="stics-name">取消人数</span>
<span>{{data.Statistics.CancelNum}}人</span> <span>{{data.Statistics.CancelNum}}人</span>
</div> </div>
<!-- <div class="col stics">
<span class="stics-name">提成金额</span>
<span>{{data.Statistics.CommissionMoney}}</span>
</div>
<div class="col stics">
<span class="stics-name">额外奖励</span>
<span>{{data.Statistics.ExtraRewardMoney}}</span>
</div> -->
</div> </div>
<div class="row col" style="justify-content: flex-end"> <div class="row col" style="justify-content: flex-end">
<div class="row tis"> <div class="row tis">
...@@ -92,7 +82,7 @@ ...@@ -92,7 +82,7 @@
</div> </div>
<div class="page-content"> <div class="page-content">
<activeOrder :dataList="data.List" :authObj="authObj" @success="refreshClassOrder" :modityOrderType="1" <activeOrder :dataList="data.List" :authObj="authObj" @success="refreshClassOrder" :modityOrderType="1"
ref="orderL"> ref="orderL" :loading="loading">
</activeOrder> </activeOrder>
<div class="row" style="justify-content: flex-end;padding: 5px 20px"> <div class="row" style="justify-content: flex-end;padding: 5px 20px">
<q-pagination v-model="msg.pageIndex" :max="pageCount" @input="changePage" class="full-width justify-end" <q-pagination v-model="msg.pageIndex" :max="pageCount" @input="changePage" class="full-width justify-end"
...@@ -104,14 +94,12 @@ ...@@ -104,14 +94,12 @@
</div> </div>
</template> </template>
<script> <script>
// import myOrderForm from '../../components/sale/myOrder-form'
import activeOrder from '../../components/sale/activeOrder-item' import activeOrder from '../../components/sale/activeOrder-item'
export default { export default {
meta: { meta: {
title: "我的活动订单" title: "我的活动订单"
}, },
components: { components: {
// myOrderForm,
activeOrder activeOrder
}, },
data() { data() {
...@@ -162,8 +150,8 @@ ...@@ -162,8 +150,8 @@
} }
}, },
created() { created() {
let data= JSON.parse(localStorage.getItem("loginUserInfo")).data let data = JSON.parse(localStorage.getItem("loginUserInfo")).data
this.msg.EduUserId=data.Id this.msg.EduUserId = data.Id
}, },
mounted() { mounted() {
this.getList(); this.getList();
...@@ -227,7 +215,6 @@ ...@@ -227,7 +215,6 @@
}, },
} }
} }
</script> </script>
<style> <style>
li { li {
...@@ -286,5 +273,4 @@ ...@@ -286,5 +273,4 @@
font-weight: 600; font-weight: 600;
margin-right: 20px margin-right: 20px
} }
</style> </style>
\ No newline at end of file
src/pages/sale/myOrder.vue
View file @ b5834441
...@@ -105,7 +105,7 @@ ...@@ -105,7 +105,7 @@
</div> </div>
<div class="page-content"> <div class="page-content">
<orderlist :dataList="data.List" :authObj="authObj" @success="refreshClassOrder" :modityOrderType="1" <orderlist :dataList="data.List" :authObj="authObj" @success="refreshClassOrder" :modityOrderType="1"
ref="orderL"> ref="orderL" :loading="loading">
</orderlist> </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 v-model="msg.pageIndex" :max="pageCount" @input="changePage" class="full-width justify-end" <q-pagination v-model="msg.pageIndex" :max="pageCount" @input="changePage" class="full-width justify-end"
......
src/pages/sale/orderStatistics.vue
View file @ b5834441
...@@ -141,7 +141,7 @@ ...@@ -141,7 +141,7 @@
</div> </div>
<div class="page-content"> <div class="page-content">
<orderlist :dataList="data.List" :authObj="authObj" @success="refreshClassOrder" :modityOrderType="3" <orderlist :dataList="data.List" :authObj="authObj" @success="refreshClassOrder" :modityOrderType="3"
ref="orderL"> ref="orderL" :loading="loading">
</orderlist> </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 v-model="msg.pageIndex" :max="pageCount" @input="changePage" class="full-width justify-end" <q-pagination v-model="msg.pageIndex" :max="pageCount" @input="changePage" class="full-width justify-end"
......
src/pages/sale/reserveClass.vue
View file @ b5834441
...@@ -107,7 +107,9 @@ ...@@ -107,7 +107,9 @@
}, },
//获取课程系列分页列表 //获取课程系列分页列表
getList() { getList() {
this.loading=true;
GetReserveClassPage(this.msg).then(res => { GetReserveClassPage(this.msg).then(res => {
this.loading=false;
if (res.Code == 1) { if (res.Code == 1) {
this.dataList = res.Data.PageData; this.dataList = res.Data.PageData;
this.PageCount = res.Data.PageCount; this.PageCount = res.Data.PageCount;
......
src/pages/sale/studyOrder.vue
View file @ b5834441
...@@ -9,23 +9,24 @@ ...@@ -9,23 +9,24 @@
<div class="page-search row items-center"> <div class="page-search row items-center">
<div class="col row wrap q-mr-lg q-col-gutter-md"> <div class="col row wrap q-mr-lg q-col-gutter-md">
<div class="col-3"> <div class="col-3">
<q-input @change="resetSearch" clearable dense standout="bg-primary text-white" v-model="msg.OrderId" label="订单号" <q-input @change="resetSearch" clearable dense standout="bg-primary text-white" v-model="msg.OrderId"
@clear="resetSearch" maxlength="10" /> label="订单号" @clear="resetSearch" maxlength="10" />
</div> </div>
<div class="col-3"> <div class="col-3">
<q-input @change="resetSearch" clearable dense standout="bg-primary text-white" v-model="msg.GuestName" label="客户名称" <q-input @change="resetSearch" clearable dense standout="bg-primary text-white" v-model="msg.GuestName"
@clear="resetSearch" maxlength="20" /> label="客户名称" @clear="resetSearch" maxlength="20" />
</div> </div>
<div class="col-3"> <div class="col-3">
<q-select dense @input="msg.OrderState==0?(msg.Q_OrderState = 1):msg.Q_OrderState=0,resetSearch()" standout="bg-primary text-white" option-value="Id" option-label="Name" <q-select dense @input="msg.OrderState==0?(msg.Q_OrderState = 1):msg.Q_OrderState=0,resetSearch()"
v-model="msg.OrderState" :options="OrderStateList" emit-value map-options label="订单状态" /> standout="bg-primary text-white" option-value="Id" option-label="Name" v-model="msg.OrderState"
:options="OrderStateList" emit-value map-options label="订单状态" />
</div> </div>
<div class="col-3"> <div class="col-3">
<q-field filled dense> <q-field filled dense>
 <template v-slot:control> <template v-slot:control>
<el-date-picker v-model="dateList" size="mini" @change="resetSearch()" value-format="yyyy-MM-dd" type="daterange" style="border:none;" <el-date-picker v-model="dateList" size="mini"  @change="resetSearch()"  value-format="yyyy-MM-dd"
 range-separator="至"  start-placeholder="报名开始时间"  end-placeholder="报名结束时间">  type="daterange"  style="border:none;"  range-separator="至"  start-placeholder="报名开始时间"
 </el-date-picker>         end-placeholder="报名结束时间" />
</template> </template>
</q-field> </q-field>
</div> </div>
...@@ -80,7 +81,8 @@ ...@@ -80,7 +81,8 @@
</div> </div>
</div> </div>
<div class="page-content"> <div class="page-content">
<orderlist :dataList="data.List" :authObj="authObj" :modityOrderType="1" @success="refreshClassOrder" ref="orderL"> <orderlist :dataList="data.List" :authObj="authObj" :modityOrderType="1" @success="refreshClassOrder" ref="orderL"
:loading="loading">
</orderlist> </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 v-model="msg.pageIndex" :max="pageCount" @input="changePage" class="full-width justify-end" <q-pagination v-model="msg.pageIndex" :max="pageCount" @input="changePage" class="full-width justify-end"
...@@ -260,7 +262,6 @@ ...@@ -260,7 +262,6 @@
}, },
} }
} }
</script> </script>
<style> <style>
li { li {
...@@ -319,5 +320,4 @@ ...@@ -319,5 +320,4 @@
font-weight: 600; font-weight: 600;
margin-right: 20px margin-right: 20px
} }
</style> </style>
\ No newline at end of file
src/pages/sale/studyOrderStatistics.vue
View file @ b5834441
...@@ -90,7 +90,7 @@ ...@@ -90,7 +90,7 @@
</div> </div>
</div> </div>
<div class="page-content"> <div class="page-content">
<orderlist :dataList="data.List" :authObj="authObj" :modityOrderType="3" @success="refreshClassOrder" ref="orderL"> <orderlist :dataList="data.List" :authObj="authObj" :modityOrderType="3" @success="refreshClassOrder" ref="orderL" :loading="loading">
</orderlist> </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 v-model="msg.pageIndex" :max="pageCount" @input="changePage" class="full-width justify-end" <q-pagination v-model="msg.pageIndex" :max="pageCount" @input="changePage" class="full-width justify-end"
......
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