优化收付款和对账报表功能,支持退款单修改退款金额
This commit is contained in:
@@ -65,12 +65,6 @@
|
||||
<span slot="numberCustomRender" slot-scope="text, record">
|
||||
<a @click="myHandleDetail(record)">{{record.number}}</a>
|
||||
</span>
|
||||
<span slot="customTitle">
|
||||
实际欠款
|
||||
<a-tooltip title="实际欠款=本单欠款-退货单欠款(主要针对存在退货的情况)">
|
||||
<a-icon type="question-circle" />
|
||||
</a-tooltip>
|
||||
</span>
|
||||
</a-table>
|
||||
<!-- table区域-end -->
|
||||
<!-- 表单区域 -->
|
||||
@@ -134,9 +128,6 @@
|
||||
{ title: '单据日期', dataIndex: 'operTimeStr',width:130},
|
||||
{ title: '操作员', dataIndex: 'userName',width:70, ellipsis:true},
|
||||
{ title: '本单欠款', dataIndex: 'needDebt',width:70 },
|
||||
{ dataIndex: 'realNeedDebt',width:80,
|
||||
slots: { title: 'customTitle' }
|
||||
},
|
||||
{ title: '已收欠款', dataIndex: 'finishDebt',width:70 },
|
||||
{ title: '待收欠款', dataIndex: 'debt',width:70 }
|
||||
],
|
||||
@@ -160,11 +151,11 @@
|
||||
this.queryParam.status = status
|
||||
this.columns[0].title = organType
|
||||
if(type === '入库') {
|
||||
this.columns[7].title = '已付欠款'
|
||||
this.columns[8].title = '待付欠款'
|
||||
this.columns[6].title = '已付欠款'
|
||||
this.columns[7].title = '待付欠款'
|
||||
} else if(type === '出库') {
|
||||
this.columns[7].title = '已收欠款'
|
||||
this.columns[8].title = '待收欠款'
|
||||
this.columns[6].title = '已收欠款'
|
||||
this.columns[7].title = '待收欠款'
|
||||
}
|
||||
this.model = Object.assign({}, {});
|
||||
this.visible = true;
|
||||
|
||||
@@ -250,7 +250,7 @@ export const FinancialModalMixin = {
|
||||
for(let i=0; i<selectBillRows.length; i++){
|
||||
let info = selectBillRows[i]
|
||||
info.billNumber = info.number
|
||||
info.needDebt = info.realNeedDebt
|
||||
info.needDebt = info.needDebt
|
||||
info.eachAmount = info.debt
|
||||
if(info.eachAmount != 0) {
|
||||
changeAmount += info.eachAmount-0
|
||||
@@ -279,7 +279,7 @@ export const FinancialModalMixin = {
|
||||
info.billNumber = 'QiChu'
|
||||
getAction('/supplier/getBeginNeedByOrganId', {'organId': organId}).then((res)=>{
|
||||
if(res.code === 200){
|
||||
info.needDebt = res.data.needDebt
|
||||
info.needDebt = res.data.needDebt?res.data.needDebt:0
|
||||
info.finishDebt = res.data.finishDebt
|
||||
info.eachAmount = res.data.eachAmount
|
||||
listEx.push(info)
|
||||
|
||||
@@ -278,7 +278,7 @@
|
||||
let organId = this.form.getFieldValue('organId')
|
||||
if(organId){
|
||||
this.$refs.debtBillList.show(organId, '出库', '销售', '客户', "")
|
||||
this.$refs.debtBillList.title = "选择销售出库欠款单据"
|
||||
this.$refs.debtBillList.title = "选择销售欠款单据"
|
||||
} else {
|
||||
this.$message.warning('请选择客户!');
|
||||
}
|
||||
|
||||
@@ -282,7 +282,7 @@
|
||||
let organId = this.form.getFieldValue('organId')
|
||||
if(organId){
|
||||
this.$refs.debtBillList.show(organId, '入库', '采购', '供应商', "")
|
||||
this.$refs.debtBillList.title = "选择采购入库欠款单据"
|
||||
this.$refs.debtBillList.title = "选择采购欠款单据"
|
||||
} else {
|
||||
this.$message.warning('请选择供应商!');
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user