Skip to content

E
ElectricitySheep
Commit 6b3db713 authored by 黄媛媛's avatar 黄媛媛
Browse files
Options

update

parent e085853c
Hide whitespace changes
Inline Side-by-side
Showing with 62 additions and 26 deletions
src/components/CommodityMan/addGoodsClass.vue
View file @ 6b3db713
......@@ -87,6 +87,14 @@
<el-button slot="append">选择链接</el-button>
</el-input>
</el-form-item>
<el-form-item label="是否对外启用">
<el-switch
v-model="userInfo.IsForeignShare"
active-color="#409EFF"
:active-value="1"
:inactive-value="2">
</el-switch>
</el-form-item>
<el-form-item label="是否启用">
<el-switch
v-model="userInfo.Enabled"
......@@ -192,6 +200,7 @@ import ChooseImg from "@/components/global/ChooseImg.vue";
AdvertisingAddress:'',
Enabled:1,
IsShow:1,
IsForeignShare:2,
},
val:'',
value:'',
......
src/components/CommodityMan/goodsListEdit.vue
View file @ 6b3db713
......@@ -473,7 +473,7 @@
</el-tab-pane>
<el-tab-pane label="分销价设置" name="second">
<el-form-item label="是否开启单独分销">
<el-switch v-model="addMsg.SeparateDistribution" active-color="#409EFF" :active-value="1"
<el-switch @change="HpChange" v-model="addMsg.SeparateDistribution" active-color="#409EFF" :active-value="1"
:inactive-value="0">
</el-switch>
</el-form-item>
......@@ -1041,6 +1041,12 @@
},
methods: {
HpChange(){
if(this.hpState==1){
this.Error("已开始和平分销，请在和平分销里面配置！");
this.addMsg.SeparateDistribution=0;
}
},
//
HySet(){
this.memberList2.forEach(item=>{
......@@ -1612,7 +1618,6 @@
GoodsId: this.GoodsId
}, res => {
this.addMsg = res.data.data;
console.log("this.addMsg",this.addMsg)
this.SpecificationPriceList = this.addMsg.SpecificationPriceList;
this.SpecificationList = this.addMsg.SpecificationList;
if (this.addMsg.SeparateDistributionType == 1) {
......@@ -1638,6 +1643,9 @@
item.Name=item.CategoryName;
this.NewCategoryList.push(item.CategoryId)
})
if(this.hpState==1){
this.addMsg.SeparateDistribution=0;
}
this.getSuggestPrice()
})
},
......
src/components/UserMan/PeaceDistribution.vue
View file @ 6b3db713
......@@ -38,11 +38,11 @@
width="80"
label="ID">
</el-table-column>
<el-table-column
<!-- <el-table-column
prop="Name"
width="200"
label="分销名称">
</el-table-column>
</el-table-column> -->
<el-table-column
prop="GradeName"
width="150"
......@@ -73,7 +73,7 @@
</el-table-column>
<el-table-column
prop="GradeName"
label="返佣(名称/比例)">
label="结算(名称/比例)">
<template slot-scope="scope">
<p v-for="(item,index) in scope.row.RatioList" :key="index" type="success" style="margin-right:6px">
{{item.GradeName}}：{{item.CommissionRatio}}%
......
src/components/UserMan/PeaceDistributionSet.vue
View file @ 6b3db713
......@@ -5,18 +5,20 @@
</div>
<div class="content">
<el-form :model="addMsg" :rules="rules" ref="addMsg" label-width="150px" style="width:60%">
<el-form-item label="分销名称" prop="Name">
<el-input v-model="addMsg.Name" size="small"></el-input>
</el-form-item>
<el-form-item label="返佣小数类型" prop="DecimalType">
<el-radio v-model="addMsg.DecimalType" :label="1">整数</el-radio>
<el-radio v-model="addMsg.DecimalType" :label="2">保留2位小数</el-radio>
</el-form-item>
<el-form-item label="是否启用" prop="Enabled">
<el-radio v-model="addMsg.Enabled" :label="1">是</el-radio>
<el-radio v-model="addMsg.Enabled" :label="2">否</el-radio>
<el-form-item label="分类">
<template v-if="addMsg.CategoryList && addMsg.CategoryList.length>0">
<el-tag type="warning" style="margin-right:10px;" @close="exitCheck(item,index)"
v-for="(item,index) in addMsg.CategoryList" :key="index" closable>
{{item.CategoryName}}
</el-tag>
</template>
<el-button type="primary" @click="flDig=true,keepCategoryList=addMsg.CategoryList"
style="margin:0 10px;" size="small">选择分类</el-button>
</el-form-item>
<!-- <el-form-item label="分销名称" prop="Name">
<el-input v-model="addMsg.Name" size="small"></el-input>
</el-form-item> -->
<el-form-item label="等级">
<el-button @click="gradeDig=true" size="small" type="primary" style="margin-bottom:10px">选择等级</el-button>
<el-table
......@@ -48,16 +50,15 @@
</el-table-column>
</el-table>
</el-form-item>
<el-form-item label="分类">
<template v-if="addMsg.CategoryList && addMsg.CategoryList.length>0">
<el-tag type="warning" style="margin-right:10px;" @close="exitCheck(item,index)"
v-for="(item,index) in addMsg.CategoryList" :key="index" closable>
{{item.CategoryName}}
</el-tag>
</template>
<el-button type="primary" @click="flDig=true,keepCategoryList=addMsg.CategoryList"
style="margin:0 10px;" size="small">选择分类</el-button>
<el-form-item label="返佣小数类型" prop="DecimalType">
<el-radio v-model="addMsg.DecimalType" :label="1">整数</el-radio>
<el-radio v-model="addMsg.DecimalType" :label="2">保留2位小数</el-radio>
</el-form-item>
<el-form-item label="是否启用" prop="Enabled">
<el-radio v-model="addMsg.Enabled" :label="1">是</el-radio>
<el-radio v-model="addMsg.Enabled" :label="2">否</el-radio>
</el-form-item>
</el-form>
</div>
<div style="margin-top:20px">
......
src/components/UserMan/baseSet.vue
View file @ 6b3db713
......@@ -36,6 +36,10 @@
<el-radio v-for="(item,index) in conditionList" v-model="addMsg.DistributorCondition" :key="index"
:label="item.Id">{{item.Name}}</el-radio>
</el-form-item>
<el-form-item v-if="hpState==1" label="和平下线自行审核" prop="HpReferralsGradeAudit">
<el-radio v-model="addMsg.HpReferralsGradeAudit" :label="1">开启</el-radio>
<el-radio v-model="addMsg.HpReferralsGradeAudit" :label="2">不开启</el-radio>
</el-form-item>
</div>
</el-card>
<el-card class="box-card" style="margin-top:10px">
......@@ -221,6 +225,7 @@
ReferralsCondition: 3,
ApplyFor: 1,
DistributorCondition: 3,
HpReferralsGradeAudit:2,
DistributorCommissionType: 1,
OneCommission: 0,
TwoCommission: 0,
......@@ -270,6 +275,11 @@
message: '请选择成为分销商条件',
trigger: 'change'
}],
HpReferralsGradeAudit: [{
required: true,
message: '请选择和平下线自行审核',
trigger: 'change'
}],
DistributorCommissionType: [{
required: true,
message: '请选择分销佣金类型',
......@@ -302,6 +312,7 @@
ReferralsList: [],
WithdrawWayList: [],
imgType: 1,
hpState:2,
};
},
......@@ -311,9 +322,16 @@
this.ReferralsEnumList();
this.WithdrawWayEnumList();
this.getData();
this.HpEnabled();
},
methods: {
HpEnabled(){
this.apipost("/api/user/GetHpDistributorIsEnabled",{}, res => {
if(res.data.resultCode==1){
this.hpState=res.data.data;
}
})
},
Save(formName) {
this.$refs[formName].validate((valid) => {
if (valid) {
......
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