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-02 00:52:30 +08:00
parent 9af01678a7
commit ae00d062b2
31 changed files with 566 additions and 252 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
jshERP-web/src/views/financial/dialog/DebtBillList.vue
View File

@@ -115,7 +115,7 @@
},
{ title: '单据日期', dataIndex: 'operTimeStr',width:130},
{ title: '操作员', dataIndex: 'userName',width:60},
{ title: '应收欠款', dataIndex: 'needDebt',width:70,
{ title: '欠款', dataIndex: 'needDebt',width:70,
customRender:function (text,record,index) {
return (record.discountLastMoney - record.changeAmount).toFixed(2);
}
@@ -146,6 +146,13 @@
this.queryParam.subType = subType
this.queryParam.status = status
this.columns[1].title = organType
if(type === '入库') {
this.columns[7].title = '已付欠款'
this.columns[8].title = '待付欠款'
} else if(type === '出库') {
this.columns[7].title = '已收欠款'
this.columns[8].title = '待收欠款'
}
this.model = Object.assign({}, {});
this.visible = true;
this.loadData(1)

54
jshERP-web/src/views/financial/dialog/FinancialDetail.vue
View File

@@ -182,12 +182,12 @@
</a-row>
<a-row class="form-row" :gutter="24">
<a-col :span="6">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="收款账户">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="收入账户">
{{model.accountName}}
</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.changeAmount}}
</a-form-item>
</a-col>
@@ -240,12 +240,12 @@
</a-row>
<a-row class="form-row" :gutter="24">
<a-col :span="6">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="付款账户">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="支出账户">
{{model.accountName}}
</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.changeAmount}}
</a-form-item>
</a-col>
@@ -318,18 +318,6 @@
</a-form-item>
</a-col>
</a-row>
<a-row class="form-row" :gutter="24">
<a-col :span="8">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="附件">
<ul style="list-style-type:none">
<li v-for="(item,index) in fileList" :key="index">
<a :href="item.url" target="_blank">{{item.name}}</a>
</li>
</ul>
</a-form-item>
</a-col>
<a-col :span="16"></a-col>
</a-row>
</section>
</template>
<!--付款-->
@@ -396,20 +384,22 @@
</a-form-item>
</a-col>
</a-row>
<a-row class="form-row" :gutter="24">
<a-col :span="8">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="附件">
<ul style="list-style-type:none">
<li v-for="(item,index) in fileList" :key="index">
<a :href="item.url" target="_blank">{{item.name}}</a>
</li>
</ul>
</a-form-item>
</a-col>
<a-col :span="16"></a-col>
</a-row>
</section>
</template>
<template v-if="fileList.length>0">
<a-row class="form-row" :gutter="24">
<a-col :span="8">
<a-form-item :labelCol="{xs: { span: 24 },sm: { span: 4 }}" :wrapperCol="{xs: { span: 24 },sm: { span: 20 }}" label="附件">
<ul style="list-style-type:none">
<li v-for="(item,index) in fileList" :key="index">
<a :href="item.url" target="_blank">{{item.name}}</a>
</li>
</ul>
</a-form-item>
</a-col>
<a-col :span="16"></a-col>
</a-row>
</template>
</a-form>
</j-modal>
</a-card>
@@ -470,9 +460,9 @@
],
moneyOutColumns: [
{ title: '采购单据编号',dataIndex: 'billNumber',width: '20%'},
{ title: '应收欠款',dataIndex: 'needDebt', width: '10%'},
{ title: '已收欠款',dataIndex: 'finishDebt', width: '10%'},
{ title: '本次收款',dataIndex: 'eachAmount', width: '10%'},
{ title: '应付欠款',dataIndex: 'needDebt', width: '10%'},
{ title: '已付欠款',dataIndex: 'finishDebt', width: '10%'},
{ title: '本次付款',dataIndex: 'eachAmount', width: '10%'},
{ title: '备注',dataIndex: 'remark', width: '20%'}
],
}
@@ -493,6 +483,8 @@
fileInfo.url= window._CONFIG['domianURL'] + '/systemConfig/static/' + fileArr[i]
this.fileList.push(fileInfo)
}
} else {
this.fileList = []
}
this.visible = true;
this.model = Object.assign({}, record);