purovps/jshERP
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优化财务单据

Browse Source
This commit is contained in:
季圣华
2021-07-03 00:44:42 +08:00
parent cc10923600
commit 090ca66a72
11 changed files with 57 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
jshERP-web/src/views/bill/PurchaseBackList.vue
View File

@@ -152,7 +152,12 @@
return (record.discountMoney + record.discountLastMoney).toFixed(2);
}
},
{ title: '优惠后金额', dataIndex: 'discountLastMoney',width:100},
{ title: '待收金额', dataIndex: 'needBackMoney',width:80,
customRender:function (text,record,index) {
let needBackMoney = record.discountLastMoney + record.otherMoney
return needBackMoney? needBackMoney.toFixed(2):''
}
},
{ title: '收款', dataIndex: 'changeAmount',width:50},
{
title: '操作',

9
jshERP-web/src/views/bill/PurchaseInList.vue
View File

@@ -152,11 +152,16 @@
return (record.discountMoney + record.discountLastMoney).toFixed(2);
}
},
{ title: '优惠后金额', dataIndex: 'discountLastMoney',width:80},
{ title: '待付金额', dataIndex: 'needInMoney',width:80,
customRender:function (text,record,index) {
let needInMoney = record.discountLastMoney + record.otherMoney
return needInMoney? needInMoney.toFixed(2):''
}
},
{ title: '付款', dataIndex: 'changeAmount',width:60},
{ title: '欠款', dataIndex: 'debt',width:60,
customRender:function (text,record,index) {
let debt = record.discountLastMoney - record.changeAmount
let debt = record.discountLastMoney + record.otherMoney - record.changeAmount
return debt? debt.toFixed(2):''
}
},

7
jshERP-web/src/views/bill/SaleBackList.vue
View File

@@ -152,7 +152,12 @@
return (record.discountMoney + record.discountLastMoney).toFixed(2);
}
},
{ title: '优惠后金额', dataIndex: 'discountLastMoney',width:100},
{ title: '待付金额', dataIndex: 'needBackMoney',width:80,
customRender:function (text,record,index) {
let needBackMoney = record.discountLastMoney + record.otherMoney
return needBackMoney? needBackMoney.toFixed(2):''
}
},
{ title: '付款', dataIndex: 'changeAmount',width:50},
{
title: '操作',

9
jshERP-web/src/views/bill/SaleOutList.vue
View File

@@ -152,11 +152,16 @@
return (record.discountMoney + record.discountLastMoney).toFixed(2);
}
},
{ title: '优惠后金额', dataIndex: 'discountLastMoney',width:80},
{ title: '待收金额', dataIndex: 'needOutMoney',width:80,
customRender:function (text,record,index) {
let needOutMoney = record.discountLastMoney + record.otherMoney
return needOutMoney? needOutMoney.toFixed(2):''
}
},
{ title: '收款', dataIndex: 'changeAmount',width:60},
{ title: '欠款', dataIndex: 'debt',width:60,
customRender:function (text,record,index) {
let debt = record.discountLastMoney - record.changeAmount
let debt = record.discountLastMoney + record.otherMoney - record.changeAmount
return debt? debt.toFixed(2):''
}
},

8
jshERP-web/src/views/bill/dialog/BillDetail.vue
View File

@@ -524,7 +524,7 @@
</a-form-item>
</a-col>
<a-col :span="6">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="付款类型">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="收款类型">
{{model.payType}}
</a-form-item>
</a-col>
@@ -544,12 +544,12 @@
<a-col :span="6">
<a-row class="form-row" :gutter="24">
<a-col :lg="24" :md="6" :sm="6">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="实付金额">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="实收金额">
{{model.changeAmount}}
</a-form-item>
</a-col>
<a-col :lg="24" :md="6" :sm="6">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="付款金额">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="收款金额">
{{model.changeAmount}}
</a-form-item>
</a-col>
@@ -559,7 +559,7 @@
</a-form-item>
</a-col>
<a-col :lg="24" :md="6" :sm="6">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="付款账户">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="收款账户">
{{model.accountName}}
</a-form-item>
</a-col>

2
jshERP-web/src/views/bill/modules/RetailOutModal.vue
View File

@@ -35,7 +35,7 @@
</a-form-item>
</a-col>
<a-col :lg="6" :md="12" :sm="24">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="付款类型">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="收款类型">
<a-select placeholder="请选择付款类型" v-decorator="[ 'payType' ]">
<a-select-option value="现付">现付</a-select-option>
<a-select-option value="预付款">预付款</a-select-option>