|
@@ -153,6 +153,14 @@
|
|
|
></newPromoModal>
|
|
|
<!-- 特价活动排序 -->
|
|
|
<discountSortModal :show="showDiscountSortModal" :activeList="discountActiveList" @ok="showDiscountSortOk"></discountSortModal>
|
|
|
+ <!-- 提交时校验销售价低于成本价提示 -->
|
|
|
+ <vaildPriceModal
|
|
|
+ ref="vaildPriceModal"
|
|
|
+ modalType="1"
|
|
|
+ :openModal="openVaildPriceModal"
|
|
|
+ :dataObj="tempData"
|
|
|
+ @close="openVaildPriceModal=false"
|
|
|
+ @ok="vaildPriceOk"></vaildPriceModal>
|
|
|
</div>
|
|
|
</template>
|
|
|
|
|
@@ -207,7 +215,9 @@ export default {
|
|
|
showNewActiveModal: false, // 新活动弹框
|
|
|
salesPromoSnSet: [], // 当前勾选的活动sn
|
|
|
showDiscountSortModal: false, // 特价活动排序弹框
|
|
|
- discountActiveList: [] // 可叠加的特价活动列表
|
|
|
+ discountActiveList: [], // 可叠加的特价活动列表
|
|
|
+ openVaildPriceModal: false, // 销售价低于成本价提示弹窗
|
|
|
+ tempData: null// 销售价低于成本价 弹窗列表数据
|
|
|
}
|
|
|
},
|
|
|
computed: {
|
|
@@ -427,6 +437,7 @@ export default {
|
|
|
const vaildActive = await salesPromoValidaSubmit({ salesBillSn: this.salesBillSn }).then(res => res.data)
|
|
|
const a = vaildActive.filter(item => item.type == 1) // 不可提交
|
|
|
const b = vaildActive.filter(item => item.type == 0) // 可跳过继续提交
|
|
|
+ const d = vaildActive.filter(item => item.type == 'audit') // 售价是否低于参考成本价
|
|
|
// 弹出不符合规则弹框,不可提交
|
|
|
if (a.length) {
|
|
|
this.$info({
|
|
@@ -465,12 +476,21 @@ export default {
|
|
|
_this.submitOrder(data)
|
|
|
}
|
|
|
})
|
|
|
- this.spinning = false
|
|
|
+ _this.spinning = false
|
|
|
+ } else if (d.length) {
|
|
|
+ _this.spinning = false
|
|
|
+ _this.tempData = d
|
|
|
+ _this.openVaildPriceModal = true
|
|
|
} else {
|
|
|
_this.submitOrder(data)
|
|
|
}
|
|
|
}
|
|
|
},
|
|
|
+ // 校验销售价低于成本价提示成功,关闭弹窗
|
|
|
+ vaildPriceOk () {
|
|
|
+ this.tempData = null
|
|
|
+ this.openVaildPriceModal = false
|
|
|
+ },
|
|
|
// 提交销售单
|
|
|
async submitOrder (data) {
|
|
|
this.spinning = true
|