|
@@ -355,7 +355,9 @@ export default {
|
|
}
|
|
}
|
|
|
|
|
|
const form = JSON.parse(JSON.stringify(_this.form))
|
|
const form = JSON.parse(JSON.stringify(_this.form))
|
|
- let rowFlag1, rowFlag2, rowFlag3
|
|
|
|
|
|
+ let rowFlag1 = null
|
|
|
|
+ let rowFlag2 = null
|
|
|
|
+ let rowFlag3 = null
|
|
if (form.gateFlag == '1') {
|
|
if (form.gateFlag == '1') {
|
|
form.gateProductList = this.$refs.cillProduct.getResultVal()
|
|
form.gateProductList = this.$refs.cillProduct.getResultVal()
|
|
form.gateAmount = form.gateType === 'RATIO_AMOUNT' ? form.gateAmount / 100 : form.gateAmount
|
|
form.gateAmount = form.gateType === 'RATIO_AMOUNT' ? form.gateAmount / 100 : form.gateAmount
|
|
@@ -413,22 +415,23 @@ export default {
|
|
},
|
|
},
|
|
// 判断品牌,分类,产品其中一个必填
|
|
// 判断品牌,分类,产品其中一个必填
|
|
isJudge (list) {
|
|
isJudge (list) {
|
|
- const flag = list.forEach(con => {
|
|
|
|
|
|
+ let flag = null
|
|
|
|
+ list.forEach(con => {
|
|
if (con.productThisList) {
|
|
if (con.productThisList) {
|
|
if (con.productThisList.length > 0) {
|
|
if (con.productThisList.length > 0) {
|
|
- return false
|
|
|
|
|
|
+ flag = false
|
|
} else {
|
|
} else {
|
|
if ((con.productTypeList && con.productTypeList.length > 0) || (con.productBrandList && con.productBrandList.length > 0)) {
|
|
if ((con.productTypeList && con.productTypeList.length > 0) || (con.productBrandList && con.productBrandList.length > 0)) {
|
|
- return false
|
|
|
|
|
|
+ flag = false
|
|
} else {
|
|
} else {
|
|
- return true
|
|
|
|
|
|
+ flag = true
|
|
}
|
|
}
|
|
}
|
|
}
|
|
} else {
|
|
} else {
|
|
if ((con.productTypeList && con.productTypeList.length > 0) || (con.productBrandList && con.productBrandList.length > 0)) {
|
|
if ((con.productTypeList && con.productTypeList.length > 0) || (con.productBrandList && con.productBrandList.length > 0)) {
|
|
- return false
|
|
|
|
|
|
+ flag = false
|
|
} else {
|
|
} else {
|
|
- return true
|
|
|
|
|
|
+ flag = true
|
|
}
|
|
}
|
|
}
|
|
}
|
|
})
|
|
})
|