|
@@ -118,12 +118,12 @@
|
|
|
bordered>
|
|
|
<!-- 单号 -->
|
|
|
<template slot="bizNo" slot-scope="text, record">
|
|
|
- <span v-if="$hasPermissions('B_salesDetail')" class="link-bule" @click="handleDetail(record)">{{ record.bizNo }}</span>
|
|
|
+ <span v-if="$hasPermissions('B_salesDetail')" class="link-bule" @click="handleDetail(record,0)">{{ record.bizNo }}</span>
|
|
|
<span v-else>{{ record.bizNo }}</span>
|
|
|
</template>
|
|
|
<!-- 下推单号 -->
|
|
|
<template slot="dispatchBillNo" slot-scope="text, record">
|
|
|
- <span v-if="$hasPermissions('B_dispatchDetail')" class="link-bule" @click="handleBhDetail(record)">{{ record.dispatchBillNo }}</span>
|
|
|
+ <span v-if="$hasPermissions('B_dispatchDetail')" class="link-bule" @click="handleDetail(record,1)">{{ record.dispatchBillNo }}</span>
|
|
|
<span v-else>{{ record.dispatchBillNo || '--' }}</span>
|
|
|
</template>
|
|
|
<!-- 操作 -->
|
|
@@ -156,9 +156,19 @@
|
|
|
@cancel="showTipModal=false">
|
|
|
<printModel ref="printModel" @cancel="showTipModal=false" @printOk="printOk"></printModel>
|
|
|
</commonModal>
|
|
|
-
|
|
|
<!-- 打印记录 -->
|
|
|
<recordModal ref="recordModal" modalTit="打印记录" :openModal="showRecordModal" @cancel="showRecordModal=false"></recordModal>
|
|
|
+ <!-- 查看销售单或备货单详情 -->
|
|
|
+ <commonModal
|
|
|
+ :modalTit="detailType?'备货单详情':'销售单详情'"
|
|
|
+ bodyPadding="10px"
|
|
|
+ width="70%"
|
|
|
+ :showFooter="false"
|
|
|
+ :openModal="showDetailModal"
|
|
|
+ @cancel="cancelDetail">
|
|
|
+ <salesDetail v-if="detailType==0" ref="salesDetail" :bizSn="bizSn"></salesDetail>
|
|
|
+ <dispatchDetail v-if="detailType==1" ref="dispatchDetail" :bizSn="bizSn"></dispatchDetail>
|
|
|
+ </commonModal>
|
|
|
</a-spin>
|
|
|
</a-card>
|
|
|
</div>
|
|
@@ -172,18 +182,23 @@ import subarea from '@/views/common/subarea.js'
|
|
|
import Area from '@/views/common/area.js'
|
|
|
import dealerSubareaScopeList from '@/views/common/dealerSubareaScopeList.vue'
|
|
|
import commonModal from '@/views/common/commonModal.vue'
|
|
|
+import salesDetail from '@/views/salesManagement/salesQuery/detail.vue'
|
|
|
+import dispatchDetail from '@/views/salesManagement/pushOrderManagement/detail.vue'
|
|
|
import recordModal from './recordModal.vue'
|
|
|
import printModel from './printModel.vue'
|
|
|
import { settleReceiptList } from '@/api/settleReceipt'
|
|
|
export default {
|
|
|
name: 'ReceiptPrintList',
|
|
|
mixins: [commonMixin],
|
|
|
- components: { STable, VSelect, dealerSubareaScopeList, rangeDate, subarea, commonModal, recordModal, Area, printModel },
|
|
|
+ components: { STable, VSelect, dealerSubareaScopeList, rangeDate, subarea, commonModal, recordModal, Area, printModel, salesDetail, dispatchDetail },
|
|
|
data () {
|
|
|
return {
|
|
|
spinning: false,
|
|
|
advanced: true, // 高级搜索 展开/关闭
|
|
|
disabled: false, // 查询、重置按钮是否可操作
|
|
|
+ showDetailModal: false,
|
|
|
+ detailType: 2,
|
|
|
+ bizSn: null,
|
|
|
tableHeight: 0,
|
|
|
time: [],
|
|
|
currentTab: 2,
|
|
@@ -271,13 +286,15 @@ export default {
|
|
|
receiverChange (val) {
|
|
|
this.queryParam.receiverName = val.name
|
|
|
},
|
|
|
- // 销售单详情
|
|
|
- handleDetail (row) {
|
|
|
- this.$router.push({ name: 'salesDetail', params: { sn: row.bizSn, type: 'salesCollection' } })
|
|
|
+ handleDetail (row, type) {
|
|
|
+ this.detailType = type
|
|
|
+ this.bizSn = type == 0 ? row.bizSn : row.dispatchBillSn
|
|
|
+ this.showDetailModal = true
|
|
|
},
|
|
|
- // 备货单号
|
|
|
- handleBhDetail (row) {
|
|
|
- this.$router.push({ name: 'pushOrderDetail', params: { sn: row.dispatchBillSn, type: 'salesCollection' } })
|
|
|
+ cancelDetail () {
|
|
|
+ this.showDetailModal = false
|
|
|
+ this.detailType = 2
|
|
|
+ this.bizSn = null
|
|
|
},
|
|
|
// 收款打印
|
|
|
handlePrint (row) {
|