|
@@ -88,14 +88,14 @@
|
|
|
:cellSelectionOption="{enable: false}"
|
|
|
:virtual-scroll-option="{enable: true}"
|
|
|
:columns="columns"
|
|
|
- :table-data="dataSource"
|
|
|
+ :table-data="tableData"
|
|
|
row-key-field-name="id"
|
|
|
:cell-style-option="cellStyleOption"
|
|
|
:cell-span-option="cellSpanOption"
|
|
|
:column-width-resize-option="columnWidthResizeOption"
|
|
|
:checkbox-option="checkboxOption"
|
|
|
/>
|
|
|
- <div v-show="showEmpty" class="empty-data">暂无数据</div>
|
|
|
+ <div v-show="showEmpty" class="empty-data"><a-empty description="暂无产品"/></div>
|
|
|
<!-- 活动规则详情 -->
|
|
|
<detailModal :openModal="openDetailModal" :itemSn="detailSn" @close="closeDetailModal"></detailModal>
|
|
|
</a-spin>
|
|
@@ -152,6 +152,7 @@ export default {
|
|
|
activeList: [], // 活动列表
|
|
|
spinning: false,
|
|
|
dataSource: [],
|
|
|
+ tableData: [],
|
|
|
tableHeight: this.maxHeight,
|
|
|
cellStyleOption: {
|
|
|
bodyCellClass: ({ row, column, rowIndex }) => {
|
|
@@ -275,9 +276,9 @@ export default {
|
|
|
款数:<strong>{record.total&&record.total.totalCategory||'--'}</strong>;
|
|
|
数量:<strong>{record.total&&record.total.totalQty||'--'}</strong>;
|
|
|
{_this.$hasPermissions('B_salesEdit_salesPrice') ? (<span>总金额:<strong>{record.total&&record.total.totalAmount||'--'}</strong>;</span>):('')}
|
|
|
- {_this.$hasPermissions('B_salesEdit_salesPrice')&&record.promo&&record.total ? (<span>优惠金额:<strong>{record.total.lossAmount||'--'}</strong>;</span>):('')}
|
|
|
- {_this.$hasPermissions('B_salesEdit_salesPrice')&&record.promo&&record.total ? (<span>采购额结余:<strong>{_this.toThousands(Number(record.total.totalPromoGiftsAmount) - Number(record.total.totalUsePromoGiftsAmount))}</strong>;</span>):('')}
|
|
|
- {_this.$hasPermissions('B_salesEdit_salesPrice')&&record.promo&&record.total ? (<span>采购额超出:<strong>{_this.toThousands(Number(record.total.totalUsePromoGiftsAmount) - Number(record.total.totalPromoGiftsAmount))}</strong>;</span>):('')}
|
|
|
+ {_this.$hasPermissions('B_salesEdit_salesPrice')&&record.promo&&record.total&&record.total.lossAmount ? (<span>优惠金额:<strong>{record.total.lossAmount}</strong>;</span>):('')}
|
|
|
+ {_this.$hasPermissions('B_salesEdit_salesPrice')&&record.promo&&record.total&&record.total.cgejyAmount ? (<span>采购额结余:<strong>{_this.toThousands(record.total.cgejyAmount)}</strong>;</span>):('')}
|
|
|
+ {_this.$hasPermissions('B_salesEdit_salesPrice')&&record.promo&&record.total&&record.total.cgeccAmount ? (<span>采购额超出:<strong>{_this.toThousands(record.total.cgeccAmount)}</strong>;</span>):('')}
|
|
|
{record.expenseAccountFlag!='WAIT' ? record.expenseAccountFlagDictValue : ''}
|
|
|
</div>
|
|
|
</div>
|
|
@@ -285,7 +286,7 @@ export default {
|
|
|
</div>
|
|
|
)
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
let arr= [
|
|
|
{ title: "", field: "", key: "acheck", type: "checkbox", align: "center" },
|
|
|
{ title: '序号', field: 'no',key: "a", width: 50, align: 'center', operationColumn: false,renderBodyCell: ({ row, column, rowIndex }, h) => { return noFormat(row,row[column.field],h)} },
|
|
@@ -402,6 +403,10 @@ export default {
|
|
|
const aclist = await salesDetailAllList(activeParams).then(res => res.data)
|
|
|
// 获取活动产品统计
|
|
|
const acTotal = await salesPromoDetailCount(activeParams).then(res => res.data)
|
|
|
+ // 采购额结余
|
|
|
+ acTotal.cgejyAmount = Number(acTotal.totalPromoGiftsAmount) - Number(acTotal.totalUsePromoGiftsAmount)
|
|
|
+ // 采购额超出
|
|
|
+ acTotal.cgeccAmount = Number(acTotal.totalUsePromoGiftsAmount) - Number(acTotal.totalPromoGiftsAmount)
|
|
|
const retList = [{
|
|
|
id: 'promo-'+i,
|
|
|
promo: promo,
|
|
@@ -434,6 +439,7 @@ export default {
|
|
|
})
|
|
|
this.showEmpty = this.dataSource.length <= 0
|
|
|
this.tableHeight = (this.showEmpty ? 200 : this.maxHeight) + 'px'
|
|
|
+ this.tableData = this.dataSource
|
|
|
this.spinning = false
|
|
|
this.disabled = false
|
|
|
},
|
|
@@ -448,6 +454,7 @@ export default {
|
|
|
this.queryParam.productTypeSn2 = ''
|
|
|
this.queryParam.productTypeSn3 = ''
|
|
|
this.queryParam.warehouseSn = undefined
|
|
|
+ this.queryParam.promoFlag = undefined
|
|
|
this.productType = []
|
|
|
this.dataSource = []
|
|
|
this.clearSelectTable()
|