Commit 3566696c by wangyanjiao

Merge branch 'development-202206' of http://114.115.138.98:8900/fukai/vue-gjjs…

Merge branch 'development-202206' of http://114.115.138.98:8900/fukai/vue-gjjs into development-202206
parents 1e3dba58 a47595be
......@@ -7454,7 +7454,7 @@ const CodeTable = {
{ label: "Panel", value: "P" },
{ label: "Rule (Method)", value: "R" },
],
docsta: [
docsta1: [
{ label: "付款成功", value: "E" },
{ label: "已寄单索款", value: "A" },
{ label: "已拒付", value: "F" },
......@@ -10425,7 +10425,7 @@ const CodeTable = {
{ label: "Panel", value: "P" },
{ label: "Rule (Method)", value: "R" },
],
docsta: [
docsta1: [
{ label: "付款成功", value: "E" },
{ label: "已寄单索款", value: "A" },
{ label: "已拒付", value: "F" },
......@@ -13397,7 +13397,7 @@ const CodeTable = {
{ label: "Panel", value: "P" },
{ label: "Rule (Method)", value: "R" },
],
docsta: [
docsta1: [
{ label: "付款成功", value: "E" },
{ label: "已寄单索款", value: "A" },
{ label: "已拒付", value: "F" },
......@@ -16370,7 +16370,7 @@ const CodeTable = {
{ label: "Panel", value: "P" },
{ label: "Rule (Method)", value: "R" },
],
docsta: [
docsta1: [
{ label: "付款成功", value: "E" },
{ label: "已寄单索款", value: "A" },
{ label: "已拒付", value: "F" },
......@@ -18526,6 +18526,9 @@ const CodeTable = {
{ label: "LMTEST02", value: "00000216" },
{ label: "blank text", value: "" },
],
atxinr: [
{ label: "blank text (for electronic SWIFT msg)", value: "<NILTXT>" },
],
accmod: [
{ label: "退汇清算", value: "3" },
......@@ -19370,7 +19373,7 @@ const CodeTable = {
{ label: "Panel", value: "P" },
{ label: "Rule (Method)", value: "R" },
],
docsta: [
docsta1: [
{ label: "付款成功", value: "E" },
{ label: "已寄单索款", value: "A" },
{ label: "已拒付", value: "F" },
......@@ -22344,7 +22347,7 @@ const CodeTable = {
{ label: "Panel", value: "P" },
{ label: "Rule (Method)", value: "R" },
],
docsta: [
docsta1: [
{ label: "付款成功", value: "E" },
{ label: "已寄单索款", value: "A" },
{ label: "已拒付", value: "F" },
......@@ -25308,7 +25311,7 @@ const CodeTable = {
{ label: "Panel", value: "P" },
{ label: "Rule (Method)", value: "R" },
],
docsta: [
docsta1: [
{ label: "付款成功", value: "E" },
{ label: "已寄单索款", value: "A" },
{ label: "已拒付", value: "F" },
......@@ -28273,7 +28276,7 @@ const CodeTable = {
{ label: "Panel", value: "P" },
{ label: "Rule (Method)", value: "R" },
],
docsta: [
docsta1: [
{ label: "付款成功", value: "E" },
{ label: "已寄单索款", value: "A" },
{ label: "已拒付", value: "F" },
......@@ -31252,7 +31255,7 @@ const CodeTable = {
{ label: "Panel", value: "P" },
{ label: "Rule (Method)", value: "R" },
],
docsta: [
docsta1: [
{ label: "付款成功", value: "E" },
{ label: "已寄单索款", value: "A" },
{ label: "已拒付", value: "F" },
......@@ -32486,9 +32489,9 @@ const CodeTable = {
{ label: "ISCO Issuance of counter-undertaking", value: "ISCO" },
],
purpos: [
{ label: "Advice of the credit amendment", value: "ADVI" },
{ label: "Advice and confirmation of the credit amendment", value: "ACNF" },
{ label: "Issuance of the credit amendment", value: "ISSU" },
{ label: "ADVI Advice of issued undertaking", value: "ADVI" },
{ label: "ACNF Advice and confirm of issued undert", value: "ACNF" },
{ label: "ISSU Issuance of undertaking", value: "ISSU" },
{ label: "ISCO Issuance of counter-undertaking", value: "ISCO" },
{ label: "ICCO Issuance of counter-counter-undert.", value: "ICCO" },
],
......@@ -32497,6 +32500,11 @@ const CodeTable = {
// {label:"Advice and confirmation of the credit amendment",value:"ACNF" },
// {label:"Issuance of the credit amendment",value:"ISSU" },
// ]
purposin: [
{ label: "ICCO Issuance of counter-counter-undert.", value: "ICCO" },
{ label: "ISSU Issuance of undertaking", value: "ISSU" },
{ label: "ISCO Issuance of counter-undertaking", value: "ISCO" },
],
purtyp: [
{ label: "合格押汇", value: "NB0" },
{ label: "不合格押汇", value: "DSB" },
......@@ -21,7 +21,7 @@ export default {
},
mounted() {
if (!this.isInDisplay) {
this.ruleCheck()
this.generateFormRules()
}
},
methods: {
......@@ -29,7 +29,16 @@ export default {
* 表单校验 rules 的赋值
* @returns void
*/
ruleCheck() {
generateFormRules() {
if (this.root) {
if (!this.root.rules) {
return;
} else {
// 新添加的表单项,需要重新确定下 validator 的触发 trigger
this.updateRulesTrigger();
return
}
}
if (!this.pattern)
return
// const keySet = new Set(Object.keys(this.pattern).concat(Object.keys(this.checkRules).concat(Object.keys(this.defaultRules))))
......@@ -76,7 +85,8 @@ export default {
* @returns
*/
getTriggerType(prop) {
const fields = this.$refs.modelForm.fields;
const modelForm = this.root ? this.root.$refs.modelForm : this.$refs.modelForm
const fields = modelForm.fields;
for (let i = 0; i < fields.length; i++) {
const field = fields[i];
if (field.prop === prop) {
......@@ -90,6 +100,24 @@ export default {
return "blur";
},
/**
* 表单有些 tab 是通过 v-if 控制的,这些表单项初始时的 trigger 均为 blur,需要手动更新
*/
updateRulesTrigger() {
const rules = this.root.rules
for (const key in rules) {
if (Object.hasOwnProperty.call(rules, key)) {
const rule = rules[key];
const triggerType = this.getTriggerType(key)
for (let i = 0; i < rule.length; i++) {
const r = rule[i];
if (r.validator && r.trigger !== triggerType) {
r.trigger = triggerType;
}
}
}
}
},
/**
* Tabs切换事件
* @param {VM} tab
*/
......
......@@ -46,8 +46,8 @@ export default {
],
"trnmod.swiadd.newmatpercnt":[
{type: "string", required: false, message: "必输项"},
{max: 3,message:"长度不能超过3"}
//{type: "string", required: false, message: "必输项"},
//{max: 3,message:"长度不能超过3"}
],
......@@ -59,7 +59,7 @@ export default {
],
"trnmod.swiadd.ametxt":[
//type: "string", required: true, message: "必输项"},
{max: 35,message:"长度不能超过35"}
//{max: 35,message:"长度不能超过35"}
],
"botp.recget.sdamod.dadsnd":[
{type: "string", required: false, message: "必输项"},
......@@ -130,7 +130,7 @@ export default {
{max: 35,message:"长度不能超过35"}
],
"bodgrp.rec.rcvdat":[
{type: "date", required: false, message: "输入正确的日期"}
//{type: "date", required: false, message: "输入正确的日期"}
],
"bodgrp.rec.shpdat":[
......@@ -141,10 +141,10 @@ export default {
{max: 35,message:"长度不能超过35"}
],
"bodgrp.rec.predat":[
{type: "date", required: false, message: "输入正确的日期"}
//{type: "date", required: false, message: "输入正确的日期"}
],
"bodgrp.rec.advdat":[
{type: "date", required: false, message: "输入正确的日期"}
//{type: "date", required: false, message: "输入正确的日期"}
],
"bodgrp.col.pts.ref":[
{type: "string", required: false, message: "必输项"},
......
......@@ -383,8 +383,8 @@ export default {
{max: 35,message:"长度不能超过35"}
],
"lidgrp.avb.pts.adrblk":[
{type: "string", required: true, message: "必输项"},
{max: 35,message:"长度不能超过35"}
{type: "string", required: true},
],
"lidgrp.avb.dbfadrblkcn":[
{type: "string", required: true, message: "必输项"},
......
......@@ -376,15 +376,15 @@ export default {
"brdgrp.srm.djuusr":[
{type: "string", required: true, message: "必输项"},
{max: 80,message:"长度不能超过80"}
{type: "string", required: true,},
],
"brdgrp.srm.djudat":[
{type: "string", required: true, message: "输入正确的日期"}
{type: "string", required: true, }
],
"brdgrp.srm.djuref":[
{type: "string", required: true, message: "必输项"},
{max: 40,message:"长度不能超过40"}
{type: "string", required: true, },
],
"invtyp" :[
......
......@@ -67,6 +67,7 @@ export default class Litdck{
},
},
docgrdm:{
docgrd:[],
docdsclab:"", // Label of document description .brtp.docgrdm.docdsclab
},
cre752flg:"", // Create 752 .brtp.cre752flg
......@@ -121,6 +122,7 @@ export default class Litdck{
},
},
blk:{
prsdoc:"",
matper:"", // Maturity Period .brdgrp.blk.matper
comcon:"", // Comments and Conclusions .brdgrp.blk.comcon
setinsbr:"", // Settlement Instructions BR .brdgrp.blk.setinsbr
......
......@@ -27,6 +27,17 @@ export default class Trnmod {
newnomtoname: "",
prepers18: "", //New Presentation Period
strinf: "", // Narrative of Maturity .trnmod.swiadd.strinf
newmatpercnt:"", // New Tenor Data .trnmod.swiadd.newmatpercnt
newmatpertyp:"", // Days/Month or Year for Maturity Period .trnmod.swiadd.newmatpertyp
newmatperbeg:"", // Start of Maturity Period .trnmod.swiadd.newmatperbeg
newmatdat:"", // New Maturity Date .trnmod.swiadd.newmatdat
ametxt:"", // Further Amendments .trnmod.swiadd.ametxt
shptoelc: "", // 货物目的地/交货地(港) .trnmod.swiadd.shptoelc
shpfroelc: "", // Shipment from .trnmod.swiadd.shpfroelc
//nartxtflg: "", // Narrative modified .trnmod.swiadd.nartxtflg
lcrgod: "", // Description of Goods amendment .trnmod.swiadd.lcrgod
lcrdoc: "", // Documents Required amendment .trnmod.swiadd.lcrdoc
//adlcnd: "", // Additional Conditions amendment .trnmod.swiadd.adlcnd
},
trndoc: {
nar754: "", // Narrative :77A: .trnmod.trndoc.nar754
......
......@@ -259,13 +259,13 @@
<c-col :span="24">
<el-form-item label="New Maturity Date" prop="trnmod.swiadd.newmatdat">
<c-date-picker type="date" @change="change" :disabled="model.bodgrp.rec.doctypcod === 'P'" v-model="model.trnmod.swiadd.newmatdat" style="width:100%" placeholder="请选择New Maturity Date"></c-date-picker>
<c-date-picker type="date" :disabled="model.bodgrp.rec.doctypcod === 'P'" v-model="model.trnmod.swiadd.newmatdat" style="width:100%" placeholder="请选择New Maturity Date"></c-date-picker>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="Further Amendments" prop="trnmod.swiadd.ametxt">
<c-input type="textarea" v-model="model.trnmod.swiadd.ametxt" maxlength="35" show-word-limit placeholder="请输入Further Amendments" ></c-input>
<c-input-format type="textarea" v-model="model.trnmod.swiadd.ametxt" :maxRows="6" :maxCols="35" placeholder="请输入Further Amendments" ></c-input-format>
</el-form-item>
</c-col>
</c-col>
......@@ -292,35 +292,20 @@ export default {
watch:{
"model.bodgrp.rec.doctypcod":function(){
if(this.model.bodgrp.rec.doctypcod=='P'){
this.model.trnmod.swiadd.newmatpercnt="";
this.model.trnmod.swiadd.newmatpertyp="";
this.model.trnmod.swiadd.newmatperbeg="";
this.model.trnmod.swiadd.newmatdat="";
this.model.bodgrp.rec.matdat="";
}
},
// "model.trnmod.swiadd.newmatdat":function(){
// if(this.model.trnmod.swiadd.newmatdat!="" ){
// this.model.bodgrp.rec.matdat=this.model.trnmod.swiadd.newmatdat;
// console.log(this.model.oldbodgrp.rec.matdat)
// }
// else{
// this.model.bodgrp.rec.matdat=this.model.oldbodgrp.rec.matdat;
// console.log(this.model.bodgrp.rec.matdat)
// }
// }
},
},
methods:{...Event,
change() {
if(this.model.trnmod.swiadd.newmatdat!="" ){
this.model.bodgrp.rec.matdat=this.model.trnmod.swiadd.newmatdat;
}
else{
this.model.bodgrp.rec.matdat=this.model.oldbodgrp.rec.matdat;
}
},
// change() {
// if(this.model.trnmod.swiadd.newmatdat!="" ){
// this.model.bodgrp.rec.matdat=this.model.trnmod.swiadd.newmatdat;
// }
// else{
// this.model.bodgrp.rec.matdat=this.model.oldbodgrp.rec.matdat;
// }
// },
},
created:function(){
......
......@@ -334,7 +334,7 @@
</el-form-item>
</c-col>
<c-col :span="24">
<c-checkbox disabled v-model="model.mtabut.clsflg"
<c-checkbox :disabled="model.setmod.docamt<=model.bodgrp.cbs.opn1.amt" v-model="model.mtabut.clsflg" @change="change1"
>Close Contract</c-checkbox
>
</c-col>
......@@ -435,10 +435,10 @@ export default {
computed: {
clsflg: {
get() {
return this.model.mtabut.clsflg === "O";
return this.model.mtabut.clsflg === "X";
},
set(val) {
this.model.mtabut.clsflg = val ? "C" : "O";
this.model.mtabut.clsflg = val ? "X" : "";
},
},
focflg: {
......@@ -473,21 +473,21 @@ export default {
}
},
change1() {
if (this.model.bodgrp.rec.focflg == "X") {
this.model.bodgrp.rec.docsta == "D";
} else {
this.model.bodgrp.rec.docsta == "B";
// if (this.model.bodgrp.rec.focflg) {
// this.model.bodgrp.rec.docsta = "D";
// } else {
// this.model.bodgrp.rec.docsta = "B";
// }
if (this.model.mtabut.clsflg=='X' ){
this.model.bodgrp.rec.docsta="E";
}
else if(this.model.bodgrp.rec.focflg=='X' && this.model.mtabut.clsflg!='X'){
this.model.bodgrp.rec.docsta="D";
}
else if(this.model.bodgrp.rec.focflg!='X' && this.model.mtabut.clsflg!='X'){
this.model.bodgrp.rec.docsta="B";
}
// if(this.model.bodgrp.rec.focflg=='X' && this.model.bodgrp.rec.clsflg==''){
// this.model.bodgrp.rec.docsta==="D";
// }
// else if(this.model.bodgrp.rec.focflg=='' && this.model.bodgrp.rec.clsflg==''){
// this.model.bodgrp.rec.docsta==="B";
// }
// else{
// this.model.bodgrp.rec.docsta=="E";
// }
if (this.model.bodgrp.rec.focflg) {
this.model.setmod.redamt = this.model.setmod.docamt;
......
......@@ -339,7 +339,7 @@
<c-col :span="24">
<el-form-item label="Decrease limits stream" prop="decstm">
<el-form-item label="修改历史列表" prop="decstm">
<c-istream-table
:list="model.decstm.rows || []"
:columns="trnData.columns"
......
......@@ -30,32 +30,7 @@
<m-conp :model="model" :codes="codes" />
</el-tab-pane>
<el-tab-pane
v-if="model.gitp.swiftflg == ''"
label="Overview"
name="ovwp"
>
<c-content>
<m-ovwp :model="model" :codes="codes" />
</c-content>
</el-tab-pane>
<!--PD000002 -->
<el-tab-pane
v-if="model.gitp.swiftflg == 'Y'"
label="Overview"
name="ovwp20"
>
<c-content>
<m-ovwp20 :model="model" :codes="codes" />
</c-content>
</el-tab-pane>
<el-tab-pane
v-if="model.gitp.swiftflg == 'N'"
label="Overview"
name="ovwp"
>
<el-tab-pane label="Overview" name="ovwp">
<c-content>
<m-ovwp :model="model" :codes="codes" />
</c-content>
......@@ -131,7 +106,6 @@
<el-tab-pane label="统一授信" name="limitbody">
<m-limitbody :model="model" :codes="codes" />
</el-tab-pane>
</c-tabs>
</el-form>
</div>
......@@ -147,7 +121,6 @@ import Default from "~/model/Getamc/Default";
import Pattern from "~/model/Getamc/Pattern";
import Conp from "./Conp";
import Ovwp from "./Ovwp";
import Ovwp20 from "./Ovwp20";
import Preperp from "./Preperp";
import Detp from "./Detp";
import Gidtxtp from "./Gidtxtp";
......@@ -166,7 +139,6 @@ export default {
components: {
"m-conp": Conp,
"m-ovwp": Ovwp,
"m-ovwp20" : Ovwp20,
"m-preperp": Preperp,
"m-detp": Detp,
"m-gidtxtp": Gidtxtp,
......@@ -175,7 +147,7 @@ export default {
"m-glepan": Glepan,
"m-coninfp": Coninfp,
"m-docpan": Docpan,
"m-doctre" :Doctre,
"m-doctre": Doctre,
"m-opnp": Opnp,
"m-limitbody": Limitbody,
},
......@@ -200,14 +172,12 @@ export default {
bookings: false,
attachments: false,
};
},
methods: {
myTabClick(tab) {
this.tabClick(tab);
if(tab.name === "setpan"){
this.bookings = true,
this.attachments = true
if (tab.name === "setpan") {
(this.bookings = true), (this.attachments = true);
}
/**
* do it yourself
......@@ -220,7 +190,7 @@ export default {
if (rtnmsg.respCode == SUCCESS) {
this.updateModel(rtnmsg.data);
//TODO 处理数据逻辑
if (this.isInDisplay){
if (this.isInDisplay) {
this.restoreDisplay();
}
} else {
......
......@@ -99,7 +99,7 @@
placeholder="请输入Guarantee Amount"
></c-input>
</c-col>
<c-col :span="4" v-if="model.gitp.swiftflg!='Y'" class="centerLable">
<c-col :span="4" v-show="model.gitp.swiftflg!='Y'" class="centerLable">
<c-checkbox disabled v-model="model.gitp.dzbhflg">电子保函标志</c-checkbox>
</c-col>
</c-col>
......@@ -147,7 +147,7 @@
</c-col> -->
<c-col :span="24">
<el-form-item v-if="model.gitp.swiftflg=='Y'" label="Incoming Purpose " prop="gidgrp.rec.purposin">
<el-form-item v-show="model.gitp.swiftflg=='Y'" label="Incoming Purpose " prop="gidgrp.rec.purposin">
<c-select :disabled="model.gitp.inc760==''" v-model="model.gidgrp.rec.purposin" style="width:100%" placeholder="请选择Incoming Purpose ">
<el-option
v-for="item in codes.purposin"
......@@ -161,7 +161,7 @@
</c-col>
<c-col :span="24">
<el-form-item v-if="model.gitp.swiftflg=='Y'" label="Outgoing Purpose" prop="gidgrp.rec.purpos">
<el-form-item v-show="model.gitp.swiftflg=='Y'" label="Outgoing Purpose" prop="gidgrp.rec.purpos">
<c-select v-model="model.gidgrp.rec.purpos" style="width:100%" placeholder="请选择Outgoing Purpose">
<el-option
v-for="item in codes.purpos"
......@@ -186,7 +186,7 @@
placeholder="请选择Handling Type"
>
<el-option
v-for="item in hndtyp"
v-for="item in codes.hndtyp"
:key="item.value"
:label="item.label"
:value="item.value"
......@@ -215,7 +215,7 @@
<c-col :span="24">
<c-col :span="24">
<el-form-item v-if="model.gitp.swiftflg=='Y'" label="Form of Undertaking" prop="gidgrp.rec.legfrm">
<el-form-item v-show="model.gitp.swiftflg=='Y'" label="Form of Undertaking" prop="gidgrp.rec.legfrm">
<c-select v-model="model.gidgrp.rec.legfrm" style="width:100%" placeholder="请选择Form of Undertaking">
<el-option
v-for="item in legfrm"
......@@ -233,7 +233,7 @@
</c-col>
<c-col :span="24">
<el-form-item v-if="model.gitp.swiftflg=='Y'" label="Demand Indicator" prop="gidgrp.rec.demand">
<el-form-item v-show="model.gitp.swiftflg=='Y'" label="Demand Indicator" prop="gidgrp.rec.demand">
<c-select v-model="model.gidgrp.rec.demand" style="width:100%" placeholder="请选择Demand Indicator">
<el-option
v-for="item in codes.demand"
......@@ -323,7 +323,7 @@
<c-col :span="24">
<el-form-item
v-if="model.gitp.swiftflg=='Y'"
v-show="model.gitp.swiftflg=='Y'"
label="Language of Undertak."
prop="gidgrp.rec.giduil"
>
......@@ -1585,17 +1585,11 @@ export default {
mixins: [commonProcess],
data(){
return {
hndtyp: [
{ label: "Transfer", value: "OT" },
{ label: "Direct (we issue)", value: "OL" },
{ label: "Indirect (please issue)", value: "OC" },
],
apprul:[
{label:"UCPR Undertaking is subject to UCP Rules f. Doc. Credit",value:"UCPR" },
{label:"OTHR The guarantee is subject to another set of rules, see Narrative",value:"OTHR" },
{label:"URDG The guarantee is subject to the ICC Rules for Demand Guarantees",value:"URDG" },
{label:"ISPR The guarantee is not subject to any set of rule",value:"ISPR"},
// {label:"ISPR The undertaking is subject to International Standby Practices ISP",value:"ISPR" },
{label:"NONE The guarantee is not subject to any set of rule",value:"NONE" },
],
legfrm:[
......@@ -1628,43 +1622,43 @@ export default {
},
},
watch:{
"model.gidgrp.rec.expflg":function () {
if(this.model.gidgrp.rec.expflg=='X'&&this.model.gidgrp.rec.hndtyp=='OC'){
this.model.gidgrp.rec.liaflg='X';
}
},
"model.gidgrp.cbs.opn1.cur":function(){
if(this.model.gidgrp.cbs.opn1.cur!=''){
this.model.cfagit.recgrp.bas.guarancurr=this.model.gidgrp.cbs.opn1.cur;
// "model.gidgrp.rec.expflg":function () {
// if(this.model.gidgrp.rec.expflg=='X'&&this.model.gidgrp.rec.hndtyp=='OC'){
// this.model.gidgrp.rec.liaflg='X';
// }
// },
// "model.gidgrp.cbs.opn1.cur":function(){
// if(this.model.gidgrp.cbs.opn1.cur!=''){
// this.model.cfagit.recgrp.bas.guarancurr=this.model.gidgrp.cbs.opn1.cur;
}
},
"model.gidgrp.cbs.max.amt":function(){
if(this.model.gidgrp.cbs.max.amt!=''){
this.model.cfagit.recgrp.bas.guaranamount=this.model.gidgrp.cbs.max.amt;
}
},
// }
// },
// "model.gidgrp.cbs.max.amt":function(){
// if(this.model.gidgrp.cbs.max.amt!=''){
// this.model.cfagit.recgrp.bas.guaranamount=this.model.gidgrp.cbs.max.amt;
// }
// },
"model.gidgrp.cbs.opn1.cur":function(){
if(this.model.gidgrp.cbs.opn1.cur!=''&&this.model.gidgrp.cbs.opn1.cur!='CNY'){
this.model.cnybop.cnyvou.currencycode=this.model.gidgrp.cbs.opn1.cur;
this.model.cnybop.cnyvou.fvouchamt=this.model.gidgrp.cbs.max.amt;
}
},
// "model.gidgrp.cbs.opn1.cur":function(){
// if(this.model.gidgrp.cbs.opn1.cur!=''&&this.model.gidgrp.cbs.opn1.cur!='CNY'){
// this.model.cnybop.cnyvou.currencycode=this.model.gidgrp.cbs.opn1.cur;
// this.model.cnybop.cnyvou.fvouchamt=this.model.gidgrp.cbs.max.amt;
// }
// },
"model.gidgrp.cbs.max.amt":function(){
if(this.model.gidgrp.cbs.max.amt!=''){
this.model.cnybop.cnyvou.fvouchamt=this.model.gidgrp.cbs.max.amt;
}
},
// "model.gidgrp.cbs.max.amt":function(){
// if(this.model.gidgrp.cbs.max.amt!=''){
// this.model.cnybop.cnyvou.fvouchamt=this.model.gidgrp.cbs.max.amt;
// }
// },
"model.gidgrp.rec.giduil":function(){
if(this.model.gidgrp.rec.giduil=='CN'){
this.model.gidgrp.rec.gtxinr.code=this.codes.gtxinr1;
}else if(this.model.gidgrp.rec.giduil=='EN'){
this.model.gidgrp.rec.gtxinr.code=this.codes.gtxinr;
}
}
// "model.gidgrp.rec.giduil":function(){
// if(this.model.gidgrp.rec.giduil=='CN'){
// this.model.gidgrp.rec.gtxinr.code=this.codes.gtxinr1;
// }else if(this.model.gidgrp.rec.giduil=='EN'){
// this.model.gidgrp.rec.gtxinr.code=this.codes.gtxinr;
// }
// }
},
methods:{
...Event,
......
......@@ -3,7 +3,9 @@
<el-col :span="11">
<c-col :span="24">
<el-form-item label="Additional Conditions" prop="lidgrp.blk.adlcnd">
<c-input type="textarea" v-model="model.lidgrp.blk.adlcnd" maxlength="65" show-word-limit placeholder="请输入Additional Conditions" ></c-input>
<c-input
disabled
type="textarea" v-model="model.lidgrp.blk.adlcnd" maxlength="65" show-word-limit placeholder="请输入Additional Conditions" ></c-input>
</el-form-item>
</c-col>
<c-col :span="24">
......@@ -18,7 +20,9 @@
<el-col :span="11" :offset="1">
<c-col :span="24">
<el-form-item label="Historic Overview" prop="lidgrp.blk.adlcndame">
<c-input type="textarea" v-model="model.lidgrp.blk.adlcndame" maxlength="50" show-word-limit placeholder="请输入Additional Conditions Amendment History" ></c-input>
<c-input
disabled
type="textarea" v-model="model.lidgrp.blk.adlcndame" maxlength="50" show-word-limit placeholder="请输入Additional Conditions Amendment History" ></c-input>
</el-form-item>
</c-col>
......
......@@ -118,10 +118,11 @@
</c-col>
<c-col :span="24">
<el-form-item label="Amount Specification" prop="trnmod.swiadd.nomspc">
<c-input
<c-select
disabled
:code="codes.nomspc"
v-model="model.trnmod.swiadd.nomspc" style="width:100%" placeholder="请选择金额说明">
</c-input>
</c-select>
</el-form-item>
</c-col>
......@@ -309,19 +310,27 @@
<c-input v-model="model.trnmod.swiadd.prepertxts18" maxlength="35" placeholder="请输入Presentation period text"></c-input>
</el-form-item>
</c-col>
<c-col :span="24">
<c-col :span="12">
<c-checkbox v-model="model.litp.aamp.aammod.addamtflg">Add. Amount</c-checkbox>
<c-checkbox
style="margin: 0px 0 10px 150px;"
v-model="model.litp.aamp.aammod.addamtflg">Add. Amount</c-checkbox>
</c-col>
<c-col :span="24">
</c-col>
<c-col :span="12">
<el-form-item label="Currency" prop="lidgrp.cbs.max2.cur">
<c-input v-model="model.lidgrp.cbs.max2.cur" maxlength="3" placeholder="请输入Currency"></c-input>
<c-input
disabled
v-model="model.lidgrp.cbs.max2.cur" maxlength="3" placeholder="请输入Currency"></c-input>
</el-form-item>
</c-col>
<c-col :span="24">
<c-col :span="12">
<el-form-item label="Additional Amount" prop="trnmod.swiadd.addamt">
<c-input v-model="model.trnmod.swiadd.addamt" placeholder="请输入Additional Amount"></c-input>
<c-input
disabled
v-model="model.trnmod.swiadd.addamt" placeholder="请输入Additional Amount"></c-input>
</el-form-item>
</c-col>
<c-col :span="24">
......@@ -336,10 +345,14 @@
</el-form-item>
</c-col>
<c-col :span="12">
<c-checkbox v-model="model.trnmod.swiadd.reqcan">Cancellation Request</c-checkbox>
<c-checkbox
style="margin: 0px 0 10px 150px;"
v-model="model.trnmod.swiadd.reqcan">Cancellation Request</c-checkbox>
</c-col>
<c-col :span="12">
<c-checkbox v-model="model.litamep.cre707flg">Create Amendment Message</c-checkbox>
<c-checkbox
style="margin: 0px 0 10px 150px;"
v-model="model.litamep.cre707flg">Create Amendment Message</c-checkbox>
</c-col>
</el-col>
......
......@@ -4,23 +4,32 @@
<el-col :span="11">
<c-col :span="24">
<el-form-item label="Description of Goods and/or Services" prop="lidgrp.blk.lcrgod">
<c-input type="textarea" v-model="model.lidgrp.blk.lcrgod" maxlength="65" show-word-limit placeholder="请输入Description of Goods" ></c-input>
<c-input
disabled
type="textarea" v-model="model.lidgrp.blk.lcrgod" maxlength="65" show-word-limit placeholder="请输入Description of Goods" ></c-input>
</el-form-item>
</c-col>
<c-col :span="24">
<c-col :span="22">
<el-form-item label="Adding / Deleting Text in Current Amendment" prop="litamep.lcrgodamep.usrblk">
<c-input
:rows="5"
type="textarea" v-model="model.litamep.lcrgodamep.usrblk" maxlength="65" show-word-limit placeholder="请输入Block to enter additional info for Add/Delete" ></c-input>
</el-form-item>
</c-col>
<c-col :span="2">
<c-button size="small" type="primary" icon="el-icon-search" @click="">
</c-button>
</c-col>
</el-col>
<el-col :span="11" :offset="1">
<c-col :span="24">
<el-form-item label="History Overview" prop="lidgrp.blk.lcrgodame">
<c-input type="textarea" v-model="model.lidgrp.blk.lcrgodame" maxlength="50" show-word-limit placeholder="请输入Description of Goods Amendment History" ></c-input>
<c-input
disabled
type="textarea" v-model="model.lidgrp.blk.lcrgodame" maxlength="50" show-word-limit placeholder="请输入Description of Goods Amendment History" ></c-input>
</el-form-item>
</c-col>
......@@ -39,13 +48,17 @@
</c-col>
<c-col :span="24">
<c-button size="small" type="primary" @click="onLcrgodamepButadd">
<c-button
disabled
size="small" type="primary" @click="onLcrgodamepButadd">
Add Text
</c-button>
</c-col>
<c-col :span="24">
<c-button size="small" type="primary" icon="el-icon-delete" @click="onLcrgodamepButdel">
<c-button
disabled
size="small" type="primary" icon="el-icon-delete" @click="onLcrgodamepButdel">
Delete text
</c-button>
</c-col>
......
......@@ -3,11 +3,13 @@
<c-col :span="11">
<c-col :span="24">
<el-form-item label="Documents Required" prop="lidgrp.blk.lcrdoc">
<c-input type="textarea" v-model="model.lidgrp.blk.lcrdoc" maxlength="65" show-word-limit placeholder="请输入Documents Required" ></c-input>
<c-input
disabled
type="textarea" v-model="model.lidgrp.blk.lcrdoc" maxlength="65" show-word-limit placeholder="请输入Documents Required" ></c-input>
</el-form-item>
</c-col>
<c-col :span="24">
<c-col :span="22">
<el-form-item label="Adding / Deleting Text in current Amendment" prop="litamep.lcrdocamep.usrblk">
<c-input type="textarea"
v-model="model.litamep.lcrdocamep.usrblk"
......@@ -17,12 +19,18 @@
></c-input>
</el-form-item>
</c-col>
<c-col :span="2">
<c-button size="small" type="primary" icon="el-icon-search" @click="">
</c-button>
</c-col>
</c-col>
<c-col :span="11" :offset="1">
<c-col :span="24">
<el-form-item label="Historic Overview" prop="lidgrp.blk.lcrdocame">
<c-input type="textarea" v-model="model.lidgrp.blk.lcrdocame" maxlength="50" show-word-limit placeholder="请输入Documents Required Amendment History" ></c-input>
<c-input
disabled
type="textarea" v-model="model.lidgrp.blk.lcrdocame" maxlength="50" show-word-limit placeholder="请输入Documents Required Amendment History" ></c-input>
</el-form-item>
</c-col>
......@@ -48,13 +56,18 @@
</c-col>
<c-col :span="24">
<c-button size="small" type="primary" @click="onLcrdocamepButadd">
<c-button
disabled
size="small" type="primary" @click="onLcrdocamepButadd">
Add Text
</c-button>
</c-col>
<c-col :span="24">
<c-button size="small" type="primary" icon="el-icon-delete" @click="onLcrdocamepButdel">
<c-button
disabled
size="small" type="primary" icon="el-icon-delete" @click="onLcrdocamepButdel">
Delete text
</c-button>
</c-col>
......
......@@ -137,7 +137,7 @@
<c-col :span="12">
<el-form-item label="Partial Shipment" prop="lidgrp.rec.shppar">
<c-select v-model="model.lidgrp.rec.shppar" style="width:100%" placeholder="请选择Partial Shipment"
:code="codes.shppar"
:code="codes.shptrss18"
>
</c-select>
</el-form-item>
......@@ -152,7 +152,7 @@
<c-col :span="12">
<el-form-item label="Transhipment" prop="lidgrp.rec.shptrs">
<c-select v-model="model.lidgrp.rec.shptrs" style="width:100%" placeholder="请选择Transhipment"
:code="codes.shppar"
:code="codes.shptrss18"
>
</c-select>
</el-form-item>
......
......@@ -163,7 +163,7 @@ import AampVue from '../Detame/Aamp.vue'
export default {
name:"Litame",
components:{
"m-amep" : Amep,
"m-ovwp" : Ovwp,
......
......@@ -78,6 +78,7 @@
<el-form-item label="Available by" prop="lidgrp.rec.avbby">
<c-select
disabled
:code="codes.avbby"
v-model="model.lidgrp.rec.avbby" style="width:100%" placeholder="请选择Available by">
</c-select>
</el-form-item>
......@@ -123,6 +124,7 @@
<el-form-item label="Form of L/C" prop="lidgrp.rec.lcrtyp">
<c-select
disabled
:code="codes.lcrtyp"
v-model="model.lidgrp.rec.lcrtyp" style="width:100%" placeholder="请选择信用证类型">
</c-select>
</el-form-item>
......@@ -156,8 +158,10 @@
</c-col>
<c-col :span="24">
<el-form-item label="Document Type" prop="brdgrp.rec.docflg">
<c-input v-model="model.brdgrp.rec.docflg" style="width:100%" disabled>
</c-input>
<c-select
:code="codes.docflg"
v-model="model.brdgrp.rec.docflg" style="width:100%" disabled>
</c-select>
</el-form-item>
</c-col>
<c-col :span="12">
......@@ -211,7 +215,7 @@
</c-col>
<c-col :span="12">
<el-form-item label="Presentation Date" prop="brdgrp.rec.predat">
<el-form-item label="Present.Date" prop="brdgrp.rec.predat">
<c-date-picker type="date" v-model="model.brdgrp.rec.predat" style="width:100%" placeholder="请选择Presentation Date"></c-date-picker>
</el-form-item>
</c-col>
......@@ -262,7 +266,9 @@
</el-form-item>
</c-col>
<c-col :span="12">
<c-checkbox v-model="model.brdgrp.rec.dscinsflg">Enter Docs, Discrep. and Instructions</c-checkbox>
<c-checkbox
:disabled="this.model.brdgrp.blk.docdisflg == 'X'"
v-model="model.brdgrp.rec.dscinsflg">Enter Docs, Discrep., Instr. and Shipping Details</c-checkbox>
</c-col>
<c-col :span="24">
<el-form-item label="最迟送达日期" prop="zcsdrq">
......@@ -303,7 +309,8 @@
</c-col>
<c-col :span="24">
<el-form-item label="Presented by Ref." prop="brdgrp.prb.pts.ref">
<c-input disabled v-model="model.brdgrp.prb.pts.ref" maxlength="16" placeholder="请输入Reference"></c-input>
<c-input
disabled v-model="model.brdgrp.prb.pts.ref" maxlength="16" placeholder="请输入Reference"></c-input>
</el-form-item>
</c-col>
<c-col :span="24">
......@@ -318,7 +325,9 @@
</c-col>
<c-col :span="24">
<el-form-item label="Presented by" prop="brdgrp.rec.docprbrol">
<c-select v-model="model.brdgrp.rec.docprbrol" style="width:100%" placeholder="请选择Presented by">
<c-select
:code="codes.docprbrol"
v-model="model.brdgrp.rec.docprbrol" style="width:100%" placeholder="请选择Presented by">
</c-select>
</el-form-item>
</c-col>
......@@ -378,17 +387,20 @@
</c-col> -->
<c-col :span="24">
<el-form-item label="Document Set Status" prop="brdgrp.rec.docsta">
<c-input disabled
v-model="model.brdgrp.rec.docsta" maxlength="1" placeholder="请输入Document Set Status"></c-input>
<c-select
disabled
:code="codes.docsta"
v-model="model.brdgrp.rec.docsta"
style="width:100%"
placeholder="请输入Document Set Status"></c-select>
</el-form-item>
</c-col>
<c-col :span="24">
<c-col :span="12">
<el-form-item label="Previous Drawings under this L/C" prop="lidgrp.rec.utlnbr">
<c-input disabled v-model="model.lidgrp.rec.utlnbr" placeholder="请输入Count of Received Document Sets"></c-input>
</el-form-item>
</c-col>
<c-col :span="24">
<c-col :span="12">
<el-form-item label="发票号" prop="brdgrp.rec.invref">
<c-input v-model="model.brdgrp.rec.invref" ></c-input>
</el-form-item>
......
......@@ -12,20 +12,20 @@
<c-col :span="24">
<el-form-item label="单据出具人" prop="brdgrp.srm.djuusr">
<c-input :disabled="!this.model.brdgrp.srm.djutyp" v-model="model.brdgrp.srm.djuusr" maxlength="80" placeholder="请输入单据出具人"></c-input>
<c-input :disabled="this.typ1" v-model="model.brdgrp.srm.djuusr" maxlength="80" placeholder="请输入单据出具人"></c-input>
</el-form-item>
</c-col>
</el-col>
<el-col :span="11" :offset="1">
<c-col :span="24">
<el-form-item label="单据出具日期" prop="brdgrp.srm.djudat">
<c-date-picker :disabled="!this.model.brdgrp.srm.djutyp" type="date" v-model="model.brdgrp.srm.djudat" style="width:100%" placeholder="请选择单据出具日期"></c-date-picker>
<c-date-picker :disabled="this.typ1" type="date" v-model="model.brdgrp.srm.djudat" style="width:100%" placeholder="请选择单据出具日期"></c-date-picker>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="货权单据编号" prop="brdgrp.srm.djuref">
<c-input :disabled="!this.model.brdgrp.srm.djutyp" v-model="model.brdgrp.srm.djuref" maxlength="40" placeholder="请输入货权单据编号"></c-input>
<c-input :disabled="this.typ1" v-model="model.brdgrp.srm.djuref" maxlength="40" placeholder="请输入货权单据编号"></c-input>
</el-form-item>
</c-col>
</el-col>
......@@ -49,8 +49,38 @@ export default {
mixins: [commonProcess],
data(){
return {
typ1:true
}
},
watch:{
"model.brdgrp.srm.djutyp":{
immediate:true,
handler(val,oldval){
if(this.model.brdgrp.srm.djutyp == 'D'){
this.typ1 = true
// ommonProcess里的 changeFormItemRequired (property,Boolean)
this.changeFormItemRequired('brdgrp.srm.djuusr', false)
this.changeFormItemRequired('brdgrp.srm.djudat', false)
this.changeFormItemRequired('brdgrp.srm.djuref', false)
this.model.brdgrp.srm.djuusr =''
this.model.brdgrp.srm.djudat =''
this.model.brdgrp.srm.djuref =''
}else if(this.model.brdgrp.srm.djutyp == ''){
this.typ1 = true
this.changeFormItemRequired('brdgrp.srm.djuusr', false)
this.changeFormItemRequired('brdgrp.srm.djudat', false)
this.changeFormItemRequired('brdgrp.srm.djuref', false)
}
else{
this.typ1 = false
this.changeFormItemRequired('brdgrp.srm.djuusr', true)
this.changeFormItemRequired('brdgrp.srm.djudat', true)
this.changeFormItemRequired('brdgrp.srm.djuref', true)
}
}
}
},
methods:{...Event},
created:function(){
......
......@@ -5,13 +5,6 @@
: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">
......
......@@ -36,7 +36,7 @@
</c-col>
<c-col :span="20">
<el-form-item label="Instructions to Pay.," prop="lidgrp.blk.insbnk">
<el-form-item label="Instructions to Pay.,Accept., Negot. Bank" prop="lidgrp.blk.insbnk">
<c-input type="textarea" v-model="model.lidgrp.blk.insbnk" maxlength="780" :rows="6" show-word-limit placeholder="请输入Instructions to Pay.," ></c-input>
</el-form-item>
</c-col>
......
......@@ -12,10 +12,11 @@
</el-form-item>
</c-col>
<c-col :span="24" v-if="flag4">
<c-col :span="24" v-if="this.flag4">
<el-form-item label="Extkey" prop="lidgrp.avb.pts.extkey">
<c-fullbox>
<c-input
<c-input
:disabled="this.flag5"
v-model="model.lidgrp.avb.pts.extkey"
maxlength="16"
placeholder="请输入External Key of Address"
......@@ -60,7 +61,7 @@
<c-col :span="24">
<el-form-item label="Available in" prop="lidgrp.avb.pts.adrblk">
<c-input
disabled
:disabled="this.flag6"
type="textarea" v-model="model.lidgrp.avb.pts.adrblk" maxlength="135" :rows="4" show-word-limit placeholder="请输入Available in" ></c-input>
</el-form-item>
</c-col>
......@@ -354,6 +355,8 @@ export default {
flag2:true,
flag3:true,
flag4:true,
flag5:false,
flag6:true
}
},
methods:{...Event,
......@@ -370,6 +373,8 @@ export default {
handler(val,oldVal){
if(val == 'O'){
this.flag4=false;
this.changeFormItemRequired('lidgrp.avb.pts.adrblk',false)
this.flag6=false
}else{
this.flag4=true;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment