Commit b72fd36c authored by 黄媛媛's avatar 黄媛媛

修改

parent e21c0115
...@@ -1083,7 +1083,7 @@ ...@@ -1083,7 +1083,7 @@
SupplierId: '', SupplierId: '',
Sort: 0, Sort: 0,
Commission:0, Commission:0,
PresentFXGrade:0, PresentFXGrade:'',
PresentFXMonth:0, PresentFXMonth:0,
Advertising:'', Advertising:'',
SubName:'', SubName:'',
...@@ -1759,6 +1759,9 @@ ...@@ -1759,6 +1759,9 @@
} }
} }
} }
if(this.addMsg.PresentFXGrade==''){//没选择的时候默认为0
this.addMsg.PresentFXGrade=0
}
this.apipost("/api/product/SetProductGoodsInfo", this.addMsg, res => { this.apipost("/api/product/SetProductGoodsInfo", this.addMsg, res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.Success(res.data.message); this.Success(res.data.message);
...@@ -2021,6 +2024,9 @@ ...@@ -2021,6 +2024,9 @@
if (this.hpState == 1) { if (this.hpState == 1) {
this.addMsg.SeparateDistribution = 0; this.addMsg.SeparateDistribution = 0;
} }
if(this.addMsg.PresentFXGrade==0){
this.addMsg.PresentFXGrade=''
}
this.getSuggestPrice(); this.getSuggestPrice();
this.getFXDGradeList2(); this.getFXDGradeList2();
......
...@@ -33,9 +33,9 @@ ...@@ -33,9 +33,9 @@
<el-input type="text" class="w160" v-model="msg.UserId" @keyup.enter.native="msg.pageIndex=1,getList()" clearable @clear="msg.pageIndex=1,getList()"></el-input> <el-input type="text" class="w160" v-model="msg.UserId" @keyup.enter.native="msg.pageIndex=1,getList()" clearable @clear="msg.pageIndex=1,getList()"></el-input>
<span style="margin-left:20px;">分销用户id:</span> <span style="margin-left:20px;">分销用户id:</span>
<el-input type="text" class="w160" v-model="msg.DistributionUserId" @keyup.enter.native="msg.pageIndex=1,getList()" clearable @clear="msg.pageIndex=1,getList()"></el-input> <el-input type="text" class="w160" v-model="msg.DistributionUserId" @keyup.enter.native="msg.pageIndex=1,getList()" clearable @clear="msg.pageIndex=1,getList()"></el-input>
<span style="margin-left:20px;">订单id:</span> <span style="margin-left:20px;">关联订单id:</span>
<el-input type="text" class="w160" v-model="msg.ReOrderId" @keyup.enter.native="msg.pageIndex=1,getList()" clearable @clear="msg.pageIndex=1,getList()"></el-input> <el-input type="text" class="w160" v-model="msg.ReOrderId" @keyup.enter.native="msg.pageIndex=1,getList()" clearable @clear="msg.pageIndex=1,getList()"></el-input>
<span style="margin-left:20px;">订单号:</span> <span style="margin-left:20px;">关联订单号:</span>
<el-input type="text" class="w200" v-model="msg.ReOrderNum" @keyup.enter.native="msg.pageIndex=1,getList()" clearable @clear="msg.pageIndex=1,getList()"></el-input> <el-input type="text" class="w200" v-model="msg.ReOrderNum" @keyup.enter.native="msg.pageIndex=1,getList()" clearable @clear="msg.pageIndex=1,getList()"></el-input>
</div> </div>
<el-table :data="dataList" v-loading="loading" border style="width: 100%;margin:20px 0;color:#303133"> <el-table :data="dataList" v-loading="loading" border style="width: 100%;margin:20px 0;color:#303133">
......
...@@ -176,6 +176,7 @@ ...@@ -176,6 +176,7 @@
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<div flex="dir:top" class="card-box"> <div flex="dir:top" class="card-box">
<div v-if="dataInfo.DistributionInfo !=undefined &&dataInfo.DistributionInfo.length>0 && dataInfo.VipCommissionInfo!=undefined && dataInfo.VipCommissionInfo.length==0">
<h3>分销信息</h3> <h3>分销信息</h3>
<div v-for="(item,index) in dataInfo.DistributionInfo" :key="index"> <div v-for="(item,index) in dataInfo.DistributionInfo" :key="index">
<div class="share-title"> <div class="share-title">
...@@ -194,8 +195,9 @@ ...@@ -194,8 +195,9 @@
<div>¥{{item.Commission}}</div> <div>¥{{item.Commission}}</div>
</div> </div>
</div> </div>
<h3 v-if="dataInfo.VipCommissionInfo!=undefined && dataInfo.VipCommissionInfo.length>0">Vip返利</h3> </div>
<div v-if="dataInfo.VipCommissionInfo!=undefined && dataInfo.VipCommissionInfo.length>0"> <div v-if="dataInfo.VipCommissionInfo!=undefined && dataInfo.VipCommissionInfo.length>0">
<h3 >Vip返利</h3>
<div v-for="(item,index2) in dataInfo.VipCommissionInfo" :key="index2"> <div v-for="(item,index2) in dataInfo.VipCommissionInfo" :key="index2">
<div class="share-title"> <div class="share-title">
<span>{{item.GradeDescription}}</span> <span>{{item.GradeDescription}}</span>
...@@ -210,8 +212,10 @@ ...@@ -210,8 +212,10 @@
<div>¥{{item.Commission}}</div> <div>¥{{item.Commission}}</div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</el-col> </el-col>
</el-row> </el-row>
......
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