|
@@ -119,14 +119,13 @@
|
|
|
<span v-if="$hasPermissions('M_pushOrderManagementList_salesPrice')">下推总金额:<strong>{{ totalData&&(totalData.totalAmount || totalData.totalAmount==0) ? toThousands(totalData.totalAmount) : '--' }}</strong>;</span>
|
|
|
</div>
|
|
|
<!-- 列表 -->
|
|
|
- <s-table
|
|
|
+ <v-table
|
|
|
class="sTable fixPagination"
|
|
|
ref="table"
|
|
|
- :style="{ height: tableHeight+70+'px' }"
|
|
|
- size="small"
|
|
|
- :rowKey="(record) => record.id"
|
|
|
+ :style="{ height: tableHeight+35+'px' }"
|
|
|
:columns="columns"
|
|
|
:data="loadData"
|
|
|
+ :pagination="{pageSize:20}"
|
|
|
:scroll="{ y:tableHeight, x:1890 }"
|
|
|
:defaultLoadData="false"
|
|
|
bordered>
|
|
@@ -144,6 +143,10 @@
|
|
|
<template slot="explainInfo" slot-scope="text, record">
|
|
|
<span class="link-bule" @click="handleExplainInfo(record)" :title="record.explainInfo">{{ record.explainInfo||'--' }}</span>
|
|
|
</template>
|
|
|
+ <!-- 单据状态 -->
|
|
|
+ <template slot="voidFlag" slot-scope="text, record">
|
|
|
+ <span :style="{color:record.voidFlag==1?'red':''}">{{ record.voidFlagDictValue||'--' }}</span>
|
|
|
+ </template>
|
|
|
<!-- 操作 -->
|
|
|
<template slot="action" slot-scope="text, record">
|
|
|
<div>
|
|
@@ -165,7 +168,7 @@
|
|
|
>取消打印</a-button>
|
|
|
</div>
|
|
|
</template>
|
|
|
- </s-table>
|
|
|
+ </v-table>
|
|
|
|
|
|
<!-- 允许此单进行备货打印操作提示 -->
|
|
|
<commonModal modalTit="操作提示" :openModal="showTipModal" @cancel="canselModal" @ok="updatePrintStatus">
|
|
@@ -201,7 +204,7 @@ import { commonMixin } from '@/utils/mixin'
|
|
|
import moment from 'moment'
|
|
|
import getDate from '@/libs/getDate.js'
|
|
|
import rangeDate from '@/views/common/rangeDate.vue'
|
|
|
-import { STable, VSelect } from '@/components'
|
|
|
+import { VTable, VSelect } from '@/components'
|
|
|
import subarea from '@/views/common/subarea.js'
|
|
|
import Area from '@/views/common/area.js'
|
|
|
import chooseWarehouse from '@/views/common/chooseWarehouse'
|
|
@@ -214,7 +217,7 @@ import customerService from '@/views/common/customerService'
|
|
|
export default {
|
|
|
name: 'PushOrderManagementList',
|
|
|
mixins: [commonMixin],
|
|
|
- components: { STable, VSelect, dealerSubareaScopeList, rangeDate, subarea, commonModal, Area, salesDetail, explainInfoModal, chooseWarehouse, customerService },
|
|
|
+ components: { VTable, VSelect, dealerSubareaScopeList, rangeDate, subarea, commonModal, Area, salesDetail, explainInfoModal, chooseWarehouse, customerService },
|
|
|
data () {
|
|
|
return {
|
|
|
spinning: false,
|
|
@@ -281,9 +284,16 @@ export default {
|
|
|
},
|
|
|
computed: {
|
|
|
columns () {
|
|
|
+ const formatDate = function (text) {
|
|
|
+ if (text) {
|
|
|
+ const ret = text.split(' ')
|
|
|
+ return (<div>{ret[0]}<br/>{ret[1]}</div>)
|
|
|
+ }
|
|
|
+ return '--'
|
|
|
+ }
|
|
|
const arr = [
|
|
|
- { title: '序号', dataIndex: 'no', width: '60px', align: 'center' },
|
|
|
- { title: '下推时间', dataIndex: 'pushedDate', width: '100px', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
+ { title: '序号', dataIndex: 'no', width: '40px', align: 'center' },
|
|
|
+ { title: '下推时间', dataIndex: 'pushedDate', width: '100px', align: 'center', customRender: function (text) { return formatDate(text) } },
|
|
|
{ title: '销售单号', scopedSlots: { customRender: 'salesBillNo' }, width: '120px', align: 'center' },
|
|
|
{ title: '备货单号', scopedSlots: { customRender: 'dispatchBillNo' }, width: '120px', align: 'center' },
|
|
|
{ title: '发货编号', dataIndex: 'sendNo', width: '80px', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
|
|
@@ -298,9 +308,9 @@ export default {
|
|
|
{ title: '收款打印状态', dataIndex: 'settlePrintStateDictValue', width: '100px', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
{ title: '对单状态', dataIndex: 'checkStatusDictValue', width: '100px', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
{ title: '业务状态', dataIndex: 'billStatusDictValue', width: '100px', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
- { title: '单据状态', dataIndex: 'voidFlagDictValue', width: '100px', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
- { title: '备货时间', dataIndex: 'stockUpDate', width: '100px', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
- { title: '出库时间', dataIndex: 'stockOutDate', width: '100px', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
+ { title: '单据状态', dataIndex: 'voidFlagDictValue', scopedSlots: { customRender: 'voidFlag' }, width: '100px', align: 'center' },
|
|
|
+ { title: '备货时间', dataIndex: 'stockUpDate', width: '100px', align: 'center', customRender: function (text) { return formatDate(text) } },
|
|
|
+ { title: '出库时间', dataIndex: 'stockOutDate', width: '100px', align: 'center', customRender: function (text) { return formatDate(text) } },
|
|
|
{ title: '操作', scopedSlots: { customRender: 'action' }, width: '100px', align: 'center', fixed: 'right' }
|
|
|
]
|
|
|
// 售价权限
|
|
@@ -410,7 +420,7 @@ export default {
|
|
|
// 计算表格高度
|
|
|
setTableH () {
|
|
|
const tableSearchH = this.$refs.tableSearch.offsetHeight
|
|
|
- this.tableHeight = window.innerHeight - tableSearchH - 230
|
|
|
+ this.tableHeight = window.innerHeight - tableSearchH - 200
|
|
|
}
|
|
|
},
|
|
|
watch: {
|