Commit 6602b420 by wangna

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 e3f72dad 11f15d60
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
import Event from "~/model/Brtset/Event"; import Event from "~/model/Brtset/Event";
import Wg from "./Wg"; import Wg from "./Wg";
import Cnyp1 from "./Cnyp1"; import Cnyp1 from "./Cnyp1";
//import Cfactlp from "./Cfactlp"; import Incp from "./Incp";
export default { export default {
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
components: { components: {
"m-wg": Wg, "m-wg": Wg,
"m-cnyp1": Cnyp1, "m-cnyp1": Cnyp1,
// "m-cfactlp": Cfactlp, "m-incp": Incp,
}, },
props: ["model", "codes"], props: ["model", "codes"],
mixins: [commonProcess], mixins: [commonProcess],
......
...@@ -47,7 +47,7 @@ export default { ...@@ -47,7 +47,7 @@ export default {
mixins: [commonProcess], mixins: [commonProcess],
data(){ data(){
return { return {
activeNames: ["conp","ovwp1","detp","opnp","gidtxtp"], activeNames: ["ovwp1"],
} }
}, },
methods:{...Event}, methods:{...Event},
......
<template> <template>
<div class="eibs-tab"> <div class="eibs">
<c-col :span="11">
<c-col :span="24"> <c-col :span="20">
<c-col :span="12"> <c-col :span="10">
<el-form-item label="附加金额" prop="ledgrp.cbs.max2.cur"> <el-form-item label="附加金额" prop="ledgrp.cbs.max2.cur">
<c-select <c-select
v-model="model.ledgrp.cbs.max2.cur" v-model="model.ledgrp.cbs.max2.cur"
...@@ -28,10 +28,10 @@ ...@@ -28,10 +28,10 @@
></c-input-currency> ></c-input-currency>
</el-form-item> </el-form-item>
</c-col> </c-col>
</c-col>
<c-col :span="24">
<c-col :span="12"> <c-col :span="10">
<el-form-item label="Open Add. Amount" prop="ledgrp.cbs.opn2.cur"> <el-form-item label="Open Add. Amount" prop="ledgrp.cbs.opn2.cur">
<c-select <c-select
v-model="model.ledgrp.cbs.opn2.cur" v-model="model.ledgrp.cbs.opn2.cur"
...@@ -54,7 +54,7 @@ ...@@ -54,7 +54,7 @@
></c-input-currency> ></c-input-currency>
</el-form-item> </el-form-item>
</c-col> </c-col>
</c-col>
<c-col :span="24"> <c-col :span="24">
<el-form-item label="Covered" prop="ledgrp.blk.addamtcov"> <el-form-item label="Covered" prop="ledgrp.blk.addamtcov">
<c-input <c-input
......
<template> <template>
<div class="eibs-tab"> <div class="eibs">
<c-row> <c-row>
<!-- left --> <!-- left -->
<c-col :span="11"> <c-col :span="12" style="padding-right: 20px;">
<!-- Available with --> <!-- Available with -->
<c-col :span="24"> <c-col :span="24">
<el-form-item label="可用银行" prop="ledgrp.rec.avbwth"> <el-form-item label="可用银行" prop="ledgrp.rec.avbwth">
...@@ -194,7 +194,7 @@ ...@@ -194,7 +194,7 @@
</c-col> </c-col>
<!-- right --> <!-- right -->
<c-col :span="11" :offset="1"> <c-col :span="12" style="padding-left: 20px;">
<c-col :span="24"> <c-col :span="24">
<el-form-item label="混合付款" prop="ledgrp.blk.mixdet"> <el-form-item label="混合付款" prop="ledgrp.blk.mixdet">
<c-input <c-input
...@@ -221,11 +221,11 @@ ...@@ -221,11 +221,11 @@
<c-button <c-button
size="small" size="small"
type="primary" type="primary"
icon="el-icon-search" icon="el-icon-more"
@click="onPreperButtxmsel" @click="onPreperButtxmsel"
disabled disabled
> >
...
</c-button> </c-button>
</template> </template>
</c-fullbox> </c-fullbox>
...@@ -259,10 +259,10 @@ ...@@ -259,10 +259,10 @@
<c-button <c-button
size="small" size="small"
type="primary" type="primary"
icon="el-icon-search" icon="el-icon-more"
@click="onChariaButtxmsel" @click="onChariaButtxmsel"
> >
...
</c-button> </c-button>
</template> </template>
</c-fullbox> </c-fullbox>
...@@ -295,7 +295,7 @@ ...@@ -295,7 +295,7 @@
</c-col> </c-col>
<c-col :span="24"> <c-col :span="24">
<el-form-item label="最大期限(天)" prop="ledgrp.rec.tenmaxday"> <el-form-item label="最大期限/天" prop="ledgrp.rec.tenmaxday">
<c-input <c-input
v-model.number="model.ledgrp.rec.tenmaxday" v-model.number="model.ledgrp.rec.tenmaxday"
placeholder="请输入远期最大期限" placeholder="请输入远期最大期限"
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<div class="eibs"> <div class="eibs">
<!-- 顶部 --> <!-- 顶部 -->
<c-col :span="24"> <c-col :span="24">
<c-col :span="11"> <c-col :span="12" style="padding-right: 20px;">
<el-form-item <el-form-item
label="信用证编号" label="信用证编号"
prop="ledgrp.rec.ownref" prop="ledgrp.rec.ownref"
...@@ -21,16 +21,10 @@ ...@@ -21,16 +21,10 @@
style="margin: 0 10px 0 0; padding: 0 12px" style="margin: 0 10px 0 0; padding: 0 12px"
size="small" size="small"
type="primary" type="primary"
icon="el-icon-info"
@click="onSeainf" @click="onSeainf"
> >
<span
style="
font-size: 15px;
font-family: '宋体';
font-weight: bold;
"
>i</span
>
</c-button> </c-button>
<c-button <c-button
style="margin: 0 0" style="margin: 0 0"
...@@ -50,7 +44,7 @@ ...@@ -50,7 +44,7 @@
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="11" :offset="1"> <c-col :span="12" style="padding-left: 20px;">
<el-form-item label="简略信息" prop="ledgrp.rec.nam"> <el-form-item label="简略信息" prop="ledgrp.rec.nam">
<c-input <c-input
v-model="model.ledgrp.rec.nam" v-model="model.ledgrp.rec.nam"
...@@ -63,7 +57,7 @@ ...@@ -63,7 +57,7 @@
</c-col> </c-col>
<!-- left --> <!-- left -->
<c-col :span="11"> <c-col :span="12" style="padding-right: 20px;">
<c-col :span="24"> <c-col :span="24">
<el-form-item label="信用证类型" prop="ledgrp.rec.lcrtyp"> <el-form-item label="信用证类型" prop="ledgrp.rec.lcrtyp">
<c-select <c-select
...@@ -373,7 +367,7 @@ ...@@ -373,7 +367,7 @@
</c-col> </c-col>
<!-- right --> <!-- right -->
<c-col :span="11" :offset="1"> <c-col :span="12" style="padding-left: 20px;">
<c-ptap <c-ptap
:model="model" :model="model"
:argadr="{ :argadr="{
...@@ -413,22 +407,26 @@ ...@@ -413,22 +407,26 @@
> >
</c-ptap> </c-ptap>
<c-col :span="12" class="centerLable marginLable"> <c-col :span="12" >
<c-checkbox v-model="model.ledgrp.rec.revflg">循环信用证</c-checkbox>
<c-checkbox v-model="model.ledgrp.rec.revflg" class="checkbox-left" style="margin: 0px 0 10px 120px">循环信用证</c-checkbox>
</c-col> </c-col>
<!-- Authorization to Debit --> <!-- Authorization to Debit -->
<c-col :span="12" class="centerLable marginLable"> <c-col :span="12" >
<c-checkbox v-model="dbtflg">Authorization to Debit</c-checkbox> <c-checkbox v-model="dbtflg" style="margin: 0px 0 10px 100px">Authorization to Debit</c-checkbox>
</c-col> </c-col>
<c-col :span="24" class="centerLable marginLable"> <c-col :span="12" >
<c-checkbox v-model="nonban">非银行开证</c-checkbox>
<c-checkbox v-model="nonban" class="checkbox-left" style="margin: 0px 0 10px 120px">非银行开证</c-checkbox>
</c-col> </c-col>
<!-- Test Key Unconfirmity --> <!-- Test Key Unconfirmity -->
<c-col :span="24" class="centerLable marginLable"> <c-col :span="12">
<c-checkbox v-model="teskeyunc">Test Key Unconfirmity</c-checkbox> <c-checkbox v-model="teskeyunc" style="margin: 0px 0 10px 120px">Test Key Unconfirmity</c-checkbox>
</c-col> </c-col>
</c-col> </c-col>
</div> </div>
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<div class="eibs-tab"> <div class="eibs-tab">
<c-row> <c-row>
<!-- left --> <!-- left -->
<c-col :span="11"> <c-col :span="12" style="padding-right: 20px;" >
<c-col :span="24"> <c-col :span="24">
<c-ptap <c-ptap
:model="model" :model="model"
...@@ -45,7 +45,7 @@ ...@@ -45,7 +45,7 @@
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="24" style="margin-left: 150px"> <c-col :span="24" style="margin-left: 0px">
<c-checkbox v-model="model.ledgrp.rec.aplbnkdirsnd" <c-checkbox v-model="model.ledgrp.rec.aplbnkdirsnd"
>直接发送</c-checkbox >直接发送</c-checkbox
> >
...@@ -53,7 +53,7 @@ ...@@ -53,7 +53,7 @@
</c-col> </c-col>
<!-- right --> <!-- right -->
<c-col :span="11" :offset="1"> <c-col :span="12" style="padding-left: 20px;">
<c-col :span="24"> <c-col :span="24">
<c-ptap <c-ptap
:model="model" :model="model"
......
<template> <template>
<div class="eibs-tab"> <div class="eibs">
<c-row> <c-row>
<c-col :span="16"> <c-col :span="16">
<el-form-item label="循环信用证信息"></el-form-item> <el-form-item label="循环信用证信息"></el-form-item>
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
</c-row> </c-row>
<c-row> <c-row>
<c-col :span="16"> <c-col :span="14">
<el-form-item label="循环类型" prop="ledgrp.rec.revtyp"> <el-form-item label="循环类型" prop="ledgrp.rec.revtyp">
<c-select <c-select
v-model="model.ledgrp.rec.revtyp" v-model="model.ledgrp.rec.revtyp"
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="8"> <c-col :span="2">
<!-- Credit is Marked as Cumulative --> <!-- Credit is Marked as Cumulative -->
<c-checkbox v-model="model.ledgrp.rec.revcum" <c-checkbox v-model="model.ledgrp.rec.revcum"
style="margin-left:10px" style="margin-left:10px"
...@@ -79,10 +79,10 @@ ...@@ -79,10 +79,10 @@
<c-button <c-button
size="small" size="small"
type="primary" type="primary"
icon="el-icon-search" icon="el-icon-more"
@click="onRevclauseButtxmsel" @click="onRevclauseButtxmsel"
> >
...
</c-button> </c-button>
</template> </template>
</c-fullbox> </c-fullbox>
......
...@@ -102,11 +102,16 @@ ...@@ -102,11 +102,16 @@
<!--PD000000 --> <!--PD000000 -->
<el-tab-pane label="备查/附言" name="coninfp"> <el-tab-pane label="备查/附言" name="coninfp">
<c-content> <c-content>
<m-coninfp :model="model" :codes="codes" /> <div class="eibs-tab">
</c-content> <el-collapse v-model="activeNames">
</el-tab-pane> <el-collapse-item title="附言" name="coninfp">
<m-coninfp :model="model" :codes="codes" />
</el-collapse-item>
</el-collapse>
</div>
</c-content>
</el-tab-pane>
<!--PD000529 --> <!--PD000529 -->
<el-tab-pane label="报文/面函" name="docpan"> <el-tab-pane label="报文/面函" name="docpan">
...@@ -237,7 +242,7 @@ export default { ...@@ -237,7 +242,7 @@ export default {
...CodeTable, ...CodeTable,
}, },
attachments: false, attachments: false,
activeNames: ["engp"], activeNames: ["engp","coninfp"],
}; };
}, },
methods: { methods: {
......
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