Skip to content

V
vue-gjjs
Commit 0eea1b01 by nanrui
Options

Merge remote-tracking branch 'origin/development-202206' into development-202206

parents 4b3e2c4c 9a7686b5
Showing with 213 additions and 125 deletions
src/config/CodeTable/index.js
...@@ -4991,6 +4991,10 @@ const CodeTable = { ...@@ -4991,6 +4991,10 @@ const CodeTable = {
{ label: "Reverse Booking (Document Set)", value: "N" }, { label: "Reverse Booking (Document Set)", value: "N" },
{ label: "Reverse Booking (Doc. Set, L/C)", value: "B" }, { label: "Reverse Booking (Doc. Set, L/C)", value: "B" },
], ],
rebkpflg1: [
{ label: "Reverse Booking (Document Set)", value: "N" },
{ label: "Reverse Booking (Doc. Set, L/C)", value: "B" },
],
refper: [ refper: [
{ label: "Same Week", value: "W=" }, { label: "Same Week", value: "W=" },
{ label: "Same Half-Year", value: "H=" }, { label: "Same Half-Year", value: "H=" },
......
src/model/Ditdav/index.js
...@@ -6,6 +6,10 @@ import Pub from "../Public" ...@@ -6,6 +6,10 @@ import Pub from "../Public"
export default class Ditdav { export default class Ditdav {
constructor() { constructor() {
this.data = { this.data = {
litapll1blk: "",
litapll2blk: "",
litapll3blk: "",
litapll4blk: "",
didgrp:{ didgrp:{
rec:{ rec:{
ownref:"", // 参考号 .didgrp.rec.ownref ownref:"", // 参考号 .didgrp.rec.ownref
......
src/views/Business/Bftcan/Canp.vue
...@@ -363,7 +363,7 @@ ...@@ -363,7 +363,7 @@
placeholder="请选择Booking Procedure" placeholder="请选择Booking Procedure"
> >
<el-option <el-option
v-for="item in codes.rebkpflg" v-for="item in codes.rebkpflg1"
:key="item.value" :key="item.value"
:label="item.label" :label="item.label"
:value="item.value" :value="item.value"
......
src/views/Business/Brtdcr/index.vue
...@@ -49,6 +49,10 @@ ...@@ -49,6 +49,10 @@
<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="glepan">
<m-glepan :model="model" :codes="codes" ref="glepan" />
</el-tab-pane>
<!--PD000000 --> <!--PD000000 -->
<el-tab-pane label="Completion" name="coninfp"> <el-tab-pane label="Completion" name="coninfp">
...@@ -100,6 +104,8 @@ import Pattern from "~/model/Brtdcr/Pattern" ...@@ -100,6 +104,8 @@ import Pattern from "~/model/Brtdcr/Pattern"
import Utlp from "./Utlp" import Utlp from "./Utlp"
import Brtdcrd from "./Brtdcrd" import Brtdcrd from "./Brtdcrd"
import Mt750p from "./Mt750p" import Mt750p from "./Mt750p"
import Glepan from "~/views/Public/Glepan";
// import Engp from "./Engp" // import Engp from "./Engp"
// import Setpan from "./Setpan" // import Setpan from "./Setpan"
...@@ -128,6 +134,8 @@ export default { ...@@ -128,6 +134,8 @@ export default {
"m-docpan" : Docpan, "m-docpan" : Docpan,
"m-doctre" : Doctre, "m-doctre" : Doctre,
"m-limitbody" : Limitbody, "m-limitbody" : Limitbody,
"m-glepan": Glepan,
}, },
provide() { provide() {
return { return {
......
src/views/Business/Getopn/Ovwp.vue
...@@ -102,7 +102,7 @@ ...@@ -102,7 +102,7 @@
></c-input> ></c-input>
</c-col> </c-col>
<c-col :span="4" v-if="model.gitp.swiftflg!='Y'" class="centerLable"> <c-col :span="4" v-if="model.gitp.swiftflg!='Y'" class="centerLable">
<c-checkbox disabled v-model="model.gitp.dzbhflg">电子保函标志</c-checkbox> <c-checkbox v-model="model.gitp.dzbhflg">电子保函标志</c-checkbox>
</c-col> </c-col>
</c-col> </c-col>
...@@ -149,7 +149,7 @@ ...@@ -149,7 +149,7 @@
</c-col> --> </c-col> -->
<c-col :span="24"> <c-col :span="24">
<el-form-item v-if="model.gitp.swiftflg=='Y'" label="Incoming Purpose " prop="gidgrp.rec.purposin"> <el-form-item v-show="model.gitp.swiftflg=='Y'" label="Incoming Purpose " prop="gidgrp.rec.purposin">
<c-select :disabled="model.gitp.inc760==''" v-model="model.gidgrp.rec.purposin" style="width:100%" placeholder="请选择Incoming Purpose "> <c-select :disabled="model.gitp.inc760==''" v-model="model.gidgrp.rec.purposin" style="width:100%" placeholder="请选择Incoming Purpose ">
<el-option <el-option
v-for="item in codes.purposin" v-for="item in codes.purposin"
...@@ -219,6 +219,18 @@ ...@@ -219,6 +219,18 @@
</c-col> </c-col>
<c-col :span="24"> <c-col :span="24">
<el-form-item v-if="model.gitp.swiftflg==''" label="Handling Type" prop="gidgrp.rec.hndtyp">
<c-select
v-model="model.gidgrp.rec.hndtyp"
style="width: 100%"
placeholder="请选择Handling Type"
:code="codes.hndtyp2"
>
</c-select>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item v-if="model.gitp.swiftflg=='N'" label="Handling Type" prop="gidgrp.rec.hndtyp"> <el-form-item v-if="model.gitp.swiftflg=='N'" label="Handling Type" prop="gidgrp.rec.hndtyp">
<c-select <c-select
v-model="model.gidgrp.rec.hndtyp" v-model="model.gidgrp.rec.hndtyp"
...@@ -266,6 +278,24 @@ ...@@ -266,6 +278,24 @@
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="24">
<el-form-item v-if="model.gitp.swiftflg=='Y'&&model.gidgrp.rec.purposin=='ISSU'&&model.gidgrp.rec.purpos=='ISCO'" label="Handling Type" prop="gidgrp.rec.hndtyp">
<c-select
v-model="model.gidgrp.rec.hndtyp"
style="width: 100%"
placeholder="请选择Handling Type"
>
<el-option
v-for="item in codes.hndtyp4"
:key="item.value"
:label="item.label"
:value="item.value"
>
</el-option>
</c-select>
</el-form-item>
</c-col>
<c-col :span="24"> <c-col :span="24">
<el-form-item v-if="model.gitp.swiftflg=='Y'&&model.gidgrp.rec.purposin=='ISSU'&&model.gidgrp.rec.purpos=='ISSU'" label="Handling Type" prop="gidgrp.rec.hndtyp"> <el-form-item v-if="model.gitp.swiftflg=='Y'&&model.gidgrp.rec.purposin=='ISSU'&&model.gidgrp.rec.purpos=='ISSU'" label="Handling Type" prop="gidgrp.rec.hndtyp">
<c-select <c-select
...@@ -274,6 +304,24 @@ ...@@ -274,6 +304,24 @@
placeholder="请选择Handling Type" placeholder="请选择Handling Type"
> >
<el-option <el-option
v-for="item in codes.hndtyp3"
:key="item.value"
:label="item.label"
:value="item.value"
>
</el-option>
</c-select>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item v-if="model.gitp.swiftflg=='Y'&&model.gidgrp.rec.purposin=='ISSU'&&model.gidgrp.rec.purpos==''" label="Handling Type" prop="gidgrp.rec.hndtyp">
<c-select
v-model="model.gidgrp.rec.hndtyp"
style="width: 100%"
placeholder="请选择Handling Type"
>
<el-option
v-for="item in codes.hndtyp5" v-for="item in codes.hndtyp5"
:key="item.value" :key="item.value"
:label="item.label" :label="item.label"
...@@ -759,7 +807,7 @@ ...@@ -759,7 +807,7 @@
</c-select> </c-select>
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="4" v-if="model.gidgrp.cbs.max.cur=='CNY'&&model.gitp.swiftflg!='Y'" class="centerLable"> <c-col :span="4" v-if="model.gitp.swiftflg!='Y'" class="centerLable">
<c-checkbox v-model="model.gidgrp.rec.teskeyunc"> <c-checkbox v-model="model.gidgrp.rec.teskeyunc">
Test Key Unconfirmity Test Key Unconfirmity
</c-checkbox> </c-checkbox>
...@@ -845,19 +893,9 @@ ...@@ -845,19 +893,9 @@
</c-col> </c-col>
<c-col :span="24"> <c-col :span="24">
<el-form-item v-if="model.gitp.swiftflg!='Y'" label="地址名称" prop="gidgrp.apl.pts.adrblk"> <el-form-item v-if="model.gitp.swiftflg!='Y'" label="地址名称" prop="gidgrp.apl.pts.adrblk">
<c-input :disabled="model.gidgrp.rec.hndtyp!='OT'" 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.apl.pts.adrblk" maxlength="35" show-word-limit placeholder="请输入地址名称" ></c-input>
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="24">
<c-ptap v-if="(model.gidgrp.rec.hndtyp=='OL'||model.gidgrp.rec.hndtyp=='')&&model.gitp.swiftflg!='Y'" :model="model" :argadr="{
title: 'Adv/Rcv bank',
grp: 'gidgrp',
rol: 'adv',
}"
@onAplpDet="onAdvpDet">
</c-ptap>
</c-col>
<c-col :span="24"> <c-col :span="24">
<el-form-item v-if="model.gitp.swiftflg!='Y'" label="Issuing Bank" prop="gidgrp.iss.pts.ref"> <el-form-item v-if="model.gitp.swiftflg!='Y'" label="Issuing Bank" prop="gidgrp.iss.pts.ref">
...@@ -916,7 +954,7 @@ ...@@ -916,7 +954,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 :disabled="model.gidgrp.rec.hndtyp=='OT'" size="small" type="primary" @click="onBenpDet"> <c-button disabled size="small" type="primary" @click="onBenpDet">
Details Details
</c-button> </c-button>
</template> </template>
...@@ -925,9 +963,10 @@ ...@@ -925,9 +963,10 @@
</c-col> </c-col>
<c-col :span="24"> <c-col :span="24">
<el-form-item v-if="model.gitp.swiftflg!='Y'" label="地址名称" prop="gidgrp.ben.pts.adrblk"> <el-form-item v-if="model.gitp.swiftflg!='Y'" label="地址名称" prop="gidgrp.ben.pts.adrblk">
<c-input :disabled="model.gidgrp.rec.hndtyp=='OT'" rows="4" type="textarea" v-model="model.gidgrp.ben.pts.adrblk" maxlength="35" show-word-limit placeholder="请输入地址名称" ></c-input> <c-input disabled rows="4" type="textarea" v-model="model.gidgrp.ben.pts.adrblk" maxlength="35" show-word-limit placeholder="请输入地址名称" ></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="被保证人" prop="gidgrp.gidcxm.warran"> <el-form-item v-if="model.gitp.swiftflg!='Y'" label="被保证人" prop="gidgrp.gidcxm.warran">
<c-input <c-input
......
src/views/Business/Getopn/index.vue
...@@ -38,11 +38,11 @@ ...@@ -38,11 +38,11 @@
<m-detp :model="model" :codes="codes"/> <m-detp :model="model" :codes="codes"/>
</el-tab-pane> </el-tab-pane>
<!--gitp PD000210 Undertaking Text --> <!--gitp PD000210 Undertaking Text -->
<!-- <el-tab-pane label="Undertaking Text" name="gidtxtp"> <el-tab-pane label="Undertaking Text" name="gidtxtp">
<m-gidtxtp :model="model" :codes="codes"/> <m-gidtxtp :model="model" :codes="codes"/>
</el-tab-pane> --> </el-tab-pane>
<el-tab-pane v-if="model.gidgrp.rec.legfrm=='STBY'||model.gidgrp.rec.purpos=='ACNF'" label="Confirmation Details" name="confp"> <el-tab-pane v-if="model.gitp.swiftflg=='Y'&&(model.gidgrp.rec.legfrm=='STBY'||model.gidgrp.rec.purpos=='ACNF')" label="Confirmation Details" name="confp">
<m-confp :model="model" :codes="codes"/> <m-confp :model="model" :codes="codes"/>
</el-tab-pane> </el-tab-pane>
......
src/views/Business/Gitopn/Preperp.vue
...@@ -53,23 +53,19 @@ ...@@ -53,23 +53,19 @@
<c-col :span="24"> <c-col :span="24">
<el-form-item label="Delivery to Address" prop="gidgrp.blk.deltoadr"> <el-form-item label="Delivery to Address" prop="gidgrp.blk.deltoadr">
<c-input :disabled="model.gidgrp.rec.delto==''" type="textarea" v-model="model.gidgrp.blk.deltoadr" maxlength="35" show-word-limit placeholder="请输入Delivery to Address" ></c-input> <c-input :disabled="model.gidgrp.rec.delto==''" rows="4" type="textarea" v-model="model.gidgrp.blk.deltoadr" maxlength="35" show-word-limit placeholder="请输入Delivery to Address" ></c-input>
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="24"> <c-col :span="24">
<el-form-item label="Transfer Conditions" prop="gidgrp.blk.trfcond"> <el-form-item label="Transfer Conditions" prop="gidgrp.blk.trfcond">
<c-input disabled type="textarea" v-model="model.gidgrp.blk.trfcond" maxlength="65" show-word-limit placeholder="请输入Transfer Conditions" ></c-input> <c-input disabled type="textarea" rows="4" v-model="model.gidgrp.blk.trfcond" maxlength="65" show-word-limit placeholder="请输入Transfer Conditions" ></c-input>
</el-form-item> </el-form-item>
</c-col> </c-col>
</c-col> </c-col>
<c-col :span="11" :offset="1"> <c-col :span="11" :offset="1">
<c-col :span="24"> <c-col :span="24">
<el-form-item label="Charges Condition">
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="Own Charges Borne by" prop="gidgrp.rec.chato"> <el-form-item label="Own Charges Borne by" prop="gidgrp.rec.chato">
<c-select v-model="model.gidgrp.rec.chato" style="width:100%" placeholder="请选择Own Charges Borne by"> <c-select v-model="model.gidgrp.rec.chato" style="width:100%" placeholder="请选择Own Charges Borne by">
<el-option <el-option
...@@ -94,7 +90,7 @@ ...@@ -94,7 +90,7 @@
<c-col :span="24"> <c-col :span="24">
<el-form-item label="Additional Details to Code for Charges" prop="gidgrp.blk.feetxt"> <el-form-item label="Additional Details to Code for Charges" prop="gidgrp.blk.feetxt">
<c-fullbox> <c-fullbox>
<c-input type="textarea" v-model="model.gidgrp.blk.feetxt" maxlength="35" show-word-limit placeholder="请输入Additional Details to Code for Charges" ></c-input> <c-input type="textarea" rows="4" v-model="model.gidgrp.blk.feetxt" maxlength="35" show-word-limit placeholder="请输入Additional Details to Code for Charges" ></c-input>
<template slot="footer"> <template slot="footer">
<c-button size="small" type="primary" icon="el-icon-search" @click="onChargiButtxmsel"> <c-button size="small" type="primary" icon="el-icon-search" @click="onChargiButtxmsel">
... ...
...@@ -103,10 +99,7 @@ ...@@ -103,10 +99,7 @@
</c-fullbox> </c-fullbox>
</el-form-item> </el-form-item>
</c-col> </c-col>
</c-col> <c-col :span="24">
</c-col>
<c-col :span="13">
<c-col :span="20"> <c-col :span="20">
<el-form-item label="Presentation Instr." prop="gidgrp.blk.preper"> <el-form-item label="Presentation Instr." prop="gidgrp.blk.preper">
<c-input :disabled="model.gitp.prepermodflg == ''" type="textarea" :rows="5" v-model="model.gidgrp.blk.preper" maxlength="65" show-word-limit placeholder="请输入Presentation Instr." ></c-input> <c-input :disabled="model.gitp.prepermodflg == ''" type="textarea" :rows="5" v-model="model.gidgrp.blk.preper" maxlength="65" show-word-limit placeholder="请输入Presentation Instr." ></c-input>
...@@ -122,6 +115,8 @@ ...@@ -122,6 +115,8 @@
vs. &History vs. &History
</c-button> </c-button>
</c-col> </c-col>
</c-col>
</c-col>
</c-col> </c-col>
</c-row> </c-row>
......
src/views/Business/Gitopn/Ptyp.vue
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
</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.apl.pts.adrblk">
<c-input disabled type="textarea" v-model="model.gidgrp.apl.pts.adrblk" maxlength="35" show-word-limit placeholder="请输入地址名称" ></c-input> <c-input disabled rows="4" type="textarea" v-model="model.gidgrp.apl.pts.adrblk" maxlength="35" show-word-limit placeholder="请输入地址名称" ></c-input>
</el-form-item> </el-form-item>
</c-col> </c-col>
......
src/views/Business/Gitopn/index.vue
...@@ -31,7 +31,9 @@ ...@@ -31,7 +31,9 @@
<!--PD000043 --> <!--PD000043 -->
<el-tab-pane label="Parties" name="ptyp"> <el-tab-pane label="Parties" name="ptyp">
<m-ptyp :model="model" :codes="codes"/> <c-content>
<m-ptyp :model="model" :codes="codes"/>
</c-content>
</el-tab-pane> </el-tab-pane>
<el-tab-pane v-if="model.gitp.swiftflg=='Y'||model.gitp.swiftflg==''" label="Presentation/Delivery" name="preperp"> <el-tab-pane v-if="model.gitp.swiftflg=='Y'||model.gitp.swiftflg==''" label="Presentation/Delivery" name="preperp">
......
src/views/Business/Letamc/Conp.vue
...@@ -16,6 +16,7 @@ ...@@ -16,6 +16,7 @@
</c-col> </c-col>
<!-- L/C Amount --> <!-- L/C Amount -->
<c-col :span="24">
<c-col :span="12"> <c-col :span="12">
<el-form-item label="L/C Amount" prop="ledgrp.cbs.nom1.cur"> <el-form-item label="L/C Amount" prop="ledgrp.cbs.nom1.cur">
<c-select <c-select
...@@ -27,7 +28,6 @@ ...@@ -27,7 +28,6 @@
></c-select> ></c-select>
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="7"> <c-col :span="7">
<el-form-item label="" label-width="5px" prop="ledgrp.cbs.nom1.amt"> <el-form-item label="" label-width="5px" prop="ledgrp.cbs.nom1.amt">
<c-input <c-input
...@@ -38,14 +38,14 @@ ...@@ -38,14 +38,14 @@
></c-input> ></c-input>
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="3" :offset="1"> <c-col :span="3" :offset="1">
<c-checkbox v-model="model.letp.letp0.aammod.addamtflg" disabled <c-checkbox v-model="model.letp.letp0.aammod.addamtflg" disabled
>Add. Amount</c-checkbox >Add. Amount</c-checkbox
> >
</c-col> </c-col>
</c-col>
<!-- Open Amount --> <!-- Open Amount -->
<c-col :span="24">
<c-col :span="12"> <c-col :span="12">
<el-form-item label="Open Amount" prop="ledgrp.cbs.opn1.cur"> <el-form-item label="Open Amount" prop="ledgrp.cbs.opn1.cur">
<c-select <c-select
...@@ -57,7 +57,6 @@ ...@@ -57,7 +57,6 @@
></c-select> ></c-select>
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="7"> <c-col :span="7">
<el-form-item label="" label-width="5px" prop="ledgrp.cbs.opn1.amt"> <el-form-item label="" label-width="5px" prop="ledgrp.cbs.opn1.amt">
<c-input <c-input
...@@ -68,12 +67,12 @@ ...@@ -68,12 +67,12 @@
></c-input> ></c-input>
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="3" :offset="1"> <c-col :span="3" :offset="1">
<c-checkbox v-model="model.ledgrp.rec.revflg" disabled <c-checkbox v-model="model.ledgrp.rec.revflg" disabled
>Revolving L/C</c-checkbox >Revolving L/C</c-checkbox
> >
</c-col> </c-col>
</c-col>
<!-- Available with --> <!-- Available with -->
<c-col :span="24"> <c-col :span="24">
<el-form-item label="Available with" prop="ledgrp.avbnam"> <el-form-item label="Available with" prop="ledgrp.avbnam">
...@@ -93,6 +92,7 @@ ...@@ -93,6 +92,7 @@
v-model="model.ledgrp.rec.avbby" v-model="model.ledgrp.rec.avbby"
style="width: 100%" style="width: 100%"
placeholder="请选择Available by [AVBBY0]" placeholder="请选择Available by [AVBBY0]"
:code="codes.avbby0"
disabled disabled
> >
</c-select> </c-select>
...@@ -165,6 +165,7 @@ ...@@ -165,6 +165,7 @@
v-model="model.ledgrp.rec.lcrtyp" v-model="model.ledgrp.rec.lcrtyp"
style="width: 100%" style="width: 100%"
placeholder="请选择Form of L/C" placeholder="请选择Form of L/C"
:code="codes.lcrtyp1"
disabled disabled
> >
</c-select> </c-select>
...@@ -178,6 +179,7 @@ ...@@ -178,6 +179,7 @@
v-model="model.ledgrp.rec.cnfdet" v-model="model.ledgrp.rec.cnfdet"
style="width: 100%" style="width: 100%"
placeholder="请选择Confirmation Instruct." placeholder="请选择Confirmation Instruct."
:code="codes.cnfins"
disabled disabled
> >
</c-select> </c-select>
...@@ -190,6 +192,7 @@ ...@@ -190,6 +192,7 @@
v-model="model.ledgrp.rec.cnfsta" v-model="model.ledgrp.rec.cnfsta"
style="width: 100%" style="width: 100%"
placeholder="请选择Confirmation Status " placeholder="请选择Confirmation Status "
:code="codes.cnfsta"
disabled disabled
> >
</c-select> </c-select>
...@@ -263,7 +266,7 @@ ...@@ -263,7 +266,7 @@
<!-- =========================== 右边 ==========================--> <!-- =========================== 右边 ==========================-->
<c-col :span="11" :offset="1"> <c-col :span="11" :offset="1">
<c-col :span="12"> <!-- <c-col :span="12">
<el-form-item label="name" prop="letp.letp0.recget.sdamod.dadsnd"> <el-form-item label="name" prop="letp.letp0.recget.sdamod.dadsnd">
<c-input <c-input
v-model="model.letp.letp0.recget.sdamod.dadsnd" v-model="model.letp.letp0.recget.sdamod.dadsnd"
...@@ -271,10 +274,10 @@ ...@@ -271,10 +274,10 @@
disabled disabled
></c-input> ></c-input>
</el-form-item> </el-form-item>
</c-col> </c-col> -->
<c-col :span="12"> <c-col :span="24">
<el-form-item label="" label-width="5px" prop="ledgrp.rec.nam"> <el-form-item label="Name" prop="ledgrp.rec.nam">
<c-input <c-input
v-model="model.ledgrp.rec.nam" v-model="model.ledgrp.rec.nam"
maxlength="40" maxlength="40"
...@@ -308,7 +311,7 @@ ...@@ -308,7 +311,7 @@
</c-col> </c-col>
<c-col :span="24"> <c-col :span="24">
<el-form-item label="Issuer Ref." prop="ledgrp.iss.pts.ref"> <el-form-item label="Iss.Bank Original LC No." prop="ledgrp.iss.pts.ref">
<c-input <c-input
v-model="model.ledgrp.iss.pts.ref" v-model="model.ledgrp.iss.pts.ref"
maxlength="16" maxlength="16"
...@@ -330,7 +333,7 @@ ...@@ -330,7 +333,7 @@
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="12"> <c-col :span="24">
<el-form-item label="Beneficiary Ref." prop="ledgrp.ben.pts.ref"> <el-form-item label="Beneficiary Ref." prop="ledgrp.ben.pts.ref">
<c-input <c-input
v-model="model.ledgrp.ben.pts.ref" v-model="model.ledgrp.ben.pts.ref"
...@@ -341,12 +344,12 @@ ...@@ -341,12 +344,12 @@
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="12"> <c-col :span="24">
<el-form-item label="Date/Place of Expiry" prop="ledgrp.ben.pts.nam"> <el-form-item label="" prop="ledgrp.ben.pts.nam">
<c-input <c-input
v-model="model.ledgrp.ben.pts.nam" v-model="model.ledgrp.ben.pts.nam"
maxlength="40" maxlength="40"
placeholder="请输入Date/Place of Expiry" placeholder="请输入"
disabled disabled
></c-input> ></c-input>
</el-form-item> </el-form-item>
......
src/views/Business/Letamc/index.vue
...@@ -55,9 +55,9 @@ ...@@ -55,9 +55,9 @@
</el-tab-pane> </el-tab-pane>
<!--PD000001 --> <!--PD000001 -->
<el-tab-pane label="Booking" name="glepan"> <!-- <el-tab-pane label="Booking" name="glepan">
<m-glepan :model="model" :codes="codes" /> <m-glepan :model="model" :codes="codes" />
</el-tab-pane> </el-tab-pane> -->
<!--PD000000 --> <!--PD000000 -->
<el-tab-pane label="Completion" name="coninfp"> <el-tab-pane label="Completion" name="coninfp">
......
src/views/Business/Letdrw/Ovwp.vue
...@@ -331,7 +331,7 @@ ...@@ -331,7 +331,7 @@
v-model="model.ledgrp.rec.apprul" v-model="model.ledgrp.rec.apprul"
style="width: 100%" style="width: 100%"
placeholder="请选择适用规则" placeholder="请选择适用规则"
:code="codes.apprul" :code="codes.apprul1"
@change="apprulChange" @change="apprulChange"
> >
</c-select> </c-select>
...@@ -354,7 +354,7 @@ ...@@ -354,7 +354,7 @@
v-model="model.ledgrp.rec.shppar" v-model="model.ledgrp.rec.shppar"
style="width: 100%" style="width: 100%"
placeholder="请选择分批装运" placeholder="请选择分批装运"
:code="codes.shppars18" :code="codes.shptrss18"
> >
</c-select> </c-select>
</el-form-item> </el-form-item>
......
src/views/Business/Letnot/Ovwp.vue
...@@ -339,7 +339,7 @@ ...@@ -339,7 +339,7 @@
v-model="model.ledgrp.rec.apprul" v-model="model.ledgrp.rec.apprul"
style="width: 100%" style="width: 100%"
placeholder="请选择适用规则" placeholder="请选择适用规则"
:code="codes.apprul" :code="codes.apprul1"
@change="apprulChange" @change="apprulChange"
> >
</c-select> </c-select>
......
src/views/Business/Letnot/index.vue
<template> <template>
<c-page title="出口信用证预通知"> <c-page title="出口信用证预通知">
<div class="eContainer"> <div class="eContainer">
<!-- <c-bus-button :$pntvm="this"></c-bus-button> j加操作按钮--> <!-- <c-bus-button :$pntvm="this"></c-bus-button> j加操作按钮-->
<c-function-btn <c-function-btn
:handleSubmit="handleSubmit" :handleSubmit="handleSubmit"
:handleCheck="handleCheck" :handleCheck="handleCheck"
...@@ -28,7 +28,12 @@ ...@@ -28,7 +28,12 @@
size="small" size="small"
:validate-on-rule-change="false" :validate-on-rule-change="false"
> >
<c-tabs v-model="tabVal" ref="elment" type="card" @tab-click="myTabClick"> <c-tabs
v-model="tabVal"
ref="elment"
type="card"
@tab-click="myTabClick"
>
<!--PD000017 --> <!--PD000017 -->
<el-tab-pane label="内容" name="ovwp"> <el-tab-pane label="内容" name="ovwp">
<c-content> <c-content>
...@@ -36,9 +41,15 @@ ...@@ -36,9 +41,15 @@
</c-content> </c-content>
</el-tab-pane> </el-tab-pane>
<!--PD000001 Additional Amount 附加金额/额外款项--> <!--PD000001 Additional Amount 附加金额/额外款项-->
<el-tab-pane label="附加金额" name="aamp" v-if="model.letp.aamp.aammod.addamtflg=='X'"> <el-tab-pane
<m-aamp :model="model" :codes="codes"/> label="附加金额"
name="aamp"
v-if="model.letp.aamp.aammod.addamtflg == 'X'"
>
<c-content>
<m-aamp :model="model" :codes="codes" />
</c-content>
</el-tab-pane> </el-tab-pane>
<!--PD000063 --> <!--PD000063 -->
...@@ -57,17 +68,23 @@ ...@@ -57,17 +68,23 @@
<!--PD000055 --> <!--PD000055 -->
<el-tab-pane label="货物说明" name="dogp"> <el-tab-pane label="货物说明" name="dogp">
<m-dogp :model="model" :codes="codes" /> <c-content>
<m-dogp :model="model" :codes="codes" />
</c-content>
</el-tab-pane> </el-tab-pane>
<!--PD000057 --> <!--PD000057 -->
<el-tab-pane label="单据要求" name="dorp"> <el-tab-pane label="单据要求" name="dorp">
<m-dorp :model="model" :codes="codes" /> <c-content>
<m-dorp :model="model" :codes="codes" />
</c-content>
</el-tab-pane> </el-tab-pane>
<!--PD000060 --> <!--PD000060 -->
<el-tab-pane label="其他条款" name="adcp"> <el-tab-pane label="其他条款" name="adcp">
<m-adcp :model="model" :codes="codes" /> <c-content>
<m-adcp :model="model" :codes="codes" />
</c-content>
</el-tab-pane> </el-tab-pane>
<!--PD000000 --> <!--PD000000 -->
...@@ -79,28 +96,45 @@ ...@@ -79,28 +96,45 @@
<!--PD000000 --> <!--PD000000 -->
<el-tab-pane label="附言" name="coninfp"> <el-tab-pane label="附言" name="coninfp">
<m-coninfp :model="model" :codes="codes" /> <c-content>
<m-coninfp :model="model" :codes="codes" />
</c-content>
</el-tab-pane> </el-tab-pane>
<!--PD000529 --> <!--PD000529 -->
<el-tab-pane label="报文及面函" name="docpan"> <el-tab-pane label="报文及面函" name="docpan">
<m-docpan :model="model" :codes="codes" /> <c-content>
<m-docpan :model="model" :codes="codes" />
</c-content>
</el-tab-pane> </el-tab-pane>
<!--PD000546 --> <!--PD000546 -->
<el-tab-pane label="附件" name="doctre"> <el-tab-pane label="附件" name="doctre">
<m-doctre :model="model" :codes="codes" /> <c-content>
<m-doctre :model="model" :codes="codes" />
</c-content>
</el-tab-pane> </el-tab-pane>
<!--PD000422 --> <!--PD000422 -->
<el-tab-pane label="银行专用特殊付款条件" name="spcrcvp" v-if="model.ledgrp.rec.spcrcbflg=='X'"> <el-tab-pane
<m-spcrcvp :model="model" :codes="codes"/> label="银行专用特殊付款条件"
name="spcrcvp"
v-if="model.ledgrp.rec.spcrcbflg == 'X'"
>
<c-content>
<m-spcrcvp :model="model" :codes="codes" />
</c-content>
</el-tab-pane> </el-tab-pane>
<!--PD000394 --> <!--PD000394 -->
<el-tab-pane label="受益人特殊付款条件" name="spcbenp" v-if="model.ledgrp.rec.spcbenflg=='X'"> <el-tab-pane
<m-spcbenp :model="model" :codes="codes"/> label="受益人特殊付款条件"
name="spcbenp"
v-if="model.ledgrp.rec.spcbenflg == 'X'"
>
<c-content>
<m-spcbenp :model="model" :codes="codes" />
</c-content>
</el-tab-pane> </el-tab-pane>
</c-tabs> </c-tabs>
</el-form> </el-form>
<c-grid-ety-prompt-dialog <c-grid-ety-prompt-dialog
...@@ -112,90 +146,89 @@ ...@@ -112,90 +146,89 @@
</c-page> </c-page>
</template> </template>
<script> <script>
import Api from "~/service/Api"; import Api from '~/service/Api'
import Utils from "~/utils/index"; import Utils from '~/utils/index'
import CodeTable from "~/config/CodeTable"; import CodeTable from '~/config/CodeTable'
import Letnot from "~/model/Letnot"; import Letnot from '~/model/Letnot'
import commonProcess from "~/mixin/commonProcess"; import commonProcess from '~/mixin/commonProcess'
import commonFuncs from "~/mixin/commonFuncs"; import commonFuncs from '~/mixin/commonFuncs'
import Check from "~/model/Letnot/Check"; import Check from '~/model/Letnot/Check'
import Default from "~/model/Letnot/Default"; import Default from '~/model/Letnot/Default'
import Pattern from "~/model/Letnot/Pattern"; import Pattern from '~/model/Letnot/Pattern'
import Ovwp from "./Ovwp"; import Ovwp from './Ovwp'
import Aamp from "./Aamp"; import Aamp from './Aamp'
import Spcrcvp from "./Spcrcvp"; import Spcrcvp from './Spcrcvp'
import Spcbenp from "./Spcbenp"; import Spcbenp from './Spcbenp'
import Detp from "./Detp"; import Detp from './Detp'
import Ptyp from "./Ptyp"; import Ptyp from './Ptyp'
import Dogp from "./Dogp"; import Dogp from './Dogp'
import Dorp from "./Dorp"; import Dorp from './Dorp'
import Adcp from "./Adcp"; import Adcp from './Adcp'
import Coninfp from "~/views/Public/Coninfp"; import Coninfp from '~/views/Public/Coninfp'
import Setpan from "~/views/Public/Setpan"; import Setpan from '~/views/Public/Setpan'
import Docpan from "~/views/Public/Docpan"; import Docpan from '~/views/Public/Docpan'
import Doctre from "~/views/Public/Doctre"; import Doctre from '~/views/Public/Doctre'
export default { export default {
name: "Letnot", name: 'Letnot',
components: { components: {
"m-ovwp": Ovwp, 'm-ovwp': Ovwp,
"m-aamp" : Aamp, 'm-aamp': Aamp,
"m-detp": Detp, 'm-detp': Detp,
"m-ptyp": Ptyp, 'm-ptyp': Ptyp,
"m-dogp": Dogp, 'm-dogp': Dogp,
"m-dorp": Dorp, 'm-dorp': Dorp,
"m-adcp": Adcp, 'm-adcp': Adcp,
// "m-notcha": Notcha, // "m-notcha": Notcha,
"m-setpan": Setpan, 'm-setpan': Setpan,
"m-coninfp": Coninfp, 'm-coninfp': Coninfp,
"m-docpan": Docpan, 'm-docpan': Docpan,
"m-doctre": Doctre, 'm-doctre': Doctre,
"m-spcrcvp" : Spcrcvp, 'm-spcrcvp': Spcrcvp,
"m-spcbenp" : Spcbenp, 'm-spcbenp': Spcbenp,
}, },
provide() { provide() {
return { return {
root: this, root: this,
}; }
}, },
mixins: [commonProcess,commonFuncs], // 里面包含了Default、Check等的公共处理 mixins: [commonProcess, commonFuncs], // 里面包含了Default、Check等的公共处理
data() { data() {
return { return {
tabVal: "ovwp", tabVal: 'ovwp',
trnName: "letnot", trnName: 'letnot',
model: new Letnot().data, model: new Letnot().data,
checkRules: Check, checkRules: Check,
defaultRules: Default, defaultRules: Default,
pattern: Pattern, pattern: Pattern,
rules: null, rules: null,
codes: { ...CodeTable }, codes: { ...CodeTable },
}; }
}, },
methods: { methods: {
myTabClick(tab){ myTabClick(tab) {
this.tabClick(tab) this.tabClick(tab)
/** /**
* do it yourself * do it yourself
**/ **/
} },
}, },
created: async function () { created: async function () {
console.log("进入letnot交易"); console.log('进入letnot交易')
let rtnmsg = await this.init({}); let rtnmsg = await this.init({})
if (rtnmsg.respCode == SUCCESS) { if (rtnmsg.respCode == SUCCESS) {
//更新数据 //更新数据
// Utils.copyValueFromVO(this.model, rtnmsg.data); // Utils.copyValueFromVO(this.model, rtnmsg.data);
this.updateModel(rtnmsg.data) this.updateModel(rtnmsg.data)
//TODO 处理数据逻辑 //TODO 处理数据逻辑
if (this.isInDisplay) { if (this.isInDisplay) {
this.restoreDisplay(); this.restoreDisplay()
} }
} else { } else {
this.$notify.error({ title: "错误", message: "服务请求失败！" }); this.$notify.error({ title: '错误', message: '服务请求失败！' })
} }
}, },
}; }
</script> </script>
<style> <style></style>
</style>
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