Skip to content

C
confucius
Commit 432c7d1a authored by zhengke's avatar zhengke
Browse files
Options

修改

parent dd5ab8bd
Hide whitespace changes
Inline Side-by-side
Showing with 82 additions and 38 deletions
src/components/sale/orderlist.vue
View file @ 432c7d1a
......@@ -5,31 +5,33 @@
<table class="enrollTotalSearchTable" border="0" cellspacing="0" cellpadding="0">
<colgroup>
<col width="12%" />
<col width="7.5%"/>
<col width="7.5%"/>
<col width="7.5%"/>
<col width="7.5%"/>
<col width="7.5%"/>
<col width="7.5%"/>
<col width="7.5%"/>
<col width="7.5%"/>
<col width="7.5%"/>
<col width="8%"/>
<col width="7%"/>
<col width="7%"/>
<col width="7%"/>
<col width="7%"/>
<col width="7%"/>
<col width="7%"/>
<col width="6%"/>
<col width="7%"/>
<col width="7%"/>
<col width="7%"/>
<col width="7%"/>
<col>
</colgroup>
<thead>
<tr class="fix_th">
<th width="12%">单号</th>
<th width="7.5%">人数</th>
<th width="7.5%">单价</th>
<th width="7.5%">成交</th>
<th width="7.5%">应收总额</th>
<th width="7.5%">实收</th>
<th width="7.5%">优惠</th>
<th width="7.5%">退款</th>
<th width="7.5%">平台税金</th>
<th width="7.5%">待收金额</th>
<th width="8%">状态</th>
<th width="7%">人数</th>
<th width="7%">单价</th>
<th width="7%">成交</th>
<th width="7%">应收总额</th>
<th width="7%">实收</th>
<th width="7%">优惠</th>
<th width="6%">少价金额</th>
<th width="7%">退款</th>
<th width="7%">平台税金</th>
<th width="7%">待收金额</th>
<th width="7%">状态</th>
<th v-if="isEdit">操作</th>
</tr>
</thead>
......@@ -55,16 +57,17 @@
</tr> -->
<colgroup>
<col width="12%" />
<col width="7.5%"/>
<col width="7.5%"/>
<col width="7.5%"/>
<col width="7.5%"/>
<col width="7.5%"/>
<col width="7.5%"/>
<col width="7.5%"/>
<col width="7.5%"/>
<col width="7.5%"/>
<col width="8%"/>
<col width="7%"/>
<col width="7%"/>
<col width="7%"/>
<col width="7%"/>
<col width="7%"/>
<col width="7%"/>
<col width="6%"/>
<col width="7%"/>
<col width="7%"/>
<col width="7%"/>
<col width="7%"/>
<col>
</colgroup>
<tr>
......@@ -89,6 +92,17 @@
</div>
<div style="font-weight: bold;color:#2961FE;cursor:pointer;" @click="getClassInfo(item)">
{{item.ClassName}}</div>
<div v-if="item.HelpEnterName">
协助人员：{{item.HelpEnterName}}
</div>
<div>
<template v-if="item.OrderSource==3">
一般同行：{{item.GeneralOccupation}}
</template>
<template v-if="item.OrderSource==7">
教育同行：{{item.EduOccupation}}
</template>
</div>
</template>
<div style="margin-top:10px;" v-if="item.OfferId>0">
报价单：<span class="order_OfferId" @click="goQuotation(item.OfferId)"
......@@ -111,6 +125,7 @@
<td style="border:none">{{item.PreferPrice.toFixed(2)}}</td>
<td style="border:none">{{item.Income.toFixed(2)}}</td>
<td style="color:var(--q-color-negative);border:none">{{item.DiscountMoney.toFixed(2)}}</td>
<td style="border:none">{{item.LessPrice}}</td>
<td style="border:none">{{item.Refund.toFixed(2)}}</td>
<td style="border:none">{{item.PlatformTax.toFixed(2)}}</td>
<td style="color:#2961FE;border:none">{{item.DueInMoney.toFixed(2)}}</td>
......@@ -191,7 +206,7 @@
</td>
</tr>
<tr>
<td :colspan="11" style="text-align: left">
<td :colspan="12" style="text-align: left">
<div class="row" v-if="item.GuestList&&item.GuestList.length>0">
学生名单：
<span v-for="(x,j) in item.GuestList" :index="j" v-if="x.GuestState==1"
......@@ -240,7 +255,7 @@
</td>
</tr>
<tr>
<td :colspan="11" style="height: 168px;text-align: left">
<td :colspan="12" style="height: 168px;text-align: left">
<div class="col row remarks q-gutter-x-md">
<div class="col">
<div>销售备注：</div>
......@@ -810,7 +825,8 @@
created() {
this.initAuth();
this.Employee();
console.log(this.dataList,'asd');
},
mounted() {
},
......
src/components/sale/studyorder-form.vue
View file @ 432c7d1a
......@@ -12,17 +12,21 @@
<q-input filled stack-label :dense="false" maxlength="8" v-model="enrollMsg.Unit_Price"
:disable="UPrice==true?false:true" @blur="countPrice" class="col-12" label="成交单价"
:rules="[val => !!val || '请填成交单价']" />
<q-select standout="bg-primary text-white" option-value="Id" option-label="Name" v-model="enrollMsg.OrderSource"
<q-select standout="bg-primary text-white" option-value="Id" class="q-pb-lg" option-label="Name" v-model="enrollMsg.OrderSource"
:options="SourceEnumList" emit-value map-options label="客人来源" />
<q-select standout="bg-primary text-white" option-value="Id" class="q-pb-lg" option-label="Name" v-model="enrollMsg.OrderNature"
:options="OrderStatus" emit-value map-options label="订单性质" />
<q-input filled stack-label :dense="false" maxlength="10"
@keyup.native="checkPrice(enrollMsg,'PreferPrice')" :disable="enrollMsg.OrderNature==1" v-model="enrollMsg.PreferPrice" class="col-12 q-pb-lg" label="应收" />
<q-input filled stack-label type="textarea" maxlength="500" :dense="false" v-model="enrollMsg.SaleRemark"
style="margin-top: 20px" class="col-12" label="备注" />
class="col-12" label="备注" />
<div style="margin:30px 10px 0 0;">
<q-btn class="q-mr-md" label="取消" @click="persistent=false" />
<q-btn class="q-mr-md" label="取消" @click="closeStudyForm" />
<q-btn color="accent" class="q-mr-md" label="保存" @click="saveSatMsg()" />
</div>
</div>
</q-card>
<div class="dialog-out-close" @click="persistent=false"
<div class="dialog-out-close" @click="closeStudyForm"
style="height:40px !important;border-top-left-radius: 4px !important;border-bottom-left-radius: 4px !important;">
<q-icon name="iconfont icon-jujue1" size="26px" />
</div>
......@@ -54,9 +58,25 @@
SaleRemark: '', //备注
OrderType: 2, //订单类型(1-班级课程订单，2-留学就业订单)
SourceId: 0, //来源变化
OrderNature:1, //订单性质(1-直通车,2-代收代付,3-返佣)
OldPreferPrice:0 //原来应收
},
UPrice: 0, //单价
SourceEnumList: [], //来源
OrderStatus:[
{
Id:1,
Name:'直通车'
},
{
Id:2,
Name:'代收代付'
},
{
Id:3,
Name:'返佣'
}
]
}
},
created() {
......@@ -68,6 +88,10 @@
this.countPrice();
},
methods: {
closeStudyForm() {
this.persistent = false;
this.$emit('close');
},
//获取客人来源列表
getOrderSEList() {
getOrderSourceEnumList({}).then(res => {
......@@ -89,6 +113,7 @@
unit_price = Number(this.enrollMsg.Unit_Price);
}
this.enrollMsg.PreferPrice = Number(guestNum * unit_price).toFixed(2);
this.enrollMsg.OldPreferPrice = Number(guestNum * unit_price).toFixed(2);
},
//保存订单
saveSatMsg() {
......
src/pages/sale/studyjob.vue
View file @ 432c7d1a
......@@ -124,7 +124,7 @@
<quotationstudy-form :obj="null" @save="showForm=false"></quotationstudy-form>
</q-dialog>
<studyorder-form v-if="isShowOrderForm" :saveObj="studyObj" @save="refreshPage()"></studyorder-form>
<studyorder-form v-if="isShowOrderForm" :saveObj="studyObj" @close="cloStudyform" @save="refreshPage()"></studyorder-form>
</div>
</div>
......@@ -265,6 +265,9 @@
},
methods: {
cloStudyform(){
this.isShowOrderForm=false;
},
//显示下单弹窗
showOrderForm(item) {
this.isShowOrderForm = true;
......
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