Skip to content

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

页面修改

parent 3cdceb08
Hide whitespace changes
Inline Side-by-side
Showing with 43 additions and 141 deletions
src/pages/studyAbroad/studyabroad.vue
View file @ a5e888da
...@@ -8,10 +8,20 @@ ...@@ -8,10 +8,20 @@
</div> </div>
<div class="col-3"> <div class="col-3">
<q-select class="q-pb-lg q-pr-lg" filled stack-label clearable option-value="Id" option-label="Name" <q-select class="q-pb-lg q-pr-lg" filled stack-label clearable option-value="Id" option-label="Name"
v-model="msg.SaleState" ref="SaleState" :options="saleDownList" label="销售状态" :dense="false" emit-value v-model="msg.SaleState" :options="saleDownList" label="销售状态" :dense="false" emit-value map-options
map-options @input="resetSearch"> @input="resetSearch">
</q-select> </q-select>
</div> </div>
<div class="col-3">
<q-select class="q-pb-lg q-pr-lg" filled stack-label clearable option-value="Id" option-label="Name"
v-model="msg.ProductType" :options="productList" label="产品类型" :dense="false" emit-value map-options
@input="resetSearch" />
</div>
<div class="col-3">
<q-select class="q-pb-lg q-pr-lg" filled stack-label clearable option-value="ID" option-label="Name"
v-model="msg.StudyCountryId" :options="CountryList" label="留学国家" :dense="false" emit-value map-options
@input="resetSearch" />
</div>
</div> </div>
</div> </div>
<div class="page-content"> <div class="page-content">
...@@ -31,7 +41,7 @@ ...@@ -31,7 +41,7 @@
<q-btn size="sm" color="accent" round dense @click="props.row.expand = !props.row.expand" <q-btn size="sm" color="accent" round dense @click="props.row.expand = !props.row.expand"
:icon="props.row.expand ? 'remove' : 'add'" /> :icon="props.row.expand ? 'remove' : 'add'" />
</q-td> </q-td>
<q-td key="ProductTypeName" :props="props" style="width:100px;"> <q-td key="ProductTypeName" :props="props" style="width:100px;">
{{props.row.ProductTypeName}} {{props.row.ProductTypeName}}
</q-td> </q-td>
...@@ -77,7 +87,7 @@ ...@@ -77,7 +87,7 @@
<q-td key="B2BRebateRatio" :props="props"> <q-td key="B2BRebateRatio" :props="props">
{{props.row.B2BRebateRatio}}{{props.row.CommissionReType==1?'%':''}} {{props.row.B2BRebateRatio}}{{props.row.CommissionReType==1?'%':''}}
</q-td> </q-td>
<q-td key="B2BReNewRatio" :props="props"> <q-td key="B2BReNewRatio" :props="props">
{{props.row.B2BReNewRatio}}{{props.row.CommissionReType==1?'%':''}} {{props.row.B2BReNewRatio}}{{props.row.CommissionReType==1?'%':''}}
</q-td> </q-td>
<q-td key="SchoolRebateRatio" :props="props"> <q-td key="SchoolRebateRatio" :props="props">
...@@ -95,7 +105,7 @@ ...@@ -95,7 +105,7 @@
<q-td key="InnerRecommendRatio" :props="props"> <q-td key="InnerRecommendRatio" :props="props">
{{props.row.InnerRecommendRatio}}{{props.row.CommissionReType==1?'%':''}} {{props.row.InnerRecommendRatio}}{{props.row.CommissionReType==1?'%':''}}
</q-td> </q-td>
<q-td key="InnerRecommendReNewRatio" :props="props"> <q-td key="InnerRecommendReNewRatio" :props="props">
{{props.row.InnerRecommendReNewRatio}}{{props.row.CommissionReType==1?'%':''}} {{props.row.InnerRecommendReNewRatio}}{{props.row.CommissionReType==1?'%':''}}
</q-td> </q-td>
...@@ -105,96 +115,6 @@ ...@@ -105,96 +115,6 @@
<q-td key="B2CRNRatio" :props="props"> <q-td key="B2CRNRatio" :props="props">
{{props.row.B2CRNRatio}}{{props.row.CommissionReType==1?'%':''}} {{props.row.B2CRNRatio}}{{props.row.CommissionReType==1?'%':''}}
</q-td> </q-td>
<!-- <q-td key="PreferentialList" style="padding-right:0px">
<div v-for="(x,index) in props.row.PreferentialList" :key="index">
<div class="border-bottom" v-if="x.PriceDiscountType == 1">
买{{ x.BuyNum }}送{{ x.SendNum }}
</div>
<div class="border-bottom" v-if="x.PriceDiscountType == 2">
单人报名优惠
<template v-if="x.PriceType==0">
{{x.PriceMoney}}%
</template>
<template v-else>
{{x.PriceMoney}} 元
</template>
</div>
<div class="border-bottom" v-if="x.PriceDiscountType == 3">
双人报名享优惠<template v-if="x.PriceType==0">
{{x.PriceMoney }}%
</template>
<template v-else>
{{x.PriceMoney}} 元
</template>
</div>
<div class="border-bottom" v-if="x.PriceDiscountType == 4">
续费优惠<template v-if="x.PriceType==0">
{{x.PriceMoney}}%
</template>
<template v-else>
{{x.PriceMoney}} 元
</template>
</div>
<div class="remark-font" v-if="x.PriceDiscountType == 0">
暂无优惠政策
</div>
</div>
<div v-if="! props.row.PreferentialList || props.row.PreferentialList.length == 0">
<div class="remark-font">暂无优惠政策</div>
</div>
</q-td> -->
<!-- <q-td key="PreferentialListSellCommission" style="padding-right:0px;padding-left:0px">
<div v-for="(x,index) in props.row.PreferentialListSellCommission" :key="index">
<div class="border-bottom" style="padding-left: 16px;padding-right: 16px"
:class="{ 'text-red': x.SaleCommissionType == 1 }" v-if="x.PriceDiscountType != 0">
{{ x.SaleCommissionType == 1 ? "￥" : ""
}}{{ x.SaleCommissionMoney
}}{{ x.SaleCommissionType == 0 ? "%" : "" }}
</div>
<div v-if="x.PriceDiscountType == 0">
<div class="remark-font">暂无佣金信息</div>
</div>
</div>
<div
v-if="!props.row.PreferentialListSellCommission || props.row.PreferentialListSellCommission.length == 0">
<div class="remark-font">暂无佣金信息</div>
</div>
</q-td> -->
<!-- <q-td key="PreferentialListB2BCommission" style="padding-left:0px">
<div v-for="(x,index) in props.row.PreferentialListB2BCommission" :key="index">
<div class="border-bottom" style="padding-left: 16px" :class="{ 'text-red': x.B2BCommissionType == 1 }"
v-if="x.PriceDiscountType != 0">
{{ x.B2BCommissionType == 1 ? "￥" : ""
}}{{ x.B2BCommissionMoney
}}{{ x.B2BCommissionType == 0 ? "%" : "" }}
</div>
<div v-if="x.PriceDiscountType == 0">
<div class="remark-font">暂无佣金信息</div>
</div>
</div>
<div
v-if="!props.row.PreferentialListB2BCommission || props.row.PreferentialListB2BCommission.length == 0">
<div class="remark-font">暂无佣金信息</div>
</div>
</q-td> -->
<!-- <q-td key="EducationCommission" style="padding-left:0px">
<div v-for="(x,index) in props.row.EducationCommission" :key="index">
<div class="border-bottom" style="padding-left: 16px" :class="{ 'text-red': x.EduCommissionType == 1 }"
v-if="x.PriceDiscountType != 0">
{{ x.EduCommissionType == 1 ? "￥" : ""
}}{{ x.EduCommissionMoney
}}{{ x.EduCommissionType == 0 ? "%" : "" }}
</div>
<div v-if="x.PriceDiscountType == 0">
<div class="remark-font">暂无佣金信息</div>
</div>
</div>
<div v-if="!props.row.EducationCommission || props.row.EducationCommission.length == 0">
<div class="remark-font">暂无佣金信息</div>
</div>
</q-td> -->
<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)" />
...@@ -202,11 +122,6 @@ ...@@ -202,11 +122,6 @@
@click="EditStudyPrice(props.row)" /> @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-section>
<q-item-label>价格设置</q-item-label>
</q-item-section>
</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)">
...@@ -274,10 +189,13 @@ ...@@ -274,10 +189,13 @@
queryStudyAbroadPage, queryStudyAbroadPage,
saveSaleState, saveSaleState,
querySaleStateList, querySaleStateList,
deleteStudyAbroad deleteStudyAbroad,
queryStudyAbroadProductType
} from '../../api/studyabroad/index' } from '../../api/studyabroad/index'
import {
queryCountryList
} from '../../api/common/common'
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/newstudyAbroadprice-form' import studyAbroadpriceForm from '../../components/studyAbroad/newstudyAbroadprice-form'
import studyproauditinfoForm from '../../components/studyAbroad/studyproauditinfo-form' import studyproauditinfoForm from '../../components/studyAbroad/studyproauditinfo-form'
import { import {
...@@ -302,7 +220,9 @@ ...@@ -302,7 +220,9 @@
rowsPerPage: 10, rowsPerPage: 10,
Name: "", Name: "",
IsQPrice: 1, IsQPrice: 1,
SaleState: "" //销售状态 SaleState: "", //销售状态
ProductType: "", //产品类型
StudyCountryId: "", //国家编号
}, },
dataList: [], dataList: [],
loading: true, loading: true,
...@@ -324,7 +244,7 @@ ...@@ -324,7 +244,7 @@
field: 'Name', field: 'Name',
align: 'left' align: 'left'
}, },
{ {
name: 'SaleStateName', name: 'SaleStateName',
label: '销售状态', label: '销售状态',
field: 'SaleStateName', field: 'SaleStateName',
...@@ -348,13 +268,6 @@ ...@@ -348,13 +268,6 @@
field: 'SchoolName', field: 'SchoolName',
align: 'left' align: 'left'
}, },
// {
// name: 'SuggestPrice',
// label: '建议卖价',
// field: 'SuggestPrice',
// align: 'left',
// field: row => row.SuggestPrice.toFixed(2)
// },
{ {
name: 'SellPrice', name: 'SellPrice',
label: '实际卖价', label: '实际卖价',
...@@ -362,7 +275,7 @@ ...@@ -362,7 +275,7 @@
align: 'left', align: 'left',
field: row => row.SellPrice.toFixed(2) field: row => row.SellPrice.toFixed(2)
}, },
{ {
name: "B2CRatio", name: "B2CRatio",
required: true, required: true,
label: "直客优惠", label: "直客优惠",
...@@ -446,35 +359,6 @@ ...@@ -446,35 +359,6 @@
align: "left", align: "left",
field: (row) => row.B2CRNRatio 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: 'Id', name: 'Id',
label: '操作', label: '操作',
...@@ -494,6 +378,8 @@ ...@@ -494,6 +378,8 @@
isShowStudyPrice: false, //是否显示价格设置 isShowStudyPrice: false, //是否显示价格设置
saleDownList: [], //销售状态下拉 saleDownList: [], //销售状态下拉
isShowInfo: false, //是否显示审核信息 isShowInfo: false, //是否显示审核信息
productList: [], //产品类型列表
CountryList: [], //国家列表
} }
}, },
computed: mapState({ computed: mapState({
...@@ -529,11 +415,27 @@ ...@@ -529,11 +415,27 @@
}, },
created() { created() {
this.getSaleStateList(); this.getSaleStateList();
this.getCountryList();
this.getProductType();
if (!this.isHaveViewSupplierAction) { if (!this.isHaveViewSupplierAction) {
this.visibleColumns.splice(this.visibleColumns.length - 1, 1); this.visibleColumns.splice(this.visibleColumns.length - 1, 1);
} }
}, },
methods: { methods: {
//获取国家列表
getCountryList() {
queryCountryList({}).then(res => {
if (res.Code == 1) {
this.CountryList = res.Data;
}
});
},
//获取产品类型列表
getProductType() {
queryStudyAbroadProductType({}).then(res => {
this.productList = res.Data;
});
},
//删除留学就业产品 //删除留学就业产品
removeStudy(item, status) { removeStudy(item, status) {
let delMsg = { let delMsg = {
......
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