diff --git a/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/chunafukuan/chunafukuanguanli/cashier.vue b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/chunafukuan/chunafukuanguanli/cashier.vue index 3d94941cee..78f70d7ebc 100644 --- a/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/chunafukuan/chunafukuanguanli/cashier.vue +++ b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/chunafukuan/chunafukuanguanli/cashier.vue @@ -162,7 +162,7 @@ - + @@ -171,106 +171,80 @@ - - + + - - *收款单位名称 - - + +
*收款单位名称
- + - - *收款银行账号 - - + +
*收款银行账号
- + - - 收款账户开户行 - - - - {{ formobj.receiveBank }} - + +
收款账户开户行
+ {{ formobj.receiveBank }} - - *付款金额 + + + +
*付款金额
+ - - - - + +
付款手续费
+ - - *付款方式 - - + +
*付款方式
- + - - *付款日期 - - - - - + +
*付款日期
+ - - *付款账号 - - + +
*付款账号
- + - - 开户名称 - - - - {{ formobj.payBank }} - + +
开户名称
+ {{ formobj.payBank }} - - 本次付款说明 - - - - - + +
本次付款说明
+ - - *付款凭证 - - - - - + +
*付款凭证
+ @@ -405,7 +379,8 @@ export default { receiveBank: '', // 收款银行名称 receiveBankAccount: '', // 收款银行账号 payCode: '', // 供应商编码 - cost: '' + cost: '', + paymentCharges: '' }, disabledCost: false, imgList: [], @@ -414,7 +389,7 @@ export default { payDate: [{ required: true, message: '请选择付款日期', trigger: 'blur' }], payBankAccount: [{ required: true, message: '请选择付款账号', trigger: 'change' }], receiveCompany: [{ required: true, message: '收款单位不能为空', trigger: 'change' }], - receiveBankAccount: [{ required: true, message: '收款银行账号不能为空', trigger: 'change' }], + receiveBankAccount: [{ required: true, message: '收款银行账号不能为空', trigger: 'change' }], cost: [{ required: true, message: '付款金额不能为空', trigger: 'blur' }] } } @@ -801,7 +776,8 @@ export default { receiveBank: '', // 收款银行名称 receiveBankAccount: '', // 收款银行账号 payCode: '', // 供应商编码 - cost: '' + cost: '', + paymentCharges: '' } this.disabledCost = false this.submitdisabled = false @@ -816,12 +792,17 @@ export default { } diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecord.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecord.java index ef7a2d9694..2d3da09e25 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecord.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecord.java @@ -115,4 +115,6 @@ public class FinPaymentrecord extends BaseEntity { private String purchaseSystemName; // 采购系统名称 @ApiModelProperty("付款时备注内容") private String busRemarks; + @ApiModelProperty(value = "付款手续费") + private BigDecimal paymentCharges; } diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecordUpdateDto.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecordUpdateDto.java index cf927b8f68..c3336df6e0 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecordUpdateDto.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecordUpdateDto.java @@ -52,4 +52,7 @@ public class FinPaymentrecordUpdateDto implements Dto { private String cost; @ApiModelProperty(value = "应收金额") private String accountsReceive; + @ApiModelProperty(value = "付款手续费") + private String paymentCharges; + } diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/appaybill/ApPayBill.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/appaybill/ApPayBill.java index c78825ab4c..0f2b62b519 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/appaybill/ApPayBill.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/appaybill/ApPayBill.java @@ -86,6 +86,8 @@ public class ApPayBill { /** * 结算方式:FSETTLETYPEIDKey (必填项) */ + @JsonProperty("FHANDLINGCHARGEFOR") + public double FHANDLINGCHARGEFOR; //手续费 @JsonProperty("FSETTLETYPEIDKey") @NotBlank(message = "FSETTLETYPEIDKey不能为空") public String FSETTLETYPEIDKey; diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java index b24714fb33..63a8ef598f 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java @@ -592,6 +592,10 @@ public class FinPaymentrecordService extends MybatisBaseService 0) { ApPayBill.FPAYBILLENTRY fpaybillentry = new ApPayBill.FPAYBILLENTRY(); + //手续费 + if (null != finPaymentrecord.getPaymentCharges()) { + fpaybillentry.setFHANDLINGCHARGEFOR(finPaymentrecord.getPaymentCharges().doubleValue()); + } //应付金额 fpaybillentry.setFPAYTOTALAMOUNTFOR(finPaymentrecord.getCost().doubleValue()); //登账日期 @@ -1098,4 +1102,4 @@ public class FinPaymentrecordService extends MybatisBaseService + + + + + +
+ + 选取文件 + 上传 + +
+
+

文件上传结果

+ +
{{ uploadResultMesssage }}
+ +
+ +
+ 确定 + 取消 +
+ @@ -133,6 +171,7 @@ import Pagination from '@/components/pagination' import pageye from '@/components/pagination/pageye' import ButtonBar from '@/components/ButtonBar' import req from '@/api/customerrepayment/customerrepayment' +import { getButtonPermissions } from '@/api/Common/dictcommons' export default { name: 'CustomerRepayment', @@ -144,7 +183,39 @@ export default { data() { return { btndisabled: false, + dialogVisible: false, + updateAction: '', + fileList: [], + uploadResultMesssage: '', + uploadData: { + fileName: '', + userSid: window.sessionStorage.getItem('userSid') + }, + headers: { + token: window.sessionStorage.getItem('token') + }, btnList: [ + { + type: 'primary', + size: 'small', + icon: 'Import', + btnKey: 'historyImport', + btnLabel: '贷后历史数据导入' + }, + { + type: 'primary', + size: 'small', + icon: 'Import', + btnKey: 'detailImport', + btnLabel: '休眠还款计划明细导入' + }, + { + type: 'primary', + size: 'small', + icon: 'Import', + btnKey: 'recordImport', + btnLabel: '生成休眠还款记录' + }, { type: 'primary', size: 'small', @@ -237,7 +308,18 @@ export default { this.getList() }, mounted() { - this.$refs['btnbar'].setButtonList(this.btnList) + getButtonPermissions({ userSid: window.sessionStorage.getItem('userSid'), url: this.$route.path, type: 0 }).then((res) => { + if (res.success) { + for (var i = 0; i < res.data.length; i++) { + for (var k = 0; k < this.btnList.length; k++) { + if (res.data[i].buttonId === this.btnList[k].btnKey) { + this.btnList.splice(k, 1) + } + } + } + this.$refs['btnbar'].setButtonList(this.btnList) + } + }) }, methods: { // 搜索条件效果 @@ -252,6 +334,15 @@ export default { btnHandle(btnKey) { console.log('XXXXXXXXXXXXXXX ' + btnKey) switch (btnKey) { + case 'historyImport': + this.historyImport() + break + case 'detailImport': + this.detailImport() + break + case 'recordImport': + this.recordImport() + break case 'doExport': this.doExport() break @@ -329,6 +420,65 @@ export default { } this.getList() }, + historyImport() { + this.dialogVisible = true + this.updateAction = process.env.VUE_APP_BASE_API + '/riskcenter/v1/loanrepaymentschedule/importHistoryData' + this.fileList = [] + this.uploadResultMesssage = '' + }, + detailImport() { + this.dialogVisible = true + this.updateAction = process.env.VUE_APP_BASE_API + '/riskcenter/v1/loanrepaymentschedule/importSleepData' + this.fileList = [] + this.uploadResultMesssage = '' + }, + recordImport() { + const tip = '请确认是否生成休眠数据还款记录' + this.$confirm(tip, '提示', { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning' + }).then(() => { + const loading = this.$loading({ + lock: true, + text: 'Loading', + spinner: 'el-icon-loading', + background: 'rgba(0, 0, 0, 0.7)' + }) + req.importSleepHistoryData({ userSid: window.sessionStorage.getItem('userSid') }).then((resp) => { + if (resp.success) { + this.$message({ type: 'success', message: resp.msg, showClose: true }) + } + this.getList() + loading.close() + }).catch(e => { + loading.close() + }) + }).catch(() => { + }) + }, + handleChange(file) { + this.uploadData.fileName = file.name + }, + handleRemove() { + this.uploadResultMesssage = '' + }, + submitUpload() { + this.$refs.upload.submit() + }, + handleSuccess(resp, file, fileList) { + const _this = this + if (resp.success) { + _this.uploadResultMesssage = resp.msg + // 上传文件数据成功后立即保存数据 + } else { + _this.uploadResultMesssage = resp.msg + } + }, + handleConfirm() { + this.dialogVisible = false + this.getList() + }, doExport() { const loading = this.$loading({ lock: true, diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentschedule/LoanRepaymentScheduleService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentschedule/LoanRepaymentScheduleService.java index 4257cca7b6..cab1de99c3 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentschedule/LoanRepaymentScheduleService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentschedule/LoanRepaymentScheduleService.java @@ -4902,7 +4902,13 @@ public class LoanRepaymentScheduleService extends MybatisBaseService 30 ? customerNoPrefix.substring(0, 30) : customerNoPrefix); return customerNoPrefix.length() > 30 ? customerNoPrefix.substring(0, 30) : customerNoPrefix; } @@ -5220,6 +5226,7 @@ public class LoanRepaymentScheduleService extends MybatisBaseService