|
@@ -88,6 +88,10 @@
|
|
|
:defaultLoadData="false"
|
|
|
bordered
|
|
|
>
|
|
|
+ <!-- 关联单号 -->
|
|
|
+ <template slot="bizNo" slot-scope="text, record">
|
|
|
+ <span style="color: #ed1c24;cursor: pointer;" v-if="$hasPermissions('B_salesDetail')" @click="handleDetail(record)">{{ record.bizNo }}</span>
|
|
|
+ </template>
|
|
|
<!-- 操作 -->
|
|
|
<template slot="action" slot-scope="text, record">
|
|
|
<a-button
|
|
@@ -112,6 +116,31 @@
|
|
|
</a-spin>
|
|
|
<!-- 详情 -->
|
|
|
<detail-modal :openModal="openModal" ref="detailModal" @close="openModal = false" />
|
|
|
+ <!-- 关联单号详情 -->
|
|
|
+ <a-modal
|
|
|
+ centered
|
|
|
+ class="outboundOrderDetail-modal"
|
|
|
+ :footer="null"
|
|
|
+ :maskClosable="false"
|
|
|
+ :bodyStyle="{padding:'12px'}"
|
|
|
+ :title="curBizTitle"
|
|
|
+ v-model="openDetailModal"
|
|
|
+ v-if="openDetailModal&&fcBizType!='SPARE_PARTS_RETURN'"
|
|
|
+ @cancle="handleDetailClose"
|
|
|
+ width="80%">
|
|
|
+ <div style="max-height: 700px;overflow-y: auto;">
|
|
|
+ <!-- 销售单 -->
|
|
|
+ <salesDetailModal v-if="fcBizType=='SELL'" :outBizSn="orderSn" />
|
|
|
+ <!-- 采购退货 -->
|
|
|
+ <pushOrderDetailModal v-if="fcBizType=='PURCHASE_RETURN'" :outBizSn="orderSn" />
|
|
|
+ <!-- 店内调出 -->
|
|
|
+ <storeTransferOutDetailModal v-if="fcBizType=='STORE_CALL_OUT'" :outBizSn="orderSn"></storeTransferOutDetailModal>
|
|
|
+ <!-- 连锁调出 -->
|
|
|
+ <chainTransferOutDetailModal v-if="fcBizType=='LINKAGE_CALL_OUT'" :outBizSn="orderSn" />
|
|
|
+ </div>
|
|
|
+ </a-modal>
|
|
|
+ <!-- 散件退货 -->
|
|
|
+ <bulkReturnGoods-detail-modal v-show="fcBizType=='SPARE_PARTS_RETURN'" :openModal="openDetailModal" :itemSn="orderSn" @close="handleDetailClose" />
|
|
|
</a-card>
|
|
|
</template>
|
|
|
|
|
@@ -120,10 +149,15 @@ import { commonMixin } from '@/utils/mixin'
|
|
|
import { STable, VSelect } from '@/components'
|
|
|
import detailModal from './detailModal.vue'
|
|
|
import rangeDate from '@/views/common/rangeDate.vue'
|
|
|
+import salesDetailModal from '@/views/salesManagement/salesQuery/detail.vue'
|
|
|
+import pushOrderDetailModal from '@/views/purchasingManagement/purchaseReturn/detail.vue'
|
|
|
+import chainTransferOutDetailModal from '@/views/allocationManagement/chainTransferOut/detail.vue'
|
|
|
+import storeTransferOutDetailModal from '@/views/allocationManagement/storeTransferOut/detail.vue'
|
|
|
+import bulkReturnGoodsDetailModal from '@/views/bulkManagement/bulkReturnGoods/detailModal.vue'
|
|
|
import { settleReceiptQuery, queryByTypeSum, settleReceiptMoney, settleReceiptQuerySum } from '@/api/settleReceipt'
|
|
|
export default {
|
|
|
name: 'FinancialCollectionList',
|
|
|
- components: { STable, VSelect, detailModal, rangeDate },
|
|
|
+ components: { STable, VSelect, detailModal, rangeDate, pushOrderDetailModal, salesDetailModal, chainTransferOutDetailModal, bulkReturnGoodsDetailModal, storeTransferOutDetailModal },
|
|
|
mixins: [commonMixin],
|
|
|
data () {
|
|
|
return {
|
|
@@ -131,8 +165,12 @@ export default {
|
|
|
advanced: true, // 高级搜索 展开/关闭
|
|
|
disabled: false, // 查询、重置按钮是否可操作
|
|
|
openModal: false, // 详情弹框
|
|
|
+ openDetailModal: false,
|
|
|
tableHeight: 0,
|
|
|
curBizType: 'ALL',
|
|
|
+ curBizTitle: '',
|
|
|
+ fcBizType: '',
|
|
|
+ orderSn: null,
|
|
|
// 查询参数
|
|
|
queryParam: {
|
|
|
bizType: 'ALL',
|
|
@@ -154,7 +192,7 @@ export default {
|
|
|
columns: [
|
|
|
{ title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
|
|
|
{ title: '收款单号', dataIndex: 'settleNo', width: '16%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
- { title: '关联单号', dataIndex: 'bizNo', width: '16%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
+ { title: '关联单号', dataIndex: 'bizNo', scopedSlots: { customRender: 'bizNo' }, width: '16%', align: 'center' },
|
|
|
{ title: '商户名称', dataIndex: 'settleClientName', width: '15%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
{ title: '应收金额', dataIndex: 'totalAmount', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? ('¥' + text) : '--') } },
|
|
|
{ title: '已收金额', dataIndex: 'settledAmount', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? ('¥' + text) : '--') } },
|
|
@@ -191,7 +229,28 @@ export default {
|
|
|
rowSelectionInfo: null
|
|
|
}
|
|
|
},
|
|
|
+ computed: {
|
|
|
+ selectTotalAmount () {
|
|
|
+ let ret = 0
|
|
|
+ this.rowSelectionInfo.selectedRows.map(item => {
|
|
|
+ ret = ret + item.unsettleAmount
|
|
|
+ })
|
|
|
+ return ret
|
|
|
+ }
|
|
|
+ },
|
|
|
methods: {
|
|
|
+ handleDetailClose () {
|
|
|
+ this.openDetailModal = false
|
|
|
+ this.orderSn = null
|
|
|
+ },
|
|
|
+ // 查看关联单号
|
|
|
+ handleDetail (row) {
|
|
|
+ console.log(row)
|
|
|
+ this.orderSn = row.bizSn
|
|
|
+ this.fcBizType = row.bizType
|
|
|
+ this.curBizTitle = row.bizTypeDictValue + '详情'
|
|
|
+ this.openDetailModal = true
|
|
|
+ },
|
|
|
// 表格选中项
|
|
|
rowSelectionFun (obj) {
|
|
|
this.rowSelectionInfo = obj || null
|
|
@@ -265,17 +324,26 @@ export default {
|
|
|
this.$message.warning('请在列表勾选后再进行批量操作!')
|
|
|
return
|
|
|
}
|
|
|
- this.loading = true
|
|
|
- this.spinning = true
|
|
|
- settleReceiptMoney(this.rowSelectionInfo && this.rowSelectionInfo.selectedRowKeys).then(res => {
|
|
|
- this.loading = false
|
|
|
- if (res.status == 200) {
|
|
|
- this.$message.success(res.message)
|
|
|
- this.$refs.table.refresh()
|
|
|
- this.$refs.table.clearSelected() // 清空表格选中项
|
|
|
- this.spinning = false
|
|
|
- } else {
|
|
|
- this.spinning = false
|
|
|
+ const _this = this
|
|
|
+ this.$confirm({
|
|
|
+ title: '提示',
|
|
|
+ content: '待收款总计' + this.selectTotalAmount + '元,确认批量收款吗?',
|
|
|
+ centered: true,
|
|
|
+ closable: true,
|
|
|
+ onOk () {
|
|
|
+ _this.loading = true
|
|
|
+ _this.spinning = true
|
|
|
+ settleReceiptMoney(_this.rowSelectionInfo && _this.rowSelectionInfo.selectedRowKeys).then(res => {
|
|
|
+ this.loading = false
|
|
|
+ if (res.status == 200) {
|
|
|
+ _this.$message.success(res.message)
|
|
|
+ _this.$refs.table.refresh()
|
|
|
+ _this.$refs.table.clearSelected() // 清空表格选中项
|
|
|
+ _this.spinning = false
|
|
|
+ } else {
|
|
|
+ _this.spinning = false
|
|
|
+ }
|
|
|
+ })
|
|
|
}
|
|
|
})
|
|
|
},
|