|
@@ -175,10 +175,10 @@
|
|
|
</div>
|
|
|
|
|
|
<!-- 列表 -->
|
|
|
- <s-table
|
|
|
+ <v-table
|
|
|
class="sTable fixPagination"
|
|
|
ref="table"
|
|
|
- :style="{ height: tableHeight+87+'px' }"
|
|
|
+ :style="{ height: tableHeight+35+'px' }"
|
|
|
size="small"
|
|
|
:rowKey="(record) => record.id"
|
|
|
:columns="columns"
|
|
@@ -186,12 +186,16 @@
|
|
|
:scroll="{ y: tableHeight }"
|
|
|
:defaultLoadData="false"
|
|
|
bordered>
|
|
|
+ <!-- 时间表头 -->
|
|
|
+ <template slot="customDateTitle">
|
|
|
+ <a-tooltip placement="top" title="第一次提交时间">提交时间 <a-icon type="question-circle" /></a-tooltip>
|
|
|
+ </template>
|
|
|
<!-- 销售单号 -->
|
|
|
<template slot="salesBillNo" slot-scope="text, record">
|
|
|
<span v-if="$hasPermissions('B_salesDetail')" class="link-bule" @click="handleDetail(record)">{{ record.salesBillNo }}</span>
|
|
|
<span v-else>{{ record.salesBillNo }}</span>
|
|
|
- <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>
|
|
|
+ <a-badge :count="'改'+record.changeTimes" :number-style="{ zoom:'0.8' }" v-if="record.changeTimes>0"></a-badge>
|
|
|
+ <a-badge count="促" v-if="record.promoFlag==1" :number-style="{ backgroundColor: '#52c41a', zoom:'0.8' }"></a-badge>
|
|
|
</template>
|
|
|
<!-- 出库仓库 -->
|
|
|
<template slot="warehouseBox" slot-scope="text, record">
|
|
@@ -205,10 +209,6 @@
|
|
|
</a-tooltip>
|
|
|
<div v-else>--</div>
|
|
|
</template>
|
|
|
- <!-- 总数量 -->
|
|
|
- <template slot="totalQty" slot-scope="text, record">
|
|
|
- {{ record.totalQty }}
|
|
|
- </template>
|
|
|
<!-- 操作 -->
|
|
|
<template slot="action" slot-scope="text, record">
|
|
|
<div>
|
|
@@ -278,7 +278,7 @@
|
|
|
>转费用报销单</a-button>
|
|
|
</div>
|
|
|
</template>
|
|
|
- </s-table>
|
|
|
+ </v-table>
|
|
|
</a-spin>
|
|
|
<!-- 选择客户弹框 -->
|
|
|
<choose-custom-modal :show="openModal" @ok="chooseCustomOk" @cancel="openModal=false"></choose-custom-modal>
|
|
@@ -319,7 +319,7 @@ import { hdExportExcel } from '@/libs/exportExcel'
|
|
|
import subarea from '@/views/common/subarea.js'
|
|
|
import Area from '@/views/common/area.js'
|
|
|
import rangeDate from '@/views/common/rangeDate.vue'
|
|
|
-import { STable, VSelect } from '@/components'
|
|
|
+import { VTable, VSelect } from '@/components'
|
|
|
import commonModal from '@/views/common/commonModal.vue'
|
|
|
import chooseCustomModal from './chooseCustomModal.vue'
|
|
|
import tipModal from './tipModal.vue'
|
|
@@ -336,7 +336,7 @@ import { salesDetailExport } from '@/api/salesBillReport'
|
|
|
export default {
|
|
|
name: 'SalesQueryList',
|
|
|
mixins: [commonMixin],
|
|
|
- components: { STable, VSelect, tipModal, chooseCustomModal, dealerSubareaScopeList, Area, rangeDate, subarea, commonModal, reportModal, chooseWarehouse, baseDataModal, customerService },
|
|
|
+ components: { VTable, VSelect, tipModal, chooseCustomModal, dealerSubareaScopeList, Area, rangeDate, subarea, commonModal, reportModal, chooseWarehouse, baseDataModal, customerService },
|
|
|
data () {
|
|
|
return {
|
|
|
spinning: false,
|
|
@@ -483,11 +483,11 @@ export default {
|
|
|
const _this = this
|
|
|
const arr = [
|
|
|
{ title: '创建时间', dataIndex: 'createDate', width: '6%', align: 'center', customRender: function (text) { return text || '--' }, sorter: true },
|
|
|
- { title: '销售单号', scopedSlots: { customRender: 'salesBillNo' }, width: '8%', align: 'center' },
|
|
|
- { title: <a-tooltip placement='top' title='第一次提交时间'>提交时间 <a-icon type="question-circle" /></a-tooltip>, dataIndex: 'firstSubmitDate', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') }, sorter: true },
|
|
|
+ { title: '销售单号', scopedSlots: { customRender: 'salesBillNo' }, width: '8%', align: 'left' },
|
|
|
+ { title: '提交时间', slots: { title: 'customDateTitle' }, dataIndex: 'firstSubmitDate', width: '6%', 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: '6%', align: 'center', ellipsis: true },
|
|
|
- { title: '总数量', dataIndex: 'totalQty', scopedSlots: { customRender: 'totalQty' }, width: '4%', align: 'center' },
|
|
|
+ { title: '总数量', dataIndex: 'totalQty', width: '4%', align: 'center' },
|
|
|
{ title: '总售价', dataIndex: 'totalAmount', width: '4%', align: 'right', isShow: false, customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
|
|
|
{ title: '已下推数量', dataIndex: 'totalPushedQty', width: '5%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
|
{ title: '下推总金额', dataIndex: 'totalPushedAmount', width: '5%', align: 'right', isShow: false, customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
|
|
@@ -502,8 +502,8 @@ export default {
|
|
|
{ title: '最近备货时间', dataIndex: 'lastStockUpDate', width: '6%', align: 'center', customRender: function (text) { return text || '--' }, sorter: true },
|
|
|
{ title: '业务状态', dataIndex: 'billStatusDictValue', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
{ title: '财务状态', dataIndex: 'financialStatusDictValue', width: '5%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
- { title: '备货打印状态', dataIndex: 'printStatusDictValue', width: '5%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
|
- { title: '操作', scopedSlots: { customRender: 'action' }, width: '7%', align: 'center' }
|
|
|
+ { title: '备货打印状态', dataIndex: 'printStatusDictValue', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
|
+ { title: '操作', scopedSlots: { customRender: 'action' }, width: '9%', align: 'center' }
|
|
|
]
|
|
|
// 根据权限及勾选按固定顺序动态显示列
|
|
|
arr.map(item => {
|
|
@@ -809,7 +809,7 @@ export default {
|
|
|
// 计算表格高度
|
|
|
setTableH () {
|
|
|
const tableSearchH = this.$refs.tableSearch.offsetHeight
|
|
|
- this.tableHeight = window.innerHeight - tableSearchH - 260
|
|
|
+ this.tableHeight = window.innerHeight - tableSearchH - 210
|
|
|
}
|
|
|
},
|
|
|
watch: {
|