|
@@ -15,7 +15,7 @@
|
|
|
<a-form-item label="付款单号"><a-input id="finacialPay-settleNo" v-model.trim="queryParam.settleNo" allowClear placeholder="请输入付款单号" /></a-form-item>
|
|
|
</a-col>
|
|
|
<a-col :md="6" :sm="24">
|
|
|
- <a-form-item label="发货单号"><a-input id="finacialPay-bizNo" v-model.trim="queryParam.bizNo" allowClear placeholder="请输入发货单号" /></a-form-item>
|
|
|
+ <a-form-item label="关联单号"><a-input id="finacialPay-bizNo" v-model.trim="queryParam.bizNo" allowClear placeholder="请输入关联单号" /></a-form-item>
|
|
|
</a-col>
|
|
|
<a-col :md="6" :sm="24">
|
|
|
<a-form-item label="商户名称">
|
|
@@ -44,6 +44,11 @@
|
|
|
<rangeDate ref="rangeDate" @change="dateChange" />
|
|
|
</a-form-item>
|
|
|
</a-col>
|
|
|
+ <a-col :md="6" :sm="24">
|
|
|
+ <a-form-item label="付款时间">
|
|
|
+ <rangeDate ref="settleDate" @change="settleChange" />
|
|
|
+ </a-form-item>
|
|
|
+ </a-col>
|
|
|
</template>
|
|
|
<a-col :md="6" :sm="24">
|
|
|
<span class="table-page-search-submitButtons">
|
|
@@ -93,6 +98,11 @@
|
|
|
:defaultLoadData="false"
|
|
|
bordered
|
|
|
>
|
|
|
+ <!-- 关联单号 -->
|
|
|
+ <template slot="bizNo" slot-scope="text, record">
|
|
|
+ <span v-if="$hasPermissions('B_purchaseDetail')||$hasPermissions('B_salesReturnDetail')||$hasPermissions('B_bulkWarehousingOrder_detail')||$hasPermissions('B_allocLinkagePutDetail')||$hasPermissions('B_expenseDetail')" class="table-td-link" @click="handleDetail(record)">{{ record.bizNo }}</span>
|
|
|
+ <span v-else>{{ record.bizNo }}</span>
|
|
|
+ </template>
|
|
|
<!-- 操作 -->
|
|
|
<template slot="action" slot-scope="text, record">
|
|
|
<a-button
|
|
@@ -118,6 +128,32 @@
|
|
|
<detail-modal :openModal="openModal" ref="detailModal" @close="openModal = false" />
|
|
|
<!-- 收付款弹框 -->
|
|
|
<settleModal ref="settleModal" @ok="settleAcountPay" :openModal="openSettleModal" @close="openSettleModal=false"></settleModal>
|
|
|
+ <!-- 关联单号详情 -->
|
|
|
+ <a-modal
|
|
|
+ centered
|
|
|
+ class="bizOrderDetail-modal"
|
|
|
+ :footer="null"
|
|
|
+ :maskClosable="false"
|
|
|
+ :bodyStyle="{padding:'12px'}"
|
|
|
+ :title="curBizTitle"
|
|
|
+ v-model="openDetailModal"
|
|
|
+ v-if="openDetailModal"
|
|
|
+ @cancel="handleDetailClose"
|
|
|
+ :width="fcBizType=='COST'?'50%':'80%'">
|
|
|
+ <div style="max-height: 700px;overflow-y: auto;">
|
|
|
+ <!-- 采购入库 -->
|
|
|
+ <purchasDetail v-if="fcBizType=='PURCHASE'" :outBizSn="orderSn" />
|
|
|
+ <stockOrderDetail v-if="fcBizType=='PURCHASE-FH'" :outBizSn="orderSn" />
|
|
|
+ <!-- 销售退货 -->
|
|
|
+ <salesReturnDetail v-if="fcBizType=='SELL_REFUND'" :outBizSn="orderSn" />
|
|
|
+ <!-- 连锁调入 -->
|
|
|
+ <chainTransInDetail v-if="fcBizType=='LINKAGE_CALL_IN'" :outBizSn="orderSn" />
|
|
|
+ <!-- 散件入库 -->
|
|
|
+ <bulkWareDetail v-if="fcBizType=='PARTS_INPUT'" :outBizSn="orderSn" />
|
|
|
+ <!-- 费用 -->
|
|
|
+ <expenseDetail v-if="fcBizType=='COST'" :outBizSn="orderSn" ></expenseDetail>
|
|
|
+ </div>
|
|
|
+ </a-modal>
|
|
|
</a-card>
|
|
|
</template>
|
|
|
|
|
@@ -129,9 +165,15 @@ import detailModal from './detailModal.vue'
|
|
|
import settleModal from '../settleModal/settleModal.vue'
|
|
|
import { settlePayQuery, queryByTypeSum, settlePayMoney, settlePayQuerySum } from '@/api/settlePay.js'
|
|
|
import rangeDate from '@/views/common/rangeDate.vue'
|
|
|
+import purchasDetail from '@/views/purchasingManagement/purchaseOrder/detail'
|
|
|
+import stockOrderDetail from '@/views/purchasingManagement/signWarehousing/stockOrderDetail'
|
|
|
+import salesReturnDetail from '@/views/salesManagement/salesReturn/detail'
|
|
|
+import chainTransInDetail from '@/views/allocationManagement/chainTransferIn/detail'
|
|
|
+import bulkWareDetail from '@/views/bulkManagement/bulkWarehousingOrder/detail'
|
|
|
+import expenseDetail from './expenseDetail'
|
|
|
export default {
|
|
|
name: 'FinancialPaymentList',
|
|
|
- components: { STable, VSelect, detailModal, rangeDate, settleModal },
|
|
|
+ components: { STable, VSelect, detailModal, rangeDate, settleModal, salesReturnDetail, chainTransInDetail, bulkWareDetail, expenseDetail, purchasDetail, stockOrderDetail },
|
|
|
mixins: [commonMixin],
|
|
|
data () {
|
|
|
return {
|
|
@@ -143,6 +185,10 @@ export default {
|
|
|
enableFundAccount: false, // 是否开启资金账户管理
|
|
|
tableHeight: 0,
|
|
|
curBizType: 'ALL',
|
|
|
+ openDetailModal: false, // 关联单详情
|
|
|
+ curBizTitle: '',
|
|
|
+ fcBizType: '',
|
|
|
+ orderSn: null,
|
|
|
// 查询参数
|
|
|
queryParam: {
|
|
|
bizType: 'ALL',
|
|
@@ -151,7 +197,9 @@ export default {
|
|
|
settleClientName: '',
|
|
|
billState: '',
|
|
|
auditBeginDate: '',
|
|
|
- auditEndDate: ''
|
|
|
+ auditEndDate: '',
|
|
|
+ settleBeginDate: '',
|
|
|
+ settleEndDate: ''
|
|
|
},
|
|
|
// 总计
|
|
|
totalData: {
|
|
@@ -164,7 +212,7 @@ export default {
|
|
|
columns: [
|
|
|
{ title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
|
|
|
{ title: '付款单号', dataIndex: 'settleNo', width: '14%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
- { title: '发货单号', dataIndex: 'bizNo', width: '14%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
+ { title: '关联单号', dataIndex: 'bizNo', scopedSlots: { customRender: 'bizNo' }, width: '14%', align: 'center' },
|
|
|
{ title: '商户名称', dataIndex: 'settleClientName', width: '10%', 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) : '--') } },
|
|
@@ -214,6 +262,28 @@ export default {
|
|
|
}
|
|
|
},
|
|
|
methods: {
|
|
|
+ // 查看关联单号
|
|
|
+ handleDetail (row) {
|
|
|
+ console.log(row)
|
|
|
+ this.orderSn = row.bizSn
|
|
|
+ this.fcBizType = row.bizType
|
|
|
+ // 采购但
|
|
|
+ if (row.bizType == 'PURCHASE') {
|
|
|
+ if (row.bizNo.indexOf('FH') >= 0) {
|
|
|
+ this.fcBizType = this.fcBizType + '-FH'
|
|
|
+ }
|
|
|
+ if (row.bizNo.indexOf('SH') >= 0) {
|
|
|
+ this.fcBizType = this.fcBizType + '-FH'
|
|
|
+ }
|
|
|
+ }
|
|
|
+ this.curBizTitle = row.bizTypeDictValue + '详情'
|
|
|
+ this.openDetailModal = true
|
|
|
+ },
|
|
|
+ handleDetailClose () {
|
|
|
+ this.openDetailModal = false
|
|
|
+ this.fcBizType = null
|
|
|
+ this.orderSn = null
|
|
|
+ },
|
|
|
...mapActions(['GetSettleAccountState']),
|
|
|
// 表格选中项
|
|
|
rowSelectionFun (obj) {
|
|
@@ -229,6 +299,10 @@ export default {
|
|
|
this.queryParam.beginDate = date[0]
|
|
|
this.queryParam.endDate = date[1]
|
|
|
},
|
|
|
+ settleChange (date) {
|
|
|
+ this.queryParam.settleBeginDate = date[0]
|
|
|
+ this.queryParam.settleEndDate = date[1]
|
|
|
+ },
|
|
|
// 总计
|
|
|
settlePayQuerySum (params) {
|
|
|
settlePayQuerySum(params).then(res => {
|
|
@@ -348,6 +422,7 @@ export default {
|
|
|
if (this.advanced) {
|
|
|
this.$refs.rangeDate.resetDate()
|
|
|
this.$refs.createDate.resetDate()
|
|
|
+ this.$refs.settleDate.resetDate()
|
|
|
}
|
|
|
this.$refs.table.clearSelected() // 清空表格选中项
|
|
|
this.queryParam = {
|
|
@@ -359,7 +434,9 @@ export default {
|
|
|
beginDate: '',
|
|
|
endDate: '',
|
|
|
auditBeginDate: '',
|
|
|
- auditEndDate: ''
|
|
|
+ auditEndDate: '',
|
|
|
+ settleBeginDate: '',
|
|
|
+ settleEndDate: ''
|
|
|
}
|
|
|
},
|
|
|
pageInit () {
|