Commit 4e584b59 authored by zhangjianguo's avatar zhangjianguo

商品详情

parent e97b24b2
...@@ -1246,7 +1246,7 @@ ...@@ -1246,7 +1246,7 @@
</div> </div>
<el-table <el-table
ref="table" ref="table"
:data="disList2" :data="disList2.length>0?disList2:[]"
border border
style="width: 100%" style="width: 100%"
@selection-change="TbaleSelectionChange3" @selection-change="TbaleSelectionChange3"
...@@ -2019,12 +2019,6 @@ ...@@ -2019,12 +2019,6 @@
this.GoodsId = this.$route.query.GoodsId; this.GoodsId = this.$route.query.GoodsId;
this.getData(); this.getData();
} }
// this.getTree();
// this.getService();
// this.getRule();
// this.getSpeciList();
// this.getDistributor();
// this.gethuiyList();
}, },
methods: { methods: {
...@@ -2079,6 +2073,7 @@ ...@@ -2079,6 +2073,7 @@
this.Error("已开始和平分销,请在和平分销里面配置!"); this.Error("已开始和平分销,请在和平分销里面配置!");
this.addMsg.SeparateDistribution = 0; this.addMsg.SeparateDistribution = 0;
} }
}, },
// //
HySet() { HySet() {
...@@ -2214,6 +2209,8 @@ ...@@ -2214,6 +2209,8 @@
butionType(val) {}, butionType(val) {},
// 删除规格模板 // 删除规格模板
DeleteggModule(item, index) { DeleteggModule(item, index) {
this.ComTreeList=[];
this.memberList2=[];
this.SpecificationList.splice(index, 1); this.SpecificationList.splice(index, 1);
if (this.SpecificationList.length == 0) { if (this.SpecificationList.length == 0) {
this.addMsg.SeparateDistributionType = 1; this.addMsg.SeparateDistributionType = 1;
...@@ -2247,10 +2244,13 @@ ...@@ -2247,10 +2244,13 @@
// 添加规格模板 // 添加规格模板
addggxm() { addggxm() {
let that = this; let that = this;
let obj = { let obj = {
Name: "", Name: "",
SpecificationValueList: [], SpecificationValueList: [],
Sort: that.SpecificationList.length Sort: that.SpecificationList.length+1,
Id:0,
EnabledImage:2
}; };
this.SpecificationList.push(obj); this.SpecificationList.push(obj);
}, },
...@@ -2263,13 +2263,22 @@ ...@@ -2263,13 +2263,22 @@
Sort: item.SpecificationValueList.length+1 Sort: item.SpecificationValueList.length+1
}; };
this.SpecificationList[index].SpecificationValueList.push(obj); this.SpecificationList[index].SpecificationValueList.push(obj);
}, },
// 修改规格值 // 修改规格值
ggzChange() { ggzChange() {
this.$forceUpdate(); this.$forceUpdate();
this.ComTreeList=[];
this.memberList2=[];
this.skuList = []; this.skuList = [];
this.getSkuData([], 0, this.SpecificationList); this.getSkuData([], 0, this.SpecificationList);
}, },
// 值
ggzChange2() {
// this.$forceUpdate();
// this.skuList = [];
// this.getSkuData([], 0, this.SpecificationValueList.);
},
chooseSpecificationValueList() { chooseSpecificationValueList() {
if (!this.SpecificationList) { if (!this.SpecificationList) {
this.SpecificationList = []; this.SpecificationList = [];
...@@ -2291,34 +2300,39 @@ ...@@ -2291,34 +2300,39 @@
list.Sort = index2; list.Sort = index2;
}); });
}); });
this.ComTreeList=[];
this.memberList2=[]
this.skuList = []; this.skuList = [];
this.getSkuData([], 0, this.SpecificationList); this.getSkuData([], 0, this.SpecificationList);
this.speciDig = false; this.speciDig = false;
}, },
getSkuData(skuArr = [], i, list) { getSkuData(skuArr = [], i, list) {
if (list[i]) { const testyunx = (skuArr = [], i, list)=>{
for (let j = 0; j < list[i].SpecificationValueList.length; j++) { if (list[i]) {
skuArr[i] = {}; for (let j = 0; j < list[i].SpecificationValueList.length; j++) {
if (i < list.length - 1) { skuArr[i] = {};
skuArr[i].SName = list[i].Name; if (i < list.length - 1) {
skuArr[i].SVName = list[i].SpecificationValueList[j].Name; skuArr[i].SName = list[i].Name;
skuArr[i].SVId = list[i].SpecificationValueList[j].Sort; skuArr[i].SVName = list[i].SpecificationValueList[j].Name;
this.getSkuData(skuArr, i + 1, list); // 递归循环 skuArr[i].SVId = list[i].SpecificationValueList[j].Sort;
} else { testyunx(skuArr, i + 1, list); // 递归循环
skuArr[i].SName = list[i].Name; }
skuArr[i].SVName = list[i].SpecificationValueList[j].Name; else {
skuArr[i].SVId = list[i].SpecificationValueList[j].Sort; skuArr[i].SName = list[i].Name;
this.skuList.push([...skuArr]); // 扩展运算符,连接两个数组 skuArr[i].SVName = list[i].SpecificationValueList[j].Name;
skuArr[i].SVId = list[i].SpecificationValueList[j].Sort;
this.skuList.push([...skuArr]); // 扩展运算符,连接两个数组
}
} }
} }
} }
testyunx(skuArr,i,list)
this.calcList(this.skuList, this.SpecificationList); this.calcList(this.skuList, this.SpecificationList);
}, },
calcList(list, calist) { calcList(list, calist) {
let oldArr=JSON.parse(JSON.stringify(this.SpecificationPriceList)) let oldArr=JSON.parse(JSON.stringify(this.SpecificationPriceList))
this.SpecificationPriceList = []; this.SpecificationPriceList = [];
let arrList = []; let arrList = [];
list.forEach(item => { list.forEach(item => {
item.AttrList = []; item.AttrList = [];
...@@ -2346,6 +2360,7 @@ ...@@ -2346,6 +2360,7 @@
list.forEach((item, i) => { list.forEach((item, i) => {
let obj={}; let obj={};
obj = { obj = {
isNoExite:true,
AttrList: item.AttrList, AttrList: item.AttrList,
SpecificationSort: item.SpecificationSort, SpecificationSort: item.SpecificationSort,
GoodsNumbers: item.GoodsNumbers, GoodsNumbers: item.GoodsNumbers,
...@@ -2353,10 +2368,14 @@ ...@@ -2353,10 +2368,14 @@
InventoryNum: item.InventoryNum, InventoryNum: item.InventoryNum,
SellingPrice: item.SellingPrice SellingPrice: item.SellingPrice
}; };
oldArr.forEach(val=>{ oldArr.forEach(val=>{
// console.log(val.SpecificationSort,item.SpecificationSort)
if(val.SpecificationSort==item.SpecificationSort){ if(val.SpecificationSort==item.SpecificationSort){
obj = { obj = {
isNoExite:false,
AttrList: item.AttrList, AttrList: item.AttrList,
// Id:0,
SpecificationSort: val.SpecificationSort, SpecificationSort: val.SpecificationSort,
GoodsNumbers: val.GoodsNumbers, GoodsNumbers: val.GoodsNumbers,
GoodsWeight: val.GoodsWeight, GoodsWeight: val.GoodsWeight,
...@@ -2366,6 +2385,7 @@ ...@@ -2366,6 +2385,7 @@
} }
}) })
this.SpecificationPriceList.push(obj); this.SpecificationPriceList.push(obj);
let obj1 = { let obj1 = {
...@@ -2376,48 +2396,126 @@ ...@@ -2376,48 +2396,126 @@
}; };
arrList.push(obj1); arrList.push(obj1);
}); });
this.calcdis(JSON.parse(JSON.stringify(arrList))); this.calcdis(JSON.parse(JSON.stringify(arrList)));
}, },
calcdis(dislist) { calcdis(dislist) {
let memberList2 = JSON.parse(JSON.stringify(dislist)); let memberListarray = JSON.parse(JSON.stringify(dislist));
let ComTreeList=JSON.parse(JSON.stringify(this.ComTreeList)); let ComTreeList=JSON.parse(JSON.stringify(this.ComTreeList));
this.ComTreeList=[]; // this.ComTreeList=[];//无法添加 报错 暂时注释掉
dislist.forEach(item => { for(let i = 0; i < dislist.length; i++){
item.GradeCommissionList = []; if(this.addMsg.SeparateDistributionType ==2 && this.ComTreeList.length>0){ //this.ComTreeList.length为0 的时候 全部为空
for (let i = 0; i < this.DropdownList.length; i++) {
if(i<ComTreeList.length){
// dislist[i].GradeCommissionList = [];
ComTreeList.forEach((val,z)=>{
if(val.SpecificationSort==dislist[i].SpecificationSort){
dislist[i].GradeCommissionList=[];
dislist[i].GradeCommissionList=val.GradeCommissionList;
}
ComTreeList.forEach(val=>{ })
}else {
for (let j = 0; j < this.DropdownList.length; j++) {
let obj = {
SpecificationSort:dislist[i].SpecificationSort,
DistributorGrade: this.DropdownList[j].Id,
OneCommission: 0,
TwoCommission: 0,
ThreeCommission: 0,
Name: dislist[i].Name
};
dislist[i].GradeCommissionList.push(obj);
}
}
}else {
for (let j = 0; j < this.DropdownList.length; j++) {
let obj = { let obj = {
SpecificationSort:item.SpecificationSort, SpecificationSort:dislist[i].SpecificationSort,
DistributorGrade: this.DropdownList[i].Id, DistributorGrade: this.DropdownList[j].Id,
OneCommission: 0, OneCommission: 0,
TwoCommission: 0, TwoCommission: 0,
ThreeCommission: 0, ThreeCommission: 0,
Name: item.Name Name: dislist[i].Name
}; };
item.GradeCommissionList.push(obj); dislist[i].GradeCommissionList.push(obj);
if(val.SpecificationSort==item.SpecificationSort){ }
item.GradeCommissionList=[];
item.GradeCommissionList=val.GradeCommissionList;
}
})
} }
});
memberList2.forEach(item => { }
item.GradePriceList = []; //以前的逻辑 暂时保留 6.22
for (let i = 0; i < this.huiyList.length; i++) { // dislist.forEach(item => {
let obj = { // item.GradeCommissionList = [];
MemberGrade: this.huiyList[i].Grade, // // for (let i = 0; i < this.DropdownList.length; i++) {
MemberPrice: "" // // let obj = {
}; // // SpecificationSort:item.SpecificationSort,
item.GradePriceList.push(obj); // // DistributorGrade: this.DropdownList[i].Id,
// // OneCommission: 0,
// // TwoCommission: 0,
// // ThreeCommission: 0,
// // Name: item.Name
// // };
// // item.GradeCommissionList.push(obj);
// ComTreeList.forEach(val=>{
//
// // if(val.SpecificationSort==item.SpecificationSort){
// // item.GradeCommissionList=[];
// // item.GradeCommissionList=val.GradeCommissionList;
// // }
// })
//
// // }
// });
// console.log('memberListarray',memberListarray)
// console.log('this.memberList2',this.memberList2)
// console.log('this.huiyList',this.huiyList)
for(let i = 0; i < memberListarray.length; i++){
memberListarray[i].GradePriceList = [];
if(this.addMsg.EnjoyMember ==1 && this.memberList2.length>0){
if(i<this.memberList2.length){
this.memberList2.forEach(val=>{
if(val.SpecificationSort==memberListarray[i].SpecificationSort){
memberListarray[i].GradePriceList=[];
memberListarray[i].GradePriceList=val.GradePriceList;
}
})
} else {
for (let j = 0; j < this.huiyList.length; j++) {
let obj = {
MemberGrade: this.huiyList[j].Grade,
MemberPrice: 0
};
memberListarray[i].GradePriceList.push(obj);
}
}
} else {
for (let j = 0; j < this.huiyList.length; j++) {
let obj = {
MemberGrade: this.huiyList[j].Grade,
MemberPrice: 0
};
memberListarray[i].GradePriceList.push(obj);
}
} }
});
}
// memberListarray.forEach(item => {
// item.GradePriceList = [];
// for (let i = 0; i < this.huiyList.length; i++) {
// let obj = {
// MemberGrade: this.huiyList[i].Grade,
// MemberPrice: 0
// };
// item.GradePriceList.push(obj);
// }
// });
this.disList2 = JSON.parse(JSON.stringify(dislist)); this.disList2 = JSON.parse(JSON.stringify(dislist));
console.log("this.disList2 ",this.disList2 ) this.memberList2 = JSON.parse(JSON.stringify(memberListarray));
this.memberList2 = JSON.parse(JSON.stringify(memberList2));
}, },
addggModeule() { addggModeule() {
this.speciDig = true; this.speciDig = true;
...@@ -2454,17 +2552,16 @@ ...@@ -2454,17 +2552,16 @@
} else { } else {
this.addMsg.DistributionCommissionList = this.disList2; this.addMsg.DistributionCommissionList = this.disList2;
} }
if ( if (this.addMsg.SeparateSetMember == 1 && this.SpecificationList.length == 0) {
this.addMsg.SeparateSetMember == 1 &&
this.SpecificationList.length == 0
) {
this.addMsg.MemberPriceList = this.memberList1; this.addMsg.MemberPriceList = this.memberList1;
this.addMsg.MemberPriceTreeList = this.memberList1;
} }
if ( if ( this.addMsg.SeparateSetMember == 1 &&this.SpecificationList.length > 0) {
this.addMsg.SeparateSetMember == 1 &&
this.SpecificationList.length > 0
) {
this.addMsg.MemberPriceList = this.memberList2; this.addMsg.MemberPriceList = this.memberList2;
this.addMsg.MemberPriceTreeList = this.memberList2;
} }
if(this.SupplierId==''){ if(this.SupplierId==''){
this.Error('请选择供应商'); this.Error('请选择供应商');
...@@ -2474,6 +2571,7 @@ ...@@ -2474,6 +2571,7 @@
} }
this.addMsg.SpecificationPriceList = this.SpecificationPriceList; this.addMsg.SpecificationPriceList = this.SpecificationPriceList;
this.addMsg.SpecificationList = this.SpecificationList; this.addMsg.SpecificationList = this.SpecificationList;
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);
...@@ -2688,7 +2786,6 @@ ...@@ -2688,7 +2786,6 @@
this.initShareSettings(); this.initShareSettings();
this.SpecificationPriceList = this.addMsg.SpecificationPriceList; this.SpecificationPriceList = this.addMsg.SpecificationPriceList;
this.ComTreeList= this.addMsg.DistributionCommissionTreeList; this.ComTreeList= this.addMsg.DistributionCommissionTreeList;
// console.log(this.SpecificationPriceList)
this.SpecificationList = this.addMsg.SpecificationList; this.SpecificationList = this.addMsg.SpecificationList;
if (this.addMsg.SeparateDistributionType == 1) { if (this.addMsg.SeparateDistributionType == 1) {
this.disList1 = this.addMsg.DistributionCommissionTreeList; this.disList1 = this.addMsg.DistributionCommissionTreeList;
...@@ -2696,10 +2793,10 @@ ...@@ -2696,10 +2793,10 @@
this.GradeCommissionList = this.addMsg.DistributionCommissionTreeList[0].GradeCommissionList; this.GradeCommissionList = this.addMsg.DistributionCommissionTreeList[0].GradeCommissionList;
} }
} }
if (this.addMsg.SeparateDistributionType == 2) { this.memberList2 = this.addMsg.MemberPriceTreeList;
// this.disList2 = this.addMsg.DistributionCommissionTreeList; // if (this.addMsg.SeparateDistributionType == 2) {
this.getDistributor(); // this.getDistributor();
} // }
this.thisType=1; this.thisType=1;
this.disList1 = []; this.disList1 = [];
...@@ -2772,6 +2869,7 @@ ...@@ -2772,6 +2869,7 @@
}); });
}, },
getDistributor() { getDistributor() {
this.loading = true; this.loading = true;
this.apipost("/api/user/GetDistributorBasicsInfo", {}, res => { this.apipost("/api/user/GetDistributorBasicsInfo", {}, res => {
this.loading = false; this.loading = false;
...@@ -2793,7 +2891,7 @@ ...@@ -2793,7 +2891,7 @@
Id: 0, Id: 0,
Grade: 0, Grade: 0,
Name: "", Name: "",
Enabled: 0 Enabled: 1
}; };
this.apipost("/api/user/GetDistributorGradeDropdownList", msg, res => { this.apipost("/api/user/GetDistributorGradeDropdownList", msg, res => {
this.DropdownList = JSON.parse(JSON.stringify(res.data.data)); this.DropdownList = JSON.parse(JSON.stringify(res.data.data));
...@@ -2821,10 +2919,12 @@ ...@@ -2821,10 +2919,12 @@
} }
}); });
this.DropdownList = JSON.parse(JSON.stringify(this.DropdownList)); this.DropdownList = JSON.parse(JSON.stringify(this.DropdownList));
if ( if (
!this.$route.query.GoodsId || !this.$route.query.GoodsId ||
this.addMsg.DistributionCommissionTreeList.length == 0 || this.thisType==1 this.addMsg.DistributionCommissionTreeList.length == 0 || this.thisType==1
) { ) {
this.GradeCommissionList = []; this.GradeCommissionList = [];
this.DropdownList.forEach(item => { this.DropdownList.forEach(item => {
let obj2 = { let obj2 = {
...@@ -2855,14 +2955,12 @@ ...@@ -2855,14 +2955,12 @@
}; };
this.disList1.push(objNew); this.disList1.push(objNew);
} }
console.log("this.disList1",this.disList1)
this.skuList = []; this.skuList = [];
this.getSkuData([], 0, this.SpecificationList); this.getSkuData([], 0, this.SpecificationList);
} }
}); });
}, },
changeSupplier(val){ changeSupplier(val){
console.log(val)
}, },
getSupplierList(){ getSupplierList(){
this.apipost("/api/Supplier/GetSupplierAllList", {}, res => { this.apipost("/api/Supplier/GetSupplierAllList", {}, res => {
......
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