Skip to content

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

页面修改

parent 1a1ebc8d
Show whitespace changes
Inline Side-by-side
Showing with 1092 additions and 1051 deletions
src/components/sale/orderlist.vue
View file @ 3f3ad493
<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,7 +20,9 @@ ...@@ -20,7 +20,9 @@
<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" @click="goOrderdetails(item,1)">{{item.OrderId}}</div> <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>
<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,7 +33,8 @@ ...@@ -31,7 +33,8 @@
<div style="margin-top:30px;">提成：{{item.CommissionMoney}}</div> <div style="margin-top:30px;">提成：{{item.CommissionMoney}}</div>
</template> </template>
<template> <template>
<div style="margin-top:30px;color:red;" 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="color:red" v-if="item.ExtraDeductMoney>0">额外扣除：{{item.ExtraDeductMoney}}</div> <div style="color:red" v-if="item.ExtraDeductMoney>0">额外扣除：{{item.ExtraDeductMoney}}</div>
</template> </template>
</td> </td>
...@@ -51,7 +54,8 @@ ...@@ -51,7 +54,8 @@
</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="编辑" @click="editOrder(item)" /> <q-btn flat size="xs" icon="edit" color="accent" style="font-weight:400" label="编辑"
@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>
...@@ -95,7 +99,6 @@ ...@@ -95,7 +99,6 @@
<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-if="!isShowClass"> <q-item clickable v-close-popup v-if="!isShowClass">
<q-item-section @click="upDateMoney(item,2)"> <q-item-section @click="upDateMoney(item,2)">
<q-item-label>额外奖励</q-item-label> <q-item-label>额外奖励</q-item-label>
...@@ -112,6 +115,11 @@ ...@@ -112,6 +115,11 @@
<q-item-label @click="showBackClassForm(item)">退课</q-item-label> <q-item-label @click="showBackClassForm(item)">退课</q-item-label>
</q-item-section> </q-item-section>
</q-item> </q-item>
<q-item clickable v-close-popup v-close-popup v-if="isShowClass">
<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>
...@@ -120,14 +128,14 @@ ...@@ -120,14 +128,14 @@
<td :colspan="11" style="text-align: left"> <td :colspan="11" style="text-align: left">
<div class="row" v-if="item.GuestList.length>0"> <div class="row" v-if="item.GuestList.length>0">
学生名单： 学生名单：
<span v-for="(x,j) in item.GuestList" :index="j" v-if="x.GuestState==1" style="color:#2961FE;margin-right: 5px">{{x.GuestName}} </span> <span v-for="(x,j) in item.GuestList" :index="j" v-if="x.GuestState==1"
style="color:#2961FE;margin-right: 5px">{{x.GuestName}} </span>
</div> </div>
<div class="row" v-if=" item.GuestList.length>0&&getTkshow(item.GuestList)"> <div class="row" v-if=" item.GuestList.length>0&&getTkshow(item.GuestList)">
退课名单： 退课名单：
<span v-for="(x,j) in item.GuestList" :index="j" v-if="x.GuestState==2" style="color:#f5576c;margin-right: 5px">{{x.GuestName}} </span> <span v-for="(x,j) in item.GuestList" :index="j" v-if="x.GuestState==2" style="color:#f5576c;margin-right: 5px">{{x.GuestName}} </span>
</div> </div>
<span v-if="item.GuestList.length==0">暂无</span> <span v-if="item.GuestList.length==0">暂无</span>
</td> </td>
</tr> </tr>
<tr> <tr>
...@@ -139,12 +147,14 @@ ...@@ -139,12 +147,14 @@
<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" v-if="item.SaleRemarkList&&item.SaleRemarkList.length>0"></span> <span class="iconfont icon-xiangxia" style="color: #2961FE;font-size: 10px"
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" style=" margin-top: 10px;background: #e6e6e6;padding: 5px;font-size: 12px"> <div v-for="(xq,jq) in item.SaleRemarkList" :index="jq"
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>
...@@ -162,12 +172,14 @@ ...@@ -162,12 +172,14 @@
<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" v-if="item.TeacherRemarkList&&item.TeacherRemarkList.length>0"></span> <span class="iconfont icon-xiangxia" style="color: #2961FE;font-size: 10px"
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" style=" margin-top: 10px;background: #e6e6e6;padding: 5px;font-size: 12px"> <div v-for="(xq,jq) in item.TeacherRemarkList" :index="jq"
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>
...@@ -185,12 +197,14 @@ ...@@ -185,12 +197,14 @@
<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" v-if="item.RectorRemarkList&&item.RectorRemarkList.length>0"></span> <span class="iconfont icon-xiangxia" style="color: #2961FE;font-size: 10px"
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" style=" margin-top: 10px;background: #e6e6e6;padding: 5px;font-size: 12px"> <div v-for="(xq,jq) in item.RectorRemarkList" :index="jq"
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>
...@@ -208,12 +222,14 @@ ...@@ -208,12 +222,14 @@
<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" v-if="item.DirectorRemarkList&&item.DirectorRemarkList.length>0"></span> <span class="iconfont icon-xiangxia" style="color: #2961FE;font-size: 10px"
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" style=" margin-top: 10px;background: #e6e6e6;padding: 5px;font-size: 12px"> <div v-for="(xq,jq) in item.DirectorRemarkList" :index="jq"
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>
...@@ -228,11 +244,12 @@ ...@@ -228,11 +244,12 @@
<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" v-if="isShowClass" style="font-weight:400;color: #02C499" label="修改" @click="chanceType(item,1)" /> <q-btn flat size="xs" icon="edit" v-if="isShowClass" style="font-weight:400;color: #02C499" label="修改"
@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" :style="{ <div class="finance row" v-for="(x,j) in item.FinanceList" :index="j"
: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>
...@@ -240,10 +257,12 @@ ...@@ -240,10 +257,12 @@
</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" v-if="isShowClass" style="font-weight:400;color: #02C499" label="修改" @click="chanceType(item,2)" /> <q-btn flat size="xs" icon="edit" v-if="isShowClass" style="font-weight:400;color: #02C499" label="修改"
@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" :style="{ <div class="finance row" v-for="(x,j) in item.RefundFinanceList" :index="j"
: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>
...@@ -257,18 +276,22 @@ ...@@ -257,18 +276,22 @@
<tbody v-if="cancelList&&cancelList.length>0"> <tbody v-if="cancelList&&cancelList.length>0">
<tr> <tr>
<td :colspan="11"> <td :colspan="11">
<span style="color:red;cursor:pointer;" @click='isShowCancel=!isShowCancel'> 取消订单</span> <span style="color:red;cursor:pointer;font-weight:bold;" @click='isShowCancel=!isShowCancel'>取消订单</span>
</td> </td>
</tr> </tr>
</tbody> </tbody>
<tbody v-if="cancelList&&cancelList.length>0 && isShowCancel" v-for="(item,index) in cancelList" :key="index+10000"> <tbody v-if="cancelList&&cancelList.length>0 && isShowCancel" 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 style="font-size: 18px;color: #2961FE;margin-bottom: 20px;font-weight: bold" @click="goOrderdetails(item)">{{item.OrderId}}</div> <div style="font-size: 18px;color: #2961FE;margin-bottom: 20px;font-weight: bold"
@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>
<template v-if="isShowClass">
<div style="margin-top: 30px;margin-bottom: 10px">班级</div> <div style="margin-top: 30px;margin-bottom: 10px">班级</div>
<div style="font-weight: bold;color:#2961FE;" @click="getClassInfo(item)">{{item.ClassName}}</div> <div style="font-weight: bold;color:#2961FE;" @click="getClassInfo(item)">{{item.ClassName}}</div>
</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>
...@@ -286,7 +309,8 @@ ...@@ -286,7 +309,8 @@
</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;display:none;" label="编辑" @click="editOrder(item)" /> <q-btn flat size="xs" 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-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>
...@@ -302,11 +326,13 @@ ...@@ -302,11 +326,13 @@
<td :colspan="11" style="text-align: left"> <td :colspan="11" style="text-align: left">
<div class="row" v-if="item.GuestList.length>0"> <div class="row" v-if="item.GuestList.length>0">
学生名单： 学生名单：
<span v-for="(x,j) in item.GuestList" :index="j" v-if="x.GuestState==1" style="color:#2961FE;margin-right: 5px">{{x.GuestName}} </span> <span v-for="(x,j) in item.GuestList" :index="j" v-if="x.GuestState==1"
style="color:#2961FE;margin-right: 5px">{{x.GuestName}} </span>
</div> </div>
<div class="row" v-if=" item.GuestList.length>0&&getTkshow(item.GuestList)"> <div class="row" v-if=" item.GuestList.length>0&&getTkshow(item.GuestList)">
退课名单： 退课名单：
<span v-for="(x,j) in item.GuestList" :index="j" v-if="x.GuestState==2" style="color:#f5576c;margin-right: 5px">{{x.GuestName}} </span> <span v-for="(x,j) in item.GuestList" :index="j" v-if="x.GuestState==2"
style="color:#f5576c;margin-right: 5px">{{x.GuestName}} </span>
</div> </div>
<span v-if="item.GuestList.length==0">暂无</span> <span v-if="item.GuestList.length==0">暂无</span>
</td> </td>
...@@ -320,12 +346,14 @@ ...@@ -320,12 +346,14 @@
<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" v-if="item.SaleRemarkList&&item.SaleRemarkList.length>0"></span> <span class="iconfont icon-xiangxia" style="color: #2961FE;font-size: 10px"
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" style=" margin-top: 10px;background: #e6e6e6;padding: 5px;font-size: 12px"> <div v-for="(xq,jq) in item.SaleRemarkList" :index="jq"
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>
...@@ -343,12 +371,14 @@ ...@@ -343,12 +371,14 @@
<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" v-if="item.TeacherRemarkList&&item.TeacherRemarkList.length>0"></span> <span class="iconfont icon-xiangxia" style="color: #2961FE;font-size: 10px"
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" style=" margin-top: 10px;background: #e6e6e6;padding: 5px;font-size: 12px"> <div v-for="(xq,jq) in item.TeacherRemarkList" :index="jq"
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>
...@@ -366,12 +396,14 @@ ...@@ -366,12 +396,14 @@
<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" v-if="item.RectorRemarkList&&item.RectorRemarkList.length>0"></span> <span class="iconfont icon-xiangxia" style="color: #2961FE;font-size: 10px"
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" style=" margin-top: 10px;background: #e6e6e6;padding: 5px;font-size: 12px"> <div v-for="(xq,jq) in item.RectorRemarkList" :index="jq"
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>
...@@ -389,12 +421,14 @@ ...@@ -389,12 +421,14 @@
<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" v-if="item.DirectorRemarkList&&item.DirectorRemarkList.length>0"></span> <span class="iconfont icon-xiangxia" style="color: #2961FE;font-size: 10px"
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" style=" margin-top: 10px;background: #e6e6e6;padding: 5px;font-size: 12px"> <div v-for="(xq,jq) in item.DirectorRemarkList" :index="jq"
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>
...@@ -409,11 +443,12 @@ ...@@ -409,11 +443,12 @@
<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" v-if="isShowClass" style="font-weight:400;color: #02C499" label="修改" @click="chanceType(item,1)" /> <q-btn flat size="xs" icon="edit" v-if="isShowClass" style="font-weight:400;color: #02C499" label="修改"
@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" :style="{ <div class="finance row" v-for="(x,j) in item.FinanceList" :index="j"
: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>
...@@ -421,10 +456,12 @@ ...@@ -421,10 +456,12 @@
</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" v-if="isShowClass" style="font-weight:400;color: #02C499" label="修改" @click="chanceType(item,2)" /> <q-btn flat size="xs" icon="edit" v-if="isShowClass" style="font-weight:400;color: #02C499" label="修改"
@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" :style="{ <div class="finance row" v-for="(x,j) in item.RefundFinanceList" :index="j"
: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>
...@@ -438,41 +475,46 @@ ...@@ -438,41 +475,46 @@
<!--取消订单--> <!--取消订单-->
</table> </table>
<!--修改订单--> <!--修改订单-->
<editorder-form v-if="isShowEditOrderForm" :save-obj="orderObj" @close="closeOrderSaveForm" @success="refreshClassOrder"></editorder-form> <editorder-form v-if="isShowEditOrderForm" :save-obj="orderObj" @close="closeOrderSaveForm"
@success="refreshClassOrder"></editorder-form>
<!--修改订单备注--> <!--修改订单备注-->
<orderremark-form v-if="isShowRemarkOrderForm" :save-obj="orderObj" :remarkType="remarkType" @close="closeRemarkForm" @success="refreshClassOrder"></orderremark-form> <orderremark-form v-if="isShowRemarkOrderForm" :save-obj="orderObj" :remarkType="remarkType"
@close="closeRemarkForm" @success="refreshClassOrder"></orderremark-form>
<!--转交订单--> <!--转交订单-->
<transOrder-form v-if="isShowTransOrderForm" :save-obj="orderObj" :employeeList="EmployeeList" @close="closeTransOrderForm" @success="refreshClassOrder"></transOrder-form> <transOrder-form v-if="isShowTransOrderForm" :save-obj="orderObj" :employeeList="EmployeeList"
@close="closeTransOrderForm" @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" @success="refreshClassOrder"></backclass-form> <backclass-form v-if="isShowBackClassForm" :save-obj="orderObj" @close="closeBackClassForm"
@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">
</div> </money-form>
</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,
...@@ -497,7 +539,7 @@ export default { ...@@ -497,7 +539,7 @@ export default {
type: Boolean type: Boolean
}, },
Comtype: { Comtype: {
type:Number type: Number
} }
}, },
data() { data() {
...@@ -506,6 +548,7 @@ export default { ...@@ -506,6 +548,7 @@ export default {
isShowRemarkOrderForm: false, //是否线下修改订单备注 isShowRemarkOrderForm: false, //是否线下修改订单备注
isShowTransOrderForm: false, //是否显示转交订单 isShowTransOrderForm: false, //是否显示转交订单
isShowBackClassForm: false, //是否显示退课申请 isShowBackClassForm: false, //是否显示退课申请
isShowContinueClass: false, //是否显示续课申请
orderObj: {}, //订单信息 orderObj: {}, //订单信息
isShowCancel: false, //是否显示取消订单 isShowCancel: false, //是否显示取消订单
remarkType: 0, //备注类型 remarkType: 0, //备注类型
...@@ -525,18 +568,22 @@ export default { ...@@ -525,18 +568,22 @@ export default {
}, },
mounted() {}, mounted() {},
methods: { methods: {
getTkshow(data){ getTkshow(data) {
let Tkshow=false; let Tkshow = false;
if(data.length>0){ if (data.length > 0) {
data.forEach(x=>{ data.forEach(x => {
if(x.GuestState==2){ if (x.GuestState == 2) {
Tkshow=true Tkshow = true
} }
}); });
} }
return Tkshow return Tkshow
}, },
//显示续课申请
showContinueClass(item) {
this.orderObj = item;
this.isShowContinueClass = true;
},
//显示退课申请 //显示退课申请
showBackClassForm(item) { showBackClassForm(item) {
this.orderObj = item; this.orderObj = item;
...@@ -731,178 +778,179 @@ export default { ...@@ -731,178 +778,179 @@ export default {
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: #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;
...@@ -916,24 +964,25 @@ li { ...@@ -916,24 +964,25 @@ 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;
} }
</style> </style>
src/layouts/MainLayout.vue
View file @ 3f3ad493
<template> <template>
<q-layout view="lHh Lpr lFf"> <q-layout view="lHh Lpr lFf">
<q-header bordered reveal height-hint="98" class="head-bg"> <q-header bordered reveal height-hint="98" class="head-bg">
<q-toolbar style="height:60px;" class="q-pr-lg q-pl-lg"> <q-toolbar style="height:60px;" class="q-pr-lg q-pl-lg">
<q-avatar style="width:38px"> <q-avatar style="width:38px">
...@@ -8,8 +8,11 @@ ...@@ -8,8 +8,11 @@
<q-toolbar-title style="font-family:perfectFont;margin-right:50px"> <q-toolbar-title style="font-family:perfectFont;margin-right:50px">
{{name}} {{name}}
</q-toolbar-title> </q-toolbar-title>
<q-tabs v-model="tab" @input="changeNavs" inline-label style="margin:0 auto; font-family:perfectFont;height:60px;flex:1;justify-content: left;" class="text-white" shrink stretch v-if="userInfo"> <q-tabs v-model="tab" @input="changeNavs" inline-label
<q-tab v-for="(x, i) in userInfo.MenuList" class="q-mr-md" :key="i" @click="setNavs(i)" :name="`navs_${i}`" :label="x.MenuName" :icon="x.MenuIcon" /> style="margin:0 auto; font-family:perfectFont;height:60px;flex:1;justify-content: left;" class="text-white"
shrink stretch v-if="userInfo">
<q-tab v-for="(x, i) in userInfo.MenuList" class="q-mr-md" :key="i" @click="setNavs(i)" :name="`navs_${i}`"
:label="x.MenuName" :icon="x.MenuIcon" />
</q-tabs> </q-tabs>
<div class="q-pl-lg"> <div class="q-pl-lg">
<q-btn-dropdown flat color="primary" size="xs"> <q-btn-dropdown flat color="primary" size="xs">
...@@ -20,95 +23,76 @@ ...@@ -20,95 +23,76 @@
</template> </template>
<q-list bordered padding class="rounded-borders" style="max-width: 350px"> <q-list bordered padding class="rounded-borders" style="max-width: 350px">
<q-item-label header>Folders</q-item-label> <q-item-label header>Folders</q-item-label>
<q-item clickable v-ripple> <q-item clickable v-ripple>
<q-item-section avatar top> <q-item-section avatar top>
<q-avatar icon="folder" color="primary" text-color="white" /> <q-avatar icon="folder" color="primary" text-color="white" />
</q-item-section> </q-item-section>
<q-item-section> <q-item-section>
<q-item-label lines="1">Photos</q-item-label> <q-item-label lines="1">Photos</q-item-label>
<q-item-label caption>February 22nd, 2019</q-item-label> <q-item-label caption>February 22nd, 2019</q-item-label>
</q-item-section> </q-item-section>
<q-item-section side> <q-item-section side>
<q-icon name="info" color="green" /> <q-icon name="info" color="green" />
</q-item-section> </q-item-section>
</q-item> </q-item>
<q-item clickable v-ripple> <q-item clickable v-ripple>
<q-item-section avatar top> <q-item-section avatar top>
<q-avatar icon="folder" color="orange" text-color="white" /> <q-avatar icon="folder" color="orange" text-color="white" />
</q-item-section> </q-item-section>
<q-item-section> <q-item-section>
<q-item-label lines="1">Movies</q-item-label> <q-item-label lines="1">Movies</q-item-label>
<q-item-label caption>March 1st, 2019</q-item-label> <q-item-label caption>March 1st, 2019</q-item-label>
</q-item-section> </q-item-section>
<q-item-section side> <q-item-section side>
<q-icon name="info" /> <q-icon name="info" />
</q-item-section> </q-item-section>
</q-item> </q-item>
<q-item clickable v-ripple> <q-item clickable v-ripple>
<q-item-section avatar top> <q-item-section avatar top>
<q-avatar icon="folder" color="teal" text-color="white" /> <q-avatar icon="folder" color="teal" text-color="white" />
</q-item-section> </q-item-section>
<q-item-section> <q-item-section>
<q-item-label lines="1">Photos</q-item-label> <q-item-label lines="1">Photos</q-item-label>
<q-item-label caption>January 15th, 2019</q-item-label> <q-item-label caption>January 15th, 2019</q-item-label>
</q-item-section> </q-item-section>
<q-item-section side> <q-item-section side>
<q-icon name="info" /> <q-icon name="info" />
</q-item-section> </q-item-section>
</q-item> </q-item>
<q-separator spaced /> <q-separator spaced />
<q-item-label header>Files</q-item-label> <q-item-label header>Files</q-item-label>
<q-item clickable v-ripple> <q-item clickable v-ripple>
<q-item-section avatar top> <q-item-section avatar top>
<q-avatar icon="assignment" color="grey" text-color="white" /> <q-avatar icon="assignment" color="grey" text-color="white" />
</q-item-section> </q-item-section>
<q-item-section> <q-item-section>
<q-item-label lines="1">Expenses spreadsheet</q-item-label> <q-item-label lines="1">Expenses spreadsheet</q-item-label>
<q-item-label caption>March 2nd, 2019</q-item-label> <q-item-label caption>March 2nd, 2019</q-item-label>
</q-item-section> </q-item-section>
<q-item-section side> <q-item-section side>
<q-icon name="info" /> <q-icon name="info" />
</q-item-section> </q-item-section>
</q-item> </q-item>
<q-item clickable v-ripple> <q-item clickable v-ripple>
<q-item-section avatar top> <q-item-section avatar top>
<q-avatar icon="place" color="grey" text-color="white" /> <q-avatar icon="place" color="grey" text-color="white" />
</q-item-section> </q-item-section>
<q-item-section> <q-item-section>
<q-item-label lines="1">Places to visit</q-item-label> <q-item-label lines="1">Places to visit</q-item-label>
<q-item-label caption>February 22, 2019</q-item-label> <q-item-label caption>February 22, 2019</q-item-label>
</q-item-section> </q-item-section>
<q-item-section side> <q-item-section side>
<q-icon name="info" color="amber" /> <q-icon name="info" color="amber" />
</q-item-section> </q-item-section>
</q-item> </q-item>
<q-item clickable v-ripple> <q-item clickable v-ripple>
<q-item-section avatar top> <q-item-section avatar top>
<q-avatar icon="library_music" color="grey" text-color="white" /> <q-avatar icon="library_music" color="grey" text-color="white" />
</q-item-section> </q-item-section>
<q-item-section> <q-item-section>
<q-item-label lines="1">My favorite song</q-item-label> <q-item-label lines="1">My favorite song</q-item-label>
<q-item-label caption>Singing it all day</q-item-label> <q-item-label caption>Singing it all day</q-item-label>
</q-item-section> </q-item-section>
<q-item-section side> <q-item-section side>
<q-icon name="info" /> <q-icon name="info" />
</q-item-section> </q-item-section>
...@@ -127,16 +111,12 @@ ...@@ -127,16 +111,12 @@
<q-toggle label="Use Mobile Data" /> <q-toggle label="Use Mobile Data" />
<q-toggle label="Bluetooth" /> <q-toggle label="Bluetooth" />
</div> </div>
<q-separator vertical inset class="q-mx-lg" /> <q-separator vertical inset class="q-mx-lg" />
<div class="column items-center"> <div class="column items-center">
<q-avatar size="72px"> <q-avatar size="72px">
<img :src="userInfo.UserIcon"> <img :src="userInfo.UserIcon">
</q-avatar> </q-avatar>
<div class="text-subtitle1 q-mt-md q-mb-xs">{{userInfo.AccountName}}</div> <div class="text-subtitle1 q-mt-md q-mb-xs">{{userInfo.AccountName}}</div>
<q-btn color="primary" label="登出系统" push size="sm" v-close-popup @click="logout" /> <q-btn color="primary" label="登出系统" push size="sm" v-close-popup @click="logout" />
</div> </div>
</div> </div>
...@@ -146,18 +126,22 @@ ...@@ -146,18 +126,22 @@
</q-header> </q-header>
<q-page-container class="window-height"> <q-page-container class="window-height">
<div class="row items-stretch full-height"> <div class="row items-stretch full-height">
<div style="box-shadow: 2px 0 10px 0 rgba(237,238,240,0.50);font-family:perfectFont;" class="text-subtitle2 second-menu-bg" :style="{'width':isExpend?'40px':'180px'}" v-if="secondNavs && secondNavs.length>0"> <div style="box-shadow: 2px 0 10px 0 rgba(237,238,240,0.50);font-family:perfectFont;"
class="text-subtitle2 second-menu-bg" :style="{'width':isExpend?'40px':'180px'}"
v-if="secondNavs && secondNavs.length>0">
<div class="full-width left-menu-box q-pt-md"> <div class="full-width left-menu-box q-pt-md">
<q-list style="width:180px;overflow:hidden"> <q-list style="width:180px;overflow:hidden">
<template v-for="(x,i) in secondNavs"> <template v-for="(x,i) in secondNavs">
<q-item :to="x.MenuUrl" clickable v-ripple :active="currentPath==x.MenuUrl" v-if="x.SubList.length==0" :key="i"> <q-item :to="x.MenuUrl" clickable v-ripple :active="currentPath==x.MenuUrl" v-if="x.SubList.length==0"
:key="i">
<q-item-section avatar> <q-item-section avatar>
<q-icon :name="x.MenuIcon" size="20px" /> <q-icon :name="x.MenuIcon" size="20px" />
</q-item-section> </q-item-section>
<q-item-section>{{x.MenuName}}</q-item-section> <q-item-section>{{x.MenuName}}</q-item-section>
</q-item> </q-item>
<q-expansion-item expand-separator v-else :label="x.MenuName"> <q-expansion-item expand-separator v-else :label="x.MenuName">
<q-item :to="y.MenuUrl" clickable v-ripple :active="currentPath==y.MenuUrl" v-for="(y, yi) in x.SubList" :key="yi"> <q-item :to="y.MenuUrl" clickable v-ripple :active="currentPath==y.MenuUrl"
v-for="(y, yi) in x.SubList" :key="yi">
<q-item-section avatar style="padding-right:0;min-width:40px;"> <q-item-section avatar style="padding-right:0;min-width:40px;">
<q-icon :name="y.MenuIcon" size="20px" /> <q-icon :name="y.MenuIcon" size="20px" />
</q-item-section> </q-item-section>
...@@ -167,7 +151,6 @@ ...@@ -167,7 +151,6 @@
</template> </template>
</q-list> </q-list>
</div> </div>
</div> </div>
<div class="col" style="background: #f2f4f7;"> <div class="col" style="background: #f2f4f7;">
<q-scroll-area class="fit" :thumb-style="thumbStyle" :bar-style="barStyle" visible style=""> <q-scroll-area class="fit" :thumb-style="thumbStyle" :bar-style="barStyle" visible style="">
...@@ -176,16 +159,16 @@ ...@@ -176,16 +159,16 @@
</div> </div>
</div> </div>
</q-page-container> </q-page-container>
</q-layout> </q-layout>
</template> </template>
<script> <script>
import EssentialLink from 'components/EssentialLink.vue' import EssentialLink from 'components/EssentialLink.vue'
import { import {
mapGetters mapGetters
} from 'vuex' } from 'vuex'
import lockr from 'lockr' import lockr from 'lockr'
export default { export default {
name: 'MainLayout', name: 'MainLayout',
components: { components: {
EssentialLink EssentialLink
...@@ -215,12 +198,11 @@ export default { ...@@ -215,12 +198,11 @@ export default {
backgroundColor: 'rgba(0,0,0,0.02)', backgroundColor: 'rgba(0,0,0,0.02)',
color: '#555' color: '#555'
}, },
isExpend:false, isExpend: false,
contentActiveStyle2: { contentActiveStyle2: {
backgroundColor: '#eee', backgroundColor: '#eee',
color: 'black' color: 'black'
}, },
thumbStyle2: { thumbStyle2: {
right: '0px', right: '0px',
borderRadius: '5px', borderRadius: '5px',
...@@ -287,36 +269,37 @@ export default { ...@@ -287,36 +269,37 @@ export default {
}) })
} }
}, },
} }
</script> </script>
<style> <style>
.full-width { .full-width {
height: 100%; height: 100%;
} }
.head-bg { .head-bg {
background-image: url('~assets/images/page/top.png'); background-image: url('~assets/images/page/top.png');
background-position: right; background-position: right;
background-repeat: no-repeat; background-repeat: no-repeat;
background-size: auto 100%; background-size: auto 100%;
} }
.second-menu-bg { .second-menu-bg {
background-image: url('~assets/images/page/left.png'); background-image: url('~assets/images/page/left.png');
background-position: bottom; background-position: bottom;
background-repeat: no-repeat; background-repeat: no-repeat;
background-size: 100% auto; background-size: 100% auto;
height:100%; height: 100%;
} }
.hide-scrollbar { .hide-scrollbar {
scrollbar-width: 5px !important; scrollbar-width: 5px !important;
-ms-overflow-style: marquee, panner !important; -ms-overflow-style: marquee, panner !important;
} }
.suojin { .suojin {
height: 40px; height: 40px;
width: 100%; width: 100%;
display: flex; display: flex;
...@@ -324,59 +307,68 @@ export default { ...@@ -324,59 +307,68 @@ export default {
justify-content: center; justify-content: center;
background: rgba(255, 255, 255, .5); background: rgba(255, 255, 255, .5);
} }
.suojin i{
.suojin i {
font-size: 24px; font-size: 24px;
color:#636363; color: #636363;
} }
.left-menu-box{
overflow-x:hidden ; .left-menu-box {
overflow-y:auto ; overflow-x: hidden;
overflow-y: auto;
max-height: 100%; max-height: 100%;
height: 100%; height: 100%;
background-color: rgba(255, 255, 255, 0.3); background-color: rgba(255, 255, 255, 0.3);
} }
.left-menu-box::-webkit-scrollbar {
.left-menu-box::-webkit-scrollbar {
width: 4px; width: 4px;
height: 4px; height: 4px;
} }
.left-menu-box::-webkit-scrollbar-thumb { .left-menu-box::-webkit-scrollbar-thumb {
border-radius: 4px; border-radius: 4px;
box-shadow: inset 0 0 5px rgba(0, 0, 0, 0.2); box-shadow: inset 0 0 5px rgba(0, 0, 0, 0.2);
background: #bbb; background: #bbb;
} }
/* .left-menu-box::-webkit-scrollbar-track { /* .left-menu-box::-webkit-scrollbar-track {
box-shadow: inset 0 0 5px rgba(0, 0, 0, 0.2); box-shadow: inset 0 0 5px rgba(0, 0, 0, 0.2);
border-radius: 10px; border-radius: 10px;
background: #EDEDED; background: #EDEDED;
} */ } */
@keyframes shouqidonghua { @keyframes shouqidonghua {
from { from {
width:180px; width: 180px;
}
to {
width: 60px;
} }
to{
width:60px;
} }
}
.changeShowqidonghua{ .changeShowqidonghua {
animation: shouqidonghua 0.5s linear; animation: shouqidonghua 0.5s linear;
width:60px !important; width: 60px !important;
overflow-x: hidden; overflow-x: hidden;
} }
@keyframes shouqidonghua {
@keyframes shouqidonghua {
from { from {
width:180px; width: 180px;
}
to {
width: 60px;
} }
to{
width:60px;
} }
}
.changeShowqidonghua{ .changeShowqidonghua {
animation: shouqidonghua 0.5s linear; animation: shouqidonghua 0.5s linear;
width:60px !important; width: 60px !important;
overflow-x: hidden; overflow-x: hidden;
} }
</style> </style>
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