diff --git a/src/config/CodeTable/index.js b/src/config/CodeTable/index.js index d13dd3b..7852bf7 100644 --- a/src/config/CodeTable/index.js +++ b/src/config/CodeTable/index.js @@ -6308,6 +6308,14 @@ const CodeTable = { ], payee: [ { label: "OWN Ourselves", value: "OWN" }, + { label: "Applicant", value:"APPL"}, + { label: "Beneficiary", value:"BENE"}, + { label: "ISS issuing Bank", value: "ISS" } + ], + ptydbt1: [ + { label: "Advising Bank", value: "ADV" }, + { label: "Applicant", value:"APPL"}, + { label: "Beneficiary", value:"BENE"}, { label: "ISS issuing Bank", value: "ISS" } ], acccur: [ diff --git a/src/model/Botdav/Pattern.js b/src/model/Botdav/Pattern.js index 6adc342..6ad32a1 100644 --- a/src/model/Botdav/Pattern.js +++ b/src/model/Botdav/Pattern.js @@ -129,7 +129,8 @@ export default { {max: 35,message:"长度不能超过35"} ], "bodgrp.rec.matpercnt":[ - {type: "number", required: true, message: "必输项"} + {type: "number" ,required: true, message: "必输项"}, + {type: "number" ,max: 999,message:"长度不能超过3"} ], "bodgrp.rec.paydocnum":[ {type: "string", required: false, message: "必输项"}, @@ -201,7 +202,7 @@ export default { "bodgrp.blk.chgtxt":[ - {type: "string", required: true, message: "必输项"}, + {type: "string", required: false, message: "必输项"}, {max: 35,message:"长度不能超过35"} ], diff --git a/src/model/Botdcr/Pattern.js b/src/model/Botdcr/Pattern.js index 12bb7d5..bcc650e 100644 --- a/src/model/Botdcr/Pattern.js +++ b/src/model/Botdcr/Pattern.js @@ -78,7 +78,7 @@ export default { ], "bodgrp.blk.resrej":[ - {type: "string", required: true, message: "必输项"}, + {type: "string", required: false, message: "必输项"}, {max: 35,message:"长度不能超过35"} ], @@ -89,7 +89,7 @@ export default { "bodgrp.blk.chgtxt":[ - {type: "string", required: true, message: "必输项"}, + {type: "string", required: false, message: "必输项"}, {max: 35,message:"长度不能超过35"} ], diff --git a/src/model/Botdcr/index.js b/src/model/Botdcr/index.js index 064f48d..0d1b732 100644 --- a/src/model/Botdcr/index.js +++ b/src/model/Botdcr/index.js @@ -2,173 +2,173 @@ import Api from "~/service/Api" import Pts from "../Common/Pts" import Pub from "../Public" -export default class Botdcr{ - constructor () { - this.data = { - - botdrrl1blk:"", - botdrrl2blk:"", - botcoll1blk:"", +export default class Botdcr { + constructor() { + this.data = { + + botdrrl1blk: "", + botdrrl2blk: "", + botcoll1blk: "", liaall: new Pub().data.Liaall, - bodgrp:{ - rec:{ - matpertyp:"", // Days/Months or Years for Maturity Period .bodgrp.rec.matpertyp - ownref:"", // Reference .bodgrp.rec.ownref - nam:"", // Name .bodgrp.rec.nam - doctypcod:"", // Collection Condition .bodgrp.rec.doctypcod - docsta:"", // Document Set Status .bodgrp.rec.docsta - matdat:"", // Maturity Date .bodgrp.rec.matdat - matpercnt:"", // Tenor Specification .bodgrp.rec.matpercnt - matperbeg:"", // Start of Maturity Period MATBEG .bodgrp.rec.matperbeg - rcvdat:"", // Order Date .bodgrp.rec.rcvdat - predat:"", // Presentation Date .bodgrp.rec.predat - chato:"", // Our Charges to .bodgrp.rec.chato - focflg:"", // Free of Payment .bodgrp.rec.focflg - waicolcod:"", // Protest Instructions .bodgrp.rec.waicolcod - wairmtcod:"", // Waive Remitting Bank Charges .bodgrp.rec.wairmtcod - othins:"", // Defer Payment until .bodgrp.rec.othins - lescom:"", // Warehouse/Insurance .bodgrp.rec.lescom - }, - cbs:{ - max:{ - cur:"", // Document Amount .bodgrp.cbs.max.cur - amt:"", // Document Amount .bodgrp.cbs.max.amt - }, - opn1:{ - cur:"", // Warehouse/Insurance .bodgrp.cbs.opn1.cur - amt:"", // Open Amount .bodgrp.cbs.opn1.amt - }, - }, - drr:{ - pts:new Pts().data, - namelc:"", // 名称 .bodgrp.drr.namelc - adrelc:"", // 地址 .bodgrp.drr.adrelc - dbfadrblkcn:"", // Chinese address .bodgrp.drr.dbfadrblkcn - }, - col:{ - pts:new Pts().data, - namelc:"", // 名称 .bodgrp.col.namelc - adrelc:"", // 地址 .bodgrp.col.adrelc - dbfadrblkcn:"", // Chinese address .bodgrp.col.dbfadrblkcn - }, - dre:{ - pts:new Pts().data, - namelc:"", // 名称 .bodgrp.dre.namelc - adrelc:"", // 地址 .bodgrp.dre.adrelc - dbfadrblkcn:"", // Chinese address .bodgrp.dre.dbfadrblkcn - }, - blk:{ - resrej:"", // Reason for Non-Payment/Non-Acceptance .bodgrp.blk.resrej - colins:"", // Collection Instructions .bodgrp.blk.colins - colinsflg:"", // Collection instructions modified .bodgrp.blk.colinsflg - dftins:"", // Draft Instructions .bodgrp.blk.dftins - proins:"", // Protest Instructions .bodgrp.blk.proins - othins:"", // Other Instructions .bodgrp.blk.othins - chgtxt:"", // Charges Text .bodgrp.blk.chgtxt - delins:"", // Delivery instructions .bodgrp.blk.delins - }, + bodgrp: { + rec: { + matpertyp: "", // Days/Months or Years for Maturity Period .bodgrp.rec.matpertyp + ownref: "", // Reference .bodgrp.rec.ownref + nam: "", // Name .bodgrp.rec.nam + doctypcod: "", // Collection Condition .bodgrp.rec.doctypcod + docsta: "", // Document Set Status .bodgrp.rec.docsta + matdat: "", // Maturity Date .bodgrp.rec.matdat + matpercnt: "", // Tenor Specification .bodgrp.rec.matpercnt + matperbeg: "", // Start of Maturity Period MATBEG .bodgrp.rec.matperbeg + rcvdat: "", // Order Date .bodgrp.rec.rcvdat + predat: "", // Presentation Date .bodgrp.rec.predat + chato: "", // Our Charges to .bodgrp.rec.chato + focflg: "", // Free of Payment .bodgrp.rec.focflg + waicolcod: "", // Protest Instructions .bodgrp.rec.waicolcod + wairmtcod: "", // Waive Remitting Bank Charges .bodgrp.rec.wairmtcod + othins: "", // Defer Payment until .bodgrp.rec.othins + lescom: "", // Warehouse/Insurance .bodgrp.rec.lescom + }, + cbs: { + max: { + cur: "", // Document Amount .bodgrp.cbs.max.cur + amt: "", // Document Amount .bodgrp.cbs.max.amt + }, + opn1: { + cur: "", // Warehouse/Insurance .bodgrp.cbs.opn1.cur + amt: "", // Open Amount .bodgrp.cbs.opn1.amt + }, + }, + drr: { + pts: new Pts().data, + namelc: "", // 名称 .bodgrp.drr.namelc + adrelc: "", // 地址 .bodgrp.drr.adrelc + dbfadrblkcn: "", // Chinese address .bodgrp.drr.dbfadrblkcn + }, + col: { + pts: new Pts().data, + namelc: "", // 名称 .bodgrp.col.namelc + adrelc: "", // 地址 .bodgrp.col.adrelc + dbfadrblkcn: "", // Chinese address .bodgrp.col.dbfadrblkcn + }, + dre: { + pts: new Pts().data, + namelc: "", // 名称 .bodgrp.dre.namelc + adrelc: "", // 地址 .bodgrp.dre.adrelc + dbfadrblkcn: "", // Chinese address .bodgrp.dre.dbfadrblkcn + }, + blk: { + resrej: "", // Reason for Non-Payment/Non-Acceptance .bodgrp.blk.resrej + colins: "", // Collection Instructions .bodgrp.blk.colins + colinsflg: "", // Collection instructions modified .bodgrp.blk.colinsflg + dftins: "", // Draft Instructions .bodgrp.blk.dftins + proins: "", // Protest Instructions .bodgrp.blk.proins + othins: "", // Other Instructions .bodgrp.blk.othins + chgtxt: "", // Charges Text .bodgrp.blk.chgtxt + delins: "", // Delivery instructions .bodgrp.blk.delins + }, + }, + botp: { + recget: { + sdamod: { + dadsnd: "", // Drag Drop Sender .botp.recget.sdamod.dadsnd + seainf: "", // .botp.recget.sdamod.seainf + }, + }, + matp: { + mattxtlab: "", // Label for MATTXT .botp.matp.mattxtlab + }, + docgrdm: { + docdsclab: "", // Label of document description .botp.docgrdm.docdsclab + docgrd: [], //docgrdm.docgrd + }, + drrp: { + ptsget: { + sdamod: { + seainf: "", // .botp.drrp.ptsget.sdamod.seainf + dadsnd: "", // Drag Drop Sender .botp.drrp.ptsget.sdamod.dadsnd + }, + }, + }, + colp: { + ptsget: { + sdamod: { + seainf: "", // .botp.colp.ptsget.sdamod.seainf + dadsnd: "", // Drag Drop Sender .botp.colp.ptsget.sdamod.dadsnd + }, + }, + }, + drep: { + ptsget: { + sdamod: { + seainf: "", // .botp.drep.ptsget.sdamod.seainf + dadsnd: "", // Drag Drop Sender .botp.drep.ptsget.sdamod.dadsnd }, - botp:{ - recget:{ - sdamod:{ - dadsnd:"", // Drag Drop Sender .botp.recget.sdamod.dadsnd - seainf:"", // .botp.recget.sdamod.seainf - }, - }, - matp:{ - mattxtlab:"", // Label for MATTXT .botp.matp.mattxtlab - }, - docgrdm:{ - docdsclab:"", // Label of document description .botp.docgrdm.docdsclab - docgrd:[], //docgrdm.docgrd - }, - drrp:{ - ptsget:{ - sdamod:{ - seainf:"", // .botp.drrp.ptsget.sdamod.seainf - dadsnd:"", // Drag Drop Sender .botp.drrp.ptsget.sdamod.dadsnd - }, - }, - }, - colp:{ - ptsget:{ - sdamod:{ - seainf:"", // .botp.colp.ptsget.sdamod.seainf - dadsnd:"", // Drag Drop Sender .botp.colp.ptsget.sdamod.dadsnd - }, - }, - }, - drep:{ - ptsget:{ - sdamod:{ - seainf:"", // .botp.drep.ptsget.sdamod.seainf - dadsnd:"", // Drag Drop Sender .botp.drep.ptsget.sdamod.dadsnd - }, - }, - }, - ptsaddp:{ - ptsaddg:[], // .botp.ptsaddp.ptsaddg - }, + }, + }, + ptsaddp: { + ptsaddg: [], // .botp.ptsaddp.ptsaddg + }, + }, + rejtypsel: "", // .rejtypsel + mtabut: { + clsflg: "", // Close Flag .mtabut.clsflg + coninf: { + oitinf: { + labinftxt: "", // Label for INFTXT .mtabut.coninf.oitinf.labinftxt + oit: { + inftxt: "", // Infotext .mtabut.coninf.oitinf.oit.inftxt + inflev: "", // Infotext Level .mtabut.coninf.oitinf.oit.inflev }, - rejtypsel:"", // .rejtypsel - mtabut:{ - clsflg:"", // Close Flag .mtabut.clsflg - coninf:{ - oitinf:{ - labinftxt:"", // Label for INFTXT .mtabut.coninf.oitinf.labinftxt - oit:{ - inftxt:"", // Infotext .mtabut.coninf.oitinf.oit.inftxt - inflev:"", // Infotext Level .mtabut.coninf.oitinf.oit.inflev - }, - }, - oitset:{ - labinftxt:"", // Label for INFTXT .mtabut.coninf.oitset.labinftxt - oit:{ - inftxt:"", // Infotext .mtabut.coninf.oitset.oit.inftxt - inflev:"", // Infotext Level .mtabut.coninf.oitset.oit.inflev - }, - }, - conexedat:"", // 执行日期 .mtabut.coninf.conexedat - usr:{ - extkey:"", // User ID .mtabut.coninf.usr.extkey - }, - }, + }, + oitset: { + labinftxt: "", // Label for INFTXT .mtabut.coninf.oitset.labinftxt + oit: { + inftxt: "", // Infotext .mtabut.coninf.oitset.oit.inftxt + inflev: "", // Infotext Level .mtabut.coninf.oitset.oit.inflev }, - // setmod:{ - // docamttyplab:"", // settled amount description as label .setmod.docamttyplab - // retmsg:"", // Label showing Retry overflow condition .setmod.retmsg - // ref:"", // our reference .setmod.ref - // doccur:"", // document currency .setmod.doccur - // docamt:"", // document amount .setmod.docamt - // dspflg:"", // Type of settlement .setmod.dspflg - // xreflg:"", // Recalculate Rates .setmod.xreflg - // setglg:{ - // labdspflg:"", // Label for Type of Settlement .setmod.setglg.labdspflg - // }, - // zmqacclab:"", // 主�'�号LABEL .setmod.zmqacclab - // zmqacc:"", // 自�'�区主�'�号 .setmod.zmqacc - // }, - // trnmod:{ - // trndoc:{ - // advlabel:"", // ADVLABEL .trnmod.trndoc.advlabel - // amdnam:"", // AMDNAM .trnmod.trndoc.amdnam - // advdoc:"", // 国内证通知书 .trnmod.trndoc.advdoc - // advnam:"", // 国内证落款 .trnmod.trndoc.advnam - // amdapl:"", // 修改申请人名称 .trnmod.trndoc.amdapl - // doclbl:"", // Lable for CONDOCSTM .trnmod.trndoc.doclbl - // doctrestm:"", // Document tree .trnmod.trndoc.doctrestm - // shwinc:"", // Show Incoming Messages .trnmod.trndoc.shwinc - // shwout:"", // Show Outgoing Messages .trnmod.trndoc.shwout - // condocstm:"", // Connected Documents .trnmod.trndoc.condocstm - // rcvatt:{ - // seainf:"", // .trnmod.trndoc.rcvatt.seainf - // }, - // filrecv:"", // File Receiver .trnmod.trndoc.filrecv - // }, - // }, - setmod: new Pub().data.Setmod, - trnmod: new Pub().data.Trnmod, - pageId: "" // ctx的key - } - } + }, + conexedat: "", // 执行日期 .mtabut.coninf.conexedat + usr: { + extkey: "", // User ID .mtabut.coninf.usr.extkey + }, + }, + }, + // setmod:{ + // docamttyplab:"", // settled amount description as label .setmod.docamttyplab + // retmsg:"", // Label showing Retry overflow condition .setmod.retmsg + // ref:"", // our reference .setmod.ref + // doccur:"", // document currency .setmod.doccur + // docamt:"", // document amount .setmod.docamt + // dspflg:"", // Type of settlement .setmod.dspflg + // xreflg:"", // Recalculate Rates .setmod.xreflg + // setglg:{ + // labdspflg:"", // Label for Type of Settlement .setmod.setglg.labdspflg + // }, + // zmqacclab:"", // 主�'�号LABEL .setmod.zmqacclab + // zmqacc:"", // 自�'�区主�'�号 .setmod.zmqacc + // }, + // trnmod:{ + // trndoc:{ + // advlabel:"", // ADVLABEL .trnmod.trndoc.advlabel + // amdnam:"", // AMDNAM .trnmod.trndoc.amdnam + // advdoc:"", // 国内证通知书 .trnmod.trndoc.advdoc + // advnam:"", // 国内证落款 .trnmod.trndoc.advnam + // amdapl:"", // 修改申请人名称 .trnmod.trndoc.amdapl + // doclbl:"", // Lable for CONDOCSTM .trnmod.trndoc.doclbl + // doctrestm:"", // Document tree .trnmod.trndoc.doctrestm + // shwinc:"", // Show Incoming Messages .trnmod.trndoc.shwinc + // shwout:"", // Show Outgoing Messages .trnmod.trndoc.shwout + // condocstm:"", // Connected Documents .trnmod.trndoc.condocstm + // rcvatt:{ + // seainf:"", // .trnmod.trndoc.rcvatt.seainf + // }, + // filrecv:"", // File Receiver .trnmod.trndoc.filrecv + // }, + // }, + setmod: new Pub().data.Setmod, + trnmod: new Pub().data.Trnmod, + pageId: "" // ctx的key + } + } } \ No newline at end of file diff --git a/src/model/Botrad/Pattern.js b/src/model/Botrad/Pattern.js index 31b098e..180c75e 100644 --- a/src/model/Botrad/Pattern.js +++ b/src/model/Botrad/Pattern.js @@ -17,7 +17,7 @@ export default { ], "bodgrp.cbs.max.amt":[ - {type: "number", required: false, message: "必输项"}, + {type: "string", required: false, message: "必输项"}, {max: 18,message:"整数位不能超过14位"}, {pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" } ], @@ -27,7 +27,7 @@ export default { ], "bodgrp.cbs.opn1.amt":[ - {type: "number", required: false, message: "必输项"}, + {type: "string", required: false, message: "必输项"}, {max: 18,message:"整数位不能超过14位"}, {pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" } ], @@ -53,8 +53,7 @@ export default { {type: "date", required: false, message: "输入正确的日期"} ], "bodgrp.rec.matpercnt":[ - {type: "string", required: false, message: "必输项"}, - {max: 3,message:"长度不能超过3"} + {type: "number", required: false, message: "必输项"}, ], "bodgrp.dre.pts.ref":[ @@ -73,7 +72,7 @@ export default { {type: "date", required: false, message: "输入正确的日期"} ], "bodgrp.blk.colinssnm":[ - {type: "string", required: true, message: "必输项"}, + {type: "string", required: false, message: "必输项"}, {max: 60,message:"长度不能超过60"} ], diff --git a/src/model/Botrad/index.js b/src/model/Botrad/index.js index 7105eab..05f6d6f 100644 --- a/src/model/Botrad/index.js +++ b/src/model/Botrad/index.js @@ -1,147 +1,177 @@ import Api from "~/service/Api" import Pts from "../Common/Pts" +import Pub from "../Public" -export default class Botrad{ - constructor () { - this.data = { - bodgrp:{ - rec:{ - matpertyp:"", // Days/Months or Years for Maturity Period .bodgrp.rec.matpertyp - ownref:"", // Reference .bodgrp.rec.ownref - nam:"", // Name .bodgrp.rec.nam - doctypcod:"", // Collection Condition .bodgrp.rec.doctypcod - docsta:"", // Document Set Status .bodgrp.rec.docsta - matdat:"", // Maturity Date .bodgrp.rec.matdat - matpercnt:"", // Tenor Specification .bodgrp.rec.matpercnt - matperbeg:"", // Starting from .bodgrp.rec.matperbeg - rcvdat:"", // Order Date .bodgrp.rec.rcvdat - predat:"", // Presentation Date .bodgrp.rec.predat - trpdoctyp:"", // Transport Doc. Type .bodgrp.rec.trpdoctyp - trpdocnum:"", // Transport Doc. Ref. .bodgrp.rec.trpdocnum - tradat:"", // Document Dated .bodgrp.rec.tradat - tramod:"", // Mode of Transport .bodgrp.rec.tramod - shpfro:"", // Shipment from .bodgrp.rec.shpfro - shpto:"", // For Transportation to .bodgrp.rec.shpto - chato:"", // Our Charges to .bodgrp.rec.chato - focflg:"", // Free of Payment .bodgrp.rec.focflg - waicolcod:"", // Protest Instructions .bodgrp.rec.waicolcod - wairmtcod:"", // Waive Remitting Bank Charges .bodgrp.rec.wairmtcod - othins:"", // Defer Payment until .bodgrp.rec.othins - lescom:"", // Warehouse/Insurance .bodgrp.rec.lescom - dircolflg:"", // Direct Collection .bodgrp.rec.dircolflg - resflg:"", // Reservated Contract .bodgrp.rec.resflg - shpdat:"", // Shipment date .bodgrp.rec.shpdat - advdat:"", // Dispatched on .bodgrp.rec.advdat - stacty:"", // Country Code Risk Country! .bodgrp.rec.stacty - stagod:"", // Goods Code .bodgrp.rec.stagod - invtyp:"", // Maturity Date .bodgrp.rec.invtyp - paydoctyp:"", // Financial Document .bodgrp.rec.paydoctyp - paydocnum:"", // Document Number .bodgrp.rec.paydocnum - issdat:"", // Issued on .bodgrp.rec.issdat - ccdndrflg:"", // Truncation - Physical Document Kept w OWN .bodgrp.rec.ccdndrflg - ccdpurflg:"", // Payment Under Reserve .bodgrp.rec.ccdpurflg - }, - cbs:{ - max:{ - cur:"", // Document Amount .bodgrp.cbs.max.cur - amt:"", // Document Amount .bodgrp.cbs.max.amt - }, - opn1:{ - cur:"", // Open Amount .bodgrp.cbs.opn1.cur - amt:"", // Open Amount .bodgrp.cbs.opn1.amt - }, - }, - drr:{ - pts:new Pts().data, - namelc:"", // 名称 .bodgrp.drr.namelc - adrelc:"", // 地址 .bodgrp.drr.adrelc - dbfadrblkcn:"", // Chinese address .bodgrp.drr.dbfadrblkcn - }, - col:{ - pts:new Pts().data, - namelc:"", // 名称 .bodgrp.col.namelc - adrelc:"", // 地址 .bodgrp.col.adrelc - dbfadrblkcn:"", // Chinese address .bodgrp.col.dbfadrblkcn - }, - dre:{ - pts:new Pts().data, - namelc:"", // 名称 .bodgrp.dre.namelc - adrelc:"", // 地址 .bodgrp.dre.adrelc - dbfadrblkcn:"", // Chinese address .bodgrp.dre.dbfadrblkcn - }, - blk:{ - colinssnm:"", // Instructions for Second Mail .bodgrp.blk.colinssnm - vesselnam:"", // Vessel Name .bodgrp.blk.vesselnam - goddes:"", // Description of Goods .bodgrp.blk.goddes - colins:"", // Collection Instructions .bodgrp.blk.colins - colinsflg:"", // Collection instructions modified .bodgrp.blk.colinsflg - dftins:"", // Draft Instructions .bodgrp.blk.dftins - proins:"", // Protest Instructions .bodgrp.blk.proins - othins:"", // Other Instructions .bodgrp.blk.othins - chgtxt:"", // Charges Text .bodgrp.blk.chgtxt - delins:"", // Delivery instructions .bodgrp.blk.delins - bogdet:"", // Tenor Details Text .bodgrp.blk.bogdet - cctinsrcv:"", // Instructions Received .bodgrp.blk.cctinsrcv - cctinscol:"", // Collection Instruction .bodgrp.blk.cctinscol - intins:"", // Interest Instructions .bodgrp.blk.intins - setinsbo:"", // Settlement insrtrctions .bodgrp.blk.setinsbo - agtaut:"", // Authority of Agent .bodgrp.blk.agtaut - }, +export default class Botrad { + constructor() { + this.data = { + botdrrl1blk: "", + botdrrl2blk: "", + botcoll1blk: "", + liaall: new Pub().data.Liaall, + setmod: new Pub().data.Setmod, + trnmod: new Pub().data.Trnmod, + + mtabut: { + clsflg: "", // Close Flag .mtabut.clsflg + coninf: { + oitinf: { + labinftxt: "", // Label for INFTXT .mtabut.coninf.oitinf.labinftxt + oit: { + inftxt: "", // Infotext .mtabut.coninf.oitinf.oit.inftxt + inflev: "", // Infotext Level .mtabut.coninf.oitinf.oit.inflev + }, + }, + oitset: { + labinftxt: "", // Label for INFTXT .mtabut.coninf.oitset.labinftxt + oit: { + inftxt: "", // Infotext .mtabut.coninf.oitset.oit.inftxt + inflev: "", // Infotext Level .mtabut.coninf.oitset.oit.inflev + }, + }, + conexedat: "", // 执行日期 .mtabut.coninf.conexedat + usr: { + extkey: "", // User ID .mtabut.coninf.usr.extkey + }, + }, + }, + + bodgrp: { + rec: { + matpertyp: "", // Days/Months or Years for Maturity Period .bodgrp.rec.matpertyp + ownref: "", // Reference .bodgrp.rec.ownref + nam: "", // Name .bodgrp.rec.nam + doctypcod: "", // Collection Condition .bodgrp.rec.doctypcod + docsta: "", // Document Set Status .bodgrp.rec.docsta + matdat: "", // Maturity Date .bodgrp.rec.matdat + matpercnt: "", // Tenor Specification .bodgrp.rec.matpercnt + matperbeg: "", // Starting from .bodgrp.rec.matperbeg + rcvdat: "", // Order Date .bodgrp.rec.rcvdat + predat: "", // Presentation Date .bodgrp.rec.predat + trpdoctyp: "", // Transport Doc. Type .bodgrp.rec.trpdoctyp + trpdocnum: "", // Transport Doc. Ref. .bodgrp.rec.trpdocnum + tradat: "", // Document Dated .bodgrp.rec.tradat + tramod: "", // Mode of Transport .bodgrp.rec.tramod + shpfro: "", // Shipment from .bodgrp.rec.shpfro + shpto: "", // For Transportation to .bodgrp.rec.shpto + chato: "", // Our Charges to .bodgrp.rec.chato + focflg: "", // Free of Payment .bodgrp.rec.focflg + waicolcod: "", // Protest Instructions .bodgrp.rec.waicolcod + wairmtcod: "", // Waive Remitting Bank Charges .bodgrp.rec.wairmtcod + othins: "", // Defer Payment until .bodgrp.rec.othins + lescom: "", // Warehouse/Insurance .bodgrp.rec.lescom + dircolflg: "", // Direct Collection .bodgrp.rec.dircolflg + resflg: "", // Reservated Contract .bodgrp.rec.resflg + shpdat: "", // Shipment date .bodgrp.rec.shpdat + advdat: "", // Dispatched on .bodgrp.rec.advdat + stacty: "", // Country Code Risk Country! .bodgrp.rec.stacty + stagod: "", // Goods Code .bodgrp.rec.stagod + invtyp: "", // Maturity Date .bodgrp.rec.invtyp + paydoctyp: "", // Financial Document .bodgrp.rec.paydoctyp + paydocnum: "", // Document Number .bodgrp.rec.paydocnum + issdat: "", // Issued on .bodgrp.rec.issdat + ccdndrflg: "", // Truncation - Physical Document Kept w OWN .bodgrp.rec.ccdndrflg + ccdpurflg: "", // Payment Under Reserve .bodgrp.rec.ccdpurflg + }, + cbs: { + max: { + cur: "", // Document Amount .bodgrp.cbs.max.cur + amt: "", // Document Amount .bodgrp.cbs.max.amt + }, + opn1: { + cur: "", // Open Amount .bodgrp.cbs.opn1.cur + amt: "", // Open Amount .bodgrp.cbs.opn1.amt + }, + }, + drr: { + pts: new Pts().data, + namelc: "", // 名称 .bodgrp.drr.namelc + adrelc: "", // 地址 .bodgrp.drr.adrelc + dbfadrblkcn: "", // Chinese address .bodgrp.drr.dbfadrblkcn + }, + col: { + pts: new Pts().data, + namelc: "", // 名称 .bodgrp.col.namelc + adrelc: "", // 地址 .bodgrp.col.adrelc + dbfadrblkcn: "", // Chinese address .bodgrp.col.dbfadrblkcn + }, + dre: { + pts: new Pts().data, + namelc: "", // 名称 .bodgrp.dre.namelc + adrelc: "", // 地址 .bodgrp.dre.adrelc + dbfadrblkcn: "", // Chinese address .bodgrp.dre.dbfadrblkcn + }, + blk: { + colinssnm: "", // Instructions for Second Mail .bodgrp.blk.colinssnm + vesselnam: "", // Vessel Name .bodgrp.blk.vesselnam + goddes: "", // Description of Goods .bodgrp.blk.goddes + colins: "", // Collection Instructions .bodgrp.blk.colins + colinsflg: "", // Collection instructions modified .bodgrp.blk.colinsflg + dftins: "", // Draft Instructions .bodgrp.blk.dftins + proins: "", // Protest Instructions .bodgrp.blk.proins + othins: "", // Other Instructions .bodgrp.blk.othins + chgtxt: "", // Charges Text .bodgrp.blk.chgtxt + delins: "", // Delivery instructions .bodgrp.blk.delins + bogdet: "", // Tenor Details Text .bodgrp.blk.bogdet + cctinsrcv: "", // Instructions Received .bodgrp.blk.cctinsrcv + cctinscol: "", // Collection Instruction .bodgrp.blk.cctinscol + intins: "", // Interest Instructions .bodgrp.blk.intins + setinsbo: "", // Settlement insrtrctions .bodgrp.blk.setinsbo + agtaut: "", // Authority of Agent .bodgrp.blk.agtaut + }, + }, + botp: { + recget: { + sdamod: { + dadsnd: "", // Drag Drop Sender .botp.recget.sdamod.dadsnd + seainf: "", // .botp.recget.sdamod.seainf + }, + }, + matp: { + mattxtlab: "", // Label for MATTXT .botp.matp.mattxtlab + }, + docgrdm: { + docgrd:"", + docdsclab: "", // Label of document description .botp.docgrdm.docdsclab + }, + usr: { + extkey: "", // Responsible User .botp.usr.extkey + }, + usrget: { + sdamod: { + seainf: "", // .botp.usrget.sdamod.seainf + }, + }, + drrp: { + ptsget: { + sdamod: { + seainf: "", // .botp.drrp.ptsget.sdamod.seainf + dadsnd: "", // Drag Drop Sender .botp.drrp.ptsget.sdamod.dadsnd + }, + }, + }, + colp: { + ptsget: { + sdamod: { + seainf: "", // .botp.colp.ptsget.sdamod.seainf + dadsnd: "", // Drag Drop Sender .botp.colp.ptsget.sdamod.dadsnd }, - botp:{ - recget:{ - sdamod:{ - dadsnd:"", // Drag Drop Sender .botp.recget.sdamod.dadsnd - seainf:"", // .botp.recget.sdamod.seainf - }, - }, - matp:{ - mattxtlab:"", // Label for MATTXT .botp.matp.mattxtlab - }, - docgrdm:{ - docdsclab:"", // Label of document description .botp.docgrdm.docdsclab - }, - usr:{ - extkey:"", // Responsible User .botp.usr.extkey - }, - usrget:{ - sdamod:{ - seainf:"", // .botp.usrget.sdamod.seainf - }, - }, - drrp:{ - ptsget:{ - sdamod:{ - seainf:"", // .botp.drrp.ptsget.sdamod.seainf - dadsnd:"", // Drag Drop Sender .botp.drrp.ptsget.sdamod.dadsnd - }, - }, - }, - colp:{ - ptsget:{ - sdamod:{ - seainf:"", // .botp.colp.ptsget.sdamod.seainf - dadsnd:"", // Drag Drop Sender .botp.colp.ptsget.sdamod.dadsnd - }, - }, - }, - drep:{ - ptsget:{ - sdamod:{ - seainf:"", // .botp.drep.ptsget.sdamod.seainf - dadsnd:"", // Drag Drop Sender .botp.drep.ptsget.sdamod.dadsnd - }, - }, - }, - ptsaddp:{ - ptsaddg:[], // .botp.ptsaddp.ptsaddg - }, + }, + }, + drep: { + ptsget: { + sdamod: { + seainf: "", // .botp.drep.ptsget.sdamod.seainf + dadsnd: "", // Drag Drop Sender .botp.drep.ptsget.sdamod.dadsnd }, - oridre:"", // Original Documents Passed to Drawee .oridre - botcoll1blk:"", // XMLPanel botcoll1的内置block .botcoll1blk - botdrrl1blk:"", // XMLPanel botdrrl1的内置block .botdrrl1blk - botcoll2blk:"", // XMLPanel botcoll2的内置block .botcoll2blk - pageId: "" // ctx的key - } - } + }, + }, + ptsaddp: { + ptsaddg: [], // .botp.ptsaddp.ptsaddg + }, + }, + oridre: "", // Original Documents Passed to Drawee .oridre + pageId: "" // ctx的key + } + } } \ No newline at end of file diff --git a/src/model/Detopn/Pattern.js b/src/model/Detopn/Pattern.js index a216e9c..75adccf 100644 --- a/src/model/Detopn/Pattern.js +++ b/src/model/Detopn/Pattern.js @@ -335,7 +335,7 @@ export default { ], "dedgrp.rec.fqtime":[ {type: "string", required: false, message: "必输项"}, - {max: 35,message:"长度不能超过35"} + {max: 140,message:"长度不能超过140"} ], "dedgrp.rec.shpto":[ {type: "string", required: false, message: "必输项"}, @@ -345,7 +345,7 @@ export default { "dedgrp.rec.sdsrfs":[ {type: "string", required: false, message: "必输项"}, - {max: 35,message:"长度不能超过35"} + {max: 140,message:"长度不能超过140"} ], "dedgrp.rec.shppro":[ {type: "string", required: false, message: "必输项"}, diff --git a/src/model/Ditdav/Pattern.js b/src/model/Ditdav/Pattern.js index ade1bcb..c856adf 100644 --- a/src/model/Ditdav/Pattern.js +++ b/src/model/Ditdav/Pattern.js @@ -17,7 +17,7 @@ export default { ], "didgrp.cbs.nom1.amt":[ - {type: "number", required: false, message: "必输项"}, + {type: "string", required: false, message: "必输项"}, {max: 18,message:"整数位不能超过14位"}, {pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" } ], @@ -30,7 +30,7 @@ export default { {max: 3,message:"长度不能超过3"} ], "didgrp.cbs.opn1.amt":[ - {type: "number", required: false, message: "必输项"}, + {type: "string", required: false, message: "必输项"}, {max: 18,message:"整数位不能超过14位"}, {pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" } ], @@ -53,7 +53,7 @@ export default { ], "didgrp.rec.shpdat":[ - {type: "date", required: false, message: "输入正确的日期"} + //{type: "date", required: false, message: "输入正确的日期"} ], "didgrp.rec.opndat":[ {type: "date", required: false, message: "输入正确的日期"} @@ -93,10 +93,10 @@ export default { "bddgrp.rec.advdat":[ - {type: "date", required: false, message: "输入正确的日期"} + //{type: "date", required: false, message: "输入正确的日期"} ], "bddgrp.rec.disdat":[ - {type: "date", required: false, message: "输入正确的日期"} + //{type: "date", required: false, message: "输入正确的日期"} ], "bddgrp.prb.pts.ref":[ {type: "string", required: false, message: "必输项"}, @@ -130,7 +130,7 @@ export default { {max: 35,message:"长度不能超过35"} ], "bddgrp.prb.adrelc":[ - {type: "string", required: true, message: "必输项"}, + //{type: "string", required: true, message: "必输项"}, {max: 35,message:"长度不能超过35"} ], "setmod.ref":[ @@ -156,18 +156,18 @@ export default { "mtabut.coninf.oitinf.oit.inftxt":[ - {type: "string", required: true, message: "必输项"}, - {max: 60,message:"长度不能超过60"} + //{type: "string", required: true, message: "必输项"}, + //{max: 60,message:"长度不能超过60"} ], "mtabut.coninf.oitset.oit.inftxt":[ - {type: "string", required: true, message: "必输项"}, - {max: 60,message:"长度不能超过60"} + //{type: "string", required: true, message: "必输项"}, + //{max: 60,message:"长度不能超过60"} ], "mtabut.coninf.conexedat":[ - {type: "date", required: false, message: "输入正确的日期"} + //{type: "date", required: false, message: "输入正确的日期"} ], "mtabut.coninf.usr.extkey":[ {type: "string", required: false, message: "必输项"}, @@ -250,7 +250,7 @@ export default { ], "liaall.limmod.comamt":[ - {type: "number", required: false, message: "必输项"}, + {type: "string", required: false, message: "必输项"}, {max: 18,message:"整数位不能超过14位"}, {pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" } ], @@ -263,7 +263,7 @@ export default { {max: 40,message:"长度不能超过40"} ], "liaall.limmod.ccvamt":[ - {type: "number", required: false, message: "必输项"}, + {type: "string", required: false, message: "必输项"}, {max: 18,message:"整数位不能超过14位"}, {pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" } ], @@ -286,22 +286,22 @@ export default { {max: 3,message:"长度不能超过3"} ], "bddgrp.cbs.max.amt":[ - {type: "number", required: false, message: "必输项"}, + {type: "string", required: false, message: "必输项"}, {max: 18,message:"整数位不能超过14位"}, {pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" } ], "bddgrp.cbs.max2.amt":[ - {type: "number", required: false, message: "必输项"}, + {type: "string", required: false, message: "必输项"}, {max: 18,message:"整数位不能超过14位"}, {pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" } ], "bddgrp.blk.chaded":[ - {type: "string", required: true, message: "必输项"}, + //{type: "string", required: true, message: "必输项"}, {max: 35,message:"长度不能超过35"} ], "bddgrp.blk.chaadd":[ - {type: "string", required: true, message: "必输项"}, + //{type: "string", required: true, message: "必输项"}, {max: 35,message:"长度不能超过35"} ], "bddgrp.rec.totcur":[ @@ -309,7 +309,7 @@ export default { {max: 3,message:"长度不能超过3"} ], "bddgrp.rec.totamt":[ - {type: "number", required: false, message: "必输项"}, + {type: "string", required: false, message: "必输项"}, {max: 18,message:"整数位不能超过14位"}, {pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" } ], @@ -327,19 +327,19 @@ export default { ], "bddgrp.acb.namelc":[ - {type: "string", required: true, message: "必输项"}, + //{type: "string", required: true, message: "必输项"}, {max: 35,message:"长度不能超过35"} ], "bddgrp.acb.pts.adrblk":[ - {type: "string", required: true, message: "必输项"}, + //{type: "string", required: true, message: "必输项"}, {max: 35,message:"长度不能超过35"} ], "bddgrp.acb.dbfadrblkcn":[ - {type: "string", required: true, message: "必输项"}, + //{type: "string", required: true, message: "必输项"}, {max: 35,message:"长度不能超过35"} ], "bddgrp.acb.adrelc":[ - {type: "string", required: true, message: "必输项"}, + //{type: "string", required: true, message: "必输项"}, {max: 35,message:"长度不能超过35"} ], "bddgrp.blk.docdis":[ @@ -348,7 +348,7 @@ export default { ], "bddgrp.blk.nartxt77a":[ - {type: "string", required: true, message: "必输项"}, + //{type: "string", required: true, message: "必输项"}, {max: 35,message:"长度不能超过35"} ], "bdtp.rmbp.ptsget.sdamod.dadsnd":[ @@ -365,19 +365,19 @@ export default { ], "bddgrp.rmb.namelc":[ - {type: "string", required: true, message: "必输项"}, + //{type: "string", required: true, message: "必输项"}, {max: 35,message:"长度不能超过35"} ], "bddgrp.rmb.pts.adrblk":[ - {type: "string", required: true, message: "必输项"}, + //{type: "string", required: true, message: "必输项"}, {max: 35,message:"长度不能超过35"} ], "bddgrp.rmb.dbfadrblkcn":[ - {type: "string", required: true, message: "必输项"}, + //{type: "string", required: true, message: "必输项"}, {max: 35,message:"长度不能超过35"} ], "bddgrp.rmb.adrelc":[ - {type: "string", required: true, message: "必输项"}, + //{type: "string", required: true, message: "必输项"}, {max: 35,message:"长度不能超过35"} ], "bdtp.bebp.ptsget.sdamod.dadsnd":[ @@ -394,22 +394,22 @@ export default { ], "bddgrp.beb.namelc":[ - {type: "string", required: true, message: "必输项"}, + //{type: "string", required: true, message: "必输项"}, {max: 35,message:"长度不能超过35"} ], "bddgrp.beb.pts.adrblk":[ - {type: "string", required: true, message: "必输项"}, + //{type: "string", required: true, message: "必输项"}, {max: 35,message:"长度不能超过35"} ], "bddgrp.beb.dbfadrblkcn":[ - {type: "string", required: true, message: "必输项"}, + //{type: "string", required: true, message: "必输项"}, {max: 35,message:"长度不能超过35"} ], "bddgrp.beb.adrelc":[ - {type: "string", required: true, message: "必输项"}, + //{type: "string", required: true, message: "必输项"}, {max: 35,message:"长度不能超过35"} ], "bddgrp.rec.totdat":[ - {type: "date", required: false, message: "输入正确的日期"} + //{type: "date", required: false, message: "输入正确的日期"} ], } \ No newline at end of file diff --git a/src/model/Ditdla/Pattern.js b/src/model/Ditdla/Pattern.js index 59c9c78..7fc693e 100644 --- a/src/model/Ditdla/Pattern.js +++ b/src/model/Ditdla/Pattern.js @@ -25,7 +25,7 @@ export default { "didgrp.cbs.opn1.amt": [ { type: "string", required: false, message: "必输项" }, { max: 18, message: "整数位不能超过14位" }, - { pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" } + //{ pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" } ], "didgrp.avbnam": [ { type: "string", required: false, message: "必输项" }, @@ -58,7 +58,7 @@ export default { { type: "string", required: false, message: "输入正确的日期" } ], "didgrp.rec.expplc": [ - { type: "string", required: true, message: "必输项" }, + //{ type: "string", required: true, message: "必输项" }, { max: 35, message: "长度不能超过35" } ], "didgrp.adv.pts.nam": [ @@ -219,7 +219,7 @@ export default { { max: 3, message: "长度不能超过3" } ], "didgrp.apl.namelc": [ - { type: "string", required: true, message: "必输项" }, + //{ type: "string", required: true, message: "必输项" }, { max: 35, message: "长度不能超过35" } ], "didgrp.apl.pts.adrblk": [ @@ -235,7 +235,7 @@ export default { { max: 76, message: "长度不能超过76" } ], "didgrp.apl.adrelc": [ - { type: "string", required: true, message: "必输项" }, + //{ type: "string", required: true, message: "必输项" }, { max: 35, message: "长度不能超过35" } ], "didgrp.rec.nomtop": [ @@ -284,7 +284,7 @@ export default { { max: 3, message: "长度不能超过3" } ], "didgrp.ben.namelc": [ - { type: "string", required: true, message: "必输项" }, + //{ type: "string", required: true, message: "必输项" }, { max: 35, message: "长度不能超过35" } ], "didgrp.ben.pts.adrblk": [ @@ -296,7 +296,7 @@ export default { { max: 35, message: "长度不能超过35" } ], "didgrp.ben.adrelc": [ - { type: "string", required: true, message: "必输项" }, + //{ type: "string", required: true, message: "必输项" }, { max: 35, message: "长度不能超过35" } ], @@ -346,7 +346,7 @@ export default { { max: 35, message: "长度不能超过35" } ], "didgrp.blk.preper": [ - { type: "string", required: true, message: "必输项" }, + //{ type: "string", required: true, message: "必输项" }, { max: 35, message: "长度不能超过35" } ], "didgrp.rec.shpfro": [ diff --git a/src/model/Letnot/Pattern.js b/src/model/Letnot/Pattern.js index 888cabb..6cdb4dd 100644 --- a/src/model/Letnot/Pattern.js +++ b/src/model/Letnot/Pattern.js @@ -207,7 +207,7 @@ export default { "ledgrp.blk.mixdet":[ {type: "string", required: true, message: "必输项"}, - {max: 35,message:"长度不能超过35"} + {max: 140,message:"长度不能超过140"} ], "letp.avbp.ptsget.sdamod.dadsnd":[ {type: "string", required: false, message: "必输项"}, @@ -228,7 +228,7 @@ export default { ], "ledgrp.blk.avbwthtxt":[ {type: "string", required: true, message: "必输项"}, - {max: 35,message:"长度不能超过35"} + {max: 140,message:"长度不能超过140"} ], "ledgrp.avb.pts.adrblk":[ {type: "string", required: true, message: "必输项"}, @@ -247,8 +247,8 @@ export default { {max: 35,message:"长度不能超过35"} ], "ledgrp.rec.prepers18":[ - {type: "string", required: false, message: "必输项"}, - {max: 3,message:"长度不能超过3"} + {type: "number", required: false, message: "必输项"}, + {type: "number",max: 999,message:"长度不能超过3"} ], @@ -259,7 +259,7 @@ export default { "ledgrp.blk.defdet":[ {type: "string", required: true, message: "必输项"}, - {max: 35,message:"长度不能超过35"} + {max: 140,message:"长度不能超过140"} ], "ledgrp.blk.feetxt":[ {type: "string", required: true, message: "必输项"}, @@ -268,7 +268,7 @@ export default { "ledgrp.blk.dftat":[ {type: "string", required: true, message: "必输项"}, - {max: 35,message:"长度不能超过35"} + {max: 105,message:"长度不能超过105"} ], "letp.drwp.ptsget.sdamod.dadsnd":[ @@ -307,8 +307,8 @@ export default { {max: 65,message:"长度不能超过65"} ], "ledgrp.rec.tenmaxday":[ - {type: "string", required: false, message: "必输项"}, - {max: 4,message:"长度不能超过4"} + {type: "number", required: false, message: "必输项"}, + {type: "number",max: 9999,message:"长度不能超过4"} ], "ledgrp.rec.porloa":[ {type: "string", required: true, message: "必输项"}, @@ -324,7 +324,7 @@ export default { ], "ledgrp.blk.shpper":[ {type: "string", required: true, message: "必输项"}, - {max: 65,message:"长度不能超过65"} + {max: 390,message:"长度不能超过390"} ], "ledgrp.adv.pts.ref":[ {type: "string", required: false, message: "必输项"}, @@ -484,7 +484,7 @@ export default { "ledgrp.blk.lcrgod":[ {type: "string", required: true, message: "必输项"}, - {max: 65,message:"长度不能超过65"} + {max: 5200,message:"长度不能超过5200"} ], @@ -495,7 +495,7 @@ export default { "ledgrp.blk.adlcnd":[ {type: "string", required: true, message: "必输项"}, - {max: 65,message:"长度不能超过65"} + {max: 52000,message:"长度不能超过52000"} ], @@ -503,7 +503,7 @@ export default { "ledgrp.blk.insbnk":[ {type: "string", required: true, message: "必输项"}, - {max: 65,message:"长度不能超过65"} + {max: 780,message:"长度不能超过780"} ], "setmod.ref":[ @@ -587,12 +587,12 @@ export default { ], "ledgrp.blk.spcrcb":[ {type: "string", required: true, message: "必输项"}, - {max: 65,message:"长度不能超过65"} + {max: 52000,message:"长度不能超过52000"} ], "ledgrp.blk.spcben":[ {type: "string", required: true, message: "必输项"}, - {max: 65,message:"长度不能超过65"} + {max: 52000,message:"长度不能超过52000"} ], } \ No newline at end of file diff --git a/src/views/Business/Botdav/Cnyp.vue b/src/views/Business/Botdav/Cnyp.vue index 9ee8e8a..c44a681 100644 --- a/src/views/Business/Botdav/Cnyp.vue +++ b/src/views/Business/Botdav/Cnyp.vue @@ -26,9 +26,9 @@ </c-col> <c-col :span="24"> - <el-form-item label="是否报送跨境人民币2106表" label-width="30%" prop="cnybop.libflg"> + <el-form-item label="是否报送跨境人民币2106表" label-width="30%" prop="cnybop.libflg" > <c-select v-model="model.cnybop.libflg" style="width:100%" placeholder="请选择是否报送跨境人民币2106表" - :code="codes.libflg" :disabled="true"> + :code="codes.libflg" :disabled="model.bodgrp.cbs.max.cur != 'CNY'"> </c-select> </el-form-item> </c-col> diff --git a/src/views/Business/Botdav/Inst.vue b/src/views/Business/Botdav/Inst.vue index a19c24d..4f170eb 100644 --- a/src/views/Business/Botdav/Inst.vue +++ b/src/views/Business/Botdav/Inst.vue @@ -193,7 +193,7 @@ <el-form-item label="Changes Condition" prop="bodgrp.rec.chato" style="padding-top:15px"> <c-select v-model="model.bodgrp.rec.chato" style="width:100%" placeholder="请选择Our Charges to" - :code="codes.chato"> + :code="codes.chadet"> </c-select> @@ -309,7 +309,7 @@ <c-col :span="12"> <el-form-item label="less comm" prop="bodgrp.cbs.opn1.cur" style="padding-top:15px"> - <c-select v-model="model.bodgrp.cbs.opn1.cur" style="width: %" placeholder="请选择Document Amount" + <c-select v-model="model.bodgrp.cbs.opn1.cur" style="width: %" placeholder="请选择Document Amount" :disabled="true" :code="codes.cur"> </c-select> diff --git a/src/views/Business/Botdav/Ovwp.vue b/src/views/Business/Botdav/Ovwp.vue index e4dcff7..984d99a 100644 --- a/src/views/Business/Botdav/Ovwp.vue +++ b/src/views/Business/Botdav/Ovwp.vue @@ -122,7 +122,7 @@ <c-col :span="12"> <el-form-item label="Tenor Specification" prop="bodgrp.rec.matpercnt"> - <c-input v-model="model.bodgrp.rec.matpercnt" placeholder="请输入Tenor Specification" + <c-input v-model.number="model.bodgrp.rec.matpercnt" placeholder="请输入Tenor Specification" onkeyup="value=value.replace(/[^\d]/g,' ')" :disabled="model.bodgrp.rec.doctypcod === 'P'"></c-input> </el-form-item> </c-col> diff --git a/src/views/Business/Botdcr/Botdcrp1.vue b/src/views/Business/Botdcr/Botdcrp1.vue index 50d57c0..80d6b77 100644 --- a/src/views/Business/Botdcr/Botdcrp1.vue +++ b/src/views/Business/Botdcr/Botdcrp1.vue @@ -187,7 +187,7 @@ </template> </el-table-column> - <el-table-column label="2st" width="auto" prop="cmail2"> + <el-table-column label="2nd" width="auto" prop="cmail2"> <template slot-scope="scope"> <c-input v-model="scope.row.cmail2" :disabled="model.rejtypsel != 'R'"></c-input> </template> @@ -234,7 +234,6 @@ export default { mixins: [commonProcess], data() { return { - columns: ['0 0 "lst1" 100 ', '1 1 "lst2" 100', '2 2 "document" 200'], codeTable: [ { label: "Airway Bills", value: "Airway Bills" }, { label: "Beneficiary's Declaration", value: "Beneficiary's Declaration" }, diff --git a/src/views/Business/Botdcr/Inst.vue b/src/views/Business/Botdcr/Inst.vue index 9f7cad8..9c83ea9 100644 --- a/src/views/Business/Botdcr/Inst.vue +++ b/src/views/Business/Botdcr/Inst.vue @@ -214,8 +214,8 @@ <c-col :span="24" style="width:100%"> <el-form-item label="Charges Text" prop="bodgrp.blk.chgtxt" style="padding-top:15px"> - <c-input type="textarea" v-model="model.bodgrp.blk.chgtxt" maxlength="35" show-word-limit - placeholder="请输入Charges Text"></c-input disabled> + <c-input type="textarea" v-model="model.bodgrp.blk.chgtxt" maxlength="35" show-word-limit disabled + placeholder="请输入Charges Text"></c-input > </el-form-item> diff --git a/src/views/Business/Botdcr/index.vue b/src/views/Business/Botdcr/index.vue index 68037c4..2626527 100644 --- a/src/views/Business/Botdcr/index.vue +++ b/src/views/Business/Botdcr/index.vue @@ -44,6 +44,11 @@ <m-setpan :model="model" :codes="codes" /> </el-tab-pane> + <el-tab-pane label="Bookings" name="glepan"> + <!--PD000001 --> + <m-glepan :model="model" :codes="codes" ref="glepan" /> + </el-tab-pane> + <!--PD000000 --> <el-tab-pane label="Completion" name="coninfp"> <m-coninfp :model="model" :codes="codes" /> @@ -79,6 +84,7 @@ import Ptyp from "./Ptyp" import Setpan from "~/views/Public/Setpan" import Coninfp from "~/views/Public/Coninfp" import Docpan from "~/views/Public/Docpan" +import Glepan from "~/views/Public/Glepan" import Doctre from "~/views/Public/Doctre" @@ -88,6 +94,7 @@ export default { "m-botdcrp1": Botdcrp1, "m-inst": Inst, "m-ptyp": Ptyp, + "m-glepan": Glepan, "m-setpan": Setpan, "m-coninfp": Coninfp, "m-engp": Engp, diff --git a/src/views/Business/Botrad/Botcoll2.vue b/src/views/Business/Botrad/Botcoll2.vue deleted file mode 100644 index 393b420..0000000 --- a/src/views/Business/Botrad/Botcoll2.vue +++ /dev/null @@ -1,34 +0,0 @@ -<template> - <div class="eibs-tab"> - - <c-col :span="12"> - <el-form-item label="XMLPanel botcoll2的内置block" prop="botcoll2blk"> - <c-input type="textarea" v-model="model.botcoll2blk" maxlength="200" show-word-limit placeholder="请输入XMLPanel botcoll2的内置block" ></c-input> - </el-form-item> - </c-col> - </div> -</template> -<script> -import Api from "~/service/Api" -import commonProcess from "~/mixin/commonProcess"; -import CodeTable from "~/config/CodeTable" -import Event from "~/model/Botrad/Event" - -export default { - inject: ['root'], - props:["model","codes"], - mixins: [commonProcess], - data(){ - return { - - } - }, - methods:{...Event}, - created:function(){ - - } -} -</script> -<style> - -</style> diff --git a/src/views/Business/Botrad/Botdrrl1.vue b/src/views/Business/Botrad/Botdrrl1.vue deleted file mode 100644 index 9192a37..0000000 --- a/src/views/Business/Botrad/Botdrrl1.vue +++ /dev/null @@ -1,34 +0,0 @@ -<template> - <div class="eibs-tab"> - - <c-col :span="12"> - <el-form-item label="XMLPanel botdrrl1的内置block" prop="botdrrl1blk"> - <c-input type="textarea" v-model="model.botdrrl1blk" maxlength="200" show-word-limit placeholder="请输入XMLPanel botdrrl1的内置block" ></c-input> - </el-form-item> - </c-col> - </div> -</template> -<script> -import Api from "~/service/Api" -import commonProcess from "~/mixin/commonProcess"; -import CodeTable from "~/config/CodeTable" -import Event from "~/model/Botrad/Event" - -export default { - inject: ['root'], - props:["model","codes"], - mixins: [commonProcess], - data(){ - return { - - } - }, - methods:{...Event}, - created:function(){ - - } -} -</script> -<style> - -</style> diff --git a/src/views/Business/Botrad/Botrad.vue b/src/views/Business/Botrad/Botrad.vue index 5762cfe..139fdee 100644 --- a/src/views/Business/Botrad/Botrad.vue +++ b/src/views/Business/Botrad/Botrad.vue @@ -1,4 +1,284 @@ <template> + <c-row> + <!-- =================顶部====================== --> + <c-col :span="24"> + <c-col :span="11"> + <c-col :span="20"> + <el-form-item label="Reference" prop="bodgrp.rec.ownref" style="width: 100%"> + <c-input v-model="model.bodgrp.rec.ownref" maxlength="16" placeholder="请输入Reference" style="width: 95%" + disabled></c-input> + </el-form-item> + </c-col> + <c-col :span="4"> + <c-button style="margin:0 10px 0 0;padding: 0 10px;" size="small" type="primary" icon="el-icon-search"></c-button> + </c-button> + </c-col> + </c-col> + <c-col :span="11" :offset="1"> + <el-form-item label="摘要" prop="bodgrp.rec.nam"> + <c-input text-align="middle" v-model="model.bodgrp.rec.nam" maxlength="40" disabled + placeholder="请输入Externally Displayed Name to Identify the Contract"></c-input> + </el-form-item> + </c-col> + </c-col> + <!-- ====================左边======================= --> + <c-col :span="11"> + <c-col :span="12"> + <el-form-item label="Document Amount" prop="bodgrp.cbs.max.cur"> + <c-select disabled v-model="model.bodgrp.cbs.max.cur" style="width: 100%" placeholder="请选择Currency"> + <el-option v-for="item in codes.cur" :key="item.value" :label="item.label" :value="item.value"> + </el-option> + </c-select> + </el-form-item> + </c-col> + <c-col :span="12"> + <el-form-item style="text-align: left" label-width="20px" prop="bodgrp.cbs.max.amt"> + <c-input-currency v-model="model.bodgrp.cbs.max.amt" style="text-align: left; width: 100%" + placeholder="请输入Document Amount" disabled + @keyup.enter.native="defaultFunction('bodgrp.cbs.max.amt', model.bodgrp.cbs.max.amt)"></c-input-currency> + </el-form-item> + </c-col> + <c-col :span="12"> + <el-form-item label="Warehouse/Insurance" prop="bodgrp.cbs.opn1.cur"> + <c-select disabled v-model="model.bodgrp.cbs.opn1.cur" style="width: 100%" placeholder="请选择Currency"> + <el-option v-for="item in codes.cur" :key="item.value" :label="item.label" :value="item.value"> + </el-option> + </c-select> + </el-form-item> + </c-col> + <c-col :span="12"> + <el-form-item style="text-align: left" label-width="20px" prop="bodgrp.cbs.opn1.amt"> + <c-input-currency v-model="model.bodgrp.cbs.opn1.amt" style="text-align: left; width: 100%" + placeholder="请输入Warehouse/Insurance" disabled + @keyup.enter.native="defaultFunction('bodgrp.cbs.opn1.amt', model.bodgrp.cbs.opn1.amt)"></c-input-currency> + </el-form-item> + </c-col> + + <c-col :span="24"> + <el-form-item label="Collection Condition" prop="bodgrp.rec.doctypcod"> + <c-select v-model="model.bodgrp.rec.doctypcod" style="width:100%" placeholder="请选择Collection Condition" + disabled> + </c-select> + </el-form-item> + </c-col> + <c-col :span="24"> + <el-form-item label="Document Set Status" prop="bodgrp.rec.docsta"> + <c-input v-model="model.bodgrp.rec.docsta" maxlength="40" placeholder="请输入Document Set Status" disabled> + </c-input> + </el-form-item> + </c-col> + <c-col :span="12"> + <el-form-item label="Maturity Date" prop="bodgrp.rec.matdat"> + <c-date-picker type="date" v-model="model.bodgrp.rec.matdat" style="width:100%" placeholder="请选择Maturity Date" + disabled></c-date-picker> + </el-form-item> + </c-col> + <c-col :span="12"> + <el-form-item label="Tenor Specification" prop="bodgrp.rec.matpercnt"> + <c-input v-model="model.bodgrp.rec.matpercnt" placeholder="请输入Tenor Specification" disabled></c-input> + </el-form-item> + </c-col> + <c-col :span="24"> + <el-form-item label=" " prop="bodgrp.rec.matperbeg"> + <c-select v-model="model.bodgrp.rec.matperbeg" style="width:100%" + placeholder="请选择Start of Maturity Period MATBEG" disabled> + </c-select> + </el-form-item> + </c-col> + <c-col :span="12"> + <el-form-item label="Order Date" prop="bodgrp.rec.rcvdat"> + <c-date-picker type="date" v-model="model.bodgrp.rec.rcvdat" style="width:100%" placeholder="请选择Order Date" + disabled></c-date-picker> + </el-form-item> + </c-col> + <c-col :span="12"> + <el-form-item label="Presentation Date" prop="bodgrp.rec.predat"> + <c-date-picker type="date" v-model="model.bodgrp.rec.predat" style="width:100%" + placeholder="请选择Presentation Date" disabled></c-date-picker> + </el-form-item> + </c-col> + + <c-col :span="24"> + <el-form-item label="Instructions for Second Mail" prop="bodgrp.blk.colinssnm" > + <c-input type="textarea" v-model="model.bodgrp.blk.colinssnm" maxlength="60" show-word-limit placeholder="请输入Instructions for Second Mail" ></c-input> + </el-form-item> + </c-col> + + <c-col :span="12"> + <c-checkbox v-model="model.oridre" padding="15">Original Documents Passed to Drawee</c-checkbox> + </c-col> + + + + </c-col> + <!-- ====================右边======================= --> + <c-col :span="11" :offset="1"> + + <c-col :span="24"> + <el-form-item label="Drawer" prop="bodgrp.drr.pts.ref"> + <c-input v-model="model.bodgrp.drr.pts.ref" maxlength="16" placeholder="请输入Drawer" ></c-input> + </el-form-item> + </c-col> + <c-col :span="24"> + <el-form-item label="Name of Party" prop="bodgrp.drr.pts.nam"> + <c-input v-model="model.bodgrp.drr.pts.nam" maxlength="40" placeholder="请输入Name of Party" disabled></c-input> + </el-form-item> + </c-col> + <c-col :span="24"> + <el-form-item label="Collecting Bank" prop="bodgrp.col.pts.ref"> + <c-input v-model="model.bodgrp.col.pts.ref" maxlength="16" placeholder="请输入Collecting Bank" disabled></c-input> + </el-form-item> + </c-col> + + <c-col :span="24"> + <el-form-item label="Name of Party" prop="bodgrp.col.pts.nam"> + <c-input v-model="model.bodgrp.col.pts.nam" maxlength="40" placeholder="请输入Name of Party" disabled></c-input> + </el-form-item> + </c-col> + <c-col :span="24"> + <el-form-item label="Drawee" prop="bodgrp.dre.pts.ref"> + <c-input v-model="model.bodgrp.dre.pts.ref" maxlength="16" placeholder="请输入Drawee" disabled></c-input> + </el-form-item> + </c-col> + <c-col :span="24"> + <el-form-item label="Name of Party" prop="bodgrp.dre.pts.nam"> + <c-input v-model="model.bodgrp.dre.pts.nam" maxlength="40" placeholder="请输入Name of Party" disabled></c-input> + </el-form-item> + </c-col> + + <c-col :span="24" style="height: 24px; margin-top: -10px"> + <el-form-item :label="model.botp.docgrdm.docdsclab" class="messageLabel"> + <c-button style="float: right" @click="addTableValue" type="primary">新增单据</c-button> + </el-form-item> + </c-col> + <c-col :span="24" style="margin-bottom: 30px;"> + <c-table height="200px" style="text-align: center" :list="this.model.botp.docgrdm.docgrd || []" + :paginationShow="false" :border="true"> + <el-table-column label="1st" width="auto"> + <template slot-scope="scope"> + <c-input v-model="scope.row.cmail1"></c-input> + </template> + + </el-table-column> + <el-table-column label="2st" width="auto"> + <template slot-scope="scope"> + <c-input v-model="scope.row.cmail2"></c-input> + </template> + </el-table-column> + <el-table-column label="Document" prop="docnam" width="auto"> + <template slot-scope="scope"> + <!-- {{scope.row.docnam}} --> + <c-select style="width: 100%" placeholder="请选择" v-model="scope.row.docnam"> + <el-option v-for="item in codeTable" :key="item.value" :label="item.label" :value="item.value"> + </el-option> + </c-select> + </template> + </el-table-column> + <el-table-column label="操作" width="170px" fixed="right"> + <template slot-scope="scope"> + <c-button @click="deleteTable(scope.$index)" type="primary">删除</c-button> + </template> + </el-table-column> + </c-table> + </c-col> + + </c-col> + + + + + </c-row> +</template> +<script> +import Api from "~/service/Api" +import commonProcess from "~/mixin/commonProcess"; +import CodeTable from "~/config/CodeTable" +import Event from "~/model/Botdcr/Event" +import Utils from "~/utils"; +import Ptap from "~/views/Public/Ptap"; + +export default { + components: { "c-ptap": Ptap }, + inject: ['root'], + props: ["model", "codes"], + mixins: [commonProcess], + data() { + return { + columns: ['0 0 "lst1" 100 ', '1 1 "lst2" 100', '2 2 "document" 200'], + codeTable: [ + { label: "Airway Bills", value: "Airway Bills" }, + { label: "Beneficiary's Declaration", value: "Beneficiary's Declaration" }, + { label: "Bill of Lading Copies", value: "Bill of Lading Copies" }, + { label: "Bill of Lading Originals", value: "Bill of Lading Originals" }, + { label: "Certificate", value: "Certificate" }, + { label: "Certificate of Analysis", value: "Certificate of Analysis" }, + { label: "Certificate of Origin", value: "Certificate of Origin" }, + { label: "Certificate of Quality", value: "Certificate of Quality" }, + { label: "Certificate of Quantity", value: "Certificate of Quantity" }, + { label: "Commercial Invoice", value: "Commercial Invoice" }, + { label: "Courier Receipt", value: "Courier Receipt" }, + { label: "Draft", value: "Draft" }, + { label: "Export Licence", value: "Export Licence" }, + { label: "Fax Report", value: "Fax Report" }, + { label: "Inspection Cert", value: "Inspection Cert" }, + { label: "Insurance Policy", value: "Insurance Policy" }, + { label: "Packing List", value: "Packing List" }, + { label: "Shipment Advice", value: "Shipment Advice" }, + { label: "Weight List", value: "Weight List" }, + ], + TableValue: [ + { + id: 0, + cmail1: "", + cmail2: "", + docnam: "", + description: "", + serialNum: "", + tableName: "", + tcddoc: "", + }, + ], + newValue: { + id: 0, + cmail1: "", + cmail2: "", + docnam: "", + description: "", + serialNum: "", + tableName: "", + tcddoc: "", + }, + + } + }, + methods: { + ...Event, + addTableValue(index) { + var newTableValue = Object.assign({}, this.newValue); + const serial = Utils.generateUUID(); + newTableValue.serialNum = serial; + this.model.botp.docgrdm.docgrd.splice(index - 1, 0, newTableValue); + }, + deleteTable(index) { + this.model.botp.docgrdm.docgrd.splice(index, 1); + }, + }, + + created: function () { + console.log(this.root); + } +} +</script> +<style> +.messageLabel>>>.el-form-item__label { + text-align: left; + font-weight: bold; + font-size: 12px; +} +</style> + + +<!-- <template> <div class="eibs-tab"> <c-col :span="12"> @@ -58,8 +338,8 @@ </c-col> <c-col :span="12"> - <el-form-item label="Open Amount" prop="bodgrp.drr.pts.nam"> - <c-input v-model="model.bodgrp.drr.pts.nam" maxlength="40" placeholder="请输入Open Amount"></c-input> + <el-form-item label="Name of Party" prop="bodgrp.drr.pts.nam"> + <c-input v-model="model.bodgrp.drr.pts.nam" maxlength="40" placeholder="请输入Name of Party"></c-input> </el-form-item> </c-col> @@ -115,8 +395,8 @@ </c-col> <c-col :span="12"> - <el-form-item label="Starting from" prop="bodgrp.rec.matperbeg"> - <c-select v-model="model.bodgrp.rec.matperbeg" style="width:100%" placeholder="请选择Starting from"> + <el-form-item label="Start of Maturity Period MATBEG" prop="bodgrp.rec.matperbeg"> + <c-select v-model="model.bodgrp.rec.matperbeg" style="width:100%" placeholder="请选择Start of Maturity Period MATBEG"> </c-select> </el-form-item> </c-col> @@ -177,4 +457,4 @@ export default { </script> <style> -</style> +</style> --> diff --git a/src/views/Business/Botrad/Detp.vue b/src/views/Business/Botrad/Detp.vue deleted file mode 100644 index 43c9d45..0000000 --- a/src/views/Business/Botrad/Detp.vue +++ /dev/null @@ -1,78 +0,0 @@ -<template> - <div class="eibs-tab"> - - <c-col :span="12"> - <el-form-item label="Transport Doc. Type" prop="bodgrp.rec.trpdoctyp"> - <c-select v-model="model.bodgrp.rec.trpdoctyp" style="width:100%" placeholder="请选择Transport Doc. Type"> - </c-select> - </el-form-item> - </c-col> - - <c-col :span="12"> - <el-form-item label="Transport Doc. Ref." prop="bodgrp.rec.trpdocnum"> - <c-input v-model="model.bodgrp.rec.trpdocnum" maxlength="40" placeholder="请输入Transport Doc. Ref."></c-input> - </el-form-item> - </c-col> - - <c-col :span="12"> - <el-form-item label="Document Dated" prop="bodgrp.rec.tradat"> - <c-date-picker type="date" v-model="model.bodgrp.rec.tradat" style="width:100%" placeholder="请选择Document Dated"></c-date-picker> - </el-form-item> - </c-col> - - <c-col :span="12"> - <el-form-item label="Mode of Transport" prop="bodgrp.rec.tramod"> - <c-select v-model="model.bodgrp.rec.tramod" style="width:100%" placeholder="请选择Mode of Transport"> - </c-select> - </el-form-item> - </c-col> - - <c-col :span="12"> - <el-form-item label="Vessel Name" prop="bodgrp.blk.vesselnam"> - <c-input v-model="model.bodgrp.blk.vesselnam" maxlength="40" placeholder="请输入Vessel Name"></c-input> - </el-form-item> - </c-col> - - <c-col :span="12"> - <el-form-item label="Shipment from" prop="bodgrp.rec.shpfro"> - <c-input v-model="model.bodgrp.rec.shpfro" maxlength="40" placeholder="请输入Shipment from"></c-input> - </el-form-item> - </c-col> - - <c-col :span="12"> - <el-form-item label="For Transportation to" prop="bodgrp.rec.shpto"> - <c-input v-model="model.bodgrp.rec.shpto" maxlength="40" placeholder="请输入For Transportation to"></c-input> - </el-form-item> - </c-col> - - <c-col :span="12"> - <el-form-item label="Description of Goods" prop="bodgrp.blk.goddes"> - <c-input type="textarea" v-model="model.bodgrp.blk.goddes" maxlength="65" show-word-limit placeholder="请输入Description of Goods" ></c-input> - </el-form-item> - </c-col> - </div> -</template> -<script> -import Api from "~/service/Api" -import commonProcess from "~/mixin/commonProcess"; -import CodeTable from "~/config/CodeTable" -import Event from "~/model/Botrad/Event" - -export default { - inject: ['root'], - props:["model","codes"], - mixins: [commonProcess], - data(){ - return { - - } - }, - methods:{...Event}, - created:function(){ - - } -} -</script> -<style> - -</style> diff --git a/src/views/Business/Botrad/Botcoll1.vue b/src/views/Business/Botrad/Frmloapan.vue similarity index 76% rename from src/views/Business/Botrad/Botcoll1.vue rename to src/views/Business/Botrad/Frmloapan.vue index e024b92..8157244 100644 --- a/src/views/Business/Botrad/Botcoll1.vue +++ b/src/views/Business/Botrad/Frmloapan.vue @@ -2,10 +2,23 @@ <div class="eibs-tab"> <c-col :span="12"> - <el-form-item label="XMLPanel botcoll1的内置block" prop="botcoll1blk"> - <c-input type="textarea" v-model="model.botcoll1blk" maxlength="200" show-word-limit placeholder="请输入XMLPanel botcoll1的内置block" ></c-input> + <c-button size="small" type="primary" @click="onFrmcnf"> + &Load + </c-button> + </c-col> + + <c-col :span="12"> + <el-form-item label="Redirect" prop="mtabut.frmloa"> + <c-select v-model="model.mtabut.frmloa" style="width:100%" placeholder="请选择Redirect"> + </c-select> </el-form-item> - </c-col> + </c-col> + + <c-col :span="12"> + <c-button size="small" type="primary" @click="onFrmcls"> + &Close + </c-button> + </c-col> </div> </template> <script> diff --git a/src/views/Business/Botrad/Inst.vue b/src/views/Business/Botrad/Inst.vue deleted file mode 100644 index 6310c1d..0000000 --- a/src/views/Business/Botrad/Inst.vue +++ /dev/null @@ -1,136 +0,0 @@ -<template> - <div class="eibs-tab"> - - <c-col :span="12"> - <el-form-item label="Collection Instructions" prop="bodgrp.blk.colins"> - <c-input type="textarea" v-model="model.bodgrp.blk.colins" maxlength="65" show-word-limit placeholder="请输入Collection Instructions" ></c-input> - </el-form-item> - </c-col> - - <c-col :span="12"> - <el-form-item label="Our Charges to" prop="bodgrp.rec.chato"> - <c-select v-model="model.bodgrp.rec.chato" style="width:100%" placeholder="请选择Our Charges to"> - </c-select> - </el-form-item> - </c-col> - - <c-col :span="12"> - <c-button size="small" type="primary" icon="el-icon-search" @click="onColinsButtxmsel"> - ... - </c-button> - </c-col> - - <c-col :span="12"> - <el-form-item label="Charges Text" prop="bodgrp.blk.chgtxt"> - <c-input type="textarea" v-model="model.bodgrp.blk.chgtxt" maxlength="35" show-word-limit placeholder="请输入Charges Text" ></c-input> - </el-form-item> - </c-col> - - <c-col :span="12"> - <c-checkbox v-model="model.bodgrp.blk.colinsflg">Collection instructions modified</c-checkbox> - </c-col> - - <c-col :span="12"> - <el-form-item label="Draft Instructions" prop="bodgrp.blk.dftins"> - <c-input type="textarea" v-model="model.bodgrp.blk.dftins" maxlength="65" show-word-limit placeholder="请输入Draft Instructions" ></c-input> - </el-form-item> - </c-col> - - <c-col :span="12"> - <c-button size="small" type="primary" icon="el-icon-search" @click="onDftinsButtxmsel"> - ... - </c-button> - </c-col> - - <c-col :span="12"> - <c-checkbox v-model="model.bodgrp.rec.focflg">Free of Payment</c-checkbox> - </c-col> - - <c-col :span="12"> - <el-form-item label="Protest Instructions" prop="bodgrp.rec.waicolcod"> - <c-select v-model="model.bodgrp.rec.waicolcod" style="width:100%" placeholder="请选择Protest Instructions"> - </c-select> - </el-form-item> - </c-col> - - <c-col :span="12"> - <el-form-item label="Protest Instructions" prop="bodgrp.blk.proins"> - <c-input type="textarea" v-model="model.bodgrp.blk.proins" maxlength="65" show-word-limit placeholder="请输入Protest Instructions" ></c-input> - </el-form-item> - </c-col> - - <c-col :span="12"> - <c-button size="small" type="primary" icon="el-icon-search" @click="onProinsButtxmsel"> - ... - </c-button> - </c-col> - - <c-col :span="12"> - <el-form-item label="Waive Remitting Bank Charges" prop="bodgrp.rec.wairmtcod"> - <c-select v-model="model.bodgrp.rec.wairmtcod" style="width:100%" placeholder="请选择Waive Remitting Bank Charges"> - </c-select> - </el-form-item> - </c-col> - - <c-col :span="12"> - <el-form-item label="Other Instructions" prop="bodgrp.blk.othins"> - <c-input type="textarea" v-model="model.bodgrp.blk.othins" maxlength="65" show-word-limit placeholder="请输入Other Instructions" ></c-input> - </el-form-item> - </c-col> - - <c-col :span="12"> - <c-button size="small" type="primary" icon="el-icon-search" @click="onOthins1Buttxmsel"> - ... - </c-button> - </c-col> - - <c-col :span="12"> - <el-form-item label="Defer Payment until" prop="bodgrp.rec.othins"> - <c-select v-model="model.bodgrp.rec.othins" style="width:100%" placeholder="请选择Defer Payment until"> - </c-select> - </el-form-item> - </c-col> - - <c-col :span="12"> - <el-form-item label="Warehouse/Insurance" prop="bodgrp.rec.lescom"> - <c-input v-model="model.bodgrp.rec.lescom" placeholder="请输入Warehouse/Insurance"></c-input> - </el-form-item> - </c-col> - - <c-col :span="12"> - <el-form-item label="Delivery instructions" prop="bodgrp.blk.delins"> - <c-input type="textarea" v-model="model.bodgrp.blk.delins" maxlength="65" show-word-limit placeholder="请输入Delivery instructions" ></c-input> - </el-form-item> - </c-col> - - <c-col :span="12"> - <c-button size="small" type="primary" icon="el-icon-search" @click="onWhinsButtxmsel"> - ... - </c-button> - </c-col> - </div> -</template> -<script> -import Api from "~/service/Api" -import commonProcess from "~/mixin/commonProcess"; -import CodeTable from "~/config/CodeTable" -import Event from "~/model/Botrad/Event" - -export default { - inject: ['root'], - props:["model","codes"], - mixins: [commonProcess], - data(){ - return { - - } - }, - methods:{...Event}, - created:function(){ - - } -} -</script> -<style> - -</style> diff --git a/src/views/Business/Botrad/Instrecp.vue b/src/views/Business/Botrad/Instrecp.vue deleted file mode 100644 index 253a8f7..0000000 --- a/src/views/Business/Botrad/Instrecp.vue +++ /dev/null @@ -1,52 +0,0 @@ -<template> - <div class="eibs-tab"> - - <c-col :span="12"> - <el-form-item label="Interest Instructions" prop="bodgrp.blk.intins"> - <c-input type="textarea" v-model="model.bodgrp.blk.intins" maxlength="65" show-word-limit placeholder="请输入Interest Instructions" ></c-input> - </el-form-item> - </c-col> - - <c-col :span="12"> - <el-form-item label="Settlement insrtrctions" prop="bodgrp.blk.setinsbo"> - <c-input type="textarea" v-model="model.bodgrp.blk.setinsbo" maxlength="65" show-word-limit placeholder="请输入Settlement insrtrctions" ></c-input> - </el-form-item> - </c-col> - - <c-col :span="12"> - <c-button size="small" type="primary" icon="el-icon-search" @click="onSetinsButtxmsel"> - ... - </c-button> - </c-col> - - <c-col :span="12"> - <el-form-item label="Authority of Agent" prop="bodgrp.blk.agtaut"> - <c-input type="textarea" v-model="model.bodgrp.blk.agtaut" maxlength="35" show-word-limit placeholder="请输入Authority of Agent" ></c-input> - </el-form-item> - </c-col> - </div> -</template> -<script> -import Api from "~/service/Api" -import commonProcess from "~/mixin/commonProcess"; -import CodeTable from "~/config/CodeTable" -import Event from "~/model/Botrad/Event" - -export default { - inject: ['root'], - props:["model","codes"], - mixins: [commonProcess], - data(){ - return { - - } - }, - methods:{...Event}, - created:function(){ - - } -} -</script> -<style> - -</style> diff --git a/src/views/Business/Botrad/Ovwp.vue b/src/views/Business/Botrad/Ovwp.vue deleted file mode 100644 index dbeae98..0000000 --- a/src/views/Business/Botrad/Ovwp.vue +++ /dev/null @@ -1,282 +0,0 @@ -<template> - <div class="eibs-tab"> - - <c-col :span="12"> - <c-button size="small" type="primary" @click="onBotpButgetref"> - Get Ref - </c-button> - </c-col> - - <c-col :span="12"> - <el-form-item label="Responsible User" prop="botp.usr.extkey"> - <c-input v-model="model.botp.usr.extkey" maxlength="8" placeholder="请输入Responsible User"></c-input> - </el-form-item> - </c-col> - - <c-col :span="12"> - <el-form-item label="" prop="botp.usrget.sdamod.seainf"> - <c-input v-model="model.botp.usrget.sdamod.seainf" placeholder="请输入"></c-input> - </el-form-item> - </c-col> - - <c-col :span="12"> - <c-checkbox v-model="model.bodgrp.rec.dircolflg">Direct Collection</c-checkbox> - </c-col> - - <c-col :span="12"> - <c-checkbox v-model="model.bodgrp.rec.resflg">Reservated Contract</c-checkbox> - </c-col> - - <c-col :span="12"> - <el-form-item label="Drag Drop Sender" prop="botp.drrp.ptsget.sdamod.dadsnd"> - <c-input v-model="model.botp.drrp.ptsget.sdamod.dadsnd" placeholder="请输入Drag Drop Sender"></c-input> - </el-form-item> - </c-col> - - <c-col :span="12"> - <el-form-item label="External Key of Address" prop="bodgrp.drr.pts.extkey"> - <c-input v-model="model.bodgrp.drr.pts.extkey" maxlength="16" placeholder="请输入External Key of Address"></c-input> - </el-form-item> - </c-col> - - <c-col :span="12"> - <el-form-item label="" prop="botp.drrp.ptsget.sdamod.seainf"> - <c-input v-model="model.botp.drrp.ptsget.sdamod.seainf" placeholder="请输入"></c-input> - </el-form-item> - </c-col> - - <c-col :span="12"> - <c-button size="small" type="primary" @click="onDrrpDet"> - Details - </c-button> - </c-col> - - <c-col :span="12"> - <el-form-item label="名称" prop="bodgrp.drr.namelc"> - <c-input type="textarea" v-model="model.bodgrp.drr.namelc" maxlength="35" show-word-limit placeholder="请输入名称" ></c-input> - </el-form-item> - </c-col> - - <c-col :span="12"> - <el-form-item label="Address Block" prop="bodgrp.drr.pts.adrblk"> - <c-input type="textarea" v-model="model.bodgrp.drr.pts.adrblk" maxlength="35" show-word-limit placeholder="请输入Address Block" ></c-input> - </el-form-item> - </c-col> - - <c-col :span="12"> - <el-form-item label="Chinese address" prop="bodgrp.drr.dbfadrblkcn"> - <c-input type="textarea" v-model="model.bodgrp.drr.dbfadrblkcn" maxlength="35" show-word-limit placeholder="请输入Chinese address" ></c-input> - </el-form-item> - </c-col> - - <c-col :span="12"> - <el-form-item label="Financial Document" prop="bodgrp.rec.paydoctyp"> - <c-select v-model="model.bodgrp.rec.paydoctyp" style="width:100%" placeholder="请选择Financial Document"> - </c-select> - </el-form-item> - </c-col> - - <c-col :span="12"> - <el-form-item label="Shipment date" prop="bodgrp.rec.shpdat"> - <c-date-picker type="date" v-model="model.bodgrp.rec.shpdat" style="width:100%" placeholder="请选择Shipment date"></c-date-picker> - </el-form-item> - </c-col> - - <c-col :span="12"> - <el-form-item label="地址" prop="bodgrp.drr.adrelc"> - <c-input type="textarea" v-model="model.bodgrp.drr.adrelc" maxlength="35" show-word-limit placeholder="请输入地址" ></c-input> - </el-form-item> - </c-col> - - <c-col :span="12"> - <el-form-item label="Dispatched on" prop="bodgrp.rec.advdat"> - <c-date-picker type="date" v-model="model.bodgrp.rec.advdat" style="width:100%" placeholder="请选择Dispatched on"></c-date-picker> - </el-form-item> - </c-col> - - <c-col :span="12"> - <el-form-item label="Drag Drop Sender" prop="botp.colp.ptsget.sdamod.dadsnd"> - <c-input v-model="model.botp.colp.ptsget.sdamod.dadsnd" placeholder="请输入Drag Drop Sender"></c-input> - </el-form-item> - </c-col> - - <c-col :span="12"> - <el-form-item label="External Key of Address" prop="bodgrp.col.pts.extkey"> - <c-input v-model="model.bodgrp.col.pts.extkey" maxlength="16" placeholder="请输入External Key of Address"></c-input> - </el-form-item> - </c-col> - - <c-col :span="12"> - <el-form-item label="" prop="botp.colp.ptsget.sdamod.seainf"> - <c-input v-model="model.botp.colp.ptsget.sdamod.seainf" placeholder="请输入"></c-input> - </el-form-item> - </c-col> - - <c-col :span="12"> - <c-button size="small" type="primary" @click="onColpDet"> - Details - </c-button> - </c-col> - - <c-col :span="12"> - <el-form-item label="Maturity Date" prop="bodgrp.rec.matdat"> - <c-date-picker type="date" v-model="model.bodgrp.rec.matdat" style="width:100%" placeholder="请选择Maturity Date"></c-date-picker> - </el-form-item> - </c-col> - - <c-col :span="12"> - <el-form-item label="Maturity Date" prop="bodgrp.rec.invtyp"> - <c-select v-model="model.bodgrp.rec.invtyp" style="width:100%" placeholder="请选择Maturity Date"> - </c-select> - </el-form-item> - </c-col> - - <c-col :span="12"> - <el-form-item label="名称" prop="bodgrp.col.namelc"> - <c-input type="textarea" v-model="model.bodgrp.col.namelc" maxlength="35" show-word-limit placeholder="请输入名称" ></c-input> - </el-form-item> - </c-col> - - <c-col :span="12"> - <el-form-item label="Address Block" prop="bodgrp.col.pts.adrblk"> - <c-input type="textarea" v-model="model.bodgrp.col.pts.adrblk" maxlength="35" show-word-limit placeholder="请输入Address Block" ></c-input> - </el-form-item> - </c-col> - - <c-col :span="12"> - <el-form-item label="Chinese address" prop="bodgrp.col.dbfadrblkcn"> - <c-input type="textarea" v-model="model.bodgrp.col.dbfadrblkcn" maxlength="35" show-word-limit placeholder="请输入Chinese address" ></c-input> - </el-form-item> - </c-col> - - <c-col :span="12"> - <el-form-item label="Document Number" prop="bodgrp.rec.paydocnum"> - <c-input v-model="model.bodgrp.rec.paydocnum" maxlength="16" placeholder="请输入Document Number"></c-input> - </el-form-item> - </c-col> - - <c-col :span="12"> - <el-form-item label="地址" prop="bodgrp.col.adrelc"> - <c-input type="textarea" v-model="model.bodgrp.col.adrelc" maxlength="35" show-word-limit placeholder="请输入地址" ></c-input> - </el-form-item> - </c-col> - - <c-col :span="12"> - <el-form-item label="Issued on" prop="bodgrp.rec.issdat"> - <c-date-picker type="date" v-model="model.bodgrp.rec.issdat" style="width:100%" placeholder="请选择Issued on"></c-date-picker> - </el-form-item> - </c-col> - - <c-col :span="12"> - <c-checkbox v-model="model.bodgrp.rec.ccdndrflg">Truncation - Physical Document Kept w OWN</c-checkbox> - </c-col> - - <c-col :span="12"> - <el-form-item label="Tenor Details Text" prop="bodgrp.blk.bogdet"> - <c-input type="textarea" v-model="model.bodgrp.blk.bogdet" maxlength="43" show-word-limit placeholder="请输入Tenor Details Text" ></c-input> - </el-form-item> - </c-col> - - <c-col :span="12"> - <c-checkbox v-model="model.bodgrp.rec.ccdpurflg">Payment Under Reserve</c-checkbox> - </c-col> - - <c-col :span="12"> - <el-form-item label="Instructions Received" prop="bodgrp.blk.cctinsrcv"> - <c-input type="textarea" v-model="model.bodgrp.blk.cctinsrcv" maxlength="35" show-word-limit placeholder="请输入Instructions Received" ></c-input> - </el-form-item> - </c-col> - - <c-col :span="12"> - <el-form-item label="Drag Drop Sender" prop="botp.drep.ptsget.sdamod.dadsnd"> - <c-input v-model="model.botp.drep.ptsget.sdamod.dadsnd" placeholder="请输入Drag Drop Sender"></c-input> - </el-form-item> - </c-col> - - <c-col :span="12"> - <el-form-item label="External Key of Address" prop="bodgrp.dre.pts.extkey"> - <c-input v-model="model.bodgrp.dre.pts.extkey" maxlength="16" placeholder="请输入External Key of Address"></c-input> - </el-form-item> - </c-col> - - <c-col :span="12"> - <el-form-item label="" prop="botp.drep.ptsget.sdamod.seainf"> - <c-input v-model="model.botp.drep.ptsget.sdamod.seainf" placeholder="请输入"></c-input> - </el-form-item> - </c-col> - - <c-col :span="12"> - <c-button size="small" type="primary" @click="onDrepDet"> - Details - </c-button> - </c-col> - - <c-col :span="12"> - <el-form-item label="名称" prop="bodgrp.dre.namelc"> - <c-input type="textarea" v-model="model.bodgrp.dre.namelc" maxlength="35" show-word-limit placeholder="请输入名称" ></c-input> - </el-form-item> - </c-col> - - <c-col :span="12"> - <el-form-item label="Address Block" prop="bodgrp.dre.pts.adrblk"> - <c-input type="textarea" v-model="model.bodgrp.dre.pts.adrblk" maxlength="35" show-word-limit placeholder="请输入Address Block" ></c-input> - </el-form-item> - </c-col> - - <c-col :span="12"> - <el-form-item label="Chinese address" prop="bodgrp.dre.dbfadrblkcn"> - <c-input type="textarea" v-model="model.bodgrp.dre.dbfadrblkcn" maxlength="35" show-word-limit placeholder="请输入Chinese address" ></c-input> - </el-form-item> - </c-col> - - <c-col :span="12"> - <el-form-item label="地址" prop="bodgrp.dre.adrelc"> - <c-input type="textarea" v-model="model.bodgrp.dre.adrelc" maxlength="35" show-word-limit placeholder="请输入地址" ></c-input> - </el-form-item> - </c-col> - - <c-col :span="12"> - <el-form-item label="Collection Instruction" prop="bodgrp.blk.cctinscol"> - <c-input type="textarea" v-model="model.bodgrp.blk.cctinscol" maxlength="35" show-word-limit placeholder="请输入Collection Instruction" ></c-input> - </el-form-item> - </c-col> - - <c-col :span="12"> - <el-form-item label="Country Code Risk Country!" prop="bodgrp.rec.stacty"> - <c-select v-model="model.bodgrp.rec.stacty" style="width:100%" placeholder="请选择Country Code Risk Country!"> - </c-select> - </el-form-item> - </c-col> - - <c-col :span="12"> - <el-form-item label="Goods Code" prop="bodgrp.rec.stagod"> - <c-select v-model="model.bodgrp.rec.stagod" style="width:100%" placeholder="请选择Goods Code"> - </c-select> - </el-form-item> - </c-col> - </div> -</template> -<script> -import Api from "~/service/Api" -import commonProcess from "~/mixin/commonProcess"; -import CodeTable from "~/config/CodeTable" -import Event from "~/model/Botrad/Event" - -export default { - inject: ['root'], - props:["model","codes"], - mixins: [commonProcess], - data(){ - return { - - } - }, - methods:{...Event}, - created:function(){ - - } -} -</script> -<style> - -</style> diff --git a/src/views/Business/Botrad/Ptsp150.vue b/src/views/Business/Botrad/Ptsp150.vue deleted file mode 100644 index 0d57c92..0000000 --- a/src/views/Business/Botrad/Ptsp150.vue +++ /dev/null @@ -1,28 +0,0 @@ -<template> - <div class="eibs-tab"> - </div> -</template> -<script> -import Api from "~/service/Api" -import commonProcess from "~/mixin/commonProcess"; -import CodeTable from "~/config/CodeTable" -import Event from "~/model/Botrad/Event" - -export default { - inject: ['root'], - props:["model","codes"], - mixins: [commonProcess], - data(){ - return { - - } - }, - methods:{...Event}, - created:function(){ - - } -} -</script> -<style> - -</style> diff --git a/src/views/Business/Botrad/Ptyp.vue b/src/views/Business/Botrad/Ptyp.vue index 983c90e..d9eb15a 100644 --- a/src/views/Business/Botrad/Ptyp.vue +++ b/src/views/Business/Botrad/Ptyp.vue @@ -1,66 +1,125 @@ <template> - <div class="eibs-tab"> - - <c-col :span="24"> - <div class="e-table-wrapper"> - <el-table - :data="model.botp.ptsaddp.ptsaddg" - style="width: 100%" - > - <el-table-column - prop="rol" - label="角色" - sortable - width="100"> - </el-table-column> - <el-table-column - prop="ptyextkey" - label="机构" - sortable - width="100"> - </el-table-column> - <el-table-column - prop="nam" - label="" - sortable - width="100"> - </el-table-column> - <el-table-column - prop="ref" - label="名称" - sortable - width="100"> - </el-table-column> - </el-table> - <el-pagination - layout="prev, pager, next" - :total="pager.botp_ptsaddp_ptsaddg.total"> - </el-pagination> - </div> - </c-col> - </div> + <c-row> + <c-col :span="11"> + <c-ptap + :model="model" + :argadr="{ + title: 'Drawer', + grp: 'bodgrp', + rol: 'drr', + }" + :disabledRef="false" + :disabledExtkey="true" + :disabled="true" + @onSeainf="onSeainf" + @onAplpDet="onBenpDet" + > + </c-ptap> + + <c-ptap + :model="model" + :argadr="{ + title: 'Drawee', + grp: 'bodgrp', + rol: 'dre', + }" + :disabledRef="true" + :disabledExtkey="true" + :disabled="true" + @onSeainf="onSeainf" + @onAplpDet="onBenpDet" + > + </c-ptap> + </c-col> + <c-col :span="11" :offset="1"> + <c-ptap + :model="model" + :argadr="{ + title: 'Collecting Bank', + grp: 'bodgrp', + rol: 'col', + }" + :disabledRef="true" + :disabledExtkey="true" + :disabled="true" + @onSeainf="onSeainf" + @onAplpDet="onBenpDet" + > + </c-ptap> + </c-col> + + <c-col :span="24"> + <c-edit-table :model="model" v-bind="ptsaddg" > + <el-table-column label="操作" text-align="center"> + <template slot-scope="scope"> + <el-button + + size="mini" + @click="handleEdit(scope.$index, scope.row)" + type="primary" + >详情</el-button + > + </template> + </el-table-column> + </c-edit-table> + </c-col> + </c-row> </template> <script> import Api from "~/service/Api" import commonProcess from "~/mixin/commonProcess"; import CodeTable from "~/config/CodeTable" -import Event from "~/model/Botrad/Event" +import Event from "~/model/Botdcr/Event" +import Utils from "~/utils"; +import Ptap from "~/views/Public/Ptap"; export default { + components: { "c-ptap": Ptap }, inject: ['root'], props:["model","codes"], mixins: [commonProcess], data(){ return { - + ptsaddg: { + columns: [ + { + title: "角色", + width: "120px", + dataIndex: "rol", + show: "select", + code: [ + { label: "1st Third Party", value: "TP1" }, + { label: "2nd Third Party", value: "TP2" }, + ] + }, + { + title: "机构实体", + width: "180px", + dataIndex: "ptyextkey", + show: "input", + }, + { + title: "名称", + width: "300px", + dataIndex: "nam", + }, + { + title: "参考地址", + width: "300px", + dataIndex: "ref", + }, + ], + urls: "botp.ptsaddp.ptsaddg", + }, } }, methods:{...Event}, created:function(){ - + onsole.log(this.root); } } </script> <style> </style> + diff --git a/src/views/Business/Botrad/index.vue b/src/views/Business/Botrad/index.vue index 5838f8a..765fa99 100644 --- a/src/views/Business/Botrad/index.vue +++ b/src/views/Business/Botrad/index.vue @@ -1,104 +1,102 @@ <template> - <div class="eContainer"> - <el-form :model="model" :rules="rules" ref="modelForm" label-width="150px" label-position="right" size="small" :validate-on-rule-change="false"> - <c-tabs v-model="tabVal" ref="elment" type="card" @tab-click="myTabClick"> - - <!--PD000015 --> - <el-tab-pane label="PD000015" name="botrad"> - <m-botrad :model="model" :codes="codes"/> - </el-tab-pane> - - <!--PD000018 --> - <el-tab-pane label="PD000018" name="botcoll1"> - <m-botcoll1 :model="model" :codes="codes"/> - </el-tab-pane> - - <!--PD000019 --> - <el-tab-pane label="PD000019" name="botdrrl1"> - <m-botdrrl1 :model="model" :codes="codes"/> - </el-tab-pane> - - <!--PD000021 --> - <el-tab-pane label="PD000021" name="botcoll2"> - <m-botcoll2 :model="model" :codes="codes"/> - </el-tab-pane> - - <!--PD000015 --> - <el-tab-pane label="PD000015" name="detp"> - <m-detp :model="model" :codes="codes"/> - </el-tab-pane> - - <!--PD000049 --> - <el-tab-pane label="PD000049" name="inst"> - <m-inst :model="model" :codes="codes"/> - </el-tab-pane> - - <!--PD000262 --> - <el-tab-pane label="PD000262" name="ovwp"> - <m-ovwp :model="model" :codes="codes"/> - </el-tab-pane> - - <!--PD000266 --> - <el-tab-pane label="PD000266" name="ptyp"> - <m-ptyp :model="model" :codes="codes"/> - </el-tab-pane> - - <!--PD000280 --> - <el-tab-pane label="PD000280" name="instrecp"> - <m-instrecp :model="model" :codes="codes"/> - </el-tab-pane> - - <!--PD000059 --> - <el-tab-pane label="PD000059" name="ptsp150"> - <m-ptsp150 :model="model" :codes="codes"/> - </el-tab-pane> - </c-tabs> - </el-form> - </div> + <c-page title="出口托收二次寄单"> + <div class="eContainer"> + <c-function-btn :handleSubmit="handleSubmit" :handleCheck="handleCheck" :handleStash="handleStash"> + <el-button size="small">备忘录</el-button> + <el-button size="small">影像信息</el-button> + <el-button size="small">保存模板</el-button> + <el-button size="small">使用模板</el-button> + <el-button size="small">制裁信息</el-button> + <el-button size="small">拆分报文</el-button> + <el-button size="small">智能提示</el-button> + </c-function-btn> + <el-form :model="model" :rules="rules" ref="modelForm" label-width="150px" label-position="right" + size="small" :validate-on-rule-change="false"> + <c-tabs v-model="tabVal" ref="elment" type="card" @tab-click="tabClick"> + + <!--PD000015 --> + <el-tab-pane label="Overview" name="botrad1"> + <m-botrad1 :model="model" :codes="codes" /> + </el-tab-pane> + + <!--PD000266 --> + <el-tab-pane label="Party" name="ptyp"> + <m-ptyp :model="model" :codes="codes" /> + </el-tab-pane> + + <!-- PD000207 + <el-tab-pane label="PD000207" name="frmloapan"> + <m-frmloapan :model="model" :codes="codes"/> + </el-tab-pane> --> + + <el-tab-pane label="Liability" name="engp"> + <m-engp :model="model" :codes="codes" /> + </el-tab-pane> + + <!--PD000000 --> + <el-tab-pane label="Settlement" name="setpan"> + <m-setpan :model="model" :codes="codes" /> + </el-tab-pane> + + <!--PD000000 --> + <el-tab-pane label="Completion" name="coninfp"> + <m-coninfp :model="model" :codes="codes" /> + </el-tab-pane> + + <!--PD000529 --> + <el-tab-pane label="Messages" name="docpan"> + <m-docpan :model="model" :codes="codes" /> + </el-tab-pane> + + <!--PD000546 --> + <el-tab-pane label="Attachments" name="doctre"> + <m-doctre :model="model" :codes="codes" /> + </el-tab-pane> + </c-tabs> + </el-form> + </div> + </c-page> </template> <script> import Api from "~/service/Api" import CodeTable from "~/config/CodeTable" -// import Botrad from "~/model/Botrad" +import commonFuncs from "~/mixin/commonFuncs"; +import Botrad from "~/model/Botrad" import commonProcess from "~/mixin/commonProcess" import Check from "~/model/Botrad/Check" import Default from "~/model/Botrad/Default" +import Engp from "~/views/Public/Engp" +import Setpan from "~/views/Public/Setpan" import Pattern from "~/model/Botrad/Pattern" -import Botrad from "./Botrad" -import Botcoll1 from "./Botcoll1" -import Botdrrl1 from "./Botdrrl1" -import Botcoll2 from "./Botcoll2" -import Detp from "./Detp" -import Inst from "./Inst" -import Ovwp from "./Ovwp" +import Coninfp from "~/views/Public/Coninfp" +import Docpan from "~/views/Public/Docpan" +import Doctre from "~/views/Public/Doctre" +import Botrad1 from "./Botrad" import Ptyp from "./Ptyp" -import Instrecp from "./Instrecp" -import Ptsp150 from "./Ptsp150" +// import Frmloapan from "./Frmloapan" export default { name: "Botrad", - components:{ - "m-botrad" : Botrad, - "m-botcoll1" : Botcoll1, - "m-botdrrl1" : Botdrrl1, - "m-botcoll2" : Botcoll2, - "m-detp" : Detp, - "m-inst" : Inst, - "m-ovwp" : Ovwp, - "m-ptyp" : Ptyp, - "m-instrecp" : Instrecp, - "m-ptsp150" : Ptsp150, + components: { + "m-botrad1": Botrad1, + "m-ptyp": Ptyp, + // "m-frmloapan": Frmloapan, + "m-setpan": Setpan, + "m-coninfp": Coninfp, + "m-engp": Engp, + "m-docpan": Docpan, + "m-doctre": Doctre, }, provide() { return { root: this } }, - mixins: [commonProcess], // 里面包含了Default、Check等的公共处理 - data(){ + mixins: [commonProcess, commonFuncs], // 里面包含了Default、Check等的公共处理 + data() { return { - tabVal: "", + tabVal: "botrad1", trnName: "botrad", model: new Botrad().data, checkRules: Check, @@ -106,33 +104,34 @@ export default { pattern: Pattern, rules: null, codes: { + ...CodeTable }, } }, - methods:{ - myTabClick(tab){ - this.tabClick(tab) - /** - * do it yourself - **/ - } + methods: { + // myTabClick(tab) { + // this.tabClick(tab) + // /** + // * do it yourself + // **/ + // } }, - created:async function(){ + created: async function () { console.log("进入botrad交易"); let rtnmsg = await this.init({}) - if(rtnmsg.respCode == SUCCESS) - { - this.updateModel(rtnmsg.data) - //TODO 处理数据逻辑 + if (rtnmsg.respCode == SUCCESS) { + this.updateModel(rtnmsg.data) + //TODO 处理数据逻辑 + if (this.isInDisplay) { + this.restoreDisplay(); + } } - else - { - this.$notify.error({title: '错误',message: '服务请求失败!'}); + else { + this.$notify.error({ title: '错误', message: '服务请求失败!' }); } } } </script> <style> - </style> diff --git a/src/views/Business/Brtdck/index.vue b/src/views/Business/Brtdck/index.vue index 73dced2..903d079 100644 --- a/src/views/Business/Brtdck/index.vue +++ b/src/views/Business/Brtdck/index.vue @@ -145,9 +145,11 @@ export default { let rtnmsg = await this.init({}) if(rtnmsg.respCode == SUCCESS) { - this.updateModel(rtnmsg.data) + this.updateModel(rtnmsg.data) //TODO 处理数据逻辑 - + if (this.isInDisplay) { + this.restoreDisplay(); + } } else { diff --git a/src/views/Business/Brteus/index.vue b/src/views/Business/Brteus/index.vue index 98abec6..291e35c 100644 --- a/src/views/Business/Brteus/index.vue +++ b/src/views/Business/Brteus/index.vue @@ -162,6 +162,9 @@ export default { if (rtnmsg.respCode == SUCCESS) { this.updateModel(rtnmsg.data) //TODO 处理数据逻辑 + if (this.isInDisplay) { + this.restoreDisplay(); + } } else { diff --git a/src/views/Business/Brtudp/index.vue b/src/views/Business/Brtudp/index.vue index 8e26654..b2174ad 100644 --- a/src/views/Business/Brtudp/index.vue +++ b/src/views/Business/Brtudp/index.vue @@ -192,6 +192,9 @@ export default { if (rtnmsg.respCode == SUCCESS) { this.updateModel(rtnmsg.data); //TODO 处理数据逻辑 + if (this.isInDisplay) { + this.restoreDisplay(); + } } else { this.$notify.error({ title: "错误", message: "服务请求失败!" }); } diff --git a/src/views/Business/BusRouter.js b/src/views/Business/BusRouter.js index 765ddc6..a6dee94 100644 --- a/src/views/Business/BusRouter.js +++ b/src/views/Business/BusRouter.js @@ -335,7 +335,7 @@ const BusRouter = [ { path: 'Dbipty', component: Dbipty, name: 'Dbipty', meta: { title: '客户静态信息管理' } }, { path: 'betdcr', component: Betdcr, name: 'Betdcr', meta: { title: '出口信用证电提不符点/拒付' } }, { path: 'betdrv', component: Betdrv, name: 'Betdrv', meta: { title: '出口信用证单据修改' } }, - { path: 'letnot', component: Letnot, name: 'Letnot', meta: { title: '出口信用证预通知' } }, + { path: 'letnot', component: Letnot, name: 'Letnot', meta: { title: '出口信用证预开立' } }, { path: 'infbpd', component: Infbpd, name: 'Infbpd', meta: { title: '出口押汇查询' } }, diff --git a/src/views/Business/Detopn/Ovwp.vue b/src/views/Business/Detopn/Ovwp.vue index c57c121..d8155e4 100644 --- a/src/views/Business/Detopn/Ovwp.vue +++ b/src/views/Business/Detopn/Ovwp.vue @@ -1,153 +1,159 @@ <template> - <div class="eibs-tab"> - - <!-- ====================左边======================= --> - <c-col :span="11"> - <c-col :span="24"> - <c-col :span="20"> - <el-form-item - label="信用证号码" - prop="dedgrp.rec.ownref" - style="width: 100%" - > - <c-input - v-model="model.dedgrp.rec.ownref" - maxlength="16" - placeholder="请输入Reference" - style="width: 95%" - disabled - ></c-input> - </el-form-item> - </c-col> - <!-- <c-col :span="1" style="text-align: right"> --> - <c-col :span="1"> - <!-- <el-form-item label="" label-width="5px"> --> - <c-button - style="margin: 0 10px 0 0; padding: 0 12px" - size="small" - type="primary" - @click="onSeainf" - > - <span - style="font-size: 15px; font-family: '宋体'; font-weight: bold" - >i</span - > - </c-button> - <!-- </el-form-item> --> - </c-col> - <c-col :span="2" :offset="1" style="text-align: right"> - <!-- <el-form-item label="" label-width="5px"> --> - <c-button - style="margin: 0 0" - size="small" - type="primary" - :disabled="this.flag" - @click="onDetpButgetref" - > - 获取 - </c-button> - <!-- </el-form-item> --> - </c-col> - <!-- </c-col> --> - </c-col> + <div class="eibs-tab"> + <!-- ====================左边======================= --> + <c-col :span="11"> + <c-col :span="24"> + <c-col :span="20"> + <el-form-item + label="信用证号码" + prop="dedgrp.rec.ownref" + style="width: 100%" + > + <c-input + v-model="model.dedgrp.rec.ownref" + maxlength="16" + placeholder="请输入Reference" + style="width: 95%" + disabled + ></c-input> + </el-form-item> + </c-col> + <!-- <c-col :span="1" style="text-align: right"> --> + <c-col :span="1"> + <!-- <el-form-item label="" label-width="5px"> --> + <c-button + style="margin: 0 10px 0 0; padding: 0 12px" + size="small" + type="primary" + @click="onSeainf" + > + <span + style=" + font-size: 15px; + font-family: '宋体'; + font-weight: bold; + " + >i</span + > + </c-button> + <!-- </el-form-item> --> + </c-col> + <c-col :span="2" :offset="1" style="text-align: right"> + <!-- <el-form-item label="" label-width="5px"> --> + <c-button + style="margin: 0 0" + size="small" + type="primary" + :disabled="this.flag" + @click="onDetpButgetref" + > + 获取 + </c-button> + <!-- </el-form-item> --> + </c-col> + <!-- </c-col> --> + </c-col> - <c-col :span="24"> - <el-form-item label="是否可以转让" prop="dedgrp.rec.lcrtyp"> - <c-select - v-model="model.dedgrp.rec.lcrtyp" - style="width: 100%" - placeholder="请选择" - > - <el-option - v-for="item in codes.lcrtyp" - :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 label="是否可以转让" prop="dedgrp.rec.lcrtyp"> + <c-select + v-model="model.dedgrp.rec.lcrtyp" + style="width: 100%" + placeholder="请选择" + > + <el-option + v-for="item in codes.lcrtyp" + :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 - label="所属客户经理" - prop="detp.usr.extkey" - style="width: 100%" - > - <c-fullbox> - <c-input - v-model="model.detp.usr.extkey" - maxlength="8" - placeholder="请输入所属客户经理" - disabled - ></c-input> - <template slot="footer"> - <c-button - style="margin-left:10px;padding: 0 10px;" - size="small" - icon="el-icon-search" - type="primary" - @click="onExtkey" - ></c-button> - </template> - </c-fullbox> - </el-form-item> - </c-col> + <c-col :span="24"> + <el-form-item + label="所属客户经理" + prop="detp.usr.extkey" + style="width: 100%" + > + <c-fullbox> + <c-input + v-model="model.detp.usr.extkey" + maxlength="8" + placeholder="请输入所属客户经理" + disabled + ></c-input> + <template slot="footer"> + <c-button + style="margin-left: 10px; padding: 0 10px" + size="small" + icon="el-icon-search" + type="primary" + @click="onExtkey" + ></c-button> + </template> + </c-fullbox> + </el-form-item> + </c-col> - <!-- <c-col> + <!-- <c-col> </c-col> --> - <c-col :span="13"> - <el-form-item label="信用证金额" prop="dedgrp.cbs.nom1.cur"> - <c-select - disabled - v-model="model.dedgrp.cbs.nom1.cur" - style="width: 100%" - placeholder="请选择Currency" - @keyup.enter.native="nom1CurEvent" - > - <el-option - v-for="item in codes.cur" - :key="item.value" - :label="item.label" - :value="item.value" - > - </el-option> - </c-select> - </el-form-item> - </c-col> + <c-col :span="13"> + <el-form-item label="信用证金额" prop="dedgrp.cbs.nom1.cur"> + <c-select + disabled + v-model="model.dedgrp.cbs.nom1.cur" + style="width: 100%" + placeholder="请选择Currency" + @keyup.enter.native="nom1CurEvent" + > + <el-option + v-for="item in codes.cur" + :key="item.value" + :label="item.label" + :value="item.value" + > + </el-option> + </c-select> + </el-form-item> + </c-col> - <c-col :span="11"> - <el-form-item - style="text-align: left" - label-width="5px" - prop="dedgrp.cbs.nom1.amt" - > - <c-input-currency - v-model="model.dedgrp.cbs.nom1.amt" - style="text-align: left; width: 100%" - placeholder="请输入信用证金额" - @keyup.enter.native=" - defaultFunction('dedgrp.cbs.nom1.amt', model.dedgrp.cbs.nom1.amt) - " - ></c-input-currency> - </el-form-item> - </c-col> + <c-col :span="11"> + <el-form-item + style="text-align: left" + label-width="5px" + prop="dedgrp.cbs.nom1.amt" + > + <c-input-currency + v-model="model.dedgrp.cbs.nom1.amt" + style="text-align: left; width: 100%" + placeholder="请输入信用证金额" + @keyup.enter.native=" + defaultFunction( + 'dedgrp.cbs.nom1.amt', + model.dedgrp.cbs.nom1.amt + ) + " + ></c-input-currency> + </el-form-item> + </c-col> - <c-col :span="24"> - <el-form-item label="大写金额" prop="detp.upamt"> - <c-input - v-model="model.detp.upamt" - maxlength="76" - placeholder="请输入大写金额" - disabled - ></c-input> - </el-form-item> - </c-col> + <c-col :span="24"> + <el-form-item label="大写金额" prop="detp.upamt"> + <c-input + v-model="model.detp.upamt" + maxlength="76" + placeholder="请输入大写金额" + disabled + ></c-input> + </el-form-item> + </c-col> - <!-- <c-col :span="24"> + <!-- <c-col :span="24"> <c-col :span="13"> <el-form-item label="上下浮动限额" prop="dedgrp.rec.nomtop"> <c-input @@ -169,31 +175,38 @@ </c-col> </c-col> --> - <c-col :span="24"> - <c-col :span="13"> - <c-form-item label="上下浮动限额" prop="dedgrp.rec.nomtop"> + <c-col :span="24"> + <c-col :span="13"> + <c-form-item label="上下浮动限额" prop="dedgrp.rec.nomtop"> + <c-input + v-model="model.dedgrp.rec.nomtop" + maxlength="9" + style="width: 100%" + placeholder="请输入Amount Tolerance - Positive" + ></c-input> + </c-form-item> + </c-col> + <c-col :span="1" style="text-align: center"> + <label + style=" + display: inline-block; + width: calc(3% - 4px); + text-align: center; + " + >-</label + > + </c-col> + <c-col :span="10"> <c-input - v-model="model.dedgrp.rec.nomtop" + v-model="model.dedgrp.rec.nomton" maxlength="9" style="width: 100%" - placeholder="请输入Amount Tolerance - Positive" + placeholder="请输入Amount Tolerance - Negative" ></c-input> - </c-form-item> - </c-col> - <c-col :span="1" style="text-align:center"> - <label style="display:inline-block;width:calc(3% - 4px);text-align:center;">-</label> + </c-col> </c-col> - <c-col :span="10"> - <c-input - v-model="model.dedgrp.rec.nomton" - maxlength="9" - style="width: 100%" - placeholder="请输入Amount Tolerance - Negative" - ></c-input> - </c-col> - </c-col> - <!-- <c-col :span="12" style="text-align: left"> + <!-- <c-col :span="12" style="text-align: left"> <el-form-item label="" style="text-align: left; margin-left: 12px" @@ -208,56 +221,60 @@ </el-form-item> </c-col> --> - <!-- <c-col> </c-col> --> - - <c-col :span="13"> - <el-form-item label="信用证最大金额" prop="dedgrp.cbs.max.cur"> - <c-select - v-model="model.dedgrp.cbs.max.cur" - placeholder="请选择Currency" - disabled - > - <el-option - v-for="item in codes.cur" - :key="item.value" - :label="item.label" - :value="item.value" - > - </el-option> - </c-select> - </el-form-item> - </c-col> + <!-- <c-col> </c-col> --> - <c-col :span="11"> - <el-form-item label="" label-width="5px" prop="dedgrp.cbs.max.amt"> - <c-input - v-model="model.dedgrp.cbs.max.amt" - placeholder="请输入信用证最大金额" - disabled - ></c-input> - </el-form-item> - </c-col> + <c-col :span="13"> + <el-form-item label="信用证最大金额" prop="dedgrp.cbs.max.cur"> + <c-select + v-model="model.dedgrp.cbs.max.cur" + placeholder="请选择Currency" + disabled + > + <el-option + v-for="item in codes.cur" + :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 label="贸易类型" prop="dedgrp.rec.mytype"> - <c-select - v-model="model.dedgrp.rec.mytype" - style="width: 100%" - placeholder="请选择贸易类型" - @change="mytypeChange" - > - <el-option - v-for="item in codes.mytype" - :key="item.value" - :label="item.label" - :value="item.value" - > - </el-option> - </c-select> - </el-form-item> - </c-col> + <c-col :span="11"> + <el-form-item + label="" + label-width="5px" + prop="dedgrp.cbs.max.amt" + > + <c-input + v-model="model.dedgrp.cbs.max.amt" + placeholder="请输入信用证最大金额" + disabled + ></c-input> + </el-form-item> + </c-col> + + <c-col :span="24"> + <el-form-item label="贸易类型" prop="dedgrp.rec.mytype"> + <c-select + v-model="model.dedgrp.rec.mytype" + style="width: 100%" + placeholder="请选择贸易类型" + @change="mytypeChange" + > + <el-option + v-for="item in codes.mytype" + :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"> <c-col :span="13"> <el-form-item label="开证日期" prop="dedgrp.rec.opndat"> <c-date-picker @@ -270,61 +287,60 @@ </el-form-item> </c-col> </c-col> --> - <c-col :span="24"> - <c-form-item label="开证日期" prop="dedgrp.rec.opndat"> - <c-date-picker - type="date" - v-model="model.dedgrp.rec.opndat" - value-format="yyyy-MM-dd" - placeholder="请选择Date" - style="width:100%" - ></c-date-picker> - </c-form-item> - </c-col> - <c-col :span="24"> - <el-form-item - v-if="model.dedgrp.rec.mytype == 'H'" - label="最迟货物装运日" - prop="dedgrp.rec.shpdat" - > - <c-date-picker - type="date" - v-model="model.dedgrp.rec.shpdat" - value-format="yyyy-MM-dd" - style="width: 100%" - placeholder="请选择Date" - ></c-date-picker> - </el-form-item> - <el-form-item - v-if="model.dedgrp.rec.mytype == 'F'" - label="最迟服务提供日" - prop="dedgrp.rec.shpdat" - > - <c-date-picker - type="date" - v-model="model.dedgrp.rec.shpdat" - value-format="yyyy-MM-dd" - style="width: 100%" - placeholder="请选择Date" - - ></c-date-picker> - </el-form-item> - <el-form-item - label="最迟货物装运日/服务提供日" - v-if="model.dedgrp.rec.mytype == '3'" - prop="dedgrp.rec.shpdat" - > - <c-date-picker - type="date" - v-model="model.dedgrp.rec.shpdat" - value-format="yyyy-MM-dd" - style="width: 100%" - placeholder="请选择" - ></c-date-picker> - </el-form-item> - </c-col> + <c-col :span="24"> + <c-form-item label="开证日期" prop="dedgrp.rec.opndat"> + <c-date-picker + type="date" + v-model="model.dedgrp.rec.opndat" + value-format="yyyy-MM-dd" + placeholder="请选择Date" + style="width: 100%" + ></c-date-picker> + </c-form-item> + </c-col> + <c-col :span="24"> + <el-form-item + v-if="model.dedgrp.rec.mytype == 'H'" + label="最迟货物装运日" + prop="dedgrp.rec.shpdat" + > + <c-date-picker + type="date" + v-model="model.dedgrp.rec.shpdat" + value-format="yyyy-MM-dd" + style="width: 100%" + placeholder="请选择Date" + ></c-date-picker> + </el-form-item> + <el-form-item + v-if="model.dedgrp.rec.mytype == 'F'" + label="最迟服务提供日" + prop="dedgrp.rec.shpdat" + > + <c-date-picker + type="date" + v-model="model.dedgrp.rec.shpdat" + value-format="yyyy-MM-dd" + style="width: 100%" + placeholder="请选择Date" + ></c-date-picker> + </el-form-item> + <el-form-item + label="最迟货物装运日/服务提供日" + v-if="model.dedgrp.rec.mytype == '3'" + prop="dedgrp.rec.shpdat" + > + <c-date-picker + type="date" + v-model="model.dedgrp.rec.shpdat" + value-format="yyyy-MM-dd" + style="width: 100%" + placeholder="请选择" + ></c-date-picker> + </el-form-item> + </c-col> - <!-- <c-col :span="24"> + <!-- <c-col :span="24"> <c-col :span="13"> <el-form-item label="有效日期" prop="dedgrp.rec.expdat"> <c-date-picker @@ -337,41 +353,41 @@ </el-form-item> </c-col> </c-col> --> - <c-col :span="24"> - <c-form-item label="有效日期" prop="dedgrp.rec.expdat"> - <c-date-picker - type="date" - v-model="model.dedgrp.rec.expdat" - value-format="yyyy-MM-dd" - placeholder="请选择Date" - style="width:100%" - ></c-date-picker> - </c-form-item> - </c-col> + <c-col :span="24"> + <c-form-item label="有效日期" prop="dedgrp.rec.expdat"> + <c-date-picker + type="date" + v-model="model.dedgrp.rec.expdat" + value-format="yyyy-MM-dd" + placeholder="请选择Date" + style="width: 100%" + ></c-date-picker> + </c-form-item> + </c-col> - <c-col :span="24"> - <c-form-item label="开证行开证类型" prop="dedgrp.rec.dkflg"> - <c-select - v-model="model.dedgrp.rec.dkflg" - style="width: 100%" - placeholder="请选择" - :code="codes.dkflg" - disabled - ></c-select> - </c-form-item> - </c-col> + <c-col :span="24"> + <c-form-item label="开证行开证类型" prop="dedgrp.rec.dkflg"> + <c-select + v-model="model.dedgrp.rec.dkflg" + style="width: 100%" + placeholder="请选择" + :code="codes.dkflg" + disabled + ></c-select> + </c-form-item> + </c-col> - <c-col :span="24"> - <el-form-item label="有效地点" prop="dedgrp.rec.expplc"> - <c-input - v-model="model.dedgrp.rec.expplc" - maxlength="35" - placeholder="请输入Place of Expiry" - ></c-input> - </el-form-item> - </c-col> + <c-col :span="24"> + <el-form-item label="有效地点" prop="dedgrp.rec.expplc"> + <c-input + v-model="model.dedgrp.rec.expplc" + maxlength="35" + placeholder="请输入Place of Expiry" + ></c-input> + </el-form-item> + </c-col> - <!-- <c-col :span="24"> + <!-- <c-col :span="24"> <c-col :span="13"> <el-form-item label="货运时间" prop="dedgrp.rec.shpdat"> <c-date-picker @@ -383,50 +399,50 @@ </el-form-item> </c-col> </c-col> --> - <c-col :span="24"> - <c-form-item label="货运时间" prop="dedgrp.rec.shpdat"> - <c-date-picker - type="date" - v-model="model.dedgrp.rec.shpdat" - style="width: 100%" - placeholder="请选择Shipment Date" - ></c-date-picker> - </c-form-item> - </c-col> + <c-col :span="24"> + <c-form-item label="货运时间" prop="dedgrp.rec.shpdat"> + <c-date-picker + type="date" + v-model="model.dedgrp.rec.shpdat" + style="width: 100%" + placeholder="请选择Shipment Date" + ></c-date-picker> + </c-form-item> + </c-col> - <c-col :span="24"> - <el-form-item label="转运" prop="dedgrp.rec.shptrs"> - <c-select - v-model="model.dedgrp.rec.shptrs" - style="width: 100%" - placeholder="请选择" - :disabled="model.dedgrp.rec.mytype == 'F'" - > - <el-option label="不允许" value="禁止"></el-option> - <el-option label="允许" value="允许"></el-option> - </c-select> - </el-form-item> - </c-col> + <c-col :span="24"> + <el-form-item label="转运" prop="dedgrp.rec.shptrs"> + <c-select + v-model="model.dedgrp.rec.shptrs" + style="width: 100%" + placeholder="请选择" + :disabled="model.dedgrp.rec.mytype == 'F'" + > + <el-option label="不允许" value="禁止"></el-option> + <el-option label="允许" value="允许"></el-option> + </c-select> + </el-form-item> + </c-col> - <c-col :span="24"> - <el-form-item label="是否通过电证系统" prop="dedgrp.rec.elcflg"> - <c-select - v-model="model.dedgrp.rec.elcflg" - style="width: 100%" - placeholder="请选择是否通过电证系统" - > - <el-option - v-for="item in codes.elcflg" - :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 label="是否通过电证系统" prop="dedgrp.rec.elcflg"> + <c-select + v-model="model.dedgrp.rec.elcflg" + style="width: 100%" + placeholder="请选择是否通过电证系统" + > + <el-option + v-for="item in codes.elcflg" + :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 label="是否代开信用证" prop="dedgrp.rec.dkflg"> <c-select v-model="model.dedgrp.rec.dkflg" style="width:100%" placeholder="请选择是否代开信用证"> @@ -435,81 +451,94 @@ </c-col> --> - <c-col :span="24"> - <el-form-item label="信用证兑付方式" prop="dedgrp.rec.avbby"> - <c-select - v-model="model.dedgrp.rec.avbby" - style="width: 100%" - @change="avbbykeyEvent" - placeholder="请选择" - > - <el-option - v-for="item in codes.avbby0" - :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 label="天数" prop="dedgrp.rec.tenmaxday"> - <c-input - v-model="model.dedgrp.rec.tenmaxday" - maxlength="35" - placeholder="请输入天数" - :disabled = "model.dedgrp.rec.avbby == 'P'" - ></c-input> - </el-form-item> - </c-col> + <c-col :span="24"> + <el-form-item label="信用证兑付方式" prop="dedgrp.rec.avbby"> + <c-select + v-model="model.dedgrp.rec.avbby" + style="width: 100%" + @change="avbbykeyEvent" + placeholder="请选择" + > + <el-option + v-for="item in codes.avbby0" + :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 label="远期付款指示" prop="dedgrp.blk.dftat"> - <c-input - type="textarea" - v-model="model.dedgrp.blk.dftat" - maxlength="35" - show-word-limit - placeholder="请输入远期付款指示" - ></c-input> - </el-form-item> - </c-col> + <c-col :span="24"> + <el-form-item label="天数" prop="dedgrp.rec.tenmaxday"> + <c-input + v-model="model.dedgrp.rec.tenmaxday" + maxlength="35" + placeholder="请输入天数" + :disabled="model.dedgrp.rec.avbby == 'P'" + ></c-input> + </el-form-item> + </c-col> - </c-col> + <c-col :span="24"> + <el-form-item label="远期付款指示" prop="dedgrp.blk.dftat"> + <c-input + type="textarea" + v-model="model.dedgrp.blk.dftat" + maxlength="35" + show-word-limit + placeholder="请输入远期付款指示" + ></c-input> + </el-form-item> + </c-col> + </c-col> - <!-- ========================右边======================= --> - <c-col :span="11" :offset="1"> - <c-col :span="24"> - <el-form-item label="摘要" prop="dedgrp.rec.nam"> - <c-input - text-align="middle" - v-model="model.dedgrp.rec.nam" - maxlength="40" - disabled - placeholder="请输入Externally Displayed Name to Identify the Contract" - ></c-input> - </el-form-item> - </c-col> + <!-- ========================右边======================= --> + <c-col :span="11" :offset="1"> + <c-col :span="24"> + <el-form-item label="摘要" prop="dedgrp.rec.nam"> + <c-input + text-align="middle" + v-model="model.dedgrp.rec.nam" + maxlength="40" + disabled + placeholder="请输入Externally Displayed Name to Identify the Contract" + ></c-input> + </el-form-item> + </c-col> - <c-col :span="24"> - <c-ptap - :model="model" - :argadr="{ - title: '受益人', - grp: 'dedgrp', - rol: 'ben', - }" - :disabled="true" - :isAdrblk="false" - @onSeainf="onSeainf" - @onAplpDet="onBenpDet" - > - </c-ptap> - </c-col> + <c-col :span="24"> + <c-ptap + :model="model" + :argadr="{ + title: '受益人', + grp: 'dedgrp', + rol: 'ben', + }" + :disabled="true" + :isAdrblk="false" + @onSeainf="onSeainf" + @onAplpDet="onBenpDet" + > + </c-ptap> + </c-col> - <!-- + <c-col :span="24"> + <c-col :span="24"> + <el-form-item + label="受益人账号" + prop="dedgrp.ben.pts.extact" + > + <c-input + v-model="model.dedgrp.ben.pts.extact" + maxlength="16" + placeholder="请输入受益人账号" + ></c-input> + </el-form-item> + </c-col> + </c-col> + <!-- <c-col :span="24"> <c-col :span="24"> <el-form-item label="受益人参考号" prop="dedgrp.ben.pts.ref"> @@ -568,45 +597,48 @@ </c-col> --> - <c-col :span="24"> - <el-form-item label="联行行号" prop="dedgrp.beb.pts.bankno"> - <c-input - v-model="model.dedgrp.beb.pts.bankno" - maxlength="20" - placeholder="请输入Number of bank" - ></c-input> - </el-form-item> - </c-col> + <c-col :span="24"> + <el-form-item label="联行行号" prop="dedgrp.beb.pts.bankno"> + <c-input + v-model="model.dedgrp.beb.pts.bankno" + maxlength="20" + placeholder="请输入Number of bank" + ></c-input> + </el-form-item> + </c-col> - <c-col :span="24"> - <el-form-item label="联行名称 电证用" prop="dedgrp.beb.pts.jigomc"> - <c-input - type="textarea" - v-model="model.dedgrp.beb.pts.jigomc" - maxlength="35" - show-word-limit - placeholder="请输入联行名称 电证用" - ></c-input> - </el-form-item> - </c-col> + <c-col :span="24"> + <el-form-item + label="联行名称 电证用" + prop="dedgrp.beb.pts.jigomc" + > + <c-input + type="textarea" + v-model="model.dedgrp.beb.pts.jigomc" + maxlength="35" + show-word-limit + placeholder="请输入联行名称 电证用" + ></c-input> + </el-form-item> + </c-col> - <c-col :span="24"> - <c-ptap - :model="model" - :argadr="{ - title: '申请人', - grp: 'dedgrp', - rol: 'apl', - }" - :disabled="true" - :isAdrblk="false" - @onSeainf="onSeainf" - @onAplpDet="onBenpDet" - > - </c-ptap> - </c-col> + <c-col :span="24"> + <c-ptap + :model="model" + :argadr="{ + title: '申请人', + grp: 'dedgrp', + rol: 'apl', + }" + :disabled="true" + :isAdrblk="false" + @onSeainf="onSeainf" + @onAplpDet="onBenpDet" + > + </c-ptap> + </c-col> - <!-- + <!-- <c-col :span="24"> <el-form-item label="申请人参考号" prop="dedgrp.apl.pts.ref"> <c-input v-model="model.dedgrp.apl.pts.ref" maxlength="16" placeholder="请输入申请人参考号"></c-input> @@ -662,44 +694,43 @@ </c-col> --> - <c-col :span="24"> - <el-form-item label="是否通知客户" prop="dedgrp.rec.rejflg"> - <c-select - v-model="model.dedgrp.rec.rejflg" - style="width: 100%" - placeholder="请选择是否通知客户" - > - </c-select> - </el-form-item> - </c-col> - - <c-col :span="24"> - <el-form-item label="拒绝通知理由" prop="dedgrp.blk.rejadvrsn"> - <c-input - type="textarea" - v-model="model.dedgrp.blk.rejadvrsn" - maxlength="35" - show-word-limit - placeholder="请输入拒绝通知理由" - ></c-input> - </el-form-item> - </c-col> + <c-col :span="24"> + <el-form-item label="是否通知客户" prop="dedgrp.rec.rejflg"> + <c-select + v-model="model.dedgrp.rec.rejflg" + style="width: 100%" + placeholder="请选择是否通知客户" + > + </c-select> + </el-form-item> + </c-col> - <c-col :span="24"> - <el-form-item label="交单期限" prop="dedgrp.blk.preper"> - <c-input - type="textarea" - v-model="model.dedgrp.blk.preper" - maxlength="35" - show-word-limit - placeholder="请输入交单期限" - ></c-input> - </el-form-item> - </c-col> + <c-col :span="24"> + <el-form-item label="拒绝通知理由" prop="dedgrp.blk.rejadvrsn"> + <c-input + type="textarea" + v-model="model.dedgrp.blk.rejadvrsn" + maxlength="35" + show-word-limit + placeholder="请输入拒绝通知理由" + ></c-input> + </el-form-item> + </c-col> - </c-col> + <c-col :span="24"> + <el-form-item label="交单期限" prop="dedgrp.blk.preper"> + <c-input + type="textarea" + v-model="model.dedgrp.blk.preper" + maxlength="35" + show-word-limit + placeholder="请输入交单期限" + ></c-input> + </el-form-item> + </c-col> + </c-col> - <!-- + <!-- <c-col :span="12"> <el-form-item label="" prop="detp.usrget.sdamod.seainf"> <c-input v-model="model.detp.usrget.sdamod.seainf" placeholder="请输入"></c-input> @@ -713,31 +744,31 @@ </el-form-item> </c-col> --> - <!-- + <!-- <c-col :span="12"> <el-form-item label="Address Block" prop="dedgrp.ben.pts.adrblk"> <c-input type="textarea" v-model="model.dedgrp.ben.pts.adrblk" maxlength="35" show-word-limit placeholder="请输入Address Block" ></c-input> </el-form-item> </c-col> --> - <!-- + <!-- <c-col :span="12"> <el-form-item label="Chinese address" prop="dedgrp.ben.dbfadrblkcn"> <c-input type="textarea" v-model="model.dedgrp.ben.dbfadrblkcn" maxlength="35" show-word-limit placeholder="请输入Chinese address" ></c-input> </el-form-item> </c-col> --> - <!-- TODO 貌似多余的 + <!-- TODO 貌似多余的 <c-col :span="12"> <span v-text="model.detp.zchday" data-path=".detp.zchday"> </span> </c-col> --> - <!-- + <!-- <c-col :span="12"> <el-form-item label="Drag Drop Sender" prop="detp.aplp.ptsget.sdamod.dadsnd"> <c-input v-model="model.detp.aplp.ptsget.sdamod.dadsnd" placeholder="请输入Drag Drop Sender"></c-input> </el-form-item> </c-col> --> - <!-- + <!-- <c-col :span="12"> <el-form-item label="" prop="detp.aplp.ptsget.sdamod.seainf"> <c-input v-model="model.detp.aplp.ptsget.sdamod.seainf" placeholder="请输入"></c-input> @@ -745,7 +776,7 @@ </c-col> --> - <!-- + <!-- <c-col :span="12"> <c-button size="small" type="primary" @click="onAplpDet"> Details @@ -753,7 +784,7 @@ </c-col> --> - <!-- + <!-- <c-col :span="12"> <el-form-item label="Chinese address" prop="dedgrp.apl.dbfadrblkcn"> <c-input type="textarea" v-model="model.dedgrp.apl.dbfadrblkcn" maxlength="35" show-word-limit placeholder="请输入Chinese address" ></c-input> @@ -805,7 +836,7 @@ </el-form-item> </c-col> --> - </div> + </div> </template> <script> import Api from "~/service/Api"; @@ -815,23 +846,23 @@ import Utils from "~/utils"; import Ptap from "~/views/Public/Ptap"; export default { - components: { "c-ptap": Ptap }, - inject: ["root"], - props: ["model", "codes"], - mixins: [commonProcess], - data() { - return { - jigomcFlag: false, - trade: "", - }; - }, - methods: { ...Event }, - created: function () {}, - computed: { - flag() { - return this.model.dedgrp.ben.pts.extkey == ""; + components: { "c-ptap": Ptap }, + inject: ["root"], + props: ["model", "codes"], + mixins: [commonProcess], + data() { + return { + jigomcFlag: false, + trade: "", + }; + }, + methods: { ...Event }, + created: function () {}, + computed: { + flag() { + return this.model.dedgrp.ben.pts.extkey == ""; + }, }, - }, }; </script> <style> diff --git a/src/views/Business/Ditdav/Davp.vue b/src/views/Business/Ditdav/Davp.vue index a8c794a..f7384a8 100644 --- a/src/views/Business/Ditdav/Davp.vue +++ b/src/views/Business/Ditdav/Davp.vue @@ -118,7 +118,7 @@ placeholder="请选择兑付方式" > <el-option - v-for="item in codes.avbby" + v-for="item in codes.avbby0" :key="item.value" :label="item.label" :value="item.value" @@ -303,7 +303,7 @@ v-model="model.bddgrp.rec.advtyp" style="width:100%" placeholder="请选择Type of Advice" - :code="codes.advtyp" + :code="advtyp" ></c-select> </el-form-item> </c-col> @@ -312,7 +312,7 @@ <c-col :span="12"> <el-form-item label="Payment" prop="bddgrp.rec.advdat"> <c-date-picker - disabled + :disabled="model.bddgrp.rec.advtyp=='750' || model.bddgrp.rec.advtyp=='oth'" type="date" v-model="model.bddgrp.rec.advdat" style="width:100%" @@ -323,7 +323,8 @@ <c-col :span="12"> <el-form-item label="Discrep" prop="bddgrp.rec.disdat"> - <c-date-picker + <c-date-picker + :disabled="model.bddgrp.rec.advtyp=='754' || model.bddgrp.rec.advtyp=='oth'" type="date" v-model="model.bddgrp.rec.disdat" style="width:100%" @@ -332,7 +333,7 @@ </el-form-item> </c-col> - <c-col :span="24"> + <!-- <c-col :span="24"> <el-form-item label=""> <c-checkbox v-model="model.bdtp.setnowflg">Register to Send and Settle Document</c-checkbox> </el-form-item> @@ -342,7 +343,7 @@ <el-form-item label=""> <c-checkbox v-model="model.bdtp.dcrflg" >Register to Handle Discrepancies</c-checkbox> </el-form-item> - </c-col> + </c-col> --> </c-col> @@ -378,7 +379,7 @@ </el-form-item> </c-col> - <c-col :span="24" > + <!-- <c-col :span="24" > <el-form-item label="Reference" prop="bddgrp.prb.pts.ref"> <c-input v-model="model.bddgrp.prb.pts.ref" @@ -386,9 +387,23 @@ placeholder="请输入Reference" ></c-input> </el-form-item> - </c-col> + </c-col> --> - <c-col :span="24" > + + <c-col :span="24"> + <c-ptap + :model="model" + :argadr="{ + title: 'ExtKey', + grp: 'bddgrp', + rol: 'prb', + }" + :disabled="true" + :onlySearch="true" + > + </c-ptap> + </c-col> + <!-- <c-col :span="24" > <c-col :span="19"> <el-form-item label="ExtKey" prop="bddgrp.prb.pts.extkey"> <c-input v-model="model.bddgrp.prb.pts.extkey" maxlength="16" placeholder="请输入External Key of Address"></c-input> @@ -408,12 +423,12 @@ Details </c-button> </c-col> - </c-col> + </c-col> --> <c-col :span="24" > <el-form-item label="名称" prop="bddgrp.prb.namelc"> - <c-input type="textarea" v-model="model.bddgrp.prb.namelc" maxlength="35" show-word-limit placeholder="请输入名称" ></c-input> + <c-input disabled type="textarea" v-model="model.bddgrp.prb.namelc" maxlength="35" show-word-limit placeholder="请输入名称" ></c-input> </el-form-item> </c-col> @@ -434,13 +449,20 @@ import Api from "~/service/Api" import commonProcess from "~/mixin/commonProcess"; import CodeTable from "~/config/CodeTable" import Event from "~/model/Ditdav/Event" +import Ptap from "~/views/Public/Ptap"; export default { + components: { "c-ptap": Ptap }, inject: ['root'], props:["model","codes"], mixins: [commonProcess], data(){ return { + advtyp: [ + { label: "Advice of Discrepancy (MT750)", value: "750" }, + { label: "Advice of Payment (MT754)", value: "754" }, + { label: "Other", value: "oth" }, + ], }; }, diff --git a/src/views/Business/Ditdav/Mt750p.vue b/src/views/Business/Ditdav/Mt750p.vue index 818bc26..742d9df 100644 --- a/src/views/Business/Ditdav/Mt750p.vue +++ b/src/views/Business/Ditdav/Mt750p.vue @@ -3,7 +3,7 @@ <c-col> <c-col :span="7"> <el-form-item label="单据金额" prop="bddgrp.cbs.max.cur"> - <c-input v-model="model.bddgrp.cbs.max.cur" maxlength="3" placeholder="请输入单据金额" disabled></c-input> + <c-select disabled v-model="model.bddgrp.cbs.max.cur" style="width:100%" placeholder="请选择单据金额" :code="codes.cur " ></c-select> </el-form-item> </c-col> diff --git a/src/views/Business/Ditdav/Othadvtypp.vue b/src/views/Business/Ditdav/Othadvtypp.vue index 8dd97c8..56a4425 100644 --- a/src/views/Business/Ditdav/Othadvtypp.vue +++ b/src/views/Business/Ditdav/Othadvtypp.vue @@ -76,7 +76,7 @@ <c-col :span="24"> <c-col :span="12"> <el-form-item label="名称" prop="bddgrp.acb.namelc"> - <c-input type="textarea" v-model="model.bddgrp.acb.namelc" maxlength="35" show-word-limit placeholder="请输入名称" ></c-input> + <c-input type="textarea" disabled v-model="model.bddgrp.acb.namelc" maxlength="35" show-word-limit placeholder="请输入名称" ></c-input> </el-form-item> </c-col> @@ -84,19 +84,19 @@ <c-col :span="12"> <el-form-item label="Address Block" prop="bddgrp.acb.pts.adrblk"> - <c-input type="textarea" v-model="model.bddgrp.acb.pts.adrblk" maxlength="35" show-word-limit placeholder="请输入Address Block" ></c-input> + <c-input type="textarea" disabled v-model="model.bddgrp.acb.pts.adrblk" maxlength="35" show-word-limit placeholder="请输入Address Block" ></c-input> </el-form-item> </c-col> </c-col> <c-col :span="12"> <el-form-item label="Chinese address" prop="bddgrp.acb.dbfadrblkcn"> - <c-input type="textarea" v-model="model.bddgrp.acb.dbfadrblkcn" maxlength="35" show-word-limit placeholder="请输入Chinese address" ></c-input> + <c-input type="textarea" disabled v-model="model.bddgrp.acb.dbfadrblkcn" maxlength="35" show-word-limit placeholder="请输入Chinese address" ></c-input> </el-form-item> </c-col> <c-col :span="12"> <el-form-item label="地址" prop="bddgrp.acb.adrelc"> - <c-input type="textarea" v-model="model.bddgrp.acb.adrelc" maxlength="35" show-word-limit placeholder="请输入地址" ></c-input> + <c-input type="textarea" disabled v-model="model.bddgrp.acb.adrelc" maxlength="35" show-word-limit placeholder="请输入地址" ></c-input> </el-form-item> </c-col> @@ -122,25 +122,25 @@ <c-col> <c-col :span="12"> <el-form-item label="名称" prop="bddgrp.beb.namelc"> - <c-input type="textarea" v-model="model.bddgrp.beb.namelc" maxlength="35" show-word-limit placeholder="请输入名称" ></c-input> + <c-input type="textarea" disabled v-model="model.bddgrp.beb.namelc" maxlength="35" show-word-limit placeholder="请输入名称" ></c-input> </el-form-item> </c-col> <c-col :span="12"> <el-form-item label="Address Block" prop="bddgrp.beb.pts.adrblk"> - <c-input type="textarea" v-model="model.bddgrp.beb.pts.adrblk" maxlength="35" show-word-limit placeholder="请输入Address Block" ></c-input> + <c-input type="textarea" disabled v-model="model.bddgrp.beb.pts.adrblk" maxlength="35" show-word-limit placeholder="请输入Address Block" ></c-input> </el-form-item> </c-col> <c-col :span="12"> <el-form-item label="Chinese address" prop="bddgrp.beb.dbfadrblkcn"> - <c-input type="textarea" v-model="model.bddgrp.beb.dbfadrblkcn" maxlength="35" show-word-limit placeholder="请输入Chinese address" ></c-input> + <c-input type="textarea" disabled v-model="model.bddgrp.beb.dbfadrblkcn" maxlength="35" show-word-limit placeholder="请输入Chinese address" ></c-input> </el-form-item> </c-col> <c-col :span="12"> <el-form-item label="地址" prop="bddgrp.beb.adrelc"> - <c-input type="textarea" v-model="model.bddgrp.beb.adrelc" maxlength="35" show-word-limit placeholder="请输入地址" ></c-input> + <c-input type="textarea" disabled v-model="model.bddgrp.beb.adrelc" maxlength="35" show-word-limit placeholder="请输入地址" ></c-input> </el-form-item> </c-col> </c-col> diff --git a/src/views/Business/Ditdav/index.vue b/src/views/Business/Ditdav/index.vue index 94ea668..2221480 100644 --- a/src/views/Business/Ditdav/index.vue +++ b/src/views/Business/Ditdav/index.vue @@ -53,7 +53,9 @@ <!--PD000000 --> <el-tab-pane label="账务" name="setpan"> + <c-content> <m-setpan :model="model" :codes="codes"/> + </c-content> </el-tab-pane> <!--PD000000 --> diff --git a/src/views/Business/Ditdla/Accp.vue b/src/views/Business/Ditdla/Accp.vue index 0bc4712..9bb716e 100644 --- a/src/views/Business/Ditdla/Accp.vue +++ b/src/views/Business/Ditdla/Accp.vue @@ -135,6 +135,13 @@ style="width: 100%" placeholder="请选择Available by" > + <el-option + v-for="item in codes.avbby0" + :key="item.value" + :label="item.label" + :value="item.value" + > + </el-option> </c-select> </el-form-item> </c-col> @@ -238,6 +245,13 @@ style="width: 100%" placeholder="请选择Form of Documentary Credit" > + <el-option + v-for="item in codes.lcrtyp" + :key="item.value" + :label="item.label" + :value="item.value" + > + </el-option> </c-select> </el-form-item> </c-col> @@ -245,6 +259,8 @@ <!--右边--> + <c-col :span="12"><el-form-item label=""></el-form-item></c-col> + <c-col :span="12"> <el-row> <c-col :span="20"> @@ -322,7 +338,7 @@ </c-col> - <c-col :span="23"> + <c-col :span="24"> <el-form-item label="Decrease limits stream" prop="decstm"> <c-istream-table :list="model.decstm.rows || []" diff --git a/src/views/Business/Ditdla/Ovwp.vue b/src/views/Business/Ditdla/Ovwp.vue index 091071d..980d742 100644 --- a/src/views/Business/Ditdla/Ovwp.vue +++ b/src/views/Business/Ditdla/Ovwp.vue @@ -419,7 +419,7 @@ placeholder="请选择假远期信用证" > <el-option - v-for="item in codes.jyqflg" + v-for="item in jyqflg" :key="item.value" :label="item.label" :value="item.value" @@ -581,14 +581,13 @@ </c-col> <c-col :span="24"> - <el-form-item label="申请人账号" prop="didgrp.apl.pts.extact"> - <c-select + <el-form-item label="申请人账号" style="width: 100%" prop="didgrp.apl.pts.extact"> + <c-input disabled v-model="model.didgrp.apl.pts.extact" - style="width: 100%" + maxlength="20" placeholder="请选择External Account" - > - </c-select> + ></c-input> </el-form-item> </c-col> <c-col :span="24"> @@ -831,6 +830,10 @@ export default { mixins: [commonProcess], data() { return { + jyqflg: [ + { label: "否", value: "" }, + { label: "是", value: "X" }, + ], jigomcFlag: false, trade: "", }; diff --git a/src/views/Business/Ditdla/index.vue b/src/views/Business/Ditdla/index.vue index d029f31..9b589f7 100644 --- a/src/views/Business/Ditdla/index.vue +++ b/src/views/Business/Ditdla/index.vue @@ -222,7 +222,7 @@ export default { }; }, methods: { - tabClick() {}, + // tabClick() {}, }, created: async function () { console.log("进入ditdla交易"); diff --git a/src/views/Business/Infled/Infsea.vue b/src/views/Business/Infled/Infsea.vue index 29627c7..5af740f 100644 --- a/src/views/Business/Infled/Infsea.vue +++ b/src/views/Business/Infled/Infsea.vue @@ -340,6 +340,15 @@ class="medium_bcs" size="medium" type="primary" + title="LETNOT" + @click="toLetnot" + > + 出口信用证预开立 + </c-button> + <c-button + class="medium_bcs" + size="medium" + type="primary" title="LETOPN" @click="toLetopn" > @@ -605,6 +614,9 @@ export default { this.$refs[refId].doClose(); }, + toLetnot(){ + this.$router.history.push("/business/letnot") + }, toLetopn(){ this.$router.history.push("/business/letopn") }, diff --git a/src/views/Business/Letnot/Adcp.vue b/src/views/Business/Letnot/Adcp.vue index 9e82c00..70e34ce 100644 --- a/src/views/Business/Letnot/Adcp.vue +++ b/src/views/Business/Letnot/Adcp.vue @@ -1,12 +1,12 @@ <template> <div class="eibs-tab"> - <c-col :span="19"> + <c-col :span="20"> <el-form-item label="附加条件" prop="ledgrp.blk.adlcnd"> <c-input type="textarea" - :rows="16" + :rows="20" v-model="model.ledgrp.blk.adlcnd" - maxlength="65" + maxlength="52000" show-word-limit placeholder="请输入Additional Conditions" > @@ -14,7 +14,7 @@ </el-form-item> </c-col> - <c-col :span="5" class="letopn_dogp_button"> + <c-col :span="2"> <c-button size="small" type="primary" @@ -25,38 +25,38 @@ </c-button> </c-col> - <c-col :span="24" class="letopn_adcp_cheak"> + <c-col :span="24" class="letnot_adcp_cheak"> <c-checkbox v-model="model.ledgrp.rec.spcbenflg"> 受益人特殊付款条款</c-checkbox > </c-col> - <c-col :span="24" class="letopn_adcp_cheak"> + <c-col :span="24" class="letnot_adcp_cheak"> <c-checkbox v-model="model.ledgrp.rec.spcrcbflg"> 收款银行特殊付款条款</c-checkbox > </c-col> - <c-col :span="24" class="letopn_adcp_cheak"> + <c-col :span="24" class="letnot_adcp_cheak"> <c-checkbox v-model="model.ledgrp.rec.redclsflg"> 红、绿条款选项 </c-checkbox> </c-col> - <c-col :span="19"> + <c-col :span="20"> <el-form-item label="付款、承兑、议付银行指示" prop="ledgrp.blk.insbnk"> <c-input type="textarea" - :rows="4" + :rows="5" v-model="model.ledgrp.blk.insbnk" - maxlength="65" + maxlength="780" show-word-limit placeholder="付款、承兑、议付银行指示" ></c-input> </el-form-item> </c-col> - <c-col :span="5" class="letopn_dogp_button"> + <c-col :span="2"> <c-button size="small" type="primary" @@ -86,7 +86,7 @@ export default { }; </script> <style> -.letopn_adcp_cheak { +.letnot_adcp_cheak { margin: 0px 0 10px 150px; } </style> diff --git a/src/views/Business/Letnot/Detp.vue b/src/views/Business/Letnot/Detp.vue index fc209b5..43e2444 100644 --- a/src/views/Business/Letnot/Detp.vue +++ b/src/views/Business/Letnot/Detp.vue @@ -1,6 +1,7 @@ <template> <div class="eibs-tab"> <c-row> + <!-- =========================================左边============================================= --> <c-col :span="11"> <!-- Available with --> <c-col :span="24"> @@ -19,7 +20,7 @@ <c-ptap :model="model" :argadr="{ - title: '指定银行', + title: '', grp: 'ledgrp', rol: 'avb', }" @@ -31,13 +32,14 @@ </c-ptap> </c-col> + <!-- 名称地址 --> <c-col :span="24"> - <el-form-item label="名称地址" prop="ledgrp.blk.avbwthtxt"> + <el-form-item label="" prop="ledgrp.blk.avbwthtxt"> <c-input type="textarea" :rows="3" v-model="model.ledgrp.blk.avbwthtxt" - maxlength="35" + maxlength="140" show-word-limit placeholder="请输入名称地址" ></c-input> @@ -55,41 +57,60 @@ </el-form-item> </c-col> --> + <!-- 信用证兑付方式 Available by--> <c-col :span="24"> <el-form-item label="兑付方式" prop="ledgrp.rec.avbby"> <c-select v-model="model.ledgrp.rec.avbby" style="width: 100%" placeholder="请选择兑付方式" - :code="codes.avbwth" + :code="codes.avbby0" + @change="avbbykeyEvent" > </c-select> </el-form-item> </c-col> + <!-- 远期付款指示 Deferred Payment Details--> <c-col :span="24"> - <el-form-item label="期限描述" prop="ledgrp.blk.defdet"> + <el-form-item label="远期付款指示" prop="ledgrp.blk.defdet"> <c-input type="textarea" :rows="3" v-model="model.ledgrp.blk.defdet" - maxlength="35" + maxlength="140" show-word-limit - placeholder="请输入期限描述" + placeholder="请输入远期付款指示" + :disabled="defdetFlag" ></c-input> </el-form-item> </c-col> + <!-- drafts at 汇票期限 --> <c-col :span="24"> <el-form-item label="汇票期限" prop="ledgrp.blk.dftat"> - <c-input - type="textarea" - :rows="3" - v-model="model.ledgrp.blk.dftat" - maxlength="35" - show-word-limit - placeholder="请输入汇票期限" - ></c-input> + <c-fullbox> + <c-input + type="textarea" + :rows="3" + v-model="model.ledgrp.blk.dftat" + maxlength="105" + show-word-limit + placeholder="请输入汇票期限" + :disabled="blkDftatFlag" + ></c-input> + <template slot="footer"> + <c-button + size="small" + type="primary" + icon="el-icon-search" + @click="onLcrdftatButtxmsel" + :disabled="blkDftatFlag" + > + ... + </c-button> + </template> + </c-fullbox> </el-form-item> </c-col> @@ -97,71 +118,171 @@ <c-ptap :model="model" :argadr="{ - title: '汇票申请人', + title: '付款人', grp: 'ledgrp', rol: 'drw', }" :noRef="true" + :onlySearch="false" @onSeainf="onSeainf" @onAplpDet="onDrwpDet" + :disabled="blkDftatFlag" > </c-ptap> </c-col> - </c-col> - <c-col :span="11" :offset="1"> + <!-- Dispatch from 货物转运地(港) --> <c-col :span="24"> - <el-form-item label="最大金额详情" prop="ledgrp.blk.mixdet"> + <el-form-item label="货物转运地(港)" prop="ledgrp.rec.shpfro"> <c-input type="textarea" - :rows="4" - v-model="model.ledgrp.blk.mixdet" - maxlength="35" show-word-limit - placeholder="请输入最大金额详情" + v-model="model.ledgrp.rec.shpfro" + maxlength="65" + :rows="1" + placeholder="请输入" ></c-input> </el-form-item> </c-col> - <!-- Days of presentation period --> + <!-- Air-/Port of Departure --> <c-col :span="24"> - <el-form-item label="交单期天数" prop="ledgrp.rec.prepers18"> + <el-form-item label="始发航空站/港口" prop="ledgrp.rec.porloa"> <c-input - v-model="model.ledgrp.rec.prepers18" - placeholder="请输入交单期天数" + type="textarea" + v-model="model.ledgrp.rec.porloa" + maxlength="65" + show-word-limit + :rows="1" + placeholder="请输入" ></c-input> </el-form-item> </c-col> + <!-- Air-/Port of Destination --> <c-col :span="24"> - <el-form-item label="交单期" prop="ledgrp.blk.preper"> + <el-form-item label="目的航空站/港口" prop="ledgrp.rec.pordis"> <c-input type="textarea" - v-model="model.ledgrp.blk.preper" - maxlength="35" + v-model="model.ledgrp.rec.pordis" + maxlength="65" show-word-limit - placeholder="请输入交单期" + rows="1" + placeholder="请输入" ></c-input> </el-form-item> </c-col> - <!-- Additional Details to Code for Charges CHATO --> + <!-- Final Destination --> <c-col :span="24"> - <el-form-item label="附加收费详情" prop="ledgrp.blk.feetxt"> + <el-form-item label="最终目的地" prop="ledgrp.rec.shpto"> <c-input type="textarea" - :rows="6" - v-model="model.ledgrp.blk.feetxt" - maxlength="35" + v-model="model.ledgrp.rec.shpto" + maxlength="65" show-word-limit - placeholder="请输入附加收费详情" + :rows="1" + placeholder="最终目的地" + ></c-input> + </el-form-item> + </c-col> + + <!-- Shipment Period --> + <c-col :span="24"> + <el-form-item label="装运期" prop="ledgrp.blk.shpper"> + <c-input + type="textarea" + v-model="model.ledgrp.blk.shpper" + maxlength="390" + :rows="3" + show-word-limit + placeholder="请输入装运期" + ></c-input> + </el-form-item> + </c-col> + </c-col> + + <!-- =========================================右边============================================= --> + <!-- Mixed Payment Details --> + <c-col :span="11" :offset="1"> + <c-col :span="24"> + <el-form-item label="混合付款指示" prop="ledgrp.blk.mixdet"> + <c-input + type="textarea" + :rows="4" + v-model="model.ledgrp.blk.mixdet" + maxlength="140" + show-word-limit + placeholder="混合付款指示" + :disabled="model.ledgrp.rec.avbby != 'M'" + ></c-input> + </el-form-item> + </c-col> + + <!-- 交单期限 presentation period--> + <c-col :span="24"> + <el-form-item label="交单期限" prop="ledgrp.blk.preper"> + <c-fullbox> + <c-input + type="textarea" + v-model="model.ledgrp.blk.preper" + maxlength="35" + show-word-limit + placeholder="请输入交单期限" + ></c-input> + <template slot="footer"> + <c-button + size="small" + type="primary" + icon="el-icon-search" + @click="onPreperButtxmsel" + > + ... + </c-button> + </template> + </c-fullbox> + </el-form-item> + </c-col> + + <!-- Days of presentation period --> + <c-col :span="24"> + <el-form-item label="" prop="ledgrp.rec.prepers18"> + <c-input + v-model.number="model.ledgrp.rec.prepers18" + placeholder="请输入交单期天数" ></c-input> </el-form-item> </c-col> + <!-- Additional Details to Charges --> + <c-col :span="24"> + <el-form-item label="附加收费详情" prop="ledgrp.blk.feetxt"> + <c-fullbox> + <c-input + type="textarea" + :rows="6" + v-model="model.ledgrp.blk.feetxt" + maxlength="210" + show-word-limit + placeholder="请输入附加收费详情" + ></c-input> + <template slot="footer"> + <c-button + size="small" + type="primary" + icon="el-icon-search" + @click="onChariaButtxmsel" + > + ... + </c-button> + </template> + </c-fullbox> + </el-form-item> + </c-col> + <!-- Own Charges Borne by --> <c-col :span="24"> - <el-form-item label="自行承担费用" prop="ledgrp.rec.chato"> + <el-form-item label="费用状况" prop="ledgrp.rec.chato"> <c-select v-model="model.ledgrp.rec.chato" style="width: 100%" @@ -172,130 +293,104 @@ </el-form-item> </c-col> + <!-- country or region code --> <c-col :span="24"> - <el-form-item label="国家统计代码" prop="ledgrp.rec.stacty"> + <el-form-item label="国家或地区代码" prop="ledgrp.rec.stacty"> <c-select v-model="model.ledgrp.rec.stacty" style="width: 100%" - placeholder="请选择国家统计代码" + placeholder="请选择国家或地区代码" :code="codes.ctytxt" > </c-select> </el-form-item> </c-col> - + <!-- 付款期限 Maxinum Tenor--> <c-col :span="24"> - <el-form-item label="兑付最高期限" prop="ledgrp.rec.tenmaxday"> + <el-form-item label="付款期限(天)" prop="ledgrp.rec.tenmaxday"> <c-input - v-model="model.ledgrp.rec.tenmaxday" - placeholder="请输入兑付最高期限" + v-model.number="model.ledgrp.rec.tenmaxday" + placeholder="请输入" + :disabled="model.ledgrp.rec.avbby == 'P'" + maxlength="4" + @keyup.enter.native=" + defaultFunction( + 'ledgrp.rec.tenmaxday', + model.ledgrp.rec.tenmaxday + ) + " ></c-input> </el-form-item> </c-col> </c-col> </c-row> - - <c-row> - <!-- Dispatch from --> - <c-col :span="11"> - <el-form-item label="转运" prop="ledgrp.rec.shpfro"> - <c-input - type="textarea" - :rows="3" - show-word-limit - v-model="model.ledgrp.rec.shpfro" - maxlength="65" - placeholder="请输入" - ></c-input> - </el-form-item> - </c-col> - - <c-col :span="11" :offset="1"> - <el-form-item label="货物装运地(港)" prop="ledgrp.rec.porloa"> - <c-input - type="textarea" - :rows="3" - v-model="model.ledgrp.rec.porloa" - maxlength="65" - show-word-limit - placeholder="请输入货物装运地(港)" - ></c-input> - </el-form-item> - </c-col> - - <c-col :span="11"> - <el-form-item label="航空/目的港" prop="ledgrp.rec.pordis"> - <c-input - type="textarea" - :rows="3" - v-model="model.ledgrp.rec.pordis" - maxlength="65" - show-word-limit - placeholder="航空/目的港" - ></c-input> - </el-form-item> - </c-col> - - <!-- Final Destination --> - <c-col :span="11" :offset="1"> - <el-form-item label="货物目的地、交货地(港)" prop="ledgrp.rec.shpto"> - <c-input - type="textarea" - :rows="3" - v-model="model.ledgrp.rec.shpto" - maxlength="65" - show-word-limit - placeholder="货物目的地、交货地(港)" - ></c-input> - </el-form-item> - </c-col> - - <!-- Shipment Period --> - <c-col :span="11"> - <el-form-item label="发货期" prop="ledgrp.blk.shpper"> - <c-input - type="textarea" - :rows="3" - v-model="model.ledgrp.blk.shpper" - maxlength="65" - show-word-limit - placeholder="请输入发货期" - ></c-input> - </el-form-item> - </c-col> - </c-row> </div> </template> <script> -import Api from "~/service/Api"; -import commonProcess from "~/mixin/commonProcess"; -import CodeTable from "~/config/CodeTable"; -import Event from "~/model/Letnot/Event"; -import Ptap from "~/views/Public/Ptap"; +import Api from '~/service/Api' +import commonProcess from '~/mixin/commonProcess' +import CodeTable from '~/config/CodeTable' +import Event from '~/model/Letnot/Event' +import Ptap from '~/views/Public/Ptap' export default { components: { // "c-ptap1": Ptap1, - "c-ptap": Ptap, + 'c-ptap': Ptap, // "c-ptsmsg": Ptsmsg, }, - inject: ["root"], - props: ["model", "codes"], + inject: ['root'], + props: ['model', 'codes'], mixins: [commonProcess], data() { - return {}; + return {} + }, + methods: { + ...Event, + avbbykeyEvent() { + if (this.model.ledgrp.rec.avbby == 'P') { + this.model.ledgrp.rec.tenmaxday = 0 + this.model.ledgrp.blk.defdet = '' + } + this.executeCheck('ledgrp.rec.avbby').then((res) => { + if (res.respCode == SUCCESS) { + Utils.copyValueFromVO(this.model, res.data) + } + }) + }, }, - methods: { ...Event }, created: function () {}, + computed: { + defdetFlag: { + get() { + return ( + // this.model.ledgrp.rec.avbby == 'A' || + // this.model.ledgrp.rec.avbby == 'P' || + // this.model.ledgrp.rec.avbby == 'M' || + // this.model.ledgrp.rec.avbby == '' + this.model.ledgrp.rec.avbby != 'D' && + this.model.ledgrp.rec.avbby != 'N' + ) + }, + }, + blkDftatFlag: { + get() { + return ( + this.model.ledgrp.rec.avbby == 'D' || + this.model.ledgrp.rec.avbby == 'M' || + this.model.ledgrp.rec.avbby == '' + ) + }, + }, + }, watch: { - "model.ledgrp.avb.pts.adrblk": { + 'model.ledgrp.avb.pts.adrblk': { handler(val, oldVal) { - this.model.ledgrp.blk.avbwthtxt = val; + this.model.ledgrp.blk.avbwthtxt = val }, immediate: true, }, }, -}; +} </script> -<style> -</style> +<style></style> diff --git a/src/views/Business/Letnot/Dogp.vue b/src/views/Business/Letnot/Dogp.vue index f464f66..3136b5f 100644 --- a/src/views/Business/Letnot/Dogp.vue +++ b/src/views/Business/Letnot/Dogp.vue @@ -1,19 +1,20 @@ <template> <div class="eibs-tab"> - <c-col :span="19"> - <el-form-item label="Description of Goods" prop="ledgrp.blk.lcrgod"> + <!-- Description of Goods --> + <c-col :span="20"> + <el-form-item label="货物描述" prop="ledgrp.blk.lcrgod"> <c-input type="textarea" v-model="model.ledgrp.blk.lcrgod" - :rows="20" - maxlength="2000" + :rows="30" + maxlength="52000" show-word-limit placeholder="请输入Description of Goods" ></c-input> </el-form-item> </c-col> - <c-col :span="5" class="letopn_dogp_button"> + <c-col :span="2"> <c-button size="small" type="primary" @@ -24,8 +25,8 @@ </c-button> </c-col> <br /> - <c-col :span="19"> - <el-form-item label="Goods Code " prop="ledgrp.rec.stagod"> + <c-col :span="20"> + <el-form-item label="货物种类 " prop="ledgrp.rec.stagod"> <c-select v-model="model.ledgrp.rec.stagod" style="width: 100%" @@ -54,8 +55,3 @@ export default { created: function () {}, }; </script> -<style> -.letopn_dogp_button { - margin: 20px 0 0 -10px; -} -</style> diff --git a/src/views/Business/Letnot/Dorp.vue b/src/views/Business/Letnot/Dorp.vue index 77becb0..0699741 100644 --- a/src/views/Business/Letnot/Dorp.vue +++ b/src/views/Business/Letnot/Dorp.vue @@ -1,19 +1,20 @@ <template> <div class="eibs-tab"> - <c-col :span="19"> - <el-form-item label="Documents Required" prop="ledgrp.blk.lcrdoc"> + <!-- Documents Required --> + <c-col :span="20"> + <el-form-item label="所需单据" prop="ledgrp.blk.lcrdoc"> <c-input type="textarea" v-model="model.ledgrp.blk.lcrdoc" - maxlength="65" + maxlength="52000" show-word-limit placeholder="请输入Documents Required" - :rows="10" + :rows="30" ></c-input> </el-form-item> </c-col> - <c-col :span="5"> + <c-col :span="2"> <c-button size="small" type="primary" diff --git a/src/views/Business/Letnot/Ovwp.vue b/src/views/Business/Letnot/Ovwp.vue index b646041..52be1f7 100644 --- a/src/views/Business/Letnot/Ovwp.vue +++ b/src/views/Business/Letnot/Ovwp.vue @@ -70,7 +70,7 @@ </el-form-item> </c-col> <c-col :span="4"> - <c-checkbox v-model="model.letp.aamp.aammod.addamtflg" style="margin-left:5px;">附加金额</c-checkbox> + <c-checkbox v-model="model.letp.aamp.aammod.addamtflg" style="margin-left:10px;">附加金额</c-checkbox> </c-col> </c-col> @@ -91,7 +91,7 @@ <c-checkbox v-model="model.ledgrp.preadvflg">PreAdvice or Notification</c-checkbox> </c-col> --> <c-col :span="4"> - <c-checkbox v-model="model.ledgrp.preadvflg" style="margin-left:5px;">预先通知</c-checkbox> + <c-checkbox v-model="model.ledgrp.preadvflg" style="margin-left:10px;">预先通知</c-checkbox> </c-col> </c-col> @@ -106,7 +106,7 @@ <!-- Incoming Transfer --> <c-col :span="4"> - <c-checkbox v-model="model.ledgrp.rec.inctrf" style="margin-left:5px;">传入传输</c-checkbox> + <c-checkbox v-model="model.ledgrp.rec.inctrf" style="margin-left:10px;">传入传输</c-checkbox> </c-col> </c-col> diff --git a/src/views/Business/Letnot/Ptyp.vue b/src/views/Business/Letnot/Ptyp.vue index 11929ab..f7354f4 100644 --- a/src/views/Business/Letnot/Ptyp.vue +++ b/src/views/Business/Letnot/Ptyp.vue @@ -1,5 +1,7 @@ <template> <c-row> + <!-- =================================左边================================= --> + <!-- 1st Advising Bank --> <c-col :span="11"> <c-col :span="24"> <c-ptap @@ -11,15 +13,19 @@ }" @onSeainf="onSeainf" @onAplpDet="onAdvpDet" + disabled + disabledRef + disabledExtkey > </c-ptap> </c-col> + <!-- 2nd Advising Bank --> <c-col :span="24"> <c-ptap :model="model" :argadr="{ - title: '申请人银行', + title: '第二通知行', grp: 'ledgrp', rol: 'a2b', }" @@ -29,6 +35,7 @@ </c-ptap> </c-col> + <!-- Confirm. Instruct. --> <c-col :span="24"> <el-form-item label="第二通知行确认指令" prop="ledgrp.rec.cnfins"> <c-select @@ -36,18 +43,20 @@ style="width: 100%" placeholder="第二通知行确认指令" :code="codes.cnfflg1" + disabled > </c-select> </el-form-item> </c-col> </c-col> - + <!-- ========================右边======================= --> <c-col :span="11" :offset="1"> + <!-- Applicant's Bank --> <c-col :span="24"> <c-ptap :model="model" :argadr="{ - title: '申请人银行', + title: '申请银行', grp: 'ledgrp', rol: 'apb', }" @@ -56,7 +65,14 @@ > </c-ptap> </c-col> + <!-- Send Directly to Applicant's Bank --> + <c-col :span="24"> + <c-checkbox v-model="model.ledgrp.rec.aplbnkdirsnd" style="margin-left:150px;" + >直接发送至申请银行</c-checkbox + > + </c-col> + <!-- Reimbursement Bank --> <c-col :span="24"> <c-ptap :model="model" @@ -71,32 +87,38 @@ </c-ptap> </c-col> + <!-- Confirmation Bank --> <c-col :span="24"> <c-ptap :model="model" :argadr="{ - title: '第二通知行', + title: '保兑行', grp: 'ledgrp', rol: 'con', }" :onlySearch="true" @onSeainf="onSeainf" - @onAplpDet="onRmbpDet" + @onAplpDet="onConpDet" + disabled + disabledRef + disabledExtkey > </c-ptap> </c-col> <c-col :span="24"> - <el-form-item label="第二通知行名称" prop="ledgrp.con.pts.nam"> + <el-form-item label="" prop="ledgrp.con.pts.nam"> <c-input v-model="model.ledgrp.con.pts.nam" maxlength="40" - placeholder="请输入第二通知行名称" + placeholder="请输入Name of Party" + disabled ></c-input> </el-form-item> </c-col> </c-col> + <!-- =============================底部表格========================= --> <c-edit-table :model="model" v-bind="ptsaddg"> - <el-table-column label="操作" align="center"> + <el-table-column label="操作" text-align="center"> <template slot-scope="scope"> <el-button size="mini" @@ -110,56 +132,55 @@ </c-row> </template> <script> -import Api from "~/service/Api"; -import commonProcess from "~/mixin/commonProcess"; -import CodeTable from "~/config/CodeTable"; -import Ptap from "~/views/Public/Ptap"; -import Event from "~/model/Letopn/Event"; +import Api from '~/service/Api' +import commonProcess from '~/mixin/commonProcess' +import CodeTable from '~/config/CodeTable' +import Ptap from '~/views/Public/Ptap' +import Event from '~/model/Letopn/Event' export default { - inject: ["root"], - components: { "c-ptap": Ptap }, - props: ["model", "codes"], + inject: ['root'], + components: { 'c-ptap': Ptap }, + props: ['model', 'codes'], mixins: [commonProcess], data() { return { ptsaddg: { columns: [ { - title: "角色", - width: "120px", - dataIndex: "rol", - show: "select", + title: '角色', + width: '120px', + dataIndex: 'rol', + show: 'select', }, { - title: "机构实体", - width: "180px", - dataIndex: "ptyextkey", - show: "input", + title: '机构实体', + width: '180px', + dataIndex: 'ptyextkey', + show: 'input', }, { - title: "名称", - width: "300px", - dataIndex: "nam", + title: '名称', + width: '300px', + dataIndex: 'nam', }, { - title: "参考地址", - width: "300px", - dataIndex: "ref", + title: '参考地址', + width: '300px', + dataIndex: 'ref', }, ], - urls: "letp.ptsaddp.ptsaddg", + urls: 'letp.ptsaddp.ptsaddg', }, - }; + } }, methods: { ...Event, handleEdit() { - console.log("1111测试"); + console.log('1111测试') }, }, created: function () {}, -}; +} </script> -<style> -</style> +<style></style> diff --git a/src/views/Business/Letnot/Spcbenp.vue b/src/views/Business/Letnot/Spcbenp.vue index f84ab06..3d38f8a 100644 --- a/src/views/Business/Letnot/Spcbenp.vue +++ b/src/views/Business/Letnot/Spcbenp.vue @@ -1,40 +1,46 @@ <template> <div class="eibs-tab"> - - <c-col :span="12"> - <el-form-item label="Special Payment Cond." prop="ledgrp.blk.spcben"> - <c-input type="textarea" v-model="model.ledgrp.blk.spcben" maxlength="65" show-word-limit - placeholder="请输入Special Payment Cond."></c-input> + <!-- Special Payment Cond.for BeneficiaryI --> + <c-col :span="20"> + <el-form-item label="受益人特殊付款条件" prop="ledgrp.blk.spcben"> + <c-input + type="textarea" + v-model="model.ledgrp.blk.spcben" + maxlength="52000" + show-word-limit + :rows="30" + placeholder="请输入Special Payment Cond. for BeneficiaryI" + ></c-input> </el-form-item> </c-col> - <c-col :span="12"> - <c-button size="small" type="primary" icon="el-icon-search" @click="onSpcbenButtxmsel"> + <c-col :span="2"> + <c-button + size="small" + type="primary" + icon="el-icon-search" + @click="onSpcbenButtxmsel" + > ... </c-button> </c-col> </div> </template> <script> -import Api from "~/service/Api" -import commonProcess from "~/mixin/commonProcess"; -import CodeTable from "~/config/CodeTable" -import Event from "~/model/Letnot/Event" +import Api from '~/service/Api' +import commonProcess from '~/mixin/commonProcess' +import CodeTable from '~/config/CodeTable' +import Event from '~/model/Letnot/Event' export default { inject: ['root'], - props: ["model", "codes"], + props: ['model', 'codes'], mixins: [commonProcess], data() { - return { - - } + return {} }, - methods: { ...Event ,onSpcbenButtxmsel(){}}, - created: function () { - - } + methods: { ...Event, onSpcbenButtxmsel() {} }, + created: function () {}, } </script> -<style> -</style> +<style></style> diff --git a/src/views/Business/Letnot/Spcrcvp.vue b/src/views/Business/Letnot/Spcrcvp.vue index 2292fae..83a60bc 100644 --- a/src/views/Business/Letnot/Spcrcvp.vue +++ b/src/views/Business/Letnot/Spcrcvp.vue @@ -1,40 +1,45 @@ <template> <div class="eibs-tab"> - - <c-col :span="12"> - <el-form-item label="Special Payment Cond." prop="ledgrp.blk.spcrcb"> - <c-input type="textarea" v-model="model.ledgrp.blk.spcrcb" maxlength="65" show-word-limit - placeholder="请输入Special Payment Cond."></c-input> + <c-col :span="20"> + <el-form-item label="银行专用特殊付款条件" prop="ledgrp.blk.spcrcb"> + <c-input + type="textarea" + v-model="model.ledgrp.blk.spcrcb" + maxlength="52000" + show-word-limit + :rows="30" + placeholder="请输入Special Payment Cond.for Bank only" + ></c-input> </el-form-item> </c-col> - <c-col :span="12"> - <c-button size="small" type="primary" icon="el-icon-search" @click="onSpcrcbButtxmsel"> + <c-col :span="2"> + <c-button + size="small" + type="primary" + icon="el-icon-search" + @click="onSpcrcbButtxmsel" + > ... </c-button> </c-col> </div> </template> <script> -import Api from "~/service/Api" -import commonProcess from "~/mixin/commonProcess"; -import CodeTable from "~/config/CodeTable" -import Event from "~/model/Letnot/Event" +import Api from '~/service/Api' +import commonProcess from '~/mixin/commonProcess' +import CodeTable from '~/config/CodeTable' +import Event from '~/model/Letnot/Event' export default { inject: ['root'], - props: ["model", "codes"], + props: ['model', 'codes'], mixins: [commonProcess], data() { - return { - - } + return {} }, - methods: { ...Event ,onSpcrcbButtxmsel(){}}, - created: function () { - - } + methods: { ...Event, onSpcrcbButtxmsel() {} }, + created: function () {}, } </script> -<style> -</style> +<style></style> diff --git a/src/views/Business/Letnot/index.vue b/src/views/Business/Letnot/index.vue index a366cc9..11bff42 100644 --- a/src/views/Business/Letnot/index.vue +++ b/src/views/Business/Letnot/index.vue @@ -67,9 +67,7 @@ <!--PD000060 --> <el-tab-pane label="其他条款" name="adcp"> - <c-content> - <m-adcp :model="model" :codes="codes" /> - </c-content> + <m-adcp :model="model" :codes="codes" /> </el-tab-pane> <!--PD000000 --> @@ -95,14 +93,14 @@ </el-tab-pane> <!--PD000422 --> - <el-tab-pane label="银行专用特殊付款条件" name="spcrcvp"> + <el-tab-pane label="银行专用特殊付款条件" name="spcrcvp" v-if="model.ledgrp.rec.spcrcbflg=='X'"> <m-spcrcvp :model="model" :codes="codes"/> </el-tab-pane> - - <!--PD000394 --> - <el-tab-pane label="受益人特殊付款条件" name="spcbenp"> + <!--PD000394 --> + <el-tab-pane label="受益人特殊付款条件" name="spcbenp" v-if="model.ledgrp.rec.spcbenflg=='X'"> <m-spcbenp :model="model" :codes="codes"/> </el-tab-pane> + </c-tabs> </el-form> <c-grid-ety-prompt-dialog diff --git a/src/views/Public/BusNavbar.vue b/src/views/Public/BusNavbar.vue index 96f8a28..938ff59 100644 --- a/src/views/Public/BusNavbar.vue +++ b/src/views/Public/BusNavbar.vue @@ -34,7 +34,11 @@ export default { "ownrefPath": { required: false, default: "didgrp" - } + }, + "tabIndex": { + required: false, + default: 1 + }, }, components: {}, mixins: [commonProcess], // 里面包含了Default、Check等的公共处理 @@ -71,6 +75,17 @@ export default { this.trnName = this.trnCode this.$nextTick(function () { this.$on("childmethods", async function () { + + let res = await this.executeRule(`cfgfil.hotreg${this.tabIndex}`); + if (res.respCode == SUCCESS) { + this.updateModel(res.data); + } else { + this.$notify.error({ + title: "错误", + message: "服务请求失败!", + }); + } + this.navcode = []; //请求按钮数据 this.model[this.ownrefPath].rec.ownref = this.ownref; diff --git a/src/views/Public/Docpan.vue b/src/views/Public/Docpan.vue index c0739ad..570cd11 100644 --- a/src/views/Public/Docpan.vue +++ b/src/views/Public/Docpan.vue @@ -2,7 +2,7 @@ <div class="eibs-tab"> <c-col :span="24" style=""> <c-istream-table-docpan :list="stmData.data" :columns="stmData.columns"> - <el-table-column label="报文格式"> + <el-table-column label="Medium"> <template slot-scope="scope"> <c-select v-model=" @@ -362,16 +362,23 @@ ? 'Sender to Rec. information' : 'Remark' " - ><el-input - type="textarea" - :rows="10" - :disabled="title == 'MT799'" - :v-model=" - title == 'MT799' - ? dialog.addtxt - : dialog.remark - " - /></el-form-item> + > + <div v-if="title == 'MT799'"> + <el-input + type="textarea" + :rows="10" + disabled + v-model="dialog.remark" + /> + </div> + <div v-else> + <el-input + type="textarea" + :rows="10" + v-model="dialog.addtxt" + /> + </div> + </el-form-item> </c-col> <c-col :span="2"> <c-button size="mini">... </c-button> @@ -444,10 +451,9 @@ export default { methods: { saveDialog() { this.centerDialogVisible = false; - console.log(this.model); this.model.trnmod.trndoc.doceot.splice(this.index, 1, this.dialog); this.executeRule("trnmod.trndoc.doccur.butaddok").then(res => { - if(res.data.respCode==SUCCESS){ + if(res.respCode==SUCCESS){ //TODO }else{ @@ -528,7 +534,8 @@ export default { if (rtnmsg.respCode == SUCCESS) { this.title = row.pandsc this.centerDialogVisible = true, - this.dialog = rtnmsg.data.trnmod_trndoc_doceot[index] + this.updateModel(rtnmsg.data); + this.dialog = this.model.trnmod.trndoc.doceot[index] this.index = index } } diff --git a/src/views/Public/Setpan.vue b/src/views/Public/Setpan.vue index 8da23a1..aa7ddd7 100644 --- a/src/views/Public/Setpan.vue +++ b/src/views/Public/Setpan.vue @@ -186,7 +186,7 @@ <el-form :model="dialog" label-width="200px"> <c-col :span="16" > <el-form-item label="收款人"> - <c-select v-model="dialog.payee" style="width: 100%"> + <c-select v-model="dialog.ptypay" style="width: 100%"> <el-option v-for="item in codes.payee" :key="item.value" @@ -205,7 +205,7 @@ <el-form-item label="付款人"> <c-select v-model="dialog.ptydbt" style="width: 100%"> <el-option - v-for="item in codes.ptydbt" + v-for="item in codes.ptydbt1" :key="item.value" :label="item.label" :value="item.value" @@ -216,7 +216,7 @@ </c-col> <c-col :span="16"> <el-form-item label="付款人摘要"> - <c-input v-model="dialog.txtdbp" style="width: 100%"/> + <c-input v-model="dialog.txtdbt" style="width: 100%"/> </el-form-item> </c-col> <c-col :span="16"> @@ -1089,8 +1089,9 @@ export default { }, // 第二个表格 detail1(index, row) { - this.executeDefault("setfel/det").then(res=>{ + this.executeDefault("setfel.det").then(res=>{ this.dialogVisible = true; + console.log(row) this.dialog = row; this.index = index; }) diff --git a/src/views/Review/Business/ReviewBdtdcr.vue b/src/views/Review/Business/ReviewBdtdcr.vue new file mode 100644 index 0000000..0d16369 --- /dev/null +++ b/src/views/Review/Business/ReviewBdtdcr.vue @@ -0,0 +1,19 @@ +<template> + <ReviewWrapper> + <Bdtdcr></Bdtdcr> + </ReviewWrapper> +</template> + +<script> +import Bdtdcr from "~/views/Business/Bdtdcr"; +import { ReviewWrapper } from "~/components/gj-common.min.js"; + +export default { + name: "ReviewBdtdcr", + components: { ReviewWrapper, Bdtdcr }, + created() {}, + mounted() {}, +}; +</script> + +<style></style> diff --git a/src/views/Review/Business/ReviewBdteus.vue b/src/views/Review/Business/ReviewBdteus.vue new file mode 100644 index 0000000..ff30cd1 --- /dev/null +++ b/src/views/Review/Business/ReviewBdteus.vue @@ -0,0 +1,19 @@ +<template> + <ReviewWrapper> + <Bdteus></Bdteus> + </ReviewWrapper> +</template> + +<script> +import Bdteus from "~/views/Business/Bdteus"; +import { ReviewWrapper } from "~/components/gj-common.min.js"; + +export default { + name: "ReviewBdteus", + components: { ReviewWrapper, Bdteus }, + created() {}, + mounted() {}, +}; +</script> + +<style></style> diff --git a/src/views/Review/Business/ReviewBotdcr.vue b/src/views/Review/Business/ReviewBotdcr.vue new file mode 100644 index 0000000..e8ec918 --- /dev/null +++ b/src/views/Review/Business/ReviewBotdcr.vue @@ -0,0 +1,19 @@ +<template> + <ReviewWrapper> + <Botdcr></Botdcr> + </ReviewWrapper> +</template> + +<script> +import Botdcr from "~/views/Business/Botdcr"; +import { ReviewWrapper } from "~/components/gj-common.min.js"; + +export default { + name: "ReviewBotdcr", + components: { ReviewWrapper, Botdcr }, + created() {}, + mounted() {}, +}; +</script> + +<style></style> diff --git a/src/views/Review/Business/ReviewBotrad.vue b/src/views/Review/Business/ReviewBotrad.vue new file mode 100644 index 0000000..e98f5d0 --- /dev/null +++ b/src/views/Review/Business/ReviewBotrad.vue @@ -0,0 +1,19 @@ +<template> + <ReviewWrapper> + <Botrad></Botrad> + </ReviewWrapper> +</template> + +<script> +import Botrad from "~/views/Business/Botrad"; +import { ReviewWrapper } from "~/components/gj-common.min.js"; + +export default { + name: "ReviewBotrad", + components: { ReviewWrapper, Botrad }, + created() {}, + mounted() {}, +}; +</script> + +<style></style> diff --git a/src/views/Review/Business/ReviewBrtdck.vue b/src/views/Review/Business/ReviewBrtdck.vue new file mode 100644 index 0000000..120647a --- /dev/null +++ b/src/views/Review/Business/ReviewBrtdck.vue @@ -0,0 +1,19 @@ +<template> + <ReviewWrapper> + <Brtdck></Brtdck> + </ReviewWrapper> +</template> + +<script> +import Brtdck from "~/views/Business/Brtdck"; +import { ReviewWrapper } from "~/components/gj-common.min.js"; + +export default { + name: "ReviewBrtdck", + components: { ReviewWrapper, Brtdck }, + created() {}, + mounted() {}, +}; +</script> + +<style></style> diff --git a/src/views/Review/Business/ReviewBrteus.vue b/src/views/Review/Business/ReviewBrteus.vue new file mode 100644 index 0000000..0b34de5 --- /dev/null +++ b/src/views/Review/Business/ReviewBrteus.vue @@ -0,0 +1,19 @@ +<template> + <ReviewWrapper> + <Brteus></Brteus> + </ReviewWrapper> +</template> + +<script> +import Brteus from "~/views/Business/Brteus"; +import { ReviewWrapper } from "~/components/gj-common.min.js"; + +export default { + name: "ReviewBrteus", + components: { ReviewWrapper, Brteus }, + created() {}, + mounted() {}, +}; +</script> + +<style></style> diff --git a/src/views/Review/Business/ReviewBrtudp.vue b/src/views/Review/Business/ReviewBrtudp.vue new file mode 100644 index 0000000..f9ca29c --- /dev/null +++ b/src/views/Review/Business/ReviewBrtudp.vue @@ -0,0 +1,19 @@ +<template> + <ReviewWrapper> + <Brtudp></Brtudp> + </ReviewWrapper> +</template> + +<script> +import Brtudp from "~/views/Business/Brtudp"; +import { ReviewWrapper } from "~/components/gj-common.min.js"; + +export default { + name: "ReviewBrtudp", + components: { ReviewWrapper, Brtudp }, + created() {}, + mounted() {}, +}; +</script> + +<style></style> diff --git a/src/views/Review/ReviewRouter.js b/src/views/Review/ReviewRouter.js index b666e46..eaaa994 100644 --- a/src/views/Review/ReviewRouter.js +++ b/src/views/Review/ReviewRouter.js @@ -7,8 +7,15 @@ import ReviewGetset from "./Business/ReviewGetset.vue"; import ReviewDetopn from "./Business/ReviewDetopn.vue"; import ReviewDetdrv from "./Business/ReviewDetdrv.vue"; import ReviewBdtdck from "./Business/ReviewBdtdck.vue"; +import ReviewBotdcr from "./Business/ReviewBotdcr.vue"; +import ReviewBotrad from "./Business/ReviewBotrad.vue"; import ReviewBotdav from "./Business/ReviewBotdav.vue"; +import ReviewBrtdck from "./Business/ReviewBrtdck.vue"; +import ReviewBrtudp from "./Business/ReviewBrtudp.vue"; +import ReviewBrteus from "./Business/ReviewBrteus.vue"; import ReviewLetnot from "./Business/ReviewLetnot.vue"; +import ReviewBdtdcr from "./Business/ReviewBdtdcr.vue"; +import ReviewBdteus from "./Business/ReviewBdteus.vue"; const ReviewRouter = [ { path: "ditopn", component: ReviewDitopn, name: "ReviewDitopn", meta: { title: "复核-买方信用证开立" } }, @@ -19,8 +26,15 @@ const ReviewRouter = [ { path: "getset", component: ReviewGetset, name: "ReviewGetset", meta: { title: "复核-Getset" } }, { path: "detopn", component: ReviewDetopn, name: "ReviewDetopn", meta: { title: "复核-Detopn" } }, { path: "detdrv", component: ReviewDetdrv, name: "ReviewDetdrv", meta: { title: "复核-Detdrv" } }, + { path: "bdtdcr", component: ReviewBdtdcr, name: "ReviewBdtdcr", meta: { title: "复核-Bdtdcr" } }, + { path: "bdteus", component: ReviewBdteus, name: "ReviewBdteus", meta: { title: "复核-Bdteus" } }, { path: "bdtdck", component: ReviewBdtdck, name: "ReviewBdtdck", meta: { title: "复核-Bdtdck" } }, - { path: "botdav", component: ReviewBotdav, name: "ReviewBotdav", meta: { title: "复核-botdav" } }, + { path: "botdcr", component: ReviewBotdcr, name: "ReviewBotdcr", meta: { title: "复核-Botdcr" } }, + { path: "botrad", component: ReviewBotrad, name: "ReviewBotrad", meta: { title: "复核-Botrad" } }, + { path: "botdav", component: ReviewBotdav, name: "ReviewBotdav", meta: { title: "复核-botdav" } }, + { path: "brtdck", component: ReviewBrtdck, name: "ReviewBrtdck", meta: { title: "复核-Brtdck" } }, + { path: "brtudp", component: ReviewBrtudp, name: "ReviewBrtudp", meta: { title: "复核-Brtudp" } }, + { path: "brteus", component: ReviewBrteus, name: "ReviewBrteus", meta: { title: "复核-Brteus" } }, { path: "letnot", component: ReviewLetnot, name: "ReviewLetnot", meta: { title: "复核-Letnot" } }, ];