|
@@ -1,8 +1,8 @@
|
|
<template>
|
|
<template>
|
|
<div class="salesDetail-wrap">
|
|
<div class="salesDetail-wrap">
|
|
<a-spin :spinning="spinning" tip="Loading...">
|
|
<a-spin :spinning="spinning" tip="Loading...">
|
|
- <a-page-header :ghost="false" :backIcon="false" class="salesDetail-cont">
|
|
|
|
- <template slot="subTitle">
|
|
|
|
|
|
+ <a-page-header :ghost="false" :backIcon="false" class="salesDetail-cont" :style="{ padding: !outBizSubSn ? '16px 24px' : '0px 24px' }">
|
|
|
|
+ <template slot="subTitle" v-if="!outBizSubSn">
|
|
<a href="javascript:;" @click="handleBack"><a-icon type="left"></a-icon> 返回列表</a>
|
|
<a href="javascript:;" @click="handleBack"><a-icon type="left"></a-icon> 返回列表</a>
|
|
</template>
|
|
</template>
|
|
<template slot="extra" v-if="$hasPermissions('B_dispatchPrint')">
|
|
<template slot="extra" v-if="$hasPermissions('B_dispatchPrint')">
|
|
@@ -42,14 +42,14 @@
|
|
<a-collapse-panel key="1" header="基础信息">
|
|
<a-collapse-panel key="1" header="基础信息">
|
|
<a-descriptions size="small" :column="3">
|
|
<a-descriptions size="small" :column="3">
|
|
<a-descriptions-item label="客户名称">{{ detailData&&detailData.buyerName || '--' }}</a-descriptions-item>
|
|
<a-descriptions-item label="客户名称">{{ detailData&&detailData.buyerName || '--' }}</a-descriptions-item>
|
|
- <a-descriptions-item label="收货地址" v-if="detailData&&detailData.salesBillExtEntity">
|
|
|
|
|
|
+ <a-descriptions-item label="收货人" v-if="detailData&&detailData.salesBillExtEntity">{{ detailData&&detailData.salesBillExtEntity&&detailData.salesBillExtEntity.consigneeName || '--' }}</a-descriptions-item>
|
|
|
|
+ <a-descriptions-item label="收款方式">{{ detailData&&detailData.settleStyleSnDictValue || '--' }}</a-descriptions-item>
|
|
|
|
+ <a-descriptions-item label="收货地址" :span="3" v-if="detailData&&detailData.salesBillExtEntity">
|
|
{{ detailData&&detailData.salesBillExtEntity&&detailData.salesBillExtEntity.shippingAddrProvinceName || '' }}
|
|
{{ detailData&&detailData.salesBillExtEntity&&detailData.salesBillExtEntity.shippingAddrProvinceName || '' }}
|
|
{{ detailData&&detailData.salesBillExtEntity&&detailData.salesBillExtEntity.shippingAddrCityName || '' }}
|
|
{{ detailData&&detailData.salesBillExtEntity&&detailData.salesBillExtEntity.shippingAddrCityName || '' }}
|
|
{{ detailData&&detailData.salesBillExtEntity&&detailData.salesBillExtEntity.shippingAddrCountyName || '' }}
|
|
{{ detailData&&detailData.salesBillExtEntity&&detailData.salesBillExtEntity.shippingAddrCountyName || '' }}
|
|
{{ detailData&&detailData.salesBillExtEntity&&detailData.salesBillExtEntity.shippingAddr || '' }}
|
|
{{ detailData&&detailData.salesBillExtEntity&&detailData.salesBillExtEntity.shippingAddr || '' }}
|
|
</a-descriptions-item>
|
|
</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="收货电话" v-if="detailData&&detailData.salesBillExtEntity">{{ detailData&&detailData.salesBillExtEntity&&detailData.salesBillExtEntity.consigneeTel || '--' }}</a-descriptions-item>
|
|
<a-descriptions-item label="备注">{{ detailData&&detailData.remarks || '--' }}</a-descriptions-item>
|
|
<a-descriptions-item label="备注">{{ detailData&&detailData.remarks || '--' }}</a-descriptions-item>
|
|
<a-descriptions-item label="业务状态">{{ detailData&&detailData.billStatusDictValue || '--' }}</a-descriptions-item>
|
|
<a-descriptions-item label="业务状态">{{ detailData&&detailData.billStatusDictValue || '--' }}</a-descriptions-item>
|
|
@@ -73,7 +73,7 @@
|
|
ref="table"
|
|
ref="table"
|
|
size="small"
|
|
size="small"
|
|
:rowKey="(record) => record.id"
|
|
:rowKey="(record) => record.id"
|
|
- :columns="$route.params.type=='stockOut' ? outColumns : columns"
|
|
|
|
|
|
+ :columns="($route.params.type=='stockOut' || outBizSubSn) ? outColumns : columns"
|
|
:data="loadData"
|
|
:data="loadData"
|
|
:scroll="{ x: 1070, y: 500 }"
|
|
:scroll="{ x: 1070, y: 500 }"
|
|
bordered>
|
|
bordered>
|
|
@@ -88,7 +88,7 @@
|
|
</a-card>
|
|
</a-card>
|
|
</a-spin>
|
|
</a-spin>
|
|
<!-- 分类打印 -->
|
|
<!-- 分类打印 -->
|
|
- <choose-type-modal :openModal="openModal" @ok="handleOk" @close="openModal=false" />
|
|
|
|
|
|
+ <choose-type-modal :openModal="openModal" :outBizSubSn="outBizSubSn" @ok="handleOk" @close="openModal=false" />
|
|
<!-- 打印 -->
|
|
<!-- 打印 -->
|
|
<div id="print"></div>
|
|
<div id="print"></div>
|
|
</div>
|
|
</div>
|
|
@@ -101,6 +101,12 @@ import { dispatchDetaillList, dispatchFindBySn, dispatchDetailPrint } from '@/ap
|
|
export default {
|
|
export default {
|
|
name: 'SalesDetail',
|
|
name: 'SalesDetail',
|
|
components: { STable, VSelect, chooseTypeModal },
|
|
components: { STable, VSelect, chooseTypeModal },
|
|
|
|
+ props: {
|
|
|
|
+ outBizSubSn: { // 有值则为弹框,无值则为页面
|
|
|
|
+ type: [Number, String],
|
|
|
|
+ default: ''
|
|
|
|
+ }
|
|
|
|
+ },
|
|
data () {
|
|
data () {
|
|
return {
|
|
return {
|
|
disabled: false,
|
|
disabled: false,
|
|
@@ -126,7 +132,7 @@ export default {
|
|
// 加载数据方法 必须为 Promise 对象
|
|
// 加载数据方法 必须为 Promise 对象
|
|
loadData: parameter => {
|
|
loadData: parameter => {
|
|
this.disabled = true
|
|
this.disabled = true
|
|
- return dispatchDetaillList(Object.assign(parameter, { dispatchBillSn: this.$route.params.sn })).then(res => {
|
|
|
|
|
|
+ return dispatchDetaillList(Object.assign(parameter, { dispatchBillSn: this.outBizSubSn || this.$route.params.sn })).then(res => {
|
|
const data = res.data
|
|
const data = res.data
|
|
const no = (data.pageNo - 1) * data.pageSize
|
|
const no = (data.pageNo - 1) * data.pageSize
|
|
for (var i = 0; i < data.list.length; i++) {
|
|
for (var i = 0; i < data.list.length; i++) {
|
|
@@ -158,7 +164,7 @@ export default {
|
|
},
|
|
},
|
|
// 详情
|
|
// 详情
|
|
getDetail () {
|
|
getDetail () {
|
|
- dispatchFindBySn({ dispatchBillSn: this.$route.params.sn }).then(res => {
|
|
|
|
|
|
+ dispatchFindBySn({ dispatchBillSn: this.outBizSubSn || this.$route.params.sn }).then(res => {
|
|
if (res.status == 200) {
|
|
if (res.status == 200) {
|
|
this.detailData = res.data
|
|
this.detailData = res.data
|
|
} else {
|
|
} else {
|
|
@@ -183,7 +189,7 @@ export default {
|
|
const _this = this
|
|
const _this = this
|
|
const params = {
|
|
const params = {
|
|
type: this.nowPrintType,
|
|
type: this.nowPrintType,
|
|
- dispatchBillSn: this.$route.params.sn
|
|
|
|
|
|
+ dispatchBillSn: this.outBizSubSn || this.$route.params.sn
|
|
}
|
|
}
|
|
_this.spinning = true
|
|
_this.spinning = true
|
|
dispatchDetailPrint(Object.assign(params, productType || {})).then(res => {
|
|
dispatchDetailPrint(Object.assign(params, productType || {})).then(res => {
|