Commit bde7549e by lianyang

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 aee907d6 d79225cd
......@@ -6804,6 +6804,11 @@ const CodeTable = {
{ label: "Beneficiary Side", value: "BENE" },
{ label: "Other", value: "OTHR" }
],
gitopn_chato:[
{ value: "U", label: "Applicant Side" },
{ value: "B", label: "Beneficiay Side" },
{ value: "O", label: "Other" },
],
getame_chato:[
{ label: "Applicant Side", value: "APPL" },
{ label: "Beneficiary Side", value: "BENE" },
......
......@@ -6,6 +6,9 @@ export default class Bctdor{
constructor () {
this.data = {
swtdat:"",
bctdrrl1blk: '', // XMLPanel bctdrrl1的内置block
bctdrrl2blk: '', // XMLPanel bctdrrl2的内置block
bctcoll1blk: '', // XMLPanel bctcoll1的内置block
bcdgrp:{
rec:{
inr:"",
......
......@@ -226,5 +226,6 @@ export default {
"cfagit.recp.dclp" :Utils.defaultFunction,
"cfagit.recp.dclp.actiontype" :Utils.defaultFunction,
"cfagit.recp.dclp.actiondesc" :Utils.defaultFunction,
"cnybop.voup" :Utils.defaultFunction,
}
//你可以添加自动default处理
......@@ -477,10 +477,10 @@ export default {
{type: "string", required: true, message: "必输项"},
{max: 780,message:"长度不能超过780"}
],
// "gidgrp.blk.atxexptxt":[
// {type: "string", required: true, message: "必输项"},
// {max: 65,message:"长度不能超过65"}
// ],
"gidgrp.blk.atxexptxt":[
{type: "string", required: true, message: "必输项"},
{max: 65,message:"长度不能超过65"}
],
"gidgrp.rec.inudat":[
......@@ -523,10 +523,10 @@ export default {
{type: "string", required: true, message: "必输项"},
{max: 780,message:"长度不能超过780"}
],
// "gidgrp.blk.atxliatxtc":[
// {type: "string", required: true, message: "必输项"},
// {max: 65,message:"长度不能超过65"}
// ],
"gidgrp.blk.atxliatxtc":[
{type: "string", required: true, message: "必输项"},
{max: 65,message:"长度不能超过65"}
],
"gidgrp.ben.adrelc":[
......
......@@ -7,7 +7,6 @@
<c-input
disabled
type="textarea"
disabled
v-model="model.bcdgrp.blk.colins"
maxlength="65"
show-word-limit
......
......@@ -439,14 +439,20 @@ export default {
methods: {
...Event,
async focflgChange() {
let rtnmsg = await this.executeDefault("bcdgrp.rec.focflg");
if (rtnmsg.respCode == SUCCESS) {
Utils.copyValueFromVO(this.model, rtnmsg.data);
}
},
async crefinflgChange() {
let rtnmsg = await this.executeDefault("trtcre.crefinflg");
let rtnmsg = await this.executeRule("trtcre.crefinflg");
if (rtnmsg.respCode == SUCCESS) {
Utils.copyValueFromVO(this.model, rtnmsg.data);
}
},
async dfflagChange() {
let rtnmsg = await this.executeDefault("dftcre.dfflag");
let rtnmsg = await this.executeRule("dftcre.dfflag");
if (rtnmsg.respCode == SUCCESS) {
Utils.copyValueFromVO(this.model, rtnmsg.data);
}
......
......@@ -25,7 +25,7 @@
<c-col :span="24">
<el-form-item label="是否报送跨境人民币2111表" prop="cnybop.outflg">
<c-select
disabled
:disabled="model.setmod.doccur != 'CNY'"
:code="codes.outflg"
v-model="model.cnybop.outflg" style="width:100%" placeholder="请选择是否报送跨境人民币2111表">
</c-select>
......
......@@ -318,7 +318,7 @@
v-model="model.trtcre.trtmod.finmod.intprd"
style="width: 100%"
placeholder="请选择计息周期"
:code="intprd"
:code="codes.intprd"
>
</c-select>
</el-form-item>
......@@ -333,7 +333,7 @@
v-model="model.trtcre.trtmod.finmod.ratchgtyp"
style="width: 95%"
placeholder="请选择利率调整方式"
:code="ratchgtyp"
:code="codes.ratchgtyp"
>
</c-select>
</el-form-item>
......@@ -971,31 +971,7 @@ export default {
mixins: [commonProcess],
data() {
return {
intprd: [
{ label: "按年计息", value: "4" },
{ label: "按6个月对月对日计息", value: "9" },
{ label: "按固定月数计息", value: "5" },
{ label: "利随本清", value: "6" },
{ label: "按月计息", value: "1" },
{ label: "按季计息", value: "2" },
{ label: "按3个月对月对日计息", value: "8" },
{ label: "按半年计息", value: "3" },
{ label: "预扣息", value: "7" },
{ label: "不计息", value: "B" },
{ label: "按周计息", value: "A" },
],
ratchgtyp: [
{ label: "固定不变", value: "1" },
{ label: "满一年一变", value: "2" },
{ label: "按季调整(季末月份)", value: "4" },
{ label: "外汇SIBOR浮动利率", value: "9" },
{ label: "按年调整", value: "6" },
{ label: "按月调整", value: "3" },
{ label: "外汇LIBOR浮动利率", value: "7" },
{ label: "按半年调整(6月、12月)", value: "5" },
{ label: "实时随人行基准利率调整", value: "A" },
{ label: "外汇HIBOR浮动利率", value: "8" },
],
};
},
methods: {
......
......@@ -16,7 +16,7 @@
size="small"
:validate-on-rule-change="false"
>
<c-tabs v-model="tabVal" ref="elment" type="card" @tab-click="tabClick">
<c-tabs v-model="tabVal" ref="elment" type="card" @tab-click="myTabClick">
<!--PD000005 -->
<el-tab-pane label="Settle BC at Maturity" name="bctsus">
<c-content>
......@@ -24,13 +24,13 @@
</c-content>
</el-tab-pane>
<el-tab-pane label="Financing Details" name="trtcrep">
<el-tab-pane label="Financing Details" name="trtcrep" v-if="model.trtcre.crefinflg">
<c-content>
<m-trtcrep :model="model" :codes="codes" />
</c-content>
</el-tab-pane>
<el-tab-pane label="同业代付" name="dftcrep">
<el-tab-pane label="同业代付" name="dftcrep" v-if="model.dftcre.dfflag">
<c-content>
<m-dftcrep :model="model" :codes="codes" />
</c-content>
......@@ -77,7 +77,7 @@
<m-doctre :model="model" :codes="codes" />
</el-tab-pane>
<el-tab-pane label="融资款项" name="rzkx">
<el-tab-pane label="融资款项" name="rzkx" v-if="model.trtcre.crefinflg">
<m-rzkx :model="model" :codes="codes" />
</el-tab-pane>
......@@ -101,13 +101,21 @@
<m-basp1 :model="model" :codes="codes" />
</el-tab-pane>
<el-tab-pane label="定向收付" name="dxzfp">
<el-tab-pane label="定向收付" name="dxzfp" v-if="model.trtcre.crefinflg">
<m-dxzfp :model="model" :codes="codes" />
</el-tab-pane>
<el-tab-pane label="跨境人名币申报" name="cnyp">
<m-cnyp :model="model" :codes="codes" />
</el-tab-pane>
<el-tab-pane
label="2111跨境支出信息"
name="outp"
v-if="model.cnybop.outflg == '1'"
>
<m-outp :model="model" :codes="codes" />
</el-tab-pane>
<el-tab-pane label="资本项目" name="cfactlp">
<m-cfactlp :model="model" :codes="codes" />
</el-tab-pane>
......@@ -183,6 +191,7 @@ import Docpan from "./Docpan";
import Doctre from "~/views/Public/Doctre";
import Limitbody from "./Limitbody";
import Glepan from "~/views/Public/Glepan";
import Outp from "./Outp";
export default {
name: "Bctset",
......@@ -210,7 +219,8 @@ export default {
"m-dxzfp" : Dxzfp,
"m-rzkx" :Rzkx,
"m-trtcrep" :Trtcrep,
"m-cips2" :Cips2
"m-cips2" :Cips2,
"m-outp": Outp,
},
provide() {
......@@ -232,7 +242,27 @@ export default {
};
},
methods: {
myTabClick(tab) {
this.tabClick(tab);
let name = tab.name;
let rulePath;
if ((name === "trtcrep")) {
rulePath = "trtcre.trtcrep";
}
if ((name === "dftcrep")) {
rulePath = "dftcre.dftcrep";
}
if(name === 'outp'){
rulePath = "cnybop.Outp"
}
if (!!rulePath) {
this.executeRule(rulePath).then((res) => {
if (res.respCode == SUCCESS) {
this.updateModel(res.data);
}
});
}
},
},
created: async function () {
console.log("进入bctset交易");
......
......@@ -222,7 +222,7 @@ export default {
/**
* do it yourself
**/
const name = tab.name
let name = tab.name
let rulePath;
if(name==="setpan"){
this.flag=true;
......
......@@ -262,7 +262,7 @@ export default {
methods: {
myTabClick(tab) {
this.tabClick(tab);
const name = tab.name;
let name = tab.name;
let rulePath;
if (name === "setpan") {
this.flag = true;
......
......@@ -165,7 +165,7 @@ export default {
/**
* do it yourself
**/
const name = tab.name
let name = tab.name
let rulePath;
let rulePath1;
if (name === "basp") {
......
......@@ -340,7 +340,7 @@ export default {
methods: {
myTabClick(tab) {
this.tabClick(tab);
const name = tab.name;
let name = tab.name;
let rulePath;
if (name === "setpan") {
this.flag = true;
......
......@@ -97,16 +97,13 @@
</c-col>
<c-col :span="24">
<c-col :span="20">
<c-col :span="20" v-if="model.gitp.covgodsrvmodflg == ''">
<el-form-item
label="Object of Contract"
prop="gidgrp.blk.covgodsrv"
>
<c-input
:disabled="
model.gitp.covgodsrvmodflg == '' ||
model.gitp.swiftflg == 'N'
"
disabled
rows="6"
type="textarea"
v-model="model.gidgrp.blk.covgodsrv"
......@@ -116,6 +113,21 @@
></c-input>
</el-form-item>
</c-col>
<c-col :span="20" v-if="model.gitp.covgodsrvmodflg != ''">
<el-form-item
label="Object of Contract"
prop="gidgrp.blk.atxcovgodsrv"
>
<c-input
rows="6"
type="textarea"
v-model="model.gidgrp.blk.axtcovgodsrv"
maxlength="350"
show-word-limit
placeholder="请输入Object of Contract"
></c-input>
</el-form-item>
</c-col>
<c-col :span="4">
<c-checkbox
v-if="model.gitp.swiftflg == 'Y'"
......
<template>
<div class="eibs-tab">
<c-row>
<c-col :span="24">
<c-col :span="16">
<c-col :span="24">
<el-form-item v-if="model.gitp.gidtxtmodflg == ''" label="Guarantee Text with Variables" prop="gidgrp.blk.gidtxt">
<i-stream-input :disabled="model.gitp.gidtxtmodflg == ''" type="textarea" rows="15" :model="model.gidgrp.blk.gidtxt" maxlength="32500" show-word-limit placeholder="请输入Guarantee Text with Variables" ></i-stream-input>
</el-form-item>
<el-form-item v-if="model.gitp.gidtxtmodflg == 'X'" label="Guarantee Text with Variables" prop="gidgrp.blk.gtxgidtxt">
<i-stream-input type="textarea" :model="model.gidgrp.blk.gtxgidtxt" rows="15" maxlength="32500" show-word-limit placeholder="请输入Guarantee Text with Variables" ></i-stream-input>
</el-form-item>
</c-col>
</c-col>
<c-col :span="6">
<c-col :span="24">
<c-checkbox v-model="model.gitp.gidtxtmodflg" style="margin:0 0 0 10px">Modify Guarantee Text</c-checkbox>
</c-col>
<c-col :span="24">
<c-checkbox v-model="model.gitp.chkgidtxt" style="margin:0 0 0 10px">Allow *</c-checkbox>
</c-col>
<c-col :span="24">
<c-button :disabled="model.gitp.gidtxtmodflg == ''" size="small" type="primary" style="margin:5px 0 0 10px;width:50%" @click="onGitpButdif">
vs. &System
</c-button>
</c-col>
<c-col :span="24">
<c-col :span="16">
<c-col :span="24">
<el-form-item
v-if="model.gitp.gidtxtmodflg == ''"
label="Guarantee Text with Variables"
prop="gidgrp.blk.gidtxt"
>
<i-stream-input
:disabled="model.gitp.gidtxtmodflg == ''"
type="textarea"
rows="15"
:model="model.gidgrp.blk.gidtxt"
maxlength="32500"
show-word-limit
placeholder="请输入Guarantee Text with Variables"
></i-stream-input>
</el-form-item>
<el-form-item
v-if="model.gitp.gidtxtmodflg == 'X'"
label="Guarantee Text with Variables"
prop="gidgrp.blk.gtxgidtxt"
>
<i-stream-input
type="textarea"
:model="model.gidgrp.blk.gtxgidtxt"
rows="15"
maxlength="32500"
show-word-limit
placeholder="请输入Guarantee Text with Variables"
@change="gtxBlur"
></i-stream-input>
</el-form-item>
</c-col>
</c-col>
<c-col :span="6">
<c-col :span="24">
<c-checkbox
v-model="model.gitp.gidtxtmodflg"
style="margin: 0 0 0 10px"
@change="modflgChange"
>Modify Guarantee Text</c-checkbox
>
</c-col>
<c-col :span="24">
<c-checkbox
v-model="model.gitp.chkgidtxt"
style="margin: 0 0 0 10px"
>Allow *</c-checkbox
>
</c-col>
<c-col :span="24">
<c-button size="small" type="primary" style="margin:5px 0 0 10px;width:50%" @click="onGitpButdifhis">
vs. &History
</c-button>
</c-col>
<c-col :span="24">
<c-button
:disabled="model.gitp.gidtxtmodflg == ''"
size="small"
type="primary"
style="margin: 5px 0 0 10px; width: 50%"
@click="onGitpButdif"
>
vs. &System
</c-button>
</c-col>
<template v-if="model.gitp.gidtxtmodflg=='X'">
<c-col :span="24">
<c-button size="small" type="primary" style="margin:5px 0 0 10px;width:50%" @click="onGitpShwgidtxt">
Show&Text
</c-button>
</c-col>
</template>
<c-col :span="24">
<c-input
style="margin:5px 0 0 10px;width:50%"
v-model="model.gidgrp.rec.ownref"
maxlength="16"
placeholder="请输入Reference"
></c-input>
</c-col>
<c-col :span="24">
<c-button
disabled
style="margin:5px 0 0 10px"
size="small"
type="primary"
@click="onGitpButgetref"
>
获取
</c-button>
</c-col>
<c-col :span="24">
<c-button disabled size="small" type="primary" style="margin:5px 0 0 10px;width:50%" @click="onGitpGidtxtmod">
修改中文保函文本
</c-button>
</c-col>
<c-col :span="24">
<c-button
size="small"
type="primary"
style="margin: 5px 0 0 10px; width: 50%"
@click="onGitpButdifhis"
>
vs. &History
</c-button>
</c-col>
<template v-if="model.gitp.gidtxtmodflg == 'X'">
<c-col :span="24">
<c-button
size="small"
type="primary"
style="margin: 5px 0 0 10px; width: 50%"
@click="onGitpShwgidtxt"
>
Show&Text
</c-button>
</c-col>
</template>
<c-col :span="24">
<c-input
style="margin: 5px 0 0 10px; width: 50%"
v-model="model.gidgrp.rec.ownref"
maxlength="16"
placeholder="请输入Reference"
></c-input>
</c-col>
<c-col :span="24">
<c-button
disabled
style="margin: 5px 0 0 10px"
size="small"
type="primary"
@click="onGitpButgetref"
>
获取
</c-button>
</c-col>
<c-col :span="24">
<c-button
disabled
size="small"
type="primary"
style="margin: 5px 0 0 10px; width: 50%"
@click="onGitpGidtxtmod"
>
修改中文保函文本
</c-button>
</c-col>
</c-col>
</c-col>
</c-row>
<!-- <c-col :span="12">
<!-- <c-col :span="12">
<c-checkbox v-model="model.gitp.gidtxtmodflg">Modify Guarantee Text</c-checkbox>
</c-col>
......@@ -114,28 +169,39 @@
</div>
</template>
<script>
import Api from "~/service/Api"
import Api from "~/service/Api";
import commonProcess from "~/mixin/commonProcess";
import CodeTable from "~/config/CodeTable"
import IStreamInput from '~/components/IStreamInput'
import Event from "~/model/Gitopn/Event"
import CodeTable from "~/config/CodeTable";
import IStreamInput from "~/components/IStreamInput";
import Event from "~/model/Gitopn/Event";
import Utils from "~/utils";
export default {
components: {IStreamInput},
inject: ['root'],
props:["model","codes"],
mixins: [commonProcess],
data(){
return {
}
components: { IStreamInput },
inject: ["root"],
props: ["model", "codes"],
mixins: [commonProcess],
data() {
return {};
},
methods: {
...Event,
async gtxBlur() {
const rtnmsg = await this.executeRule("gidgrp.blk.gtxgidtxt");
if (rtnmsg.respCode == SUCCESS) {
Utils.copyValueFromVO(this.model, rtnmsg.data);
}
},
methods:{...Event},
created:function(){
}
}
async modflgChange() {
const rtnmsg = await this.executeRule("gitp.gidtxtmodflg");
if (rtnmsg.respCode == SUCCESS) {
Utils.copyValueFromVO(this.model, rtnmsg.data);
}
},
},
created: function () {},
};
</script>
<style>
</style>
......@@ -1822,7 +1822,7 @@
<c-input
type="textarea"
rows="4"
:disabled="model.gitp.exptxtmodflg == ''"
disabled
v-model="model.gidgrp.blk.exptxt"
maxlength="780"
show-word-limit
......@@ -1839,7 +1839,6 @@
<c-input
type="textarea"
rows="4"
:disabled="model.gitp.exptxtmodflg == ''"
v-model="model.gidgrp.blk.atxexptxt"
maxlength="780"
@blur="atxexpBlur"
......@@ -1891,11 +1890,9 @@
>
<c-select
:disabled="
model.gidgrp.rec.purpos == 'ISSU' ||
!(
model.gidgrp.rec.purposin == 'ICCO' &&
model.gidgrp.rec.purpos == 'ISCO'
)
!(model.gidgrp.rec.hndtyp=='OC'||
model.gidgrp.rec.purpos=='ISCO'||
model.gidgrp.rec.purpos=='ICCO')
"
v-model="model.gidgrp.rec.liatypc"
style="width: 100%"
......@@ -1945,13 +1942,13 @@
<c-col :span="24">
<c-col :span="20">
<el-form-item
v-if="model.gitp.swiftflg == 'Y'"
v-if="model.gitp.swiftflg == 'Y'&&model.gitp.liatxtcmodflg==''"
label="Liability Condition"
prop="gidgrp.blk.liatxtc"
>
<c-input
type="textarea"
:disabled="model.gitp.liatxtcmodflg == ''"
disabled
rows="4"
v-model="model.gidgrp.blk.liatxtc"
maxlength="780"
......@@ -1959,6 +1956,21 @@
placeholder="请输入Liability Condition"
></c-input>
</el-form-item>
<el-form-item
v-if="model.gitp.swiftflg == 'Y'&&model.gitp.liatxtcmodflg=='X'"
label="Liability Condition"
prop="gidgrp.blk.atxliatxtc"
>
<c-input
type="textarea"
rows="4"
v-model="model.gidgrp.blk.atxliatxtc"
maxlength="780"
show-word-limit
placeholder="请输入Liability Condition"
@blur="atxliatxtcBlur"
></c-input>
</el-form-item>
</c-col>
<c-col :span="4">
<c-checkbox
......@@ -1970,6 +1982,7 @@
"
v-model="model.gitp.liatxtcmodflg"
style="margin: 0 0 0 10px"
@change="liamodflgChange"
>Modify Text</c-checkbox
>
<c-button
......@@ -2042,7 +2055,21 @@ export default {
async atxexpBlur() {
let rtnmsg = await this.executeRule("gidgrp.blk.atxexptxt");
if (rtnmsg.respCode == SUCCESS) {
Utils.updateModel(this.model, rtnmsg.data);
Utils.copyValueFromVO(this.model, rtnmsg.data);
}
},
async atxliatxtcBlur() {
let rtnmsg = await this.executeRule("gidgrp.blk.atxliatxtc");
if (rtnmsg.respCode == SUCCESS) {
Utils.copyValueFromVO(this.model, rtnmsg.data);
}
},
async liamodflgChange() {
let rtnmsg = await this.executeRule("gitp.liatxtcmodflg");
if (rtnmsg.respCode == SUCCESS) {
Utils.copyValueFromVO(this.model, rtnmsg.data);
}
},
},
......
......@@ -352,7 +352,7 @@ export default {
methods: {
myTabClick(tab) {
this.tabClick(tab);
const name = tab.name;
let name = tab.name;
let rulePath;
if (name === "conp") {
rulePath = "cfagit.recp.conp";
......@@ -364,13 +364,12 @@ export default {
this.flag = true;
}
if (name === "cfap") {
rulePath = "cfagit.visflg";
rulePath = "cfagit.cfap";
}
if (name === "dclpp") {
rulePath = "dclpp";
}
if ((name = "docpan")) {
rulePath = "trnmod.trndoc.docpan";
}if (name === "gidtxtp"){
rulePath = "gitp.gidtxtp"
}
if (!!rulePath) {
this.executeRule(rulePath).then((res) => {
......
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