|
@@ -80,6 +80,7 @@
|
|
<span>{{ record.dealerProductEntity.code }}</span>
|
|
<span>{{ record.dealerProductEntity.code }}</span>
|
|
<a-badge v-if="record.promotionFlag && record.promotionFlag=='GIFT'" count="促" :number-style="{ backgroundColor: '#52c41a', zoom:'80%',marginLeft:'5px' }"></a-badge>
|
|
<a-badge v-if="record.promotionFlag && record.promotionFlag=='GIFT'" count="促" :number-style="{ backgroundColor: '#52c41a', zoom:'80%',marginLeft:'5px' }"></a-badge>
|
|
<a-badge v-if="record.promotionFlag && record.promotionFlag=='DISCOUNT'" count="特" :number-style="{ backgroundColor: '#faad14', zoom:'80%',marginLeft:'5px' }"></a-badge>
|
|
<a-badge v-if="record.promotionFlag && record.promotionFlag=='DISCOUNT'" count="特" :number-style="{ backgroundColor: '#faad14', zoom:'80%',marginLeft:'5px' }"></a-badge>
|
|
|
|
+ <a-badge v-if="record.convertPromoGiftsFlag && record.convertPromoGiftsFlag==1" count="转" :number-style="{ backgroundColor: '#ff0000', zoom:'80%',marginLeft:'5px' }"></a-badge>
|
|
</template>
|
|
</template>
|
|
<!-- 采购数量 -->
|
|
<!-- 采购数量 -->
|
|
<template slot="origqty" slot-scope="text, record">
|
|
<template slot="origqty" slot-scope="text, record">
|
|
@@ -100,60 +101,28 @@
|
|
<span v-if="record.promotionFlag && (record.promotionFlag=='GIFT' || record.promotionFlag=='DISCOUNT')">{{ record.discountedAmount||record.discountedAmount==0?toThousands(record.discountedAmount) : '--' }}{{ record.totalOrigAmount ? '(' + toThousands(record.totalOrigAmount) + ')' : '' }}</span>
|
|
<span v-if="record.promotionFlag && (record.promotionFlag=='GIFT' || record.promotionFlag=='DISCOUNT')">{{ record.discountedAmount||record.discountedAmount==0?toThousands(record.discountedAmount) : '--' }}{{ record.totalOrigAmount ? '(' + toThousands(record.totalOrigAmount) + ')' : '' }}</span>
|
|
<span v-else>{{ toThousands(record.discountedAmount) }}</span>
|
|
<span v-else>{{ toThousands(record.discountedAmount) }}</span>
|
|
</template>
|
|
</template>
|
|
- </s-table>
|
|
|
|
- </a-collapse-panel>
|
|
|
|
- </a-collapse>
|
|
|
|
- </a-card>
|
|
|
|
- <!-- 促销品详情 -->
|
|
|
|
- <a-card size="small" v-if="false" :bordered="false" class="purchaseOrderDetail-cont">
|
|
|
|
- <a-collapse :activeKey="['1']">
|
|
|
|
- <a-collapse-panel key="1" header="促销品详情">
|
|
|
|
- <!-- 总计 -->
|
|
|
|
- <a-alert type="info" style="margin-bottom:10px">
|
|
|
|
- <div slot="message">产品款数 <strong>{{ detail&&(detail.totalCategory || detail.totalCategory==0) ? detail.totalCategory : '--' }}</strong> ,
|
|
|
|
- 采购数量合计 <strong>{{ detail&&(detail.totalQty || detail.totalQty==0) ? detail.totalQty : '--' }}</strong> ,
|
|
|
|
- 采购金额合计 <strong>{{ detail&&(detail.totalAmount || detail.totalAmount==0) ? toThousands(detail.totalAmount,2) : '--' }}</strong></div>
|
|
|
|
- </a-alert>
|
|
|
|
- <!-- 列表 -->
|
|
|
|
- <s-table
|
|
|
|
- class="sTable"
|
|
|
|
- ref="table-1"
|
|
|
|
- size="small"
|
|
|
|
- :rowKey="(record) => record.id"
|
|
|
|
- :columns="columns"
|
|
|
|
- :data="loadData"
|
|
|
|
- :scroll="{ x: 1060 }"
|
|
|
|
- bordered>
|
|
|
|
- <!-- 采购数量 -->
|
|
|
|
- <template slot="origqty" slot-scope="text, record">
|
|
|
|
- <div>{{ text }}</div>
|
|
|
|
- <div v-if="record.origqty">原采购数量:{{ record.origqty }}</div>
|
|
|
|
|
|
+ <!-- 转采购额数量 -->
|
|
|
|
+ <template slot="customTitle1">
|
|
|
|
+ <a-tooltip>
|
|
|
|
+ <template slot="title">
|
|
|
|
+ 即促销产品转采购额的数量,订单完结后会进行费用报销
|
|
|
|
+ </template>
|
|
|
|
+ 转采购额数量<a-icon type="question-circle" />
|
|
|
|
+ </a-tooltip>
|
|
</template>
|
|
</template>
|
|
- <!-- 已取消数量 -->
|
|
|
|
- <template slot="outOfStockNum" slot-scope="text, record">
|
|
|
|
- <span>{{ record.outOfStockNum }}</span>
|
|
|
|
|
|
+ <!-- 转采购额金额 -->
|
|
|
|
+ <template slot="customTitle2">
|
|
|
|
+ <a-tooltip>
|
|
|
|
+ <template slot="title">
|
|
|
|
+ 即促销产品转采购额金额,促销产品转采购额数量*销售价
|
|
|
|
+ </template>
|
|
|
|
+ 转采购额金额<a-icon type="question-circle" />
|
|
|
|
+ </a-tooltip>
|
|
</template>
|
|
</template>
|
|
</s-table>
|
|
</s-table>
|
|
</a-collapse-panel>
|
|
</a-collapse-panel>
|
|
</a-collapse>
|
|
</a-collapse>
|
|
</a-card>
|
|
</a-card>
|
|
- <!-- 单据记录 -->
|
|
|
|
- <a-card size="small" v-if="false" :bordered="false" class="purchaseOrderDetail-cont">
|
|
|
|
- <a-collapse :activeKey="['1']">
|
|
|
|
- <a-collapse-panel key="1" header="单据记录">
|
|
|
|
- <a-timeline class="timeline-box">
|
|
|
|
- <a-timeline-item>2021-02-01 15:22:38 王凯 审核通过</a-timeline-item>
|
|
|
|
- <a-timeline-item>
|
|
|
|
- <p>2021-02-01 15:22:38 王凯 审核通过</p>
|
|
|
|
- <p class="auxiliary-txt">产品编号JA-11076P的采购数量,由【10】修改为【5】</p>
|
|
|
|
- <p class="auxiliary-txt">产品编号JA-11076P的采购数量,由【10】修改为【5】</p>
|
|
|
|
- </a-timeline-item>
|
|
|
|
- <a-timeline-item>Technical testing 2015-09-01</a-timeline-item>
|
|
|
|
- <a-timeline-item>Network problems being solved 2015-09-01</a-timeline-item>
|
|
|
|
- </a-timeline>
|
|
|
|
- </a-collapse-panel>
|
|
|
|
- </a-collapse>
|
|
|
|
- </a-card>
|
|
|
|
</a-spin>
|
|
</a-spin>
|
|
</div>
|
|
</div>
|
|
</template>
|
|
</template>
|
|
@@ -207,8 +176,8 @@ export default {
|
|
const _this = this
|
|
const _this = this
|
|
const arr = [
|
|
const arr = [
|
|
{ title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
|
|
{ title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
|
|
- { title: '产品编码', dataIndex: 'dealerProductEntity.code', width: '16%', align: 'center', scopedSlots: { customRender: 'code' } },
|
|
|
|
- { title: '产品名称', dataIndex: 'dealerProductEntity.name', width: '16%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
|
|
|
|
|
|
+ { title: '产品编码', dataIndex: 'dealerProductEntity.code', width: '14%', align: 'center', scopedSlots: { customRender: 'code' } },
|
|
|
|
+ { title: '产品名称', dataIndex: 'dealerProductEntity.name', width: '18%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
|
|
{ title: '原厂编码', dataIndex: 'dealerProductEntity.origCode', width: '15%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
{ title: '原厂编码', dataIndex: 'dealerProductEntity.origCode', width: '15%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
{ title: '单位', dataIndex: 'dealerProductEntity.unit', width: '5%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
{ title: '单位', dataIndex: 'dealerProductEntity.unit', width: '5%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
// { title: '采购单价', dataIndex: 'discountedPrice', width: '7%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
// { title: '采购单价', dataIndex: 'discountedPrice', width: '7%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
@@ -223,6 +192,10 @@ export default {
|
|
arr.splice(6, 0, { title: '采购金额', dataIndex: 'discountedAmount', width: '7%', align: 'right', scopedSlots: { customRender: 'amount' } })
|
|
arr.splice(6, 0, { title: '采购金额', dataIndex: 'discountedAmount', width: '7%', align: 'right', scopedSlots: { customRender: 'amount' } })
|
|
arr.splice(8, 0, { title: '审核订单金额', dataIndex: 'pushedAmount', width: '8%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text, 2) : '--') } })
|
|
arr.splice(8, 0, { title: '审核订单金额', dataIndex: 'pushedAmount', width: '8%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text, 2) : '--') } })
|
|
}
|
|
}
|
|
|
|
+ if(this.detail && this.detail.totalConvertPromoGiftsQty){
|
|
|
|
+ arr.push({ slots: { title: 'customTitle1' }, dataIndex: 'convertPromoGiftsQty', width: '7%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
|
|
|
|
+ arr.push({ slots: { title: 'customTitle2' }, dataIndex: 'convertPromoGiftsAmount', width: '7%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text, 2) : '--') } })
|
|
|
|
+ }
|
|
return arr
|
|
return arr
|
|
}
|
|
}
|
|
},
|
|
},
|