Commit 41ba27e4 authored by zhengke's avatar zhengke

修改

parent 07c04614
...@@ -174,6 +174,11 @@ ...@@ -174,6 +174,11 @@
建议零售价:¥{{ SuggestPriceInfo.MPrice }} 建议零售价:¥{{ SuggestPriceInfo.MPrice }}
</span> </span>
</el-form-item> </el-form-item>
<el-form-item label="返佣总金额" prop="Commission">
<el-input v-model="addMsg.Commission" size="small" placeholder="请输入内容" class="input-with-select">
<el-button slot="append"></el-button>
</el-input>
</el-form-item>
<el-form-item label="商品面议"> <el-form-item label="商品面议">
<el-tooltip class="item" effect="dark" content="如果开启面议,则商品无法在线支付" placement="top-start" <el-tooltip class="item" effect="dark" content="如果开启面议,则商品无法在线支付" placement="top-start"
style="position: absolute;left: -22px;top:12px"> style="position: absolute;left: -22px;top:12px">
...@@ -278,6 +283,8 @@ ...@@ -278,6 +283,8 @@
<el-option label="库存" :value="2"></el-option> <el-option label="库存" :value="2"></el-option>
<el-option label="重量(g)" :value="3"></el-option> <el-option label="重量(g)" :value="3"></el-option>
<el-option label="货号" :value="4"></el-option> <el-option label="货号" :value="4"></el-option>
<el-option label="成本价" :value="5"></el-option>
<el-option label="返佣总金额" :value="6"></el-option>
</el-select> </el-select>
<el-button @click="ggPlSet" slot="append">确定</el-button> <el-button @click="ggPlSet" slot="append">确定</el-button>
</el-input> </el-input>
...@@ -307,6 +314,16 @@ ...@@ -307,6 +314,16 @@
<el-input v-model="scope.row.InventoryNum" size="small"></el-input> <el-input v-model="scope.row.InventoryNum" size="small"></el-input>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column :render-header="renderHeader" label="成本价">
<template slot-scope="scope">
<el-input v-model="scope.row.CostMoney" size="small"></el-input>
</template>
</el-table-column>
<el-table-column :render-header="renderHeader" width="120" label="返佣总金额">
<template slot-scope="scope">
<el-input v-model="scope.row.Commission" size="small"></el-input>
</template>
</el-table-column>
<el-table-column label="重量(克)"> <el-table-column label="重量(克)">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input v-model="scope.row.GoodsWeight" size="small"></el-input> <el-input v-model="scope.row.GoodsWeight" size="small"></el-input>
...@@ -1018,6 +1035,7 @@ ...@@ -1018,6 +1035,7 @@
FullMoneyPinkage: 0, FullMoneyPinkage: 0,
SupplierId: '', SupplierId: '',
Sort: 0, Sort: 0,
Commission:0
}, },
SupplierId: '', SupplierId: '',
fenleiData: [], fenleiData: [],
...@@ -1055,6 +1073,11 @@ ...@@ -1055,6 +1073,11 @@
required: true, required: true,
message: "请输入商品单位", message: "请输入商品单位",
trigger: "blur" trigger: "blur"
}],
Commission: [{
required: true,
message: "返佣总金额",
trigger: "blur"
}] }]
}, },
imgType: 1, imgType: 1,
...@@ -1292,6 +1315,12 @@ ...@@ -1292,6 +1315,12 @@
if (this.ggpl == 4) { if (this.ggpl == 4) {
item.GoodsNumbers = this.valpl; item.GoodsNumbers = this.valpl;
} }
if(this.ggpl == 5){
item.CostMoney = this.valpl;
}
if(this.ggpl == 6){
item.Commission = this.valpl;
}
} }
}); });
}); });
...@@ -1307,7 +1336,7 @@ ...@@ -1307,7 +1336,7 @@
h("span", column.label), h("span", column.label),
h("i", { h("i", {
class: "iconfont icon-xinghao1", class: "iconfont icon-xinghao1",
style: "color:#F56C6C;left: -41px;position: relative;" style: "color:#F56C6C;float:left"
}) })
]); ]);
}, },
...@@ -1454,6 +1483,8 @@ ...@@ -1454,6 +1483,8 @@
item.GoodsWeight = 0; item.GoodsWeight = 0;
item.InventoryNum = 0; item.InventoryNum = 0;
item.SellingPrice = 0; item.SellingPrice = 0;
item.CostMoney = 0;
item.Commission = 0;
item.AttrList.push(obj); item.AttrList.push(obj);
}); });
}); });
...@@ -1466,7 +1497,9 @@ ...@@ -1466,7 +1497,9 @@
GoodsNumbers: item.GoodsNumbers, GoodsNumbers: item.GoodsNumbers,
GoodsWeight: item.GoodsWeight, GoodsWeight: item.GoodsWeight,
InventoryNum: item.InventoryNum, InventoryNum: item.InventoryNum,
SellingPrice: item.SellingPrice SellingPrice: item.SellingPrice,
CostMoney: item.CostMoney,
Commission: item.Commission
}; };
oldArr.forEach(val => { oldArr.forEach(val => {
if (val.SpecificationSort == item.SpecificationSort) { if (val.SpecificationSort == item.SpecificationSort) {
...@@ -1477,7 +1510,9 @@ ...@@ -1477,7 +1510,9 @@
GoodsNumbers: val.GoodsNumbers, GoodsNumbers: val.GoodsNumbers,
GoodsWeight: val.GoodsWeight, GoodsWeight: val.GoodsWeight,
InventoryNum: val.InventoryNum, InventoryNum: val.InventoryNum,
SellingPrice: val.SellingPrice SellingPrice: val.SellingPrice,
CostMoney: val.CostMoney,
Commission: val.Commission
}; };
} }
}) })
...@@ -1640,9 +1675,26 @@ ...@@ -1640,9 +1675,26 @@
}else{ }else{
this.addMsg.SupplierId = this.SupplierId != '' ? this.SupplierId : 0; this.addMsg.SupplierId = this.SupplierId != '' ? this.SupplierId : 0;
} }
this.addMsg.SpecificationPriceList = this.SpecificationPriceList; this.addMsg.SpecificationPriceList = this.SpecificationPriceList;
this.addMsg.SpecificationList = this.SpecificationList; this.addMsg.SpecificationList = this.SpecificationList;
for(var i=0;i<this.addMsg.SpecificationPriceList.length;i++){
if(this.addMsg.SpecificationPriceList[i].SellingPrice===''){
this.Error('请输入'+(i+1)+'行价格');
return
}
if(this.addMsg.SpecificationPriceList[i].InventoryNum===''){
this.Error('请输入'+(i+1)+'行库存');
return
}
if(this.addMsg.SpecificationPriceList[i].CostMoney===''){
this.Error('请输入'+(i+1)+'行成本价');
return
}
if(this.addMsg.SpecificationPriceList[i].Commission===''){
this.Error('请输入'+(i+1)+'行返佣总金额');
return
}
}
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);
...@@ -1859,6 +1911,7 @@ ...@@ -1859,6 +1911,7 @@
res => { res => {
if(res.data.resultCode == 1){ if(res.data.resultCode == 1){
this.addMsg = res.data.data; this.addMsg = res.data.data;
console.log(res,'resss');
if (this.addMsg.SupplierId != 0) { if (this.addMsg.SupplierId != 0) {
this.SupplierId = this.addMsg.SupplierId; this.SupplierId = this.addMsg.SupplierId;
......
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