Skip to content

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

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

parents ed6c583e 08d1bb27
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 342 additions and 92 deletions
src/components/sale/addSuppliesStockOut-from.vue
View file @ 0ef83732
...@@ -399,7 +399,7 @@ import { ...@@ -399,7 +399,7 @@ import {
haochaimsg: { haochaimsg: {
pageIndex: 1, pageIndex: 1,
pageSize: 10, pageSize: 10,
FeeType:1, FeeType:0,
Name: "", Name: "",
SuppliesNum: "", SuppliesNum: "",
BrandName: "", BrandName: "",
......
src/pages/studyAbroad/employment.vue
View file @ 0ef83732
...@@ -58,7 +58,46 @@ ...@@ -58,7 +58,46 @@
<q-td key="SellPrice" :props="props"> <q-td key="SellPrice" :props="props">
{{props.row.SellPrice}} {{props.row.SellPrice}}
</q-td> </q-td>
<q-td key="PreferentialList" style="padding-right:0px">
<q-td key="B2CRatio" :props="props">
{{props.row.B2CRatio}}%
</q-td>
<q-td key="B2CReNewRatio" :props="props">
{{props.row.B2CReNewRatio}}%
</q-td>
<q-td key="B2BRebateRatio" :props="props">
{{props.row.B2BRebateRatio}}{{props.row.CommissionReType==1?'%':''}}
</q-td>
<q-td key="B2BReNewRatio" :props="props">
{{props.row.B2BReNewRatio}}{{props.row.CommissionReType==1?'%':''}}
</q-td>
<q-td key="SchoolRebateRatio" :props="props">
{{props.row.SchoolRebateRatio}}{{props.row.CommissionReType==1?'%':''}}
</q-td>
<q-td key="SchoolReNewRatio" :props="props">
{{props.row.SchoolReNewRatio}}{{props.row.CommissionReType==1?'%':''}}
</q-td>
<q-td key="TransIntroductceRatio" :props="props">
{{props.row.TransIntroductceRatio}}{{props.row.CommissionReType==1?'%':''}}
</q-td>
<q-td key="TransIntroductceReNewRatio" :props="props">
{{props.row.TransIntroductceReNewRatio}}{{props.row.CommissionReType==1?'%':''}}
</q-td>
<q-td key="InnerRecommendRatio" :props="props">
{{props.row.InnerRecommendRatio}}{{props.row.CommissionReType==1?'%':''}}
</q-td>
<q-td key="InnerRecommendReNewRatio" :props="props">
{{props.row.InnerRecommendReNewRatio}}{{props.row.CommissionReType==1?'%':''}}
</q-td>
<q-td key="B2CRbRatio" :props="props">
{{props.row.B2CRbRatio}}{{props.row.CommissionReType==1?'%':''}}
</q-td>
<q-td key="B2CRNRatio" :props="props">
{{props.row.B2CRNRatio}}{{props.row.CommissionReType==1?'%':''}}
</q-td>
<!-- <q-td key="PreferentialList" style="padding-right:0px">
<div v-for="(x,index) in props.row.PreferentialList" :key="index"> <div v-for="(x,index) in props.row.PreferentialList" :key="index">
<div class="border-bottom" v-if="x.PriceDiscountType == 1"> <div class="border-bottom" v-if="x.PriceDiscountType == 1">
买{{ x.BuyNum }}送{{ x.SendNum }} 买{{ x.BuyNum }}送{{ x.SendNum }}
...@@ -145,7 +184,7 @@ ...@@ -145,7 +184,7 @@
<div v-if="!props.row.EducationCommission || props.row.EducationCommission.length == 0"> <div v-if="!props.row.EducationCommission || props.row.EducationCommission.length == 0">
<div class="remark-font">暂无佣金信息</div> <div class="remark-font">暂无佣金信息</div>
</div> </div>
</q-td> </q-td> -->
<q-td key="SaleStateName"> <q-td key="SaleStateName">
<template v-if="props.row.SaleState==1"> <template v-if="props.row.SaleState==1">
{{props.row.SaleStateName}} {{props.row.SaleStateName}}
...@@ -158,13 +197,15 @@ ...@@ -158,13 +197,15 @@
<q-td key="Id" style="width:200px;"> <q-td key="Id" style="width:200px;">
<q-btn flat size="xs" icon="edit" color="accent" style="font-weight:400" label="编辑" <q-btn flat size="xs" icon="edit" color="accent" style="font-weight:400" label="编辑"
@click="EditStudy(props.row)" /> @click="EditStudy(props.row)" />
<q-btn flat size="xs" icon="edit" color="accent" style="font-weight:400" label="价格设置"
@click="EditStudyPrice(props.row)" />
<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 @click="EditStudyPrice(props.row)"> <!-- <q-item clickable v-close-popup @click="EditStudyPrice(props.row)">
<q-item-section> <q-item-section>
<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 <q-item clickable v-close-popup
v-if="props.row.SaleState==1||props.row.SaleState==4||props.row.SaleState==5" v-if="props.row.SaleState==1||props.row.SaleState==4||props.row.SaleState==5"
@click="applyApply(props.row,2)"> @click="applyApply(props.row,2)">
...@@ -220,7 +261,7 @@ ...@@ -220,7 +261,7 @@
@success="refreshPage"> @success="refreshPage">
</studyAbroad-form> </studyAbroad-form>
<studyAbroadprice-form v-if="isShowStudyPrice" :save-obj="studyObj" :Type="2" @close="closeStudyForm" <studyAbroadprice-form v-if="isShowStudyPrice" :save-obj="studyObj" :Type="2" @close="closeStudyForm"
@success="refreshPage"> @success="refreshPage(),isShowStudyPrice=false">
</studyAbroadprice-form> </studyAbroadprice-form>
<studyproauditinfo-form v-if="isShowInfo" :Id="studyObj.Id" @close="closeStudyForm"></studyproauditinfo-form> <studyproauditinfo-form v-if="isShowInfo" :Id="studyObj.Id" @close="closeStudyForm"></studyproauditinfo-form>
</div> </div>
...@@ -235,7 +276,8 @@ ...@@ -235,7 +276,8 @@
deleteStudyAbroad deleteStudyAbroad
} from '../../api/studyabroad/index' } from '../../api/studyabroad/index'
import studyAbroadForm from '../../components/studyAbroad/studyAbroad-form' import studyAbroadForm from '../../components/studyAbroad/studyAbroad-form'
import studyAbroadpriceForm from '../../components/studyAbroad/studyAbroadprice-form' // import studyAbroadpriceForm from '../../components/studyAbroad/studyAbroadprice-form'
import studyAbroadpriceForm from '../../components/studyAbroad/newstudyAbroadprice-form'
import studyproauditinfoForm from '../../components/studyAbroad/studyproauditinfo-form' import studyproauditinfoForm from '../../components/studyAbroad/studyproauditinfo-form'
import { import {
mapState mapState
...@@ -298,48 +340,133 @@ ...@@ -298,48 +340,133 @@
field: 'SchoolName', field: 'SchoolName',
align: 'left' align: 'left'
}, },
{ // {
name: 'SuggestPrice', // name: 'SuggestPrice',
label: '建议卖价', // label: '建议卖价',
field: 'SuggestPrice', // field: 'SuggestPrice',
align: 'left', // align: 'left',
field: row => row.SuggestPrice.toFixed(2) // field: row => row.SuggestPrice.toFixed(2)
}, // },
{ {
name: 'SellPrice', name: 'SellPrice',
label: '实际卖价', label: '实际卖价',
field: 'SellPrice', field: 'SellPrice',
align: 'left', align: 'left',
field: row => row.SellPrice.toFixed(2) field: row => row.SellPrice.toFixed(2)
},
{
name: "B2CRatio",
required: true,
label: "直客优惠",
align: "left",
field: (row) => row.B2CRatio
},
{
name: "B2CReNewRatio",
required: true,
label: "直客优惠续费",
align: "left",
field: (row) => row.B2CReNewRatio
},
{
name: "B2BRebateRatio",
required: true,
label: "一般同行返佣比例",
align: "left",
field: (row) => row.B2BRebateRatio
},
{
name: "B2BReNewRatio",
required: true,
label: "一般同行续费返佣",
align: "left",
field: (row) => row.B2BReNewRatio
},
{
name: "SchoolRebateRatio",
required: true,
label: "校园同行返佣比例",
align: "left",
field: (row) => row.SchoolRebateRatio
},
{
name: "SchoolReNewRatio",
required: true,
label: "校园同行续费返佣",
align: "left",
field: (row) => row.SchoolReNewRatio
},
{
name: "TransIntroductceRatio",
required: true,
label: "转介返佣",
align: "left",
field: (row) => row.TransIntroductceRatio
},
{
name: "TransIntroductceReNewRatio",
required: true,
label: "转介续费返佣",
align: "left",
field: (row) => row.TransIntroductceReNewRatio
}, },
{ {
name: "PreferentialList", name: "InnerRecommendRatio",
required: true, required: true,
label: "优惠政策", label: "内推返佣",
align: "left", align: "left",
field: row => row.PreferentialList field: (row) => row.InnerRecommendRatio
}, },
{ {
name: "PreferentialListSellCommission", name: "InnerRecommendReNewRatio",
required: true, required: true,
label: "销售佣金", label: "内推续费返佣",
align: "left", align: "left",
field: row => row.PreferentialList field: (row) => row.InnerRecommendReNewRatio
}, },
{ {
name: "PreferentialListB2BCommission", name: "B2CRbRatio",
required: true, required: true,
label: "同行佣金", label: "直客返佣",
align: "left", align: "left",
field: row => row.PreferentialList field: (row) => row.B2CRbRatio
}, },
{ {
name: "EducationCommission", name: "B2CRNRatio",
required: true, required: true,
label: "教育同行佣金", label: "直客续费返佣",
align: "left", align: "left",
field: row => row.PreferentialList field: (row) => row.B2CRNRatio
}, },
// {
// name: "PreferentialList",
// required: true,
// label: "优惠政策",
// align: "left",
// field: row => row.PreferentialList
// },
// {
// name: "PreferentialListSellCommission",
// required: true,
// label: "销售佣金",
// align: "left",
// field: row => row.PreferentialList
// },
// {
// name: "PreferentialListB2BCommission",
// required: true,
// label: "同行佣金",
// align: "left",
// field: row => row.PreferentialList
// },
// {
// name: "EducationCommission",
// required: true,
// label: "教育同行佣金",
// align: "left",
// field: row => row.PreferentialList
// },
{ {
name: 'SaleStateName', name: 'SaleStateName',
label: '销售状态', label: '销售状态',
......
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