|
@@ -1,9 +1,14 @@
|
|
|
<template>
|
|
|
<div class="salesDetail-wrap">
|
|
|
<a-spin :spinning="spinning" tip="Loading...">
|
|
|
- <a-page-header :ghost="false" :backIcon="false" class="salesDetail-cont" :style="{ padding: !outBizSubSn ? '16px 24px' : '0px 24px' }">
|
|
|
+ <a-page-header :ghost="false" :backIcon="false" class="salesDetail-cont" :style="{marginBottom:!outBizSubSn&&!bizSn?'10px':'0px'}">
|
|
|
<template slot="subTitle" v-if="!outBizSubSn&&!bizSn">
|
|
|
<a href="javascript:;" @click="handleBack"><a-icon type="left"></a-icon> 返回列表</a>
|
|
|
+ <span style="margin: 0 15px;color: #666;font-weight: bold;">单号:{{ detailData&&detailData.dispatchBillNo }}</span>
|
|
|
+ <span style="margin: 0 10px;color: #666;">客户名称:{{ detailData&&detailData.buyerName }}</span>
|
|
|
+ <a-button type="link" class="button-default" @click="showDetail=!showDetail">
|
|
|
+ <a-icon :type="showDetail ? 'eye-invisible' : 'eye'"/> {{ showDetail?'隐藏':'查看' }}信息
|
|
|
+ </a-button>
|
|
|
</template>
|
|
|
<template slot="extra">
|
|
|
<a-button
|
|
@@ -16,7 +21,7 @@
|
|
|
@click="handlePrint('DISPATCH_BILL')">发货打印</a-button>
|
|
|
<a-button
|
|
|
key="3"
|
|
|
- type="default"
|
|
|
+ type="primary"
|
|
|
class="button-info"
|
|
|
id="salesDetail-fhfl-print-btn"
|
|
|
:disabled="localDataSource.length==0"
|
|
@@ -24,7 +29,7 @@
|
|
|
<a-divider type="vertical" />
|
|
|
<a-button
|
|
|
key="2"
|
|
|
- type="primary"
|
|
|
+ type="default"
|
|
|
class="button-info"
|
|
|
id="purchaseOrderDetail-export-btn"
|
|
|
:disabled="localDataSource.length==0"
|
|
@@ -41,30 +46,53 @@
|
|
|
</template>
|
|
|
</a-page-header>
|
|
|
<!-- 基础信息 -->
|
|
|
- <a-card size="small" :bordered="false" class="salesDetail-cont">
|
|
|
+ <a-card size="small" :bordered="false" class="salesDetail-cont" v-if="showDetail">
|
|
|
+ <div>
|
|
|
+ <a-descriptions size="small" :column="3">
|
|
|
+ <a-descriptions-item label="客户名称">{{ detailData&&detailData.buyerName || '--' }}</a-descriptions-item>
|
|
|
+ <a-descriptions-item label="销售单号">{{ detailData&&detailData.salesBillNo || '--' }}</a-descriptions-item>
|
|
|
+ <a-descriptions-item label="备货单号">{{ detailData&&detailData.dispatchBillNo || '--' }}</a-descriptions-item>
|
|
|
+ <a-descriptions-item label="收货客户名称">{{ detailData&&detailData.receiverName || '--' }}</a-descriptions-item>
|
|
|
+ <a-descriptions-item label="发货编号">{{ detailData&&detailData.sendNo || '--' }}</a-descriptions-item>
|
|
|
+ <a-descriptions-item label="收款方式">{{ detailData&&detailData.settleStyleSnDictValue || '--' }}</a-descriptions-item>
|
|
|
+ <a-descriptions-item label="收货人" v-if="detailData&&detailData.salesBillExtEntity">{{ detailData&&detailData.salesBillExtEntity&&detailData.salesBillExtEntity.consigneeName || '--' }}</a-descriptions-item>
|
|
|
+ <a-descriptions-item label="收货电话" v-if="detailData&&detailData.salesBillExtEntity">{{ detailData&&detailData.salesBillExtEntity&&detailData.salesBillExtEntity.consigneeTel || '--' }}</a-descriptions-item>
|
|
|
+ <a-descriptions-item label="收货地址" :span="2" v-if="detailData&&detailData.salesBillExtEntity">
|
|
|
+ {{ detailData&&detailData.salesBillExtEntity&&detailData.salesBillExtEntity.shippingAddrProvinceName || '' }}
|
|
|
+ {{ detailData&&detailData.salesBillExtEntity&&detailData.salesBillExtEntity.shippingAddrCityName || '' }}
|
|
|
+ {{ detailData&&detailData.salesBillExtEntity&&detailData.salesBillExtEntity.shippingAddrCountyName || '' }}
|
|
|
+ {{ detailData&&detailData.salesBillExtEntity&&detailData.salesBillExtEntity.shippingAddr || '' }}
|
|
|
+ </a-descriptions-item>
|
|
|
+ <a-descriptions-item label="业务状态">{{ detailData&&detailData.billStatusDictValue || '--' }}</a-descriptions-item>
|
|
|
+ <a-descriptions-item label="备注">{{ detailData&&detailData.remarks || '--' }}</a-descriptions-item>
|
|
|
+ </a-descriptions>
|
|
|
+ </div>
|
|
|
+ </a-card>
|
|
|
+ <!-- 弹框基础信息 -->
|
|
|
+ <div style="padding: 10px 12px 0 12px" v-if="outBizSubSn||bizSn">
|
|
|
<a-collapse :activeKey="['1']">
|
|
|
<a-collapse-panel key="1" header="基础信息">
|
|
|
- <a-descriptions size="small" :column="3">
|
|
|
- <a-descriptions-item label="客户名称">{{ detailData&&detailData.buyerName || '--' }}</a-descriptions-item>
|
|
|
- <a-descriptions-item label="销售单号">{{ detailData&&detailData.salesBillNo || '--' }}</a-descriptions-item>
|
|
|
- <a-descriptions-item label="备货单号">{{ detailData&&detailData.dispatchBillNo || '--' }}</a-descriptions-item>
|
|
|
- <a-descriptions-item label="收货客户名称">{{ detailData&&detailData.receiverName || '--' }}</a-descriptions-item>
|
|
|
- <a-descriptions-item label="发货编号">{{ detailData&&detailData.sendNo || '--' }}</a-descriptions-item>
|
|
|
- <a-descriptions-item label="收款方式">{{ detailData&&detailData.settleStyleSnDictValue || '--' }}</a-descriptions-item>
|
|
|
- <a-descriptions-item label="收货人" v-if="detailData&&detailData.salesBillExtEntity">{{ detailData&&detailData.salesBillExtEntity&&detailData.salesBillExtEntity.consigneeName || '--' }}</a-descriptions-item>
|
|
|
- <a-descriptions-item label="收货电话" v-if="detailData&&detailData.salesBillExtEntity">{{ detailData&&detailData.salesBillExtEntity&&detailData.salesBillExtEntity.consigneeTel || '--' }}</a-descriptions-item>
|
|
|
- <a-descriptions-item label="收货地址" :span="2" v-if="detailData&&detailData.salesBillExtEntity">
|
|
|
- {{ detailData&&detailData.salesBillExtEntity&&detailData.salesBillExtEntity.shippingAddrProvinceName || '' }}
|
|
|
- {{ detailData&&detailData.salesBillExtEntity&&detailData.salesBillExtEntity.shippingAddrCityName || '' }}
|
|
|
- {{ detailData&&detailData.salesBillExtEntity&&detailData.salesBillExtEntity.shippingAddrCountyName || '' }}
|
|
|
- {{ detailData&&detailData.salesBillExtEntity&&detailData.salesBillExtEntity.shippingAddr || '' }}
|
|
|
- </a-descriptions-item>
|
|
|
- <a-descriptions-item label="业务状态">{{ detailData&&detailData.billStatusDictValue || '--' }}</a-descriptions-item>
|
|
|
- <a-descriptions-item label="备注">{{ detailData&&detailData.remarks || '--' }}</a-descriptions-item>
|
|
|
- </a-descriptions>
|
|
|
+ <a-descriptions size="small" :column="3">
|
|
|
+ <a-descriptions-item label="客户名称">{{ detailData&&detailData.buyerName || '--' }}</a-descriptions-item>
|
|
|
+ <a-descriptions-item label="销售单号">{{ detailData&&detailData.salesBillNo || '--' }}</a-descriptions-item>
|
|
|
+ <a-descriptions-item label="备货单号">{{ detailData&&detailData.dispatchBillNo || '--' }}</a-descriptions-item>
|
|
|
+ <a-descriptions-item label="收货客户名称">{{ detailData&&detailData.receiverName || '--' }}</a-descriptions-item>
|
|
|
+ <a-descriptions-item label="发货编号">{{ detailData&&detailData.sendNo || '--' }}</a-descriptions-item>
|
|
|
+ <a-descriptions-item label="收款方式">{{ detailData&&detailData.settleStyleSnDictValue || '--' }}</a-descriptions-item>
|
|
|
+ <a-descriptions-item label="收货人" v-if="detailData&&detailData.salesBillExtEntity">{{ detailData&&detailData.salesBillExtEntity&&detailData.salesBillExtEntity.consigneeName || '--' }}</a-descriptions-item>
|
|
|
+ <a-descriptions-item label="收货电话" v-if="detailData&&detailData.salesBillExtEntity">{{ detailData&&detailData.salesBillExtEntity&&detailData.salesBillExtEntity.consigneeTel || '--' }}</a-descriptions-item>
|
|
|
+ <a-descriptions-item label="收货地址" :span="2" v-if="detailData&&detailData.salesBillExtEntity">
|
|
|
+ {{ detailData&&detailData.salesBillExtEntity&&detailData.salesBillExtEntity.shippingAddrProvinceName || '' }}
|
|
|
+ {{ detailData&&detailData.salesBillExtEntity&&detailData.salesBillExtEntity.shippingAddrCityName || '' }}
|
|
|
+ {{ detailData&&detailData.salesBillExtEntity&&detailData.salesBillExtEntity.shippingAddrCountyName || '' }}
|
|
|
+ {{ detailData&&detailData.salesBillExtEntity&&detailData.salesBillExtEntity.shippingAddr || '' }}
|
|
|
+ </a-descriptions-item>
|
|
|
+ <a-descriptions-item label="业务状态">{{ detailData&&detailData.billStatusDictValue || '--' }}</a-descriptions-item>
|
|
|
+ <a-descriptions-item label="备注">{{ detailData&&detailData.remarks || '--' }}</a-descriptions-item>
|
|
|
+ </a-descriptions>
|
|
|
</a-collapse-panel>
|
|
|
</a-collapse>
|
|
|
- </a-card>
|
|
|
+ </div>
|
|
|
<a-card size="small" :bordered="false" class="pages-wrap">
|
|
|
<!-- alert -->
|
|
|
<a-alert type="info" style="margin-bottom: 10px;" v-if="detailData!=null">
|
|
@@ -81,14 +109,16 @@
|
|
|
</a-alert>
|
|
|
<!-- 列表 -->
|
|
|
<s-table
|
|
|
- class="sTable"
|
|
|
+ class="sTable fixPagination"
|
|
|
+ :style="{ height: !outBizSubSn&&!bizSn ? 'auto' : tableHeight+65+'px' }"
|
|
|
ref="table"
|
|
|
size="small"
|
|
|
:rowKey="(record) => record.no"
|
|
|
rowKeyName="no"
|
|
|
+ :pageSize="30"
|
|
|
:columns="($route.params.type=='stockOut' || outBizSubSn) ? outColumns : columns"
|
|
|
:data="loadData"
|
|
|
- :scroll="{ y: 500 }"
|
|
|
+ :scroll="{ y: tableHeight }"
|
|
|
:defaultLoadData="false"
|
|
|
bordered>
|
|
|
<!-- 产品编码 -->
|
|
@@ -147,9 +177,9 @@ export default {
|
|
|
spinning: false,
|
|
|
outColumns: [
|
|
|
{ title: '序号', dataIndex: 'no', width: '6%', align: 'center' },
|
|
|
- { title: '产品编码', dataIndex: 'productCode', width: '25%', scopedSlots: { customRender: 'productCode' }, align: 'center' },
|
|
|
- { title: '产品名称', dataIndex: 'productName', width: '33%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
|
|
|
- { title: '原厂编码', dataIndex: 'productOrigCode', width: '20%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
+ { title: '产品编码', dataIndex: 'productCode', width: '25%', scopedSlots: { customRender: 'productCode' }, align: 'left' },
|
|
|
+ { title: '产品名称', dataIndex: 'productName', width: '33%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
|
|
|
+ { title: '原厂编码', dataIndex: 'productOrigCode', width: '20%', align: 'left', customRender: function (text) { return text || '--' } },
|
|
|
{ title: '单位', dataIndex: 'productOrigUnit', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
{ title: '本次出库数', dataIndex: 'qty', width: '10%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } }
|
|
|
],
|
|
@@ -184,7 +214,9 @@ export default {
|
|
|
nowPrintType: '', // 当前打印类型
|
|
|
openExcelModal: false,
|
|
|
fromRouter: null,
|
|
|
- nowType: 'print'
|
|
|
+ nowType: 'print',
|
|
|
+ showDetail: false,
|
|
|
+ tableHeight: 300
|
|
|
}
|
|
|
},
|
|
|
computed: {
|
|
@@ -194,9 +226,9 @@ export default {
|
|
|
columns () {
|
|
|
const arr = [
|
|
|
{ title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
|
|
|
- { title: '产品编码', dataIndex: 'productCode', width: '19%', scopedSlots: { customRender: 'productCode' }, align: 'center' },
|
|
|
- { title: '产品名称', dataIndex: 'productName', width: '10%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
|
|
|
- { title: '原厂编码', dataIndex: 'productOrigCode', width: '19%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
+ { title: '产品编码', dataIndex: 'productCode', width: '10%', scopedSlots: { customRender: 'productCode' }, align: 'left' },
|
|
|
+ { title: '产品名称', dataIndex: 'productName', width: '23%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
|
|
|
+ { title: '原厂编码', dataIndex: 'productOrigCode', width: '15%', align: 'left', customRender: function (text) { return text || '--' } },
|
|
|
{ title: '单位', dataIndex: 'productOrigUnit', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
// { title: '销售价格', dataIndex: 'price', width: '8%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
|
// { title: '市级销售价格', dataIndex: 'cityPrice', width: '10%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
@@ -214,11 +246,19 @@ export default {
|
|
|
return arr
|
|
|
}
|
|
|
},
|
|
|
+ watch: {
|
|
|
+ showDetail(newValue, oldValue) {
|
|
|
+ this.getTableHeight()
|
|
|
+ }
|
|
|
+ },
|
|
|
methods: {
|
|
|
// 返回
|
|
|
handleBack () {
|
|
|
this.$router.push({ name: 'pushOrderManagementList' })
|
|
|
},
|
|
|
+ getTableHeight(){
|
|
|
+ this.tableHeight = this.outBizSubSn || this.bizSn ? 300 : (window.innerHeight - (this.showDetail ? 407 : 265))
|
|
|
+ },
|
|
|
// 详情
|
|
|
getDetail () {
|
|
|
dispatchFindBySn({ dispatchBillSn: this.outBizSubSn || this.bizSn || this.$route.params.sn }).then(res => {
|
|
@@ -227,6 +267,7 @@ export default {
|
|
|
} else {
|
|
|
this.detailData = null
|
|
|
}
|
|
|
+ this.getTableHeight()
|
|
|
})
|
|
|
},
|
|
|
// 导出Excel
|