|
@@ -292,8 +292,8 @@ export default {
|
|
|
_this.$message.warning('订单起订量设置不能为空!')
|
|
|
return
|
|
|
}
|
|
|
- const isCountEmpty = isNumEmpty(form.specialProductList)
|
|
|
- const isMoneyEmpty = isNumEmpty(form.specialProductList)
|
|
|
+ const isCountEmpty = _this.isNumEmpty(form.specialProductList)
|
|
|
+ const isMoneyEmpty = _this.isNumEmpty(form.specialProductList)
|
|
|
if (isCountEmpty.flag) {
|
|
|
_this.$message.warning('促销比例不能为空!')
|
|
|
return
|
|
@@ -328,11 +328,11 @@ export default {
|
|
|
dataList.forEach(item => {
|
|
|
if (item.dataSourceOrigin === '0') { // 判断分类品牌
|
|
|
if (!item.provinceDiscountRate || !item.cityDiscountRate || !item.specialDiscountRate) {
|
|
|
- arr.push()
|
|
|
+ arr.push(item.productScopeSn)
|
|
|
}
|
|
|
} else {
|
|
|
if (!item.cityDiscountPrice || !item.provinceDiscountPrice || !item.specialDiscountPrice) {
|
|
|
- arr1.push()
|
|
|
+ arr1.push(item.productScopeSn)
|
|
|
}
|
|
|
}
|
|
|
})
|
|
@@ -527,12 +527,18 @@ export default {
|
|
|
return snArr
|
|
|
},
|
|
|
handleProductsAdd (con) {
|
|
|
+ debugger
|
|
|
const newArr = []
|
|
|
con.forEach(newCon => {
|
|
|
if (!newCon.provincePrice || !newCon.cityPrice || !newCon.specialPrice) {
|
|
|
newArr.push(newCon.code)
|
|
|
}
|
|
|
})
|
|
|
+ con.map((list, pos) => {
|
|
|
+ if (!list.provincePrice || !list.cityPrice || !list.specialPrice) {
|
|
|
+ con.splice(pos, 1)
|
|
|
+ }
|
|
|
+ })
|
|
|
const _this = this
|
|
|
if (newArr && newArr.length > 0) {
|
|
|
_this.$info({
|
|
@@ -541,14 +547,11 @@ export default {
|
|
|
closable: true,
|
|
|
centered: true,
|
|
|
onOk () {
|
|
|
- con.map((list, pos) => {
|
|
|
- if (!list.provincePrice || !list.cityPrice || !list.specialPrice) {
|
|
|
- con.splice(pos, 1)
|
|
|
- }
|
|
|
- })
|
|
|
_this.handleProductsOk(con)
|
|
|
}
|
|
|
})
|
|
|
+ } else {
|
|
|
+ _this.handleProductsOk(con)
|
|
|
}
|
|
|
},
|
|
|
// +新增产品
|