Browse Source

Merge remote-tracking branch 'origin/master'

master
fanzongzhe0036 4 weeks ago
parent
commit
919512af7e
  1. 14
      anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/fukuanshenqing/paymentAdd.vue
  2. 2
      anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/fukuanshenqing/paymentInfo.vue
  3. 2
      anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/fukuanshenqing/relation/closingPayment.vue
  4. 4
      anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/fukuanshenqing/relation/paymentInformationAdd.vue
  5. 8
      anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/fukuanshenqing/relation/paymentInformationInfo.vue
  6. 5
      anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/fukuanguanliFlow/fukuanguanli/fukuanDaiBanInfo.vue
  7. 24
      anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/fukuanguanliFlow/fukuanguanli/fukuanEdit.vue
  8. 5
      anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/fukuanguanliFlow/fukuanguanli/fukuanYiBanInfo.vue
  9. 2
      anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/fukuanguanliFlow/fukuanguanli/relation/closingPayment.vue
  10. 75
      anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/fukuanguanliFlow/fukuanguanli/relation/paymentInformationAdd.vue
  11. 12
      anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/fukuanguanliFlow/fukuanguanli/relation/paymentInformationInfo.vue
  12. 18
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecordFeign.java
  13. 22
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordRest.java
  14. 95
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java

14
anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/fukuanshenqing/paymentAdd.vue

@ -36,16 +36,16 @@
</el-form-item>
</el-col>
<el-col :span="6">
<div class="span-sty">款项范围</div>
<el-form-item>
<div class="span-sty"><span class="icon">*</span>款项范围</div>
<el-form-item prop="costRangeValue">
<el-select class="addinputInfo" v-model="formobj.costRangeValue" clearable filterable @change="changeCostRange" placeholder="请选择">
<el-option v-for="item in costRange_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<div class="span-sty">款项类别</div>
<el-form-item>
<div class="span-sty"><span class="icon">*</span>款项类别</div>
<el-form-item prop="costTypeValue">
<el-select class="addinputInfo" v-model="formobj.costTypeValue" clearable filterable @change="changeCostType" placeholder="请选择">
<el-option v-for="item in costType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"></el-option>
</el-select>
@ -113,7 +113,7 @@
</el-table-column>
<el-table-column prop="costTitleValue" label="款项名称" align="center" width="200" />
<el-table-column prop="openDate" label="融资付款开通日期" align="center" width="160" />
<el-table-column prop="period" label="期数" align="center" width="100" />
<el-table-column prop="period" label="期(台)数" align="center" width="100" />
<el-table-column label="付款方式" align="center" width="200">
<template slot-scope="scope">
<el-select v-model="scope.row.payWayValue" placeholder="请选择" filterable @change="changePayWay($event, scope.row)">
@ -436,6 +436,8 @@ export default {
},
rules: {
carBrandName: [{ required: true, message: '品牌不能为空', trigger: 'change' }],
costRangeValue: [{ required: true, message: '款项范围不能为空', trigger: 'change' }],
costTypeValue: [{ required: true, message: '款项类别不能为空', trigger: 'change' }],
isVeh: [{ required: true, message: '是否涉及车辆不能为空', trigger: 'change' }],
payCompany: [{ required: true, message: '付款单位不能为空', trigger: 'change' }],
isLeaderSp: [{ required: true, message: '是否事业部运营经理审批不能为空', trigger: 'change' }],
@ -616,7 +618,7 @@ export default {
applySid: '', // sid
costTitleValue: e.costTitleValue, //
openDate: e.openDate, //
period: e.period, //
period: e.period, // ()
payWayKey: '', // Key
payWayValue: '', // Value
receiveCompany: e.receiveCompany, //

2
anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/fukuanshenqing/paymentInfo.vue

@ -72,7 +72,7 @@
<el-table-column fixed width="80" label="序号" type="index" :index="index + 1" align="center"/>
<el-table-column prop="costTitleValue" label="款项名称" align="center" width="200" />
<el-table-column prop="openDate" label="融资付款开通日期" align="center" width="160" />
<el-table-column prop="period" label="期数" align="center" width="100" />
<el-table-column prop="period" label="期(台)数" align="center" width="100" />
<el-table-column prop="payWayValue" label="付款方式" align="center" width="150" />
<el-table-column prop="receiveCompany" label="收款单位名称" align="center" width="140" />
<el-table-column prop="bank" label="开户行" align="center" width="130" />

2
anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/fukuanshenqing/relation/closingPayment.vue

@ -10,7 +10,7 @@
<el-table-column fixed label="序号" type="index" :index="indexMethod" align="center" width="80px"/>
<el-table-column prop="costTitleValue" label="款项名称" align="center" width="200" />
<el-table-column prop="openDate" label="融资付款开通日期" align="center" width="160" />
<el-table-column prop="period" label="期数" align="center" width="100" />
<el-table-column prop="period" label="期(台)数" align="center" width="100" />
<el-table-column prop="receiveCompany" label="收款单位名称" align="center" width="140" />
<el-table-column prop="bank" label="开户行" align="center" width="130" />
<el-table-column prop="receivingAccount" label="收款银行账号" align="center" width="140" />

4
anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/fukuanshenqing/relation/paymentInformationAdd.vue

@ -80,7 +80,7 @@
<el-button size="mini" type="danger" @click="toDelete(scope.$index)">删除</el-button>
</template>
</el-table-column>
<el-table-column label="期数" align="center">
<el-table-column label="期(台)数" align="center">
<template slot-scope="scope">
<el-input @keyup.native="scope.row.period = getNumber(scope.row.period, 2)" v-model="scope.row.period" clearable placeholder="" />
</template>
@ -332,7 +332,7 @@ export default {
costTitleKey: '', //
detailSid: '', // sid
openDate: '', //
period: '', //
period: '', // ()
payCompanySid: '', // sid
payCompany: '', //
receiveCompany: '', //

8
anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/fukuanshenqing/relation/paymentInformationInfo.vue

@ -1,4 +1,4 @@
<temp<template>
<template>
<div class="app-container">
<div v-show="viewState == 1">
<div class="tab-header webtop">
@ -53,7 +53,7 @@
<div class="title">平仓信息</div>
<el-table :key="tableKey" :data="formobj.finPaymentapplyDetailsBelowEveList" :index="index" border style="width: 100%">
<el-table-column fixed width="80" label="序号" type="index" :index="index + 1" align="center" />
<el-table-column prop="period" label="期数" align="center" />
<el-table-column prop="period" label="期(台)数" align="center" />
<el-table-column prop="exePayDate" label="平仓付款日期" align="center" />
<el-table-column prop="exePayPrice" label="平仓付款金额" align="center" />
<el-table-column prop="receivingAccount" label="收款银行账号" align="center" />
@ -67,7 +67,6 @@
</template>
<script>
export default {
name: 'PaymentInformationInfo',
data() {
@ -100,8 +99,7 @@ export default {
this.$nextTick(() => {
this.$refs['form_obj'].clearValidate()
})
const value = JSON.parse(JSON.stringify(row))
this.formobj = row
this.formobj = JSON.parse(JSON.stringify(row))
},
handleReturn() {
this.formobj = {

5
anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/fukuanguanliFlow/fukuanguanli/fukuanDaiBanInfo.vue

@ -74,7 +74,7 @@
<el-table-column fixed width="80" label="序号" type="index" :index="index + 1" align="center"/>
<el-table-column prop="costTitleValue" label="款项名称" align="center" width="200" />
<el-table-column prop="openDate" label="融资付款开通日期" align="center" width="160" />
<el-table-column prop="period" label="期数" align="center" width="100" />
<el-table-column prop="period" label="期(台)数" align="center" width="100" />
<el-table-column prop="payWayValue" label="付款方式" align="center" width="150" />
<el-table-column prop="receiveCompany" label="收款单位名称" align="center" width="140" />
<el-table-column prop="bank" label="开户行" align="center" width="130" />
@ -311,7 +311,6 @@ export default {
paymentVisible: false, // --
paymentInformation: { //
index: '',
liquidationPayment: '', //
list: []
},
dialogList: {
@ -394,7 +393,6 @@ export default {
handleLookPayment(row, index) {
this.paymentVisible = true
this.paymentInformation.inde = index
this.paymentInformation.liquidationPayment = this.formobj.createTime + row.paymentType + '平仓款'
this.paymentInformation.list = JSON.parse(JSON.stringify(row.finPaymentapplyDetailsBelowList))
},
resetStateByInformation() {
@ -410,7 +408,6 @@ export default {
this.paymentVisible = false
this.paymentInformation = {
index: '',
liquidationPayment: '',
list: []
}
},

24
anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/fukuanguanliFlow/fukuanguanli/fukuanEdit.vue

@ -27,7 +27,7 @@
</el-row>
<el-row>
<el-col :span="6">
<div class="span-sty">品牌</div>
<div class="span-sty"><span class="icon">*</span>品牌</div>
<el-form-item prop="carBrandName">
<el-select class="addinputInfo" v-model="formobj.carBrandName" filterable placeholder="请选择" @change="changeCarBrand" clearable>
<el-option v-for="item in carBrand_list" :key="item.sid" :label="item.brandName" :value="item.brandName"/>
@ -35,16 +35,16 @@
</el-form-item>
</el-col>
<el-col :span="6">
<div class="span-sty">款项范围</div>
<el-form-item>
<div class="span-sty"><span class="icon">*</span>款项范围</div>
<el-form-item prop="costRangeValue">
<el-select class="addinputInfo" v-model="formobj.costRangeValue" clearable filterable @change="changeCostRange" placeholder="请选择">
<el-option v-for="item in costRange_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<div class="span-sty">款项类别</div>
<el-form-item>
<div class="span-sty"><span class="icon">*</span>款项类别</div>
<el-form-item prop="costTypeValue">
<el-select class="addinputInfo" v-model="formobj.costTypeValue" clearable filterable @change="changeCostType" placeholder="请选择">
<el-option v-for="item in costType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"></el-option>
</el-select>
@ -112,7 +112,7 @@
</el-table-column>
<el-table-column prop="costTitleValue" label="款项名称" align="center" width="200" />
<el-table-column prop="openDate" label="融资付款开通日期" align="center" width="160" />
<el-table-column prop="period" label="期数" align="center" width="100" />
<el-table-column prop="period" label="期(台)数" align="center" width="100" />
<el-table-column label="付款方式" align="center" width="200">
<template slot-scope="scope">
<el-select v-model="scope.row.payWayValue" placeholder="请选择" filterable @change="changePayWay($event, scope.row)">
@ -182,6 +182,7 @@
<el-table-column prop="payAccountTotal" label="关联付款金额" align="center" width="140"/>
</el-table>
</div>
<div v-show="formobj.costTypeKey == '001' && formobj.isVeh == '1'"><!-- 款项类别为主车厂家采购且是否涉及车辆为是时显示 -->
<div class="title titleOne">
<div>车辆列表</div>
@ -434,6 +435,8 @@ export default {
},
rules: {
carBrandName: [{ required: true, message: '品牌不能为空', trigger: 'change' }],
costRangeValue: [{ required: true, message: '款项范围不能为空', trigger: 'change' }],
costTypeValue: [{ required: true, message: '款项类别不能为空', trigger: 'change' }],
isVeh: [{ required: true, message: '是否涉及车辆不能为空', trigger: 'change' }],
payCompany: [{ required: true, message: '付款单位不能为空', trigger: 'change' }],
isLeaderSp: [{ required: true, message: '是否事业部运营经理审批不能为空', trigger: 'change' }],
@ -443,7 +446,6 @@ export default {
paymentBtn: false, // -- --
paymentInformation: { //
index: '',
liquidationPayment: '', //
list: []
}
}
@ -607,7 +609,7 @@ export default {
applySid: '', // sid
costTitleValue: e.costTitleValue, //
openDate: e.openDate, //
period: e.period, //
period: e.period, // ()
payWayKey: '', // Key
payWayValue: '', // Value
receiveCompany: e.receiveCompany, //
@ -688,20 +690,18 @@ export default {
this.paymentVisible = true
this.paymentBtn = true
this.paymentInformation.index = index
this.paymentInformation.liquidationPayment = this.formobj.createTime + row.paymentType + '平仓款'
this.paymentInformation.list = JSON.parse(JSON.stringify(row.finPaymentapplyDetailsBelowList))
},
handleLookPayment(row, index) {
this.paymentVisible = true
this.paymentBtn = false
this.paymentInformation.inde = index
this.paymentInformation.liquidationPayment = this.formobj.createTime + row.paymentType + '平仓款'
this.paymentInformation.list = JSON.parse(JSON.stringify(row.finPaymentapplyDetailsBelowList))
},
paymentAdd() {
this.paymentVisible = false
this.viewState = 3
this.$refs['divPaymentInformation'].showAdd(this.formobj.useOrgSid, this.paymentInformation.liquidationPayment)
this.$refs['divPaymentInformation'].showAdd(this.formobj.useOrgSid)
},
backInformation(value) {
this.viewState = 1
@ -716,6 +716,7 @@ export default {
receiveCompany: value.receiveCompany, //
receiveCompanySid: value.receiveCompanySid, // sid
bank: value.bank, //
bankShortName: value.bankShortName, //
receivingAccount: value.receivingAccount, //
payAccount: value.payAccount, //
detailSid: '', // sid
@ -755,7 +756,6 @@ export default {
this.paymentBtn = false
this.paymentInformation = {
index: '',
liquidationPayment: '',
list: []
}
},

5
anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/fukuanguanliFlow/fukuanguanli/fukuanYiBanInfo.vue

@ -72,7 +72,7 @@
<el-table-column fixed width="80" label="序号" type="index" :index="index + 1" align="center"/>
<el-table-column prop="costTitleValue" label="款项名称" align="center" width="200" />
<el-table-column prop="openDate" label="融资付款开通日期" align="center" width="160" />
<el-table-column prop="period" label="期数" align="center" width="100" />
<el-table-column prop="period" label="期(台)数" align="center" width="100" />
<el-table-column prop="payWayValue" label="付款方式" align="center" width="150" />
<el-table-column prop="receiveCompany" label="收款单位名称" align="center" width="140" />
<el-table-column prop="bank" label="开户行" align="center" width="130" />
@ -286,7 +286,6 @@ export default {
paymentVisible: false, // --
paymentInformation: { //
index: '',
liquidationPayment: '', //
list: []
},
//
@ -352,7 +351,6 @@ export default {
handleLookPayment(row, index) {
this.paymentVisible = true
this.paymentInformation.inde = index
this.paymentInformation.liquidationPayment = this.formobj.createTime + row.paymentType + '平仓款'
this.paymentInformation.list = JSON.parse(JSON.stringify(row.finPaymentapplyDetailsBelowList))
},
resetStateByInformation() {
@ -368,7 +366,6 @@ export default {
this.paymentVisible = false
this.paymentInformation = {
index: '',
liquidationPayment: '',
list: []
}
},

2
anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/fukuanguanliFlow/fukuanguanli/relation/closingPayment.vue

@ -10,7 +10,7 @@
<el-table-column fixed label="序号" type="index" :index="indexMethod" align="center" width="80px"/>
<el-table-column prop="costTitleValue" label="款项名称" align="center" width="200" />
<el-table-column prop="openDate" label="融资付款开通日期" align="center" width="160" />
<el-table-column prop="period" label="期数" align="center" width="100" />
<el-table-column prop="period" label="期(台)数" align="center" width="100" />
<el-table-column prop="receiveCompany" label="收款单位名称" align="center" width="140" />
<el-table-column prop="bank" label="开户行" align="center" width="130" />
<el-table-column prop="receivingAccount" label="收款银行账号" align="center" width="140" />

75
anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/fukuanguanliFlow/fukuanguanli/relation/paymentInformationAdd.vue

@ -1,4 +1,4 @@
<temp<template>
<template>
<div class="app-container">
<div v-show="viewState == 1">
<div class="tab-header webtop">
@ -8,7 +8,7 @@
<el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
</div>
</div>
<div class="">
<div class="listconadd">
<el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
<el-row style="border-top: 1px solid #e0e3eb">
<el-col :span="12">
@ -61,7 +61,7 @@
<el-col :span="12">
<div class="span-sty"><span class="icon">*</span>后期是否有平仓付款</div>
<el-form-item prop="isPay">
<el-radio-group class="addinputInfo" v-model="formobj.isPay">
<el-radio-group class="addinputInfo" disabled v-model="formobj.isPay">
<el-radio label="1"></el-radio>
<el-radio label="0"></el-radio>
</el-radio-group>
@ -80,8 +80,7 @@
<el-button size="mini" type="danger" @click="toDelete(scope.$index)">删除</el-button>
</template>
</el-table-column>
<el-table-column prop="costTitleValue" label="平仓款名称" align="center" />
<el-table-column label="期数" align="center">
<el-table-column label="期(台)数" align="center">
<template slot-scope="scope">
<el-input @keyup.native="scope.row.period = getNumber(scope.row.period, 2)" v-model="scope.row.period" clearable placeholder="" />
</template>
@ -96,6 +95,13 @@
<el-input @keyup.native="scope.row.exePayPrice = getNumber(scope.row.exePayPrice, 2)" v-model="scope.row.exePayPrice" clearable placeholder="" />
</template>
</el-table-column>
<el-table-column label="收款银行账号" align="center">
<template slot-scope="scope">
<el-select v-model="scope.row.receivingAccount" placeholder="请选择" clearable filterable>
<el-option v-for="item in receivingAccount_list" :key="item.sid" :label="item.receivingAccount" :value="item.receivingAccount"></el-option>
</el-select>
</template>
</el-table-column>
<el-table-column label="备注" align="center">
<template slot-scope="scope">
<el-input v-model="scope.row.remarks" clearable placeholder="" />
@ -130,11 +136,9 @@
</el-row>
<el-row>
<el-col :span="12">
<div class="span-sty">业务类型</div>
<div class="span-sty">银行简称</div>
<el-form-item>
<el-select class="addinputInfo" v-model="temp.businessTypeValue" placeholder="请选择" @change="businessTypeChange" clearable filterable>
<el-option v-for="item in businessType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"></el-option>
</el-select>
<el-input class="addinputInfo addinputw" v-model="temp.bankShortName" clearable placeholder=""/>
</el-form-item>
</el-col>
<el-col :span="12">
@ -166,8 +170,7 @@ export default {
costTitle_list: [],
payment_list: [],
receiveCompany_list: [],
businessType_list: [],
liquidationPayment: '', //
receivingAccount_list: [],
formobj: {
sid: '', // sid
costTitleKey: '', //
@ -176,6 +179,7 @@ export default {
paymentType: '', // value
receiveCompany: '', //
receiveCompanySid: '', // sid
bankShortName: '', //
bank: '', //
receivingAccount: '', //
payAccount: '', //
@ -189,8 +193,7 @@ export default {
companyName: '', //
bank: '', //
receivingAccount: '', //
businessTypeKey: '', // key
businessTypeValue: '', // value
bankShortName: '',
remarks: '', //
useOrgSid: '', // sid
useOrgName: ''
@ -216,19 +219,13 @@ export default {
this.payment_list = res.data
}
})
typeValues({ type: 'cw_businessType' }).then((res) => {
if (res.success) {
this.businessType_list = res.data
}
})
},
showAdd(useOrgSid, liquidationPayment) {
showAdd(useOrgSid) {
this.viewTitle = '【新增】付款信息'
this.$nextTick(() => {
this.$refs['form_obj'].clearValidate()
})
this.init()
this.liquidationPayment = liquidationPayment
this.temp.useOrgSid = useOrgSid
this.selectByUseOrgSid(useOrgSid)
},
@ -261,8 +258,14 @@ export default {
const choose = this.costTitle_list.filter((item) => item.dictValue === value)
if (choose !== null && choose.length > 0) {
this.formobj.costTitleKey = choose[0].dictKey
if (value === '银行保证金') {
this.formobj.isPay = '1'
} else {
this.formobj.isPay = '0'
}
} else {
this.formobj.costTitleKey = ''
this.formobj.isPay = ''
}
},
paymentChange(value) {
@ -279,10 +282,27 @@ export default {
this.formobj.receiveCompanySid = choose[0].sid
this.formobj.receiveCompany = choose[0].companyName
this.formobj.bank = choose[0].bank
this.formobj.bankShortName = choose[0].bankShortName
if (this.formobj.costTitleValue === '银行保证金') {
if (this.receiveCompany_list.length > 0) {
this.receivingAccount_list = []
this.receiveCompany_list.forEach((e) => {
if (e.companyName === this.formobj.receiveCompany && e.bank === this.formobj.bank) {
this.receivingAccount_list.push({
sid: e.sid,
receivingAccount: e.receivingAccount
})
}
})
}
} else {
this.receivingAccount_list = []
}
} else {
this.formobj.receiveCompanySid = ''
this.formobj.receiveCompany = ''
this.formobj.bank = ''
this.formobj.bankShortName = ''
}
},
receiveCompanyAdd() {
@ -303,18 +323,16 @@ export default {
this.temp.companyName = '' //
this.temp.bank = '' //
this.temp.receivingAccount = '' //
this.temp.businessTypeKey = '' // key
this.temp.businessTypeValue = '' // value
this.temp.bankShortName = ''
this.temp.remarks = '' //
},
toAdd() {
this.formobj.finPaymentapplyDetailsBelowEveList.push({
sid: '', // sid
costTitleKey: '', //
costTitleValue: this.liquidationPayment, //
detailSid: '', // sid
openDate: '', //
period: '', //
period: '', // ()
payCompanySid: '', // sid
payCompany: '', //
receiveCompany: '', //
@ -330,14 +348,6 @@ export default {
toDelete(index) {
this.formobj.finPaymentapplyDetailsBelowEveList.splice(index, 1)
},
businessTypeChange(value) {
const choose = this.businessType_list.filter((item) => item.dictValue === value)
if (choose !== null && choose.length > 0) {
this.temp.businessTypeKey = choose[0].dictKey
} else {
this.temp.businessTypeKey = ''
}
},
saveOrUpdate() {
this.$refs['form_obj'].validate((valid) => {
if (valid) {
@ -356,6 +366,7 @@ export default {
receiveCompany: '', //
receiveCompanySid: '', // sid
bank: '', //
bankShortName: '', //
receivingAccount: '', //
payAccount: '', //
detailSid: '', // sid

12
anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/fukuanguanliFlow/fukuanguanli/relation/paymentInformationInfo.vue

@ -1,4 +1,4 @@
<temp<template>
<template>
<div class="app-container">
<div v-show="viewState == 1">
<div class="tab-header webtop">
@ -7,7 +7,7 @@
<el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
</div>
</div>
<div class="">
<div class="listconadd">
<el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
<el-row style="border-top: 1px solid #e0e3eb">
<el-col :span="12">
@ -53,10 +53,10 @@
<div class="title">平仓信息</div>
<el-table :key="tableKey" :data="formobj.finPaymentapplyDetailsBelowEveList" :index="index" border style="width: 100%">
<el-table-column fixed width="80" label="序号" type="index" :index="index + 1" align="center" />
<el-table-column prop="costTitleValue" label="平仓款名称" align="center" />
<el-table-column prop="period" label="期数" align="center" />
<el-table-column prop="period" label="期(台)数" align="center" />
<el-table-column prop="exePayDate" label="平仓付款日期" align="center" />
<el-table-column prop="exePayPrice" label="平仓付款金额" align="center" />
<el-table-column prop="receivingAccount" label="收款银行账号" align="center" />
<el-table-column prop="remarks" label="备注" align="center" />
</el-table>
</div>
@ -67,7 +67,6 @@
</template>
<script>
export default {
name: 'PaymentInformationInfo',
data() {
@ -100,8 +99,7 @@ export default {
this.$nextTick(() => {
this.$refs['form_obj'].clearValidate()
})
const value = JSON.parse(JSON.stringify(row))
this.formobj = row
this.formobj = JSON.parse(JSON.stringify(row))
},
handleReturn() {
this.formobj = {

18
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecordFeign.java

@ -33,19 +33,6 @@ import io.swagger.annotations.ApiOperation;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.*;
/**
* Project: anrui-fin(财务) <br/>
* File: FinPaymentrecordFeign.java <br/>
* Class: com.yxt.anrui.fin.api.finpaymentrecord.FinPaymentrecordFeign <br/>
* Description: fin_paymentrecord. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2022-06-23 13:45:10 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Api(tags = "fin_paymentrecord")
@FeignClient(
contextId = "anrui-fin-FinPaymentrecord",
@ -104,4 +91,9 @@ public interface FinPaymentrecordFeign {
@GetMapping("/fetchBySid")
@ResponseBody
ResultBean<FinPaymentrecord> fetchBySid(@RequestParam("sid") String sid);
@ApiOperation("出纳付款列表推送财务凭证")
@PostMapping("/pushVoucher")
@ResponseBody
public ResultBean pushVoucher(@RequestParam("sid") String sid);
}

22
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordRest.java

@ -34,21 +34,8 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
/**
* Project: anrui-fin(财务) <br/>
* File: FinPaymentrecordFeignFallback.java <br/>
* Class: com.yxt.anrui.fin.biz.finpaymentrecord.FinPaymentrecordRest <br/>
* Description: fin_paymentrecord. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2022-06-23 13:45:10 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Api(tags = "出纳付款列表")
@RestController("com.yxt.anrui.fin.biz.finpaymentrecord.FinPaymentrecordRest")
@RestController
@RequestMapping("v1/finpaymentrecord")
public class FinPaymentrecordRest implements FinPaymentrecordFeign {
@ -110,4 +97,11 @@ public class FinPaymentrecordRest implements FinPaymentrecordFeign {
FinPaymentrecord finPaymentrecord = finPaymentrecordService.fetchBySid(sid);
return rb.success().setData(finPaymentrecord);
}
@Override
public ResultBean pushVoucher(String sid) {
ResultBean rb = ResultBean.fireFail();
finPaymentrecordService.pushVoucher(sid);
return rb.success();
}
}

95
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java

@ -52,18 +52,22 @@ import com.yxt.anrui.base.common.enums.DictCommonEnum;
import com.yxt.anrui.fin.api.finmanufacturerbank.FinManufacturerBank;
import com.yxt.anrui.fin.api.finpaymentapply.FinPaymentapply;
import com.yxt.anrui.fin.api.finpaymentapplydetails.FinPaymentapplyDetails;
import com.yxt.anrui.fin.api.finpaymentapplydetailsbeloweve.FinPaymentapplyDetailsBelowEve;
import com.yxt.anrui.fin.api.finpaymentapplyvehicle.FinPaymentapplyVehicleVo;
import com.yxt.anrui.fin.api.finpaymentrecord.*;
import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailedjr.FinUncollectedReceivablesDetailedJR;
import com.yxt.anrui.fin.api.kingdee.FinKingDeeFeign;
import com.yxt.anrui.fin.api.kingdee.appaybill.ApPayBill;
import com.yxt.anrui.fin.api.kingdee.voucher.Voucher;
import com.yxt.anrui.fin.biz.finmanufacturerbank.FinManufacturerBankService;
import com.yxt.anrui.fin.biz.finpaymentapply.FinPaymentapplyService;
import com.yxt.anrui.fin.biz.finpaymentapplydetails.FinPaymentapplyDetailsService;
import com.yxt.anrui.fin.biz.finpaymentapplydetailsbeloweve.FinPaymentapplyDetailsBelowEveService;
import com.yxt.anrui.fin.biz.finpaymentapplyvehicle.FinPaymentapplyVehicleService;
import com.yxt.anrui.fin.biz.finuncollectedreceivablesdetailedjr.FinUncollectedReceivablesDetailedJRService;
import com.yxt.anrui.fin.biz.kingdee.appaybill.ApPayBillService;
import com.yxt.anrui.fin.biz.kingdee.voucher.VoucherService;
import com.yxt.anrui.portal.api.dictcommon.DictCommonFeign;
import com.yxt.anrui.portal.api.flow.FlowableFeign;
import com.yxt.anrui.portal.api.flow.PCHistTaskListAndCommentList;
import com.yxt.anrui.portal.api.sysorganization.SysOrganization;
@ -105,6 +109,7 @@ import org.apache.tomcat.util.threads.ThreadPoolExecutor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
@ -117,19 +122,6 @@ import java.util.stream.Collectors;
import static java.util.Comparator.comparing;
/**
* Project: anrui-fin(财务) <br/>
* File: FinPaymentrecordService.java <br/>
* Class: com.yxt.anrui.fin.biz.finpaymentrecord.FinPaymentrecordService <br/>
* Description: fin_paymentrecord 业务逻辑. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2022-06-23 13:45:10 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Slf4j
@Service
public class FinPaymentrecordService extends MybatisBaseService<FinPaymentrecordMapper, FinPaymentrecord> {
@ -192,6 +184,12 @@ public class FinPaymentrecordService extends MybatisBaseService<FinPaymentrecord
private LoanSettleApplyFeign loanSettleApplyFeign;
@Autowired
private VoucherService voucherService;
@Resource
private FinKingDeeFeign finKingDeeFeign;
@Autowired
private DictCommonFeign dictCommonFeign;
@Autowired
private FinPaymentapplyDetailsBelowEveService finPaymentapplyDetailsBelowEveService;
public PagerVo<FinPaymentrecordVo> listPageVo(PagerQuery<FinPaymentrecordQuery> pq) {
FinPaymentrecordQuery query = pq.getParams();
@ -1627,4 +1625,75 @@ public class FinPaymentrecordService extends MybatisBaseService<FinPaymentrecord
}
public void pushVoucher(String sid) {
Voucher voucher = new Voucher();
FinPaymentrecord finPaymentrecord = fetchBySid(sid);
SysOrganizationVo organizationVo = sysOrganizationFeign.fetchBySid(finPaymentrecord.getUseOrgSid()).getData();
if (null != organizationVo) {
voucher.setAccountBook(organizationVo.getOrgCode());
voucher.setVoucherNo(organizationVo.getOrgCode());
}
List<Voucher.VoucherResultDetailDto> voucherResultDetailDtos = new ArrayList<>();
Voucher.VoucherResultDetailDto voucherResultDetailDto = new Voucher.VoucherResultDetailDto();
if ("015".equals(finPaymentrecord.getCostTitleKey())) {//银行保证金
//借方
voucherResultDetailDto.setSummary("付" + finPaymentrecord.getCostTitleValue() + finPaymentrecord.getCost());
voucherResultDetailDto.setSubjectNo("1009.03");
SysOrganizationVo deptVo = sysOrganizationFeign.fetchBySid(finPaymentrecord.getPurchaseSystemSid()).getData();
voucherResultDetailDto.setDimensionDept(deptVo.getOrgCode());
String key = dictCommonFeign.selectByValue(finPaymentrecord.getReceiveBank()).getData();
voucherResultDetailDto.setBank(key);
voucherResultDetailDto.setDebit(finPaymentrecord.getCost().toString());
voucherResultDetailDtos.add(voucherResultDetailDto);
//贷方
voucherResultDetailDto.setSummary("付" + finPaymentrecord.getCostTitleValue() + finPaymentrecord.getCost());
voucherResultDetailDto.setSubjectNo("1002.01.00");
voucherResultDetailDto.setBankAccount(finPaymentrecord.getPayBankAccount());
voucherResultDetailDto.setCredit(finPaymentrecord.getCost().toString());
voucherResultDetailDtos.add(voucherResultDetailDto);
} else if ("016".equals(finPaymentrecord.getCostTitleKey())) {//银行手续费
//借方
voucherResultDetailDto.setSummary("付" + finPaymentrecord.getCostTitleValue() + finPaymentrecord.getCost());
voucherResultDetailDto.setSubjectNo("6603.03.00");
voucherResultDetailDto.setDebit(finPaymentrecord.getCost().toString());
voucherResultDetailDtos.add(voucherResultDetailDto);
//贷方
voucherResultDetailDto.setSummary("付" + finPaymentrecord.getCostTitleValue());
voucherResultDetailDto.setSubjectNo("1002.01.00");
voucherResultDetailDto.setBankAccount(finPaymentrecord.getPayBankAccount());
voucherResultDetailDto.setCredit(finPaymentrecord.getCost().toString());
voucherResultDetailDtos.add(voucherResultDetailDto);
} else if ("017".equals(finPaymentrecord.getCostTitleKey())) {//金融服务费
//借方
voucherResultDetailDto.setSummary("付" + finPaymentrecord.getCostTitleValue() + finPaymentrecord.getCost());
voucherResultDetailDto.setSubjectNo("6603.03.00");
voucherResultDetailDto.setDebit(finPaymentrecord.getCost().toString());
voucherResultDetailDtos.add(voucherResultDetailDto);
//贷方
voucherResultDetailDto.setSummary("付" + finPaymentrecord.getCostTitleValue());
voucherResultDetailDto.setSubjectNo("1002.01.00");
voucherResultDetailDto.setBankAccount(finPaymentrecord.getPayBankAccount());
voucherResultDetailDto.setCredit(finPaymentrecord.getCost().toString());
voucherResultDetailDtos.add(voucherResultDetailDto);
}else if (StringUtils.isBlank(finPaymentrecord.getCostTitleKey())){//平仓款
//借方
FinPaymentapplyDetailsBelowEve finPaymentapplyDetailsBelowEve = finPaymentapplyDetailsBelowEveService.fetchBySid(finPaymentrecord.getBusSid());
voucherResultDetailDto.setSummary("还" + finPaymentrecord.getCostTitleValue() + finPaymentapplyDetailsBelowEve.getExePayDate());
voucherResultDetailDto.setSubjectNo("1009.03");
SysOrganizationVo deptVo = sysOrganizationFeign.fetchBySid(finPaymentrecord.getPurchaseSystemSid()).getData();
voucherResultDetailDto.setDimensionDept(deptVo.getOrgCode());
String key = dictCommonFeign.selectByValue(finPaymentrecord.getReceiveBank()).getData();
voucherResultDetailDto.setBank(key);
voucherResultDetailDto.setDebit(finPaymentrecord.getCost().toString());
voucherResultDetailDtos.add(voucherResultDetailDto);
//贷方
voucherResultDetailDto.setSummary("还" + finPaymentrecord.getCostTitleValue() + finPaymentapplyDetailsBelowEve.getExePayDate());
voucherResultDetailDto.setSubjectNo("1002.01.00");
voucherResultDetailDto.setBankAccount(finPaymentrecord.getPayBankAccount());
voucherResultDetailDto.setCredit(finPaymentrecord.getCost().toString());
voucherResultDetailDtos.add(voucherResultDetailDto);
}
voucher.setResultDetails(voucherResultDetailDtos);
finKingDeeFeign.saveVoucher(voucher);
}
}

Loading…
Cancel
Save