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

4
jshERP-web/src/views/financial/AdvanceInList.vue
View File

@@ -123,7 +123,9 @@
{ title: '单据编号', dataIndex: 'billNo',width:160},
{ title: '操作员', dataIndex: 'userName',width:80},
{ title: '单据日期 ', dataIndex: 'billTimeStr',width:160},
{ title: '合计', dataIndex: 'totalPrice',width:80},
{ title: '合计金额', dataIndex: 'totalPrice',width:80},
{ title: '优惠金额', dataIndex: 'discountMoney',width:80},
{ title: '收款金额', dataIndex: 'changeAmount',width:80},
{ title: '备注', dataIndex: 'remark',width:200},
{
title: '操作',

2
jshERP-web/src/views/financial/GiroList.vue
View File

@@ -122,7 +122,7 @@
{ title: '单据编号', dataIndex: 'billNo',width:160},
{ title: '操作员', dataIndex: 'userName',width:80},
{ title: '单据日期 ', dataIndex: 'billTimeStr',width:160},
{ title: '合计', dataIndex: 'totalPrice',width:80},
{ title: '实付金额', dataIndex: 'changeAmount',width:80},
{ title: '备注', dataIndex: 'remark',width:200},
{
title: '操作',

2
jshERP-web/src/views/financial/ItemInList.vue
View File

@@ -123,7 +123,7 @@
{ title: '单据编号', dataIndex: 'billNo',width:160},
{ title: '操作员', dataIndex: 'userName',width:80},
{ title: '单据日期 ', dataIndex: 'billTimeStr',width:160},
{ title: '合计', dataIndex: 'totalPrice',width:80},
{ title: '收入金额', dataIndex: 'changeAmount',width:80},
{ title: '备注', dataIndex: 'remark',width:200},
{
title: '操作',

2
jshERP-web/src/views/financial/ItemOutList.vue
View File

@@ -123,7 +123,7 @@
{ title: '单据编号', dataIndex: 'billNo',width:160},
{ title: '操作员', dataIndex: 'userName',width:80},
{ title: '单据日期 ', dataIndex: 'billTimeStr',width:160},
{ title: '合计', dataIndex: 'totalPrice',width:80},
{ title: '支出金额', dataIndex: 'changeAmount',width:80},
{ title: '备注', dataIndex: 'remark',width:200},
{
title: '操作',

4
jshERP-web/src/views/financial/MoneyInList.vue
View File

@@ -123,7 +123,9 @@
{ title: '单据编号', dataIndex: 'billNo',width:160},
{ title: '操作员', dataIndex: 'userName',width:80},
{ title: '单据日期 ', dataIndex: 'billTimeStr',width:160},
{ title: '合计', dataIndex: 'totalPrice',width:80},
{ title: '合计收款', dataIndex: 'totalPrice',width:80},
{ title: '优惠金额', dataIndex: 'discountMoney',width:80},
{ title: '实际收款', dataIndex: 'changeAmount',width:80},
{ title: '备注', dataIndex: 'remark',width:200},
{
title: '操作',

4
jshERP-web/src/views/financial/MoneyOutList.vue
View File

@@ -123,7 +123,9 @@
{ title: '单据编号', dataIndex: 'billNo',width:160},
{ title: '操作员', dataIndex: 'userName',width:80},
{ title: '单据日期 ', dataIndex: 'billTimeStr',width:160},
{ title: '合计', dataIndex: 'totalPrice',width:80},
{ title: '合计付款', dataIndex: 'totalPrice',width:80},
{ title: '优惠金额', dataIndex: 'discountMoney',width:80},
{ title: '实际付款', dataIndex: 'changeAmount',width:80},
{ title: '备注', dataIndex: 'remark',width:200},
{
title: '操作',

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);

15
jshERP-web/src/views/financial/modules/AdvanceInModal.vue
View File

@@ -80,6 +80,13 @@
<a-col :lg="6" :md="12" :sm="24">
</a-col>
</a-row>
<a-row class="form-row" :gutter="24">
<a-col :lg="6" :md="12" :sm="24">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="附件">
<j-upload v-model="fileList" bizPath="financial"></j-upload>
</a-form-item>
</a-col>
</a-row>
</a-form>
</a-spin>
</j-modal>
@@ -89,11 +96,13 @@
import { FormTypes } from '@/utils/JEditableTableUtil'
import { JEditableTableMixin } from '@/mixins/JEditableTableMixin'
import { FinancialModalMixin } from '../mixins/FinancialModalMixin'
import JUpload from '@/components/jeecg/JUpload'
import JDate from '@/components/jeecg/JDate'
export default {
name: "AdvanceInModal",
mixins: [JEditableTableMixin, FinancialModalMixin],
components: {
JUpload,
JDate
},
data () {
@@ -105,6 +114,7 @@
addDefaultRowNum: 1,
visible: false,
model: {},
fileList:[],
labelCol: {
xs: { span: 24 },
sm: { span: 8 },
@@ -156,12 +166,14 @@
editAfter() {
if (this.action === 'add') {
this.addInit("SYF")
this.fileList = []
} else {
this.model.billTime = this.model.billTimeStr
this.$nextTick(() => {
this.form.setFieldsValue(pick(this.model,'organId', 'handsPersonId', 'billTime', 'billNo', 'remark',
'totalPrice', 'discountMoney', 'changeAmount'))
});
this.fileList = this.model.fileName
// 加载子表数据
let params = {
headerId: this.model.id
@@ -180,6 +192,9 @@
totalPrice += item.eachAmount-0
}
billMain.totalPrice = totalPrice
if(this.fileList && this.fileList.length > 0) {
billMain.fileName = this.fileList
}
if(this.model.id){
billMain.id = this.model.id
}

15
jshERP-web/src/views/financial/modules/GiroModal.vue
View File

@@ -74,6 +74,13 @@
<a-col :lg="6" :md="12" :sm="24">
</a-col>
</a-row>
<a-row class="form-row" :gutter="24">
<a-col :lg="6" :md="12" :sm="24">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="附件">
<j-upload v-model="fileList" bizPath="financial"></j-upload>
</a-form-item>
</a-col>
</a-row>
</a-form>
</a-spin>
</j-modal>
@@ -83,11 +90,13 @@
import { FormTypes } from '@/utils/JEditableTableUtil'
import { JEditableTableMixin } from '@/mixins/JEditableTableMixin'
import { FinancialModalMixin } from '../mixins/FinancialModalMixin'
import JUpload from '@/components/jeecg/JUpload'
import JDate from '@/components/jeecg/JDate'
export default {
name: "GiroModal",
mixins: [JEditableTableMixin, FinancialModalMixin],
components: {
JUpload,
JDate
},
data () {
@@ -99,6 +108,7 @@
addDefaultRowNum: 1,
visible: false,
model: {},
fileList:[],
labelCol: {
xs: { span: 24 },
sm: { span: 8 },
@@ -156,12 +166,14 @@
editAfter() {
if (this.action === 'add') {
this.addInit("ZZ")
this.fileList = []
} else {
this.model.billTime = this.model.billTimeStr
this.$nextTick(() => {
this.form.setFieldsValue(pick(this.model,'organId', 'handsPersonId', 'billTime', 'billNo', 'remark',
'accountId', 'changeAmount'))
});
this.fileList = this.model.fileName
// 加载子表数据
let params = {
headerId: this.model.id
@@ -181,6 +193,9 @@
}
billMain.totalPrice = 0-totalPrice
billMain.changeAmount = 0-billMain.changeAmount
if(this.fileList && this.fileList.length > 0) {
billMain.fileName = this.fileList
}
if(this.model.id){
billMain.id = this.model.id
}

27
jshERP-web/src/views/financial/modules/ItemInModal.vue
View File

@@ -63,8 +63,8 @@
</a-row>
<a-row class="form-row" :gutter="24">
<a-col :lg="6" :md="12" :sm="24">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="收款账户">
<a-select placeholder="选择收款账户" v-decorator="[ 'accountId', validatorRules.accountId ]" :dropdownMatchSelectWidth="false">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="收入账户">
<a-select placeholder="选择收入账户" v-decorator="[ 'accountId', validatorRules.accountId ]" :dropdownMatchSelectWidth="false">
<a-select-option v-for="(item,index) in accountList" :key="index" :value="item.id">
{{ item.name }}
</a-select-option>
@@ -72,8 +72,8 @@
</a-form-item>
</a-col>
<a-col :lg="6" :md="12" :sm="24">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="收款金额">
<a-input placeholder="请输入收款金额" v-decorator.trim="[ 'changeAmount', validatorRules.changeAmount ]" />
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="收入金额">
<a-input placeholder="请输入收入金额" v-decorator.trim="[ 'changeAmount', validatorRules.changeAmount ]" />
</a-form-item>
</a-col>
<a-col :lg="6" :md="12" :sm="24">
@@ -81,6 +81,13 @@
<a-col :lg="6" :md="12" :sm="24">
</a-col>
</a-row>
<a-row class="form-row" :gutter="24">
<a-col :lg="6" :md="12" :sm="24">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="附件">
<j-upload v-model="fileList" bizPath="financial"></j-upload>
</a-form-item>
</a-col>
</a-row>
</a-form>
</a-spin>
</j-modal>
@@ -90,11 +97,13 @@
import { FormTypes } from '@/utils/JEditableTableUtil'
import { JEditableTableMixin } from '@/mixins/JEditableTableMixin'
import { FinancialModalMixin } from '../mixins/FinancialModalMixin'
import JUpload from '@/components/jeecg/JUpload'
import JDate from '@/components/jeecg/JDate'
export default {
name: "ItemInModal",
mixins: [JEditableTableMixin, FinancialModalMixin],
components: {
JUpload,
JDate
},
data () {
@@ -106,6 +115,7 @@
addDefaultRowNum: 1,
visible: false,
model: {},
fileList:[],
labelCol: {
xs: { span: 24 },
sm: { span: 8 },
@@ -143,12 +153,12 @@
},
accountId:{
rules: [
{ required: true, message: '请选择收款账户!' }
{ required: true, message: '请选择收入账户!' }
]
},
changeAmount:{
rules: [
{ required: true, message: '请输入收款金额!' }
{ required: true, message: '请输入收入金额!' }
]
}
},
@@ -168,12 +178,14 @@
editAfter() {
if (this.action === 'add') {
this.addInit("SR")
this.fileList = []
} else {
this.model.billTime = this.model.billTimeStr
this.$nextTick(() => {
this.form.setFieldsValue(pick(this.model,'organId', 'handsPersonId', 'billTime', 'billNo', 'remark',
'accountId','changeAmount'))
});
this.fileList = this.model.fileName
// 加载子表数据
let params = {
headerId: this.model.id
@@ -192,6 +204,9 @@
totalPrice += item.eachAmount-0
}
billMain.totalPrice = totalPrice
if(this.fileList && this.fileList.length > 0) {
billMain.fileName = this.fileList
}
if(this.model.id){
billMain.id = this.model.id
}

15
jshERP-web/src/views/financial/modules/ItemOutModal.vue
View File

@@ -81,6 +81,13 @@
<a-col :lg="6" :md="12" :sm="24">
</a-col>
</a-row>
<a-row class="form-row" :gutter="24">
<a-col :lg="6" :md="12" :sm="24">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="附件">
<j-upload v-model="fileList" bizPath="financial"></j-upload>
</a-form-item>
</a-col>
</a-row>
</a-form>
</a-spin>
</j-modal>
@@ -90,11 +97,13 @@
import { FormTypes } from '@/utils/JEditableTableUtil'
import { JEditableTableMixin } from '@/mixins/JEditableTableMixin'
import { FinancialModalMixin } from '../mixins/FinancialModalMixin'
import JUpload from '@/components/jeecg/JUpload'
import JDate from '@/components/jeecg/JDate'
export default {
name: "ItemOutModal",
mixins: [JEditableTableMixin, FinancialModalMixin],
components: {
JUpload,
JDate
},
data () {
@@ -106,6 +115,7 @@
addDefaultRowNum: 1,
visible: false,
model: {},
fileList:[],
labelCol: {
xs: { span: 24 },
sm: { span: 8 },
@@ -168,12 +178,14 @@
editAfter() {
if (this.action === 'add') {
this.addInit("ZC")
this.fileList = []
} else {
this.model.billTime = this.model.billTimeStr
this.$nextTick(() => {
this.form.setFieldsValue(pick(this.model,'organId', 'handsPersonId', 'billTime', 'billNo', 'remark',
'accountId','changeAmount'))
});
this.fileList = this.model.fileName
// 加载子表数据
let params = {
headerId: this.model.id
@@ -193,6 +205,9 @@
}
billMain.totalPrice = 0-totalPrice
billMain.changeAmount = 0-billMain.changeAmount
if(this.fileList && this.fileList.length > 0) {
billMain.fileName = this.fileList
}
if(this.model.id){
billMain.id = this.model.id
}

8
jshERP-web/src/views/financial/modules/MoneyOutModal.vue
View File

@@ -155,10 +155,10 @@
loading: false,
dataSource: [],
columns: [
{ title: '销售单据编号',key: 'billNumber',width: '20%', type: FormTypes.input, readonly: true },
{ title: '应收欠款',key: 'needDebt', width: '10%', type: FormTypes.inputNumber, statistics: true, readonly: true },
{ title: '已收欠款', key: 'finishDebt', width: '10%', type: FormTypes.inputNumber, statistics: true, readonly: true },
{ title: '本次收款',key: 'eachAmount', width: '10%', type: FormTypes.inputNumber, statistics: true, placeholder: '请输入${title}',
{ title: '采购单据编号',key: 'billNumber',width: '20%', type: FormTypes.input, readonly: true },
{ title: '应付欠款',key: 'needDebt', width: '10%', type: FormTypes.inputNumber, statistics: true, readonly: true },
{ title: '已付欠款', key: 'finishDebt', width: '10%', type: FormTypes.inputNumber, statistics: true, readonly: true },
{ title: '本次付款',key: 'eachAmount', width: '10%', type: FormTypes.inputNumber, statistics: true, placeholder: '请输入${title}',
validateRules: [{ required: true, message: '${title}不能为空' }]
},
{ title: '备注',key: 'remark', width: '20%', type: FormTypes.input, placeholder: '请输入${title}'}