Commit e14c46cf by 闫泽浩

Merge branch 'development-202206' of http://114.115.138.98:8900/fukai/vue-gjjs…

Merge branch 'development-202206' of http://114.115.138.98:8900/fukai/vue-gjjs into development-202206
parents 68adadd8 e3a81421
......@@ -3925,6 +3925,14 @@ const CodeTable = {
{ label: "不计息", value: "B" },
{ label: "按周计息", value: "A" },
],
intprd1: [
{ label: "按月计息", value: "1" },
{ label: "按季计息", value: "2" },
{ label: "按半年计息", value: "3" },
{ label: "按年计息", value: "4" },
{ label: "利随本清", value: "6" },
{ label: "预扣息", value: "7" },
],
inttyp: [
{label: "从融资本金中扣收", value: "1"},
{label: "从扣息账户中扣收", value: "2"},
......@@ -5090,6 +5098,19 @@ const CodeTable = {
{ label: "外汇HIBOR浮动利率", value: "9" },
{ label: "外汇SIBOR浮动利率", value: "A" },
],
ratchgtyp2: [
{ label: "固定不变", value: "1" },
{ label: "实时随LPR调整", value: "A" },
{ label: "按季(每季度末月锚定起息日)", value: "4" },
{ label: "按半年(每年6月和12月锚定起息日)", value: "5" },
{ label: "融资起息日每满1个月", value: "D" },
{ label: "融资起息日每满3个月", value: "E" },
{ label: "融资起息日每满6个月", value: "F" },
{ label: "融资起息日每满1年", value: "2" },
{ label: "外汇LIBOR浮动利率", value: "7" },
{ label: "外汇HIBOR浮动利率", value: "8" },
{ label: "外汇SIBOR浮动利率", value: "9" },
],
ratfcc: [
{ label: "+/-到值", value: "A" },
{ label: "保留旧值", value: "N" },
......
......@@ -19,7 +19,7 @@ export default {
const selDst= "dspstm";
let params = {selIds,selDst};
this.model.infbut.selrow = idx + 1;
let rtnmsg = await this.executeRule("infbut.dspstm", params)
let rtnmsg = await this.executeRule("infbut.dsp", params)
if(rtnmsg.respCode == SUCCESS)
{
//TODO 处理数据逻辑
......
......@@ -413,7 +413,7 @@
placeholder="请选择计息周期"
>
<el-option
v-for="item in codes.intprd"
v-for="item in codes.intprd1"
:key="item.value"
:label="item.label"
:value="item.value"
......@@ -434,7 +434,7 @@
placeholder="请选择利率调整方式"
>
<el-option
v-for="item in codes.ratchgtyp"
v-for="item in codes.ratchgtyp2"
:key="item.value"
:label="item.label"
:value="item.value"
......@@ -487,7 +487,7 @@
</c-col>
<c-col :span="12">
<el-form-item label="是否定向收付" prop="bpdgrp.rec.flowflag">
<el-form-item v-if="zmqflg == 'x'" label="是否定向收付" prop="bpdgrp.rec.flowflag">
<c-select
v-model="model.bpdgrp.rec.flowflag"
style="width: 100%"
......@@ -543,6 +543,7 @@
<c-col :span="12">
<el-form-item label="卖出执行利率" prop="bpdgrp.rec.bmhrat">
<c-input
:disabled="model.bpdgrp.rec.ffttyp==''"
v-model="model.bpdgrp.rec.bmhrat"
placeholder="请输入卖出执行利率"
></c-input>
......@@ -565,6 +566,7 @@
<c-col :span="12">
<el-form-item label="税率" prop="bptmod.finmod.shuilv">
<c-input
disabled
v-model="model.bptmod.finmod.shuilv"
placeholder="请输入税率"
></c-input>
......@@ -577,6 +579,7 @@
<c-col :span="12">
<el-form-item label="预收息金额" prop="bptmod.finmod.intamt">
<c-input
disabled
v-model="model.bptmod.finmod.intamt"
placeholder="请输入预收息金额"
></c-input>
......@@ -595,6 +598,7 @@
<c-col :span="12">
<el-form-item label="预扣息方式" prop="bptmod.finmod.inttyp">
<c-select
:disabled="model.bptmod.finmod.intprd!='7'"
v-model="model.bptmod.finmod.inttyp"
style="width: 100%"
placeholder="请选择预扣息方式"
......@@ -652,12 +656,12 @@
label="审批流程发起标识"
prop="bptmod.finmod.dinmod.rmbsbs"
>
<c-select
<c-input
disabled
v-model="model.bptmod.finmod.dinmod.rmbsbs"
style="width: 100%"
placeholder="请选择审批流程发起标识"
maxlength="1"
>
</c-select>
</c-input>
</el-form-item>
</c-col>
</c-row>
......@@ -714,7 +718,7 @@
<el-form-item label="" prop=""> </el-form-item>
</c-col>
<c-col :span="10">
<c-checkbox v-model="model.bptmod.finmod.wjdkfl"
<c-checkbox disabled v-model="model.bptmod.finmod.wjdkfl"
>是否到期主动扣收款</c-checkbox
>
</c-col>
......@@ -725,6 +729,7 @@
<c-col :span="12">
<el-form-item label="利率调整周期" prop="bptmod.finmod.ratchgprd">
<c-select
:disabled="!(model.bptmod.finmod.ratchgtyp=='7'||model.bptmod.finmod.ratchgtyp=='8'||model.bptmod.finmod.ratchgtyp=='9')"
v-model="model.bptmod.finmod.ratchgprd"
style="width: 100%"
placeholder=""
......@@ -887,6 +892,7 @@
<c-col :span="12">
<el-form-item label="预扣息账号" prop="bptmod.finmod.intact">
<c-input
:disabled="model.bptmod.finmod.inttyp!='1'"
v-model="model.bptmod.finmod.intact"
style="width: 100%"
placeholder="请输入预扣息账号"
......@@ -894,7 +900,7 @@
</el-form-item>
</c-col>
<c-col :span="8">
<!-- <c-col :span="8">
<el-form-item label="交易类型" prop="bpdgrp.rec.trntyp">
<c-input
v-model="model.bpdgrp.rec.trntyp"
......@@ -902,7 +908,7 @@
placeholder="请输入交易类型"
></c-input>
</el-form-item>
</c-col>
</c-col> -->
<c-col :span="1">
<c-button
size="small"
......@@ -917,7 +923,7 @@
<!---line10---->
<c-row>
<c-col :span="12">
<el-form-item label="对方账号" prop="bpdgrp.rec.oppacc">
<el-form-item v-if="zmqflg == 'x'" label="对方账号" prop="bpdgrp.rec.oppacc">
<c-input
v-model="model.bpdgrp.rec.oppacc"
maxlength="35"
......@@ -929,11 +935,12 @@
<!---line11---->
<c-row>
<c-col :span="12">
<!-- <c-col :span="12">
<span v-text="model.fftlxx" data-path=".fftlxx"> </span>
</c-col>
</c-col> -->
<c-col :span="12">
<el-form-item label="福费廷转卖类型" prop="bpdgrp.rec.ffttyp">
<el-form-item v-if="(model.bpdgrp.rec.fintyp=='F'||model.bpdgrp.rec.fintyp=='G') && model.bptmod.finmod.intprd=='7'" label="福费廷转卖类型" prop="bpdgrp.rec.ffttyp">
<c-select
v-model="model.bpdgrp.rec.ffttyp"
style="width: 100%"
......@@ -971,7 +978,9 @@ export default {
props: ["model", "codes"],
mixins: [commonProcess],
data() {
return {};
return {
zmqflg: null,
};
},
methods: {
...Event,
......
<template>
<div class="eibs-tab">
<!-- ==================================左边-国内外汇贷款编号================================ -->
<c-col :span="12" style="padding-right: 20px;">
<c-col :span="24">
<el-form-item label="国内外汇贷款编号" prop="cfabpt.recp.dclp.dofoexlocode">
<c-input
v-model="model.cfabpt.recp.dclp.dofoexlocode"
maxlength="28"
placeholder="请输入国内外汇贷款编号"
disabled
></c-input>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="变动编号" prop="cfabpt.recp.dclp.changeno">
<c-input
v-model="model.cfabpt.recp.dclp.changeno"
maxlength="4"
placeholder="请输入变动编号"
disabled
></c-input>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="操作类型" prop="cfabpt.recp.dclp.actiontype">
<c-select
v-model="model.cfabpt.recp.dclp.actiontype"
style="width: 100%"
placeholder="请选择操作类型"
disabled
:code="codes.actiontype"
>
</c-select>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="银行业务编号" prop="cfabpt.recp.dclp.buscode">
<c-input
v-model="model.cfabpt.recp.dclp.buscode"
maxlength="32"
placeholder="请输入银行业务编号"
disabled
></c-input>
</el-form-item>
</c-col>
<c-col :span="12">
<el-form-item label="变动日期" prop="cfabpt.recp.dclp.chdate">
<c-date-picker
type="date"
v-model="model.cfabpt.recp.dclp.chdate"
style="width: 100%"
placeholder="请选择变动日期"
value-format="yyyy-MM-dd"
disabled
></c-date-picker>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="期初余额" prop="cfabpt.recp.dclp.loanopenbalan">
<c-input
v-model="model.cfabpt.recp.dclp.loanopenbalan"
maxlength="32"
placeholder="请输入期初余额"
disabled
></c-input>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="期末余额" prop="cfabpt.recp.dclp.loanopenbalan">
<c-input
v-model="model.cfabpt.recp.dclp.endbalan"
maxlength="32"
placeholder="请输入期末余额"
disabled
></c-input>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="提款币种" prop="cfabpt.recp.dclp.withcurrence">
<c-select
v-model="model.cfabpt.recp.dclp.withcurrence"
style="width: 100%"
placeholder="请选择提款币种"
:code="codes.curtxt1"
>
</c-select>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="提款金额" prop="cfabpt.recp.dclp.withamount">
<c-input
v-model="model.cfabpt.recp.dclp.withamount"
maxlength="32"
placeholder="请输入提款金额"
></c-input>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="结汇金额" prop="cfabpt.recp.dclp.settamount">
<c-input
v-model="model.cfabpt.recp.dclp.settamount"
maxlength="32"
placeholder="请输入结汇金额"
></c-input>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="资金用途" prop="cfabpt.recp.dclp.useofunds">
<c-select
v-model="model.cfabpt.recp.dclp.useofunds"
style="width: 100%"
placeholder="请选择资金用途"
:code="codes.curtxt"
>
</c-select>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="还本币种" prop="cfabpt.recp.dclp.princurr">
<c-select
v-model="model.cfabpt.recp.dclp.princurr"
style="width: 100%"
placeholder="请选择还本币种"
:code="codes.curtxt1"
>
</c-select>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="还本金额" prop="cfabpt.recp.dclp.repayamount">
<c-input
v-model="model.cfabpt.recp.dclp.repayamount"
maxlength="32"
placeholder="请输入还本金额"
></c-input>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="购汇还本金额" prop="cfabpt.recp.dclp.prepayamount">
<c-input
v-model="model.cfabpt.recp.dclp.prepayamount"
maxlength="32"
placeholder="请输入购汇还本金额"
></c-input>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="付息币种" prop="cfabpt.recp.dclp.inpaycurr">
<c-select
v-model="model.cfabpt.recp.dclp.inpaycurr"
style="width: 100%"
placeholder="请选择付息币种"
:code="codes.curtxt1"
>
</c-select>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="付息金额" prop="cfabpt.recp.dclp.inpayamount">
<c-input
v-model="model.cfabpt.recp.dclp.inpayamount"
maxlength="32"
placeholder="请输入付息金额"
></c-input>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="购汇付息金额" prop="cfabpt.recp.dclp.pinpayamount">
<c-input
v-model="model.cfabpt.recp.dclp.pinpayamount"
maxlength="32"
placeholder="请输入购汇付息金额"
></c-input>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="备注" prop="cfabpt.recp.dclp.remark">
<c-input
type="textarea"
v-model="model.cfabpt.recp.dclp.remark"
maxlength="248"
show-word-limit
placeholder="请输入备注"
:rows="5"
></c-input>
</el-form-item>
</c-col>
</c-col>
<!-- ==================================右边-删除原因================================ -->
<c-col :span="12" style="padding-left: 20px;">
<c-col :span="24">
<el-form-item label="删除原因" prop="cfabpt.recp.dclp.actiondesc">
<c-input
type="textarea"
v-model="model.cfabpt.recp.dclp.actiondesc"
maxlength="248"
show-word-limit
placeholder="请输入删除原因"
:rows="5"
disabled
></c-input>
</el-form-item>
</c-col>
<!-- <c-col :span="12">
<c-button size="small" type="primary" @click="onSav"> &Save </c-button>
</c-col> -->
<!-- <c-col :span="12">
<c-button size="small" type="primary" @click="onChk"> &Check </c-button>
</c-col> -->
<c-col :span="17" :offset="7">
<c-checkbox v-model="model.cfabpt.recp.dclp.acp" disabled>确认</c-checkbox>
</c-col>
</c-col>
</div>
</template>
<script>
import Api from '~/service/Api'
import commonProcess from '~/mixin/commonProcess'
import CodeTable from '~/config/CodeTable'
import Event from '~/model/Bptopn/Event'
export default {
inject: ['root'],
props: ['model', 'codes'],
mixins: [commonProcess],
data() {
return {}
},
methods: { ...Event },
created: function () {},
}
</script>
<style></style>
......@@ -3,9 +3,10 @@
<c-col :span="12">
<el-form-item label="单据编号" prop="bpdgrp.rec.pntref">
<c-input
disabled
v-model="model.bpdgrp.rec.pntref"
maxlength="16"
placeholder="请输入单据编号"
placeholder=""
></c-input>
</el-form-item>
</c-col>
......
......@@ -159,6 +159,13 @@
<m-conp :model="model" :codes="codes" />
</c-content>
</el-tab-pane>
<!--PD000001 -->
<el-tab-pane label="国内外汇贷款-变动信息" name="dclpp">
<c-content>
<m-dclpp :model="model" :codes="codes" />
</c-content>
</el-tab-pane>
</c-tabs>
</el-form>
......@@ -199,6 +206,7 @@ import Cfap from "./Cfap";
import Dinpan from "./Dinpan";
import Limitbody from "~/views/Public/Limitbody";
import Conp from "./Conp";
import Dclpp from "./Dclpp";
export default {
name: "Bptopn",
......@@ -220,6 +228,7 @@ export default {
"m-dinpan": Dinpan,
"m-limitbody": Limitbody,
"m-conp": Conp,
"m-dclpp": Dclpp,
},
provide() {
return {
......
......@@ -30,32 +30,32 @@
<m-ptyp :model="model" :codes="codes" />
</el-collapse-item>
<el-collapse-item title="货物修改" name="7">
<el-collapse-item title="货物修改" name="dogpame">
<!-- 当事人 -->
<m-dogpame :model="model" :codes="codes" />
</el-collapse-item>
<el-collapse-item title="单据修改" name="8">
<el-collapse-item title="单据修改" name="dorpame">
<!-- 货物 -->
<m-dorpame :model="model" :codes="codes" :dtyp="'dogp'" :rec="'lid'" />
</el-collapse-item>
<el-collapse-item title="附件条款(修改)" name="9">
<el-collapse-item title="附件条款(修改)" name="adcpame">
<!-- 单据 -->
<m-adcpame :model="model" :codes="codes" :dtyp="'dorp'" :rec="'lid'" />
</el-collapse-item>
<el-collapse-item title="银行指示(修改)" name="10">
<el-collapse-item title="银行指示(修改)" name="adcpame">
<!-- 附加条款 -->
<m-inspame :model="model" :codes="codes" :dtyp="'adcp'" :rec="'lid'" />
<m-adcpame :model="model" :codes="codes" :dtyp="'adcp'" :rec="'lid'" />
</el-collapse-item>
<el-collapse-item title="货物" name="11">
<el-collapse-item title="货物" name="dogp">
<!-- 单据 -->
<m-dogp :model="model" :codes="codes" :dtyp="'dorp'" :rec="'lid'" />
</el-collapse-item>
<el-collapse-item title="单据" name="12">
<el-collapse-item title="单据" name="dorp">
<!-- 附加条款 -->
<m-dorp :model="model" :codes="codes" :dtyp="'adcp'" :rec="'lid'" />
</el-collapse-item>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment