Commit a835ba2b 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 1e9c84e3 de7b3e62
...@@ -6717,7 +6717,12 @@ const CodeTable = { ...@@ -6717,7 +6717,12 @@ const CodeTable = {
{ label: "新西兰元", value: "NZD" }, { label: "新西兰元", value: "NZD" },
{ label: "美元", value: "USD" }, { label: "美元", value: "USD" },
], ],
gitopn_cur:[
{ label: "CNY-人民币", value: "CNY" },
{ label: "KRW-韩圆", value: "KRW" },
{ label: "NZD-新西兰元", value: "NZD" },
{ label: "USD-美元", value: "USD" },
],
cnfflg1: [ cnfflg1: [
{ label: "WITHOUT", value: "W" }, { label: "WITHOUT", value: "W" },
{ label: "CONFIRM", value: "C" }, { label: "CONFIRM", value: "C" },
......
...@@ -220,5 +220,7 @@ export default { ...@@ -220,5 +220,7 @@ export default {
"gitp.lettername" :Utils.defaultFunction, "gitp.lettername" :Utils.defaultFunction,
"gidgrp.blk.apprulc" :Utils.defaultFunction, "gidgrp.blk.apprulc" :Utils.defaultFunction,
"gidgrp.rec.autrnwflg" :Utils.defaultFunction, "gidgrp.rec.autrnwflg" :Utils.defaultFunction,
"setmod.glemod.glepan" :Utils.defaultFunction,
"cfagit.cfap" :Utils.defaultFunction,
} }
//你可以添加自动default处理 //你可以添加自动default处理
...@@ -260,17 +260,16 @@ ...@@ -260,17 +260,16 @@
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="12"> <c-col :span="12">
<el-form-item label="文档数" prop="didgrp.rec.utlnbr"> <el-form-item label="此信用证下的到单次数" prop="didgrp.rec.utlnbr">
<c-input v-model="model.didgrp.rec.utlnbr" placeholder="请输入Count of Received Document Sets" <c-input v-model="model.didgrp.rec.utlnbr" placeholder="请输入此信用证下的到单次数" disabled></c-input>
disabled></c-input>
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="12"> <c-col :span="12">
<el-form-item label="此信用证下的到单次数" prop="days"> <el-form-item label="文档数" prop="days">
<c-input v-model="model.days" placeholder="请输入此信用证下的到单次数"></c-input> <c-input v-model="model.days" placeholder="请输入Count of Received Document Sets"
></c-input>
</el-form-item> </el-form-item>
</c-col> </c-col>
......
...@@ -41,30 +41,7 @@ ...@@ -41,30 +41,7 @@
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="23">
<el-form-item
label="信用证号码"
prop="didgrp.rec.ownref"
style="width: 100%"
>
<c-input
v-model="model.didgrp.rec.ownref"
maxlength="16"
placeholder="请输入信用证参考号"
style="width: 95%"
disabled
></c-input>
</el-form-item>
</c-col>
<c-col :span="1">
<c-button
style="margin:0 10px 0 0;padding: 0 10px;"
size="small"
type="primary"
icon="el-icon-search"
@click="onSeainf"
></c-button>
</c-col>
<c-col :span="23"> <c-col :span="23">
<el-form-item <el-form-item
...@@ -204,11 +181,12 @@ ...@@ -204,11 +181,12 @@
<c-col :span="24"> <c-col :span="24">
<el-form-item label="单据状态" prop="bddgrp.rec.docsta"> <el-form-item label="单据状态" prop="bddgrp.rec.docsta">
<c-select <c-select
v-model="model.bddgrp.rec.docflg" v-model="model.bddgrp.rec.docsta"
style="width:100%" style="width:100%"
placeholder="请选择单据状态" placeholder="请选择单据状态"
:code="codes.docsta" :code="codes.docsta1"
disabled> :disabled="true"
>
</c-select> </c-select>
</el-form-item> </el-form-item>
</c-col> </c-col>
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
<el-form-item label="数据采集标志" prop="cfagit.cfaflg"> <el-form-item label="数据采集标志" prop="cfagit.cfaflg">
<c-select v-model="model.cfagit.cfaflg" <c-select v-model="model.cfagit.cfaflg"
style="width:100%" style="width:100%"
placeholder="请选择数据采集标志"> placeholder="请选择数据采集标志" >
<el-option <el-option
v-for="item in codes.cfaflg1" v-for="item in codes.cfaflg1"
:key="item.value" :key="item.value"
...@@ -81,6 +81,7 @@ import Api from "~/service/Api" ...@@ -81,6 +81,7 @@ import Api from "~/service/Api"
import commonProcess from "~/mixin/commonProcess"; import commonProcess from "~/mixin/commonProcess";
import CodeTable from "~/config/CodeTable" import CodeTable from "~/config/CodeTable"
import Event from "~/model/Gitopn/Event" import Event from "~/model/Gitopn/Event"
import Utils from "~/utils";
export default { export default {
inject: ['root'], inject: ['root'],
...@@ -97,6 +98,12 @@ export default { ...@@ -97,6 +98,12 @@ export default {
}, },
methods:{ methods:{
...Event, ...Event,
// async cfaChange(){
// let rtnmsg = await this.executeRule("cfagit.cfap")
// if (rtnmsg.respCode == SUCCESS) {
// Utils.copyValueFromVO(this.model, rtnmsg.data);
// }
// }
}, },
created:function(){ created:function(){
......
<template>
<div class="eibs-tab">
<!-- ==================================左边-外债编号================================ -->
<c-col :span="12">
<c-col :span="24">
<el-form-item label="外债编号" prop="cfagit.recp.dclp.exdebtcode">
<c-input
v-model="model.cfagit.recp.dclp.exdebtcode"
maxlength="28"
placeholder="请输入外债编号"
disabled
></c-input>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="变动编号" prop="cfagit.recp.dclp.changeno">
<c-input
v-model="model.cfagit.recp.dclp.changeno"
maxlength="4"
placeholder="请输入变动编号"
disabled
></c-input>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="操作类型" prop="cfagit.recp.dclp.actiontype">
<c-select
v-model="model.cfagit.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="cfagit.recp.dclp.buscode">
<c-input
v-model="model.cfagit.recp.dclp.buscode"
maxlength="32"
placeholder="请输入银行业务参号"
disabled
></c-input>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="变动类型" prop="cfagit.recp.dclp.changtype">
<c-select
v-model="model.cfagit.recp.dclp.changtype"
style="width: 100%"
placeholder="请选择变动类型"
disabled
>
</c-select>
</el-form-item>
</c-col>
<c-col :span="12">
<el-form-item label="变动日期" prop="cfagit.recp.dclp.chdate">
<c-date-picker
type="date"
v-model="model.cfagit.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="cfagit.recp.dclp.chcurrency">
<c-select
v-model="model.cfagit.recp.dclp.chcurrency"
style="width: 100%"
placeholder="请选择变动币种"
:code="codes.curtxt"
disabled
>
</c-select>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="变动金额" prop="cfagit.recp.dclp.chamount">
<c-input
v-model="model.cfagit.recp.dclp.chamount"
placeholder="请输入变动金额"
class="m-input-currency"
disabled
></c-input>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="公允价值" prop="cfagit.recp.dclp.fairvalue">
<c-input
v-model="model.cfagit.recp.dclp.fairvalue"
placeholder="请输入公允价值"
class="m-input-currency"
disabled
></c-input>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="备注" prop="cfagit.recp.dclp.remark">
<c-input
type="textarea"
v-model="model.cfagit.recp.dclp.remark"
maxlength="248"
show-word-limit
placeholder="请输入备注"
:rows="5"
></c-input>
</el-form-item>
</c-col>
</c-col>
<!-- ==================================右边-删除原因================================ -->
<c-col :span="11" :offset="1">
<c-col :span="24">
<el-form-item label="删除原因" prop="cfagit.recp.dclp.actiondesc">
<c-input
type="textarea"
v-model="model.cfagit.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.cfagit.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/Gitopn/Event'
export default {
inject: ['root'],
props: ['model', 'codes'],
mixins: [commonProcess],
data() {
return {}
},
methods: { ...Event },
created: function () {},
}
</script>
<style></style>
...@@ -77,14 +77,8 @@ ...@@ -77,14 +77,8 @@
v-model="model.gidgrp.cbs.max.cur" v-model="model.gidgrp.cbs.max.cur"
style="width: 100%" style="width: 100%"
placeholder="请选择Guarantee Amount" placeholder="请选择Guarantee Amount"
:code="codes.gitopn_cur"
> >
<el-option
v-for="item in codes.cur"
:key="item.value"
:label="item.label"
:value="item.value"
>
</el-option>
</c-select> </c-select>
</el-form-item> </el-form-item>
</c-col> </c-col>
...@@ -607,7 +601,7 @@ ...@@ -607,7 +601,7 @@
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="24"> <c-col :span="24">
<el-form-item v-if="model.gitp.swiftflg!='Y'" label="是否分离式保函" prop="gidgrp.rec.fenlishi"> <el-form-item v-if="model.gitp.swiftflg!='Y'" label="分离式保函" prop="gidgrp.rec.fenlishi">
<c-select <c-select
:disabled="model.gidgrp.rec.hndtyp=='OT'" :disabled="model.gidgrp.rec.hndtyp=='OT'"
v-model="model.gidgrp.rec.fenlishi" v-model="model.gidgrp.rec.fenlishi"
...@@ -867,7 +861,7 @@ ...@@ -867,7 +861,7 @@
</c-button> </c-button>
</c-col> </c-col>
</c-col> </c-col>
<c-col :span="24"> <!-- <c-col :span="24">
<el-form-item v-if="model.gitp.swiftflg!='Y'" label="Old Reference" prop="gidgrp.rec.oldref"> <el-form-item v-if="model.gitp.swiftflg!='Y'" label="Old Reference" prop="gidgrp.rec.oldref">
<c-input <c-input
v-model="model.gidgrp.rec.oldref" v-model="model.gidgrp.rec.oldref"
...@@ -875,9 +869,9 @@ ...@@ -875,9 +869,9 @@
placeholder="请输入Old Reference" placeholder="请输入Old Reference"
></c-input> ></c-input>
</el-form-item> </el-form-item>
</c-col> </c-col> -->
<c-col :span="24"> <c-col :span="24">
<el-form-item v-if="model.gitp.swiftflg!='Y'" label="Inure Date" prop="gidgrp.rec.inudat"> <el-form-item v-if="model.gitp.swiftflg!='Y'" label="保函生效日" prop="gidgrp.rec.inudat">
<c-date-picker <c-date-picker
type="date" type="date"
v-model="model.gidgrp.rec.inudat" v-model="model.gidgrp.rec.inudat"
...@@ -1049,7 +1043,7 @@ ...@@ -1049,7 +1043,7 @@
<c-col :span="24"> <c-col :span="24">
<el-form-item v-if="model.gitp.swiftflg!='Y'" label="被保证人" prop="gidgrp.gidcxm.warran"> <el-form-item v-if="model.gitp.swiftflg!='Y'" label="被保证人" prop="gidgrp.gidcxm.warran">
<c-input <c-input
:disabled="model.gidgrp.rec.hndtyp!='OT'" :disabled="model.gidgrp.rec.fenlishi==''"
v-model="model.gidgrp.gidcxm.warran" v-model="model.gidgrp.gidcxm.warran"
maxlength="40" maxlength="40"
placeholder="请输入被保证人" placeholder="请输入被保证人"
...@@ -1057,12 +1051,12 @@ ...@@ -1057,12 +1051,12 @@
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="24"> <c-col :span="24">
<el-form-item v-if="model.gitp.swiftflg!='Y'" label="Valid from" prop="gidgrp.rec.opndat"> <el-form-item v-if="model.gitp.swiftflg!='Y'" label="Issuance Date" prop="gidgrp.rec.opndat">
<c-date-picker <c-date-picker
type="date" type="date"
v-model="model.gidgrp.rec.opndat" v-model="model.gidgrp.rec.opndat"
style="width: 100%" style="width: 100%"
placeholder="请选择Valid from" placeholder="请选择Issuance Date"
></c-date-picker> ></c-date-picker>
</el-form-item> </el-form-item>
</c-col> </c-col>
......
...@@ -12,14 +12,7 @@ ...@@ -12,14 +12,7 @@
<c-col :span="24"> <c-col :span="24">
<c-col :span="12"> <c-col :span="12">
<el-form-item label="Guarantee Amount" prop="gidgrp.cbs.mac.cur"> <el-form-item label="Guarantee Amount" prop="gidgrp.cbs.mac.cur">
<c-select v-model="model.gidgrp.cbs.mac.cur" style="width:100%" placeholder="请选择Guarantee Amount"> <c-select :code="codes.gitopn_cur" v-model="model.gidgrp.cbs.mac.cur" style="width:100%" placeholder="请选择Guarantee Amount">
<el-option
v-for="item in codes.cur"
:key="item.value"
:label="item.label"
:value="item.value"
>
</el-option>
</c-select> </c-select>
</el-form-item> </el-form-item>
</c-col> </c-col>
......
...@@ -5,18 +5,18 @@ ...@@ -5,18 +5,18 @@
<c-col :span="12"> <c-col :span="12">
<c-col :span="24"> <c-col :span="24">
<el-form-item label="Applicant Ref." prop="gidgrp.apl.pts.ref"> <el-form-item label="Applicant Ref." prop="gidgrp.apc.pts.ref">
<c-input v-model="model.gidgrp.apl.pts.ref" maxlength="16" placeholder="请输入Applicant Ref."></c-input> <c-input v-model="model.gidgrp.apc.pts.ref" maxlength="16" placeholder="请输入Applicant Ref."></c-input>
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="24"> <c-col :span="24">
<el-form-item label="Applicant" prop="gidgrp.apl.pts.extkey"> <el-form-item label="Applicant" prop="gidgrp.apc.pts.extkey">
<c-fullbox> <c-fullbox>
<c-input v-model="model.gidgrp.apl.pts.extkey" <c-input v-model="model.gidgrp.apc.pts.extkey"
maxlength="16" maxlength="16"
placeholder="请输入External Key of Address" placeholder="请输入External Key of Address"
@keyup.enter.native=" @keyup.enter.native="
showGridPromptDialog(`gidgrp.apl.pts.extkey`) showGridPromptDialog(`gidgrp.apc.pts.extkey`)
"></c-input> "></c-input>
<template slot="footer"> <template slot="footer">
<c-button <c-button
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
> >
<span style="font-family:'宋体';font-weight:bold">i</span> <span style="font-family:'宋体';font-weight:bold">i</span>
</c-button> </c-button>
<c-button size="small" type="primary" @click="onAplpDet"> <c-button size="small" type="primary" @click="onApcpDet">
Details Details
</c-button> </c-button>
</template> </template>
...@@ -35,8 +35,8 @@ ...@@ -35,8 +35,8 @@
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="24"> <c-col :span="24">
<el-form-item label="地址名称" prop="gidgrp.apl.pts.adrblk"> <el-form-item label="地址名称" prop="gidgrp.apc.pts.adrblk">
<c-input rows="4" type="textarea" v-model="model.gidgrp.apl.pts.adrblk" maxlength="35" show-word-limit placeholder="请输入地址名称" ></c-input> <c-input rows="4" type="textarea" v-model="model.gidgrp.apc.pts.adrblk" maxlength="35" show-word-limit placeholder="请输入地址名称" ></c-input>
</el-form-item> </el-form-item>
</c-col> </c-col>
......
...@@ -69,13 +69,13 @@ ...@@ -69,13 +69,13 @@
</c-content> </c-content>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="Settlement" name="Settlement"> <el-tab-pane label="Settlement" name="setpan">
<c-content> <c-content>
<m-setpan :model="model" :codes="codes"/> <m-setpan :model="model" :codes="codes"/>
</c-content> </c-content>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="Bookings" name="Booking"> <el-tab-pane v-if="this.flag" label="Bookings" name="glepan">
<c-content> <c-content>
<m-glepan :model="model" :codes="codes"/> <m-glepan :model="model" :codes="codes"/>
</c-content> </c-content>
...@@ -134,6 +134,12 @@ ...@@ -134,6 +134,12 @@
<el-tab-pane v-if="model.cfagit.cfaflg=='1'" label="对外担保-签约信息2" name="conp1"> <el-tab-pane v-if="model.cfagit.cfaflg=='1'" label="对外担保-签约信息2" name="conp1">
<m-conp1 :model="model" :codes="codes"/> <m-conp1 :model="model" :codes="codes"/>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="对外担保-责任余额信息" name="dclpp" v-if="model.cfagit.cfaflg==1">
<c-content>
<m-dclpp :model="model" :codes="codes"/>
</c-content>
</el-tab-pane>
<el-tab-pane v-if="model.gidgrp.rec.purpos=='ISCO'||model.gidgrp.rec.purpos=='ICCO'" label="Seq C : Overview" name="ovwpc"> <el-tab-pane v-if="model.gidgrp.rec.purpos=='ISCO'||model.gidgrp.rec.purpos=='ICCO'" label="Seq C : Overview" name="ovwpc">
<c-content> <c-content>
...@@ -223,11 +229,11 @@ import Ptypc from "./Ptypc" ...@@ -223,11 +229,11 @@ import Ptypc from "./Ptypc"
import Detpc from "./Detpc" import Detpc from "./Detpc"
import Gidtxtpc from "./Gidtxtpc" import Gidtxtpc from "./Gidtxtpc"
import Preperpc from "./Preperpc" import Preperpc from "./Preperpc"
import Ovwp20 from "./Ovwp20"
import Confp from "./Confp" import Confp from "./Confp"
import Conp from "./Conp" import Conp from "./Conp"
import Conp1 from "./Conp1" import Conp1 from "./Conp1"
import Aacp from "./Aacp" import Aacp from "./Aacp"
import Dclpp from "./Dclpp"
import Engp from "~/views/Public/Engp"; import Engp from "~/views/Public/Engp";
...@@ -259,10 +265,10 @@ export default { ...@@ -259,10 +265,10 @@ export default {
"m-detpc" : Detpc, "m-detpc" : Detpc,
"m-gidtxtpc" : Gidtxtpc, "m-gidtxtpc" : Gidtxtpc,
"m-preperpc" : Preperpc, "m-preperpc" : Preperpc,
"m-ovwp20" : Ovwp20,
"m-confp" : Confp, "m-confp" : Confp,
"m-conp" : Conp, "m-conp" : Conp,
"m-conp1":Conp1, "m-conp1":Conp1,
"m-dclpp" : Dclpp,
"m-engp" :Engp, "m-engp" :Engp,
"m-ccvpan" :Ccvpan, "m-ccvpan" :Ccvpan,
...@@ -292,6 +298,7 @@ export default { ...@@ -292,6 +298,7 @@ export default {
codes: { codes: {
...CodeTable, ...CodeTable,
}, },
flag:false,
} }
}, },
methods:{ methods:{
...@@ -305,21 +312,12 @@ export default { ...@@ -305,21 +312,12 @@ export default {
if(name==="voup"){ if(name==="voup"){
rulePath = "cnybop.voup"; rulePath = "cnybop.voup";
} }
// if (name === "glepan") { if(name==="setpan"){
// rulePath = "glepan"; this.flag=true;
// } }
// if (name === "coninfp") { if(name==='cfap'){
// rulePath = "coninfp"; rulePath = "cfagit.cfap";
// } }
// if (name === "docpan") {
// rulePath = "oit.inftxt";
// }
// if (name === "doctre") {
// rulePath = "doctre";
// }
// if (name === "sbxx") {
// rulePath = "trd.ownref,cnyp";
// }
if (!!rulePath) { if (!!rulePath) {
this.executeRule(rulePath).then(res => { this.executeRule(rulePath).then(res => {
if (res.respCode == SUCCESS) { if (res.respCode == SUCCESS) {
...@@ -334,6 +332,9 @@ export default { ...@@ -334,6 +332,9 @@ export default {
// * do it yourself // * do it yourself
// **/ // **/
// } // }
// async gleClick(){
// this.flag=true;
// },
}, },
created:async function(){ created:async function(){
console.log("进入gitopn交易"); console.log("进入gitopn交易");
......
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