|
@@ -166,11 +166,6 @@
|
|
|
<a-badge :count="'改'+record.changeTimes" :number-style="{ zoom:'80%' }" v-if="record.changeTimes>0"></a-badge>
|
|
|
<a-badge count="促" v-if="record.promoFlag==1" :number-style="{ backgroundColor: '#52c41a', zoom:'80%' }"></a-badge>
|
|
|
</template>
|
|
|
- <!-- 提交时间 -->
|
|
|
- <template slot="submitDateBox" slot-scope="text, record">
|
|
|
- <span v-if="record.salesBillSource=='PURCHASE'">{{ record.submitDate||'--' }}</span>
|
|
|
- <span v-else>{{ record.firstSubmitDate||'--' }}</span>
|
|
|
- </template>
|
|
|
<!-- 出库仓库 -->
|
|
|
<template slot="warehouseBox" slot-scope="text, record">
|
|
|
<a-tooltip placement="right" v-if="record.newWarehouseNameSet && record.newWarehouseNameSet.length>0">
|
|
@@ -417,7 +412,7 @@ export default {
|
|
|
const arr = [
|
|
|
{ title: '创建时间', dataIndex: 'createDate', width: '6%', align: 'center', customRender: function (text) { return text || '--' }, sorter: true },
|
|
|
{ title: '销售单号', scopedSlots: { customRender: 'salesBillNo' }, width: '7%', align: 'center' },
|
|
|
- { title: <a-tooltip placement='top' title='第一次提交时间'>提交时间 <a-icon type="question-circle" /></a-tooltip>, dataIndex: 'firstSubmitDate', width: '8%', align: 'center', scopedSlots: { customRender: 'submitDateBox' }, sorter: true },
|
|
|
+ { title: <a-tooltip placement='top' title='第一次提交时间'>提交时间 <a-icon type="question-circle" /></a-tooltip>, dataIndex: 'firstSubmitDate', width: '8%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') }, sorter: true },
|
|
|
{ title: '客户名称', dataIndex: 'buyerName', width: '8%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
|
|
|
{ title: '出库仓库', scopedSlots: { customRender: 'warehouseBox' }, width: '8%', align: 'center', ellipsis: true },
|
|
|
{ title: '总数量', dataIndex: 'totalQty', scopedSlots: { customRender: 'totalQty' }, width: '4%', align: 'center' },
|