Skip to content

E
ElectricitySheep
Commit 35c53059 authored by zhengke's avatar zhengke
Browse files
Options

Merge branch 'master' of http://gitlab.oytour.com/huangyuanyuan/electricitysheep

parents 85596ec0 d76e6d97
Hide whitespace changes
Inline Side-by-side
Showing with 34 additions and 44 deletions
src/components/pintuan/pintuanActive.vue
View file @ 35c53059
......@@ -151,8 +151,7 @@
<i class="elzk el-tooltip el-icon-info"></i>
</el-tooltip>
</template>
<goodsSpe v-show="IsShowSpec" v-if="addMsg.SpecificationList&&addMsg.SpecificationList.length>0"
:addMsg="addMsg"></goodsSpe>
<goodsSpe v-show="IsShowSpec" :addMsg="addMsg"></goodsSpe>
</el-form-item>
<el-form-item label="商品货号">
<el-input v-model="addMsg.Goods_no" size="small" :disabled="true" placeholder="请输入商品货号"
......@@ -310,7 +309,6 @@
</div>
</div>
</el-form-item>
</el-col>
</el-row>
</el-card>
......@@ -412,7 +410,8 @@
</el-card>
</el-tab-pane>
<el-tab-pane label="阶梯团设置">
<groupStep v-if="addMsg.SpecificationList&&addMsg.SpecificationList.length>0" :addMsg="addMsg">
<groupStep ref="groupStep" v-if="addMsg.SpecificationList&&addMsg.SpecificationList.length>0"
:addMsg="addMsg">
</groupStep>
</el-tab-pane>
<el-tab-pane label="分销价设置">
......@@ -565,6 +564,9 @@
SeparateDistributionMoneyType: 1, //分销佣金类型 2固定金额 1百分比
EnjoyMember: 2, // 是否享受会员功能 1是 2否
SeparateSetMember: 2, //是否单独设置会员价 1是 2否
SpecificationList: [], //规格和规格值
SpecificationPriceList: [], //规格价格
GroupList: [], //阶梯团价格
},
IsShowSpec: false, //是否显示规格
......@@ -863,7 +865,18 @@
}
this.$forceUpdate();
}
}
},
watch: {
'addMsg.SpecificationPriceList': {
handler(newVal, oldVal) {
if (newVal != oldVal) {
if (this.$refs.groupStep) {
this.$refs.groupStep.addPintuan()
}
}
},
},
},
};
</script>
src/components/pintuan/pintuanPlugin/goodsSpecifica.vue
View file @ 35c53059
......@@ -190,27 +190,32 @@
</template>
<el-table-column :render-header="renderHeader" label="价格">
<template slot-scope="scope">
<el-input v-model="scope.row.SellingPrice" @keyup.native="checkPrice(scope.row,'SellingPrice')" size="small"></el-input>
<el-input v-model="scope.row.SellingPrice" @keyup.native="checkPrice(scope.row,'SellingPrice')"
size="small"></el-input>
</template>
</el-table-column>
<el-table-column :render-header="renderHeader" label="库存">
<template slot-scope="scope">
<el-input v-model="scope.row.InventoryNum" @keyup.native="checkPrice(scope.row,'InventoryNum')" size="small"></el-input>
<el-input v-model="scope.row.InventoryNum" @keyup.native="checkPrice(scope.row,'InventoryNum')"
size="small"></el-input>
</template>
</el-table-column>
<el-table-column :render-header="renderHeader" label="成本价" width="90">
<template slot-scope="scope">
<el-input v-model="scope.row.CostMoney" @keyup.native="checkPrice(scope.row,'CostMoney')" size="small"></el-input>
<el-input v-model="scope.row.CostMoney" @keyup.native="checkPrice(scope.row,'CostMoney')" size="small">
</el-input>
</template>
</el-table-column>
<el-table-column :render-header="renderHeader" v-if="FxState==1" width="120" label="返佣总金额">
<template slot-scope="scope">
<el-input v-model="scope.row.Commission" @keyup.native="checkPrice(scope.row,'Commission')" size="small"></el-input>
<el-input v-model="scope.row.Commission" @keyup.native="checkPrice(scope.row,'Commission')" size="small">
</el-input>
</template>
</el-table-column>
<el-table-column label="重量(克)" width="90">
<template slot-scope="scope">
<el-input v-model="scope.row.GoodsWeight" @keyup.native="checkPrice(scope.row,'GoodsWeight')" size="small"></el-input>
<el-input v-model="scope.row.GoodsWeight" @keyup.native="checkPrice(scope.row,'GoodsWeight')"
size="small"></el-input>
</template>
</el-table-column>
<el-table-column prop="address" label="货号">
......@@ -330,7 +335,10 @@
this.calcList(this.skuList, this.addMsg.SpecificationList);
},
calcList(tempSkuList, calist) {
let oldArr = JSON.parse(JSON.stringify(this.addMsg.SpecificationPriceList))
let oldArr = [];
if (this.addMsg.SpecificationPriceList) {
oldArr = JSON.parse(JSON.stringify(this.addMsg.SpecificationPriceList));
}
this.addMsg.SpecificationPriceList = [];
var tempArray = [];
tempSkuList.forEach(item => {
......@@ -381,9 +389,7 @@
DeleteggModule(item, index) {
let that = this;
that.Confirm("是否确认删除?", function () {
if (item.Id > 0) {
//that.getDeleteSpec(item.Id);
}
that.ComTreeList = [];
that.memberList2 = [];
that.addMsg.SpecificationList.splice(index, 1);
......@@ -399,9 +405,6 @@
Deleteggz(item, index, index2) {
let that = this;
that.Confirm("是否确认删除?", function () {
if (item.Id > 0) {
//that.getDeleteSpecValue(item.Id);
}
that.addMsg.SpecificationList[index].SpecificationValueList.splice(index2, 1);
that.$forceUpdate();
if (that.addMsg.SpecificationList[index].SpecificationValueList.length == 0) {
......@@ -411,6 +414,7 @@
that.getSkuData([], 0, that.addMsg.SpecificationList);
});
},
//选择图片
openggImg(item, index, item2, index2) {
this.changeState = true;
this.imgType = 3;
......@@ -585,33 +589,6 @@
});
}
});
},
//删除规格后调用
getDeleteSpec(Id) {
let msg = {
Id: Id
}
this.apipost("/api/GroupBuy/DeleteSpec", msg, res => {
if (res.data.resultCode == 1) {
} else {
this.Error(res.data.message);
}
})
},
//删除规格值过后调用
getDeleteSpecValue(Id) {
let msg = {
Id: Id
}
this.apipost("/api/GroupBuy/DeleteSpecValue", msg, res => {
if (res.data.resultCode == 1) {
} else {
this.Error(res.data.message);
}
})
}
},
mounted() {
......
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