|
@@ -104,14 +104,14 @@
|
|
</a-select>
|
|
</a-select>
|
|
</a-form-item>
|
|
</a-form-item>
|
|
</a-col>
|
|
</a-col>
|
|
- <a-col flex="260px" v-if="showTransferDealer">
|
|
|
|
|
|
+ <a-col flex="300px" v-if="showTransferDealer">
|
|
<a-form-item label="发货经销商库存">
|
|
<a-form-item label="发货经销商库存">
|
|
<v-select
|
|
<v-select
|
|
code="STOCK_LABEL"
|
|
code="STOCK_LABEL"
|
|
id="purchaseOrder-basicInfo-transferQty"
|
|
id="purchaseOrder-basicInfo-transferQty"
|
|
v-model="transferQty"
|
|
v-model="transferQty"
|
|
allowClear
|
|
allowClear
|
|
- placeholder="请选择发货经销商库存是否满足"
|
|
|
|
|
|
+ placeholder="请选择是否满足"
|
|
></v-select>
|
|
></v-select>
|
|
</a-form-item>
|
|
</a-form-item>
|
|
</a-col>
|
|
</a-col>
|
|
@@ -175,10 +175,12 @@
|
|
:transferQty="transferQty"
|
|
:transferQty="transferQty"
|
|
:showTransferDealer="showTransferDealer"
|
|
:showTransferDealer="showTransferDealer"
|
|
:showCityPrice="isCityPrice"
|
|
:showCityPrice="isCityPrice"
|
|
- @hideTable="v=>hideNormalTable=v">
|
|
|
|
|
|
+ @hideTable="hideTable">
|
|
</detailProductList>
|
|
</detailProductList>
|
|
</div>
|
|
</div>
|
|
- <div v-if="hideNormalTable&&hideActiveTable" :style="{height:pageHeight+30+'px'}" class="empty-data-box"><a-empty description="暂无产品" :image="simpleImage"/></div>
|
|
|
|
|
|
+ <div v-if="hideNormalTable&&hideActiveTable" :style="{height:pageHeight+10+'px'}" class="empty-data-box">
|
|
|
|
+ <a-empty description="暂无产品" :image="simpleImage"/>
|
|
|
|
+ </div>
|
|
</a-card>
|
|
</a-card>
|
|
<!-- 活动产品列表 -->
|
|
<!-- 活动产品列表 -->
|
|
<a-card
|
|
<a-card
|
|
@@ -186,7 +188,7 @@
|
|
:bordered="false"
|
|
:bordered="false"
|
|
title="活动产品"
|
|
title="活动产品"
|
|
class="salesEdit-cont"
|
|
class="salesEdit-cont"
|
|
- v-if="activeList.length&&!hideActiveTable"
|
|
|
|
|
|
+ v-if="!hideActiveTable"
|
|
>
|
|
>
|
|
<activeStatisticsList
|
|
<activeStatisticsList
|
|
ref="activeTjList"
|
|
ref="activeTjList"
|
|
@@ -205,28 +207,52 @@
|
|
:salesBillSn="$route.params.sn || bizSn"
|
|
:salesBillSn="$route.params.sn || bizSn"
|
|
:authCode="authCode"
|
|
:authCode="authCode"
|
|
:showCityPrice="isCityPrice"
|
|
:showCityPrice="isCityPrice"
|
|
- @hideTable="v=>hideActiveTable=v">
|
|
|
|
|
|
+ @hideTable="hideTable">
|
|
</detailProductList>
|
|
</detailProductList>
|
|
</a-card>
|
|
</a-card>
|
|
</a-spin>
|
|
</a-spin>
|
|
<div class="affix-cont" :class="bizSn?'affix-footer-bar':''" :style="{padding:hideFooter?0:'7px 0 4px'}">
|
|
<div class="affix-cont" :class="bizSn?'affix-footer-bar':''" :style="{padding:hideFooter?0:'7px 0 4px'}">
|
|
<a-button
|
|
<a-button
|
|
- style="width: 100px;margin-right:20px;"
|
|
|
|
|
|
+ style="width: 100px;margin: 0 10px;"
|
|
:disabled="spinning"
|
|
:disabled="spinning"
|
|
type="primary"
|
|
type="primary"
|
|
class="button-info"
|
|
class="button-info"
|
|
- id="salesDetail-audit-btn"
|
|
|
|
|
|
+ id="salesDetail-transfer-btn"
|
|
v-if="$hasPermissions('B_salesTransfer')&&$route.params.pageType!='salesNewDetailAudit'&&(detailData&&detailData.promoFlag!=1&&(detailData.billStatus == 'WAIT_AUDIT'||detailData.billStatus == 'SUPERIOR_AUDIT_REJECT' || detailData.billStatus == 'TRANSFER_AUDIT_REJECT')&&detailData.salesBillSource=='PURCHASE'&&detailData.orderType=='TIRE')"
|
|
v-if="$hasPermissions('B_salesTransfer')&&$route.params.pageType!='salesNewDetailAudit'&&(detailData&&detailData.promoFlag!=1&&(detailData.billStatus == 'WAIT_AUDIT'||detailData.billStatus == 'SUPERIOR_AUDIT_REJECT' || detailData.billStatus == 'TRANSFER_AUDIT_REJECT')&&detailData.salesBillSource=='PURCHASE'&&detailData.orderType=='TIRE')"
|
|
@click="handleOrder()"
|
|
@click="handleOrder()"
|
|
>
|
|
>
|
|
转单
|
|
转单
|
|
</a-button>
|
|
</a-button>
|
|
<a-button
|
|
<a-button
|
|
- style="width: 100px;"
|
|
|
|
|
|
+ type="primary"
|
|
|
|
+ class="button-info"
|
|
|
|
+ ghost
|
|
|
|
+ :disabled="spinning"
|
|
|
|
+ style="width: 100px;margin: 0 10px;"
|
|
|
|
+ id="salesDetail-edit-btn"
|
|
|
|
+ v-if="detailData&&detailData.salesBillSource == 'SALES' && (detailData.billStatus == 'WAIT_SUBMIT' || detailData.billStatus == 'WAIT_AUDIT' || detailData.billStatus == 'AUDIT_REJECT' || detailData.billStatus == 'HQ_CHANGE')&&$hasPermissions('B_salesEdit')"
|
|
|
|
+ @click="handleEdit()"
|
|
|
|
+ >
|
|
|
|
+ 编辑
|
|
|
|
+ </a-button>
|
|
|
|
+ <a-button
|
|
|
|
+ style="width: 100px;margin: 0 10px;"
|
|
|
|
+ :disabled="spinning"
|
|
|
|
+ type="primary"
|
|
|
|
+ ghost
|
|
|
|
+ id="salesDetail-edit1-btn"
|
|
|
|
+ v-if="detailData&&detailData.salesBillSource == 'PURCHASE' && (detailData.billStatus == 'WAIT_AUDIT'||detailData.billStatus == 'HQ_CHANGE'||detailData.billStatus == 'SUPERIOR_AUDIT_REJECT' || detailData.billStatus == 'TRANSFER_AUDIT_REJECT')&&$hasPermissions('B_salesEdit')"
|
|
|
|
+ @click="handleChangeOrder()"
|
|
|
|
+ >
|
|
|
|
+ 改单
|
|
|
|
+ </a-button>
|
|
|
|
+ <a-button
|
|
|
|
+ style="width: 100px;margin: 0 10px;"
|
|
:disabled="spinning"
|
|
:disabled="spinning"
|
|
type="primary"
|
|
type="primary"
|
|
class="button-info"
|
|
class="button-info"
|
|
- id="salesDetail-audit-btn"
|
|
|
|
|
|
+ ghost
|
|
|
|
+ id="salesDetail-UPaudit-btn"
|
|
v-if="detailData&&(detailData.billStatus == 'WAIT_AUDIT'||detailData.billStatus == 'SUPERIOR_AUDIT_REJECT' || detailData.billStatus == 'TRANSFER_AUDIT_REJECT')&&$hasPermissions('B_salesAudit')&&$route.params.pageType!='salesNewDetailTransfer'"
|
|
v-if="detailData&&(detailData.billStatus == 'WAIT_AUDIT'||detailData.billStatus == 'SUPERIOR_AUDIT_REJECT' || detailData.billStatus == 'TRANSFER_AUDIT_REJECT')&&$hasPermissions('B_salesAudit')&&$route.params.pageType!='salesNewDetailTransfer'"
|
|
@click="handleAudit()"
|
|
@click="handleAudit()"
|
|
>
|
|
>
|
|
@@ -234,7 +260,7 @@
|
|
</a-button>
|
|
</a-button>
|
|
<!-- 转单审核 -->
|
|
<!-- 转单审核 -->
|
|
<a-button
|
|
<a-button
|
|
- style="width: 100px;"
|
|
|
|
|
|
+ style="width: 100px;margin: 0 10px;"
|
|
:disabled="spinning"
|
|
:disabled="spinning"
|
|
type="primary"
|
|
type="primary"
|
|
class="button-info"
|
|
class="button-info"
|
|
@@ -245,27 +271,7 @@
|
|
审核
|
|
审核
|
|
</a-button>
|
|
</a-button>
|
|
<a-button
|
|
<a-button
|
|
- type="primary"
|
|
|
|
- :disabled="spinning"
|
|
|
|
- style="width: 100px;margin: 0 20px;"
|
|
|
|
- id="salesDetail-edit-btn"
|
|
|
|
- v-if="detailData&&detailData.salesBillSource == 'SALES' && (detailData.billStatus == 'WAIT_SUBMIT' || detailData.billStatus == 'WAIT_AUDIT' || detailData.billStatus == 'AUDIT_REJECT' || detailData.billStatus == 'HQ_CHANGE')&&$hasPermissions('B_salesEdit')"
|
|
|
|
- @click="handleEdit()"
|
|
|
|
- >
|
|
|
|
- 编辑
|
|
|
|
- </a-button>
|
|
|
|
- <a-button
|
|
|
|
- style="width: 100px;margin: 0 20px;"
|
|
|
|
- :disabled="spinning"
|
|
|
|
- type="primary"
|
|
|
|
- id="salesDetail-edit1-btn"
|
|
|
|
- v-if="detailData&&detailData.salesBillSource == 'PURCHASE' && (detailData.billStatus == 'WAIT_AUDIT'||detailData.billStatus == 'HQ_CHANGE'||detailData.billStatus == 'SUPERIOR_AUDIT_REJECT' || detailData.billStatus == 'TRANSFER_AUDIT_REJECT')&&$hasPermissions('B_salesEdit')"
|
|
|
|
- @click="handleChangeOrder()"
|
|
|
|
- >
|
|
|
|
- 改单
|
|
|
|
- </a-button>
|
|
|
|
- <a-button
|
|
|
|
- style="width: 100px;"
|
|
|
|
|
|
+ style="width: 100px;margin: 0 10px;"
|
|
:disabled="spinning"
|
|
:disabled="spinning"
|
|
type="primary"
|
|
type="primary"
|
|
class="button-success"
|
|
class="button-success"
|
|
@@ -277,7 +283,7 @@
|
|
</a-button>
|
|
</a-button>
|
|
<a-button
|
|
<a-button
|
|
id="salesDetail-dispatch"
|
|
id="salesDetail-dispatch"
|
|
- style="width: 100px;"
|
|
|
|
|
|
+ style="width: 100px;margin: 0 10px;"
|
|
type="primary"
|
|
type="primary"
|
|
class="button-warning"
|
|
class="button-warning"
|
|
v-if="detailData&&detailData.billStatus == 'WAIT_PUSH'&&$hasPermissions('B_salesDispatch')"
|
|
v-if="detailData&&detailData.billStatus == 'WAIT_PUSH'&&$hasPermissions('B_salesDispatch')"
|
|
@@ -434,7 +440,7 @@ export default {
|
|
// 表格高度计算
|
|
// 表格高度计算
|
|
pageHeight () {
|
|
pageHeight () {
|
|
if (!this.bizSn && (this.hideNormalTable || this.hideActiveTable || this.activeList.length == 0)) {
|
|
if (!this.bizSn && (this.hideNormalTable || this.hideActiveTable || this.activeList.length == 0)) {
|
|
- return window.innerHeight - 330 + (this.hideFooter ? 45 : 0)
|
|
|
|
|
|
+ return window.innerHeight - 320 + (this.hideFooter ? 45 : 0)
|
|
}
|
|
}
|
|
return 'auto'
|
|
return 'auto'
|
|
}
|
|
}
|
|
@@ -459,6 +465,14 @@ export default {
|
|
this.searchTable()
|
|
this.searchTable()
|
|
})
|
|
})
|
|
},
|
|
},
|
|
|
|
+ // 是否隐藏表格
|
|
|
|
+ hideTable (type) {
|
|
|
|
+ if (type == 'normal') {
|
|
|
|
+ this.hideNormalTable = true
|
|
|
|
+ } else {
|
|
|
|
+ this.hideActiveTable = true
|
|
|
|
+ }
|
|
|
|
+ },
|
|
// 编辑
|
|
// 编辑
|
|
handleEdit () {
|
|
handleEdit () {
|
|
const row = this.detailData
|
|
const row = this.detailData
|
|
@@ -531,10 +545,10 @@ export default {
|
|
// 查询数据
|
|
// 查询数据
|
|
searchTable () {
|
|
searchTable () {
|
|
this.hideNormalTable = false
|
|
this.hideNormalTable = false
|
|
- this.hideActiveTable = false
|
|
|
|
|
|
+ this.hideActiveTable = this.activeList.length == 0
|
|
this.$nextTick(() => {
|
|
this.$nextTick(() => {
|
|
this.$refs.productList.searchTable()
|
|
this.$refs.productList.searchTable()
|
|
- if (this.activeList.length) this.$refs.productActiveList.searchTable()
|
|
|
|
|
|
+ if (!this.hideActiveTable) this.$refs.productActiveList.searchTable()
|
|
})
|
|
})
|
|
},
|
|
},
|
|
// 详情
|
|
// 详情
|
|
@@ -553,9 +567,10 @@ export default {
|
|
// 已参与活动列表
|
|
// 已参与活动列表
|
|
const list = await salesPromoQueryList({ salesBillSn: this.$route.params.sn || this.bizSn }).then(res => res.data || [])
|
|
const list = await salesPromoQueryList({ salesBillSn: this.$route.params.sn || this.bizSn }).then(res => res.data || [])
|
|
this.activeList = list.filter(item => item.promotion && item.promotionRule)
|
|
this.activeList = list.filter(item => item.promotion && item.promotionRule)
|
|
|
|
+ this.hideActiveTable = this.activeList.length == 0
|
|
// 触发活动统计查询变量
|
|
// 触发活动统计查询变量
|
|
this.$nextTick(() => {
|
|
this.$nextTick(() => {
|
|
- if (this.activeList.length) {
|
|
|
|
|
|
+ if (!this.hideActiveTable) {
|
|
this.$refs.activeTjList.hasInit = false
|
|
this.$refs.activeTjList.hasInit = false
|
|
}
|
|
}
|
|
})
|
|
})
|