|
@@ -150,6 +150,11 @@
|
|
|
</a-select>
|
|
|
</a-form-item>
|
|
|
</a-col>
|
|
|
+ <a-col flex="200px">
|
|
|
+ <a-form-item label="累计产品">
|
|
|
+ <v-select code="FLAG" v-model="borrowFlag" allowClear placeholder="请选择是否累计产品"></v-select>
|
|
|
+ </a-form-item>
|
|
|
+ </a-col>
|
|
|
<a-col flex="300px" v-if="showTransferDealer">
|
|
|
<a-form-item label="发货经销商库存" style="margin-bottom: 0!important;">
|
|
|
<v-select
|
|
@@ -195,6 +200,7 @@
|
|
|
:authCode="authCode"
|
|
|
:chooseList="chooseDealerList"
|
|
|
:transferQty="transferQty"
|
|
|
+ :borrowFlag="borrowFlag"
|
|
|
:showTransferDealer="showTransferDealer"
|
|
|
:showCityPrice="isCityPrice"
|
|
|
:showAveragePrice="isAveragePrice"
|
|
@@ -436,6 +442,7 @@ export default {
|
|
|
tempData: undefined, // 校验临时数据
|
|
|
openVaildPriceModal: false, // 校验价格弹框
|
|
|
transferQty: undefined, // 发货经销商库存查询
|
|
|
+ borrowFlag: undefined, // 是否累计产品
|
|
|
openDealerStock: false, // 打开经销商库存弹窗
|
|
|
openTransferOrder: false, // 打开转单弹窗
|
|
|
selectedDealer: '', // 发货经销商名称
|
|
@@ -603,6 +610,7 @@ export default {
|
|
|
this.warehouseSn = undefined
|
|
|
this.promoFlag = undefined
|
|
|
this.transferQty = undefined
|
|
|
+ this.borrowFlag = undefined
|
|
|
this.searchTable()
|
|
|
},
|
|
|
// 查询数据
|
|
@@ -731,6 +739,7 @@ export default {
|
|
|
const c = vaildActive.filter(item => item.type == 'price_less_0') // 不可提交
|
|
|
const b = vaildActive.filter(item => item.type == 0) // 文字提示,可跳过继续提交
|
|
|
const d = vaildActive.filter(item => item.type == 'price_less_cost' || item.type == 'wait_up_audit_price_less_cost') // 价格校验表格提示,可跳过继续提交
|
|
|
+ const e = vaildActive.filter(item => item.type == 'allBorrowProductFlag') // 只有累计产品
|
|
|
// 弹出不符合规则弹框,不可提交
|
|
|
if (a.length) {
|
|
|
this.$info({
|
|
@@ -764,7 +773,8 @@ export default {
|
|
|
return
|
|
|
}
|
|
|
// 文字提示,可跳过继续提交
|
|
|
- if (b.length) {
|
|
|
+ if (b.length || e.length) {
|
|
|
+ const textObj = b || e
|
|
|
// 弹出确认提示信息,可跳过继续提交
|
|
|
_this.$confirm({
|
|
|
title: '提示',
|
|
@@ -774,7 +784,7 @@ export default {
|
|
|
width: 600,
|
|
|
content: <div style="padding-top:15px;">
|
|
|
<ol>
|
|
|
- {b.map(item => (
|
|
|
+ {textObj.map(item => (
|
|
|
<li style="padding:3px 0;">{item.message}</li>
|
|
|
))}
|
|
|
</ol>
|