Skip to content

V
vue-gjjs
Commit a47595be by huangxin
Options

botame,ditdla优化

parent 3e4c70cf
Showing with 45 additions and 49 deletions
src/model/Botame/Pattern.js
...@@ -46,8 +46,8 @@ export default { ...@@ -46,8 +46,8 @@ export default {
], ],
"trnmod.swiadd.newmatpercnt":[ "trnmod.swiadd.newmatpercnt":[
{type: "string", required: false, message: "必输项"}, //{type: "string", required: false, message: "必输项"},
{max: 3,message:"长度不能超过3"} //{max: 3,message:"长度不能超过3"}
], ],
...@@ -59,7 +59,7 @@ export default { ...@@ -59,7 +59,7 @@ export default {
], ],
"trnmod.swiadd.ametxt":[ "trnmod.swiadd.ametxt":[
//type: "string", required: true, message: "必输项"}, //type: "string", required: true, message: "必输项"},
{max: 35,message:"长度不能超过35"} //{max: 35,message:"长度不能超过35"}
], ],
"botp.recget.sdamod.dadsnd":[ "botp.recget.sdamod.dadsnd":[
{type: "string", required: false, message: "必输项"}, {type: "string", required: false, message: "必输项"},
...@@ -130,7 +130,7 @@ export default { ...@@ -130,7 +130,7 @@ export default {
{max: 35,message:"长度不能超过35"} {max: 35,message:"长度不能超过35"}
], ],
"bodgrp.rec.rcvdat":[ "bodgrp.rec.rcvdat":[
{type: "date", required: false, message: "输入正确的日期"} //{type: "date", required: false, message: "输入正确的日期"}
], ],
"bodgrp.rec.shpdat":[ "bodgrp.rec.shpdat":[
...@@ -141,10 +141,10 @@ export default { ...@@ -141,10 +141,10 @@ export default {
{max: 35,message:"长度不能超过35"} {max: 35,message:"长度不能超过35"}
], ],
"bodgrp.rec.predat":[ "bodgrp.rec.predat":[
{type: "date", required: false, message: "输入正确的日期"} //{type: "date", required: false, message: "输入正确的日期"}
], ],
"bodgrp.rec.advdat":[ "bodgrp.rec.advdat":[
{type: "date", required: false, message: "输入正确的日期"} //{type: "date", required: false, message: "输入正确的日期"}
], ],
"bodgrp.col.pts.ref":[ "bodgrp.col.pts.ref":[
{type: "string", required: false, message: "必输项"}, {type: "string", required: false, message: "必输项"},
......
src/model/Public/Trnmod/index.js
...@@ -27,6 +27,17 @@ export default class Trnmod { ...@@ -27,6 +27,17 @@ export default class Trnmod {
newnomtoname: "", newnomtoname: "",
prepers18: "", //New Presentation Period prepers18: "", //New Presentation Period
strinf: "", // Narrative of Maturity .trnmod.swiadd.strinf 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: { trndoc: {
nar754: "", // Narrative :77A: .trnmod.trndoc.nar754 nar754: "", // Narrative :77A: .trnmod.trndoc.nar754
......
src/views/Business/Botame/Amep.vue
...@@ -259,13 +259,13 @@ ...@@ -259,13 +259,13 @@
<c-col :span="24"> <c-col :span="24">
<el-form-item label="New Maturity Date" prop="trnmod.swiadd.newmatdat"> <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> </el-form-item>
</c-col> </c-col>
<c-col :span="24"> <c-col :span="24">
<el-form-item label="Further Amendments" prop="trnmod.swiadd.ametxt"> <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> </el-form-item>
</c-col> </c-col>
</c-col> </c-col>
...@@ -292,35 +292,20 @@ export default { ...@@ -292,35 +292,20 @@ export default {
watch:{ watch:{
"model.bodgrp.rec.doctypcod":function(){ "model.bodgrp.rec.doctypcod":function(){
if(this.model.bodgrp.rec.doctypcod=='P'){ 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.trnmod.swiadd.newmatdat="";
this.model.bodgrp.rec.matdat=""; 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, methods:{...Event,
change() { // change() {
if(this.model.trnmod.swiadd.newmatdat!="" ){ // if(this.model.trnmod.swiadd.newmatdat!="" ){
this.model.bodgrp.rec.matdat=this.model.trnmod.swiadd.newmatdat; // this.model.bodgrp.rec.matdat=this.model.trnmod.swiadd.newmatdat;
} // }
else{ // else{
this.model.bodgrp.rec.matdat=this.model.oldbodgrp.rec.matdat; // this.model.bodgrp.rec.matdat=this.model.oldbodgrp.rec.matdat;
} // }
}, // },
}, },
created:function(){ created:function(){
......
src/views/Business/Botset/Setp.vue
...@@ -334,7 +334,7 @@ ...@@ -334,7 +334,7 @@
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="24"> <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 >Close Contract</c-checkbox
> >
</c-col> </c-col>
...@@ -435,10 +435,10 @@ export default { ...@@ -435,10 +435,10 @@ export default {
computed: { computed: {
clsflg: { clsflg: {
get() { get() {
return this.model.mtabut.clsflg === "O"; return this.model.mtabut.clsflg === "X";
}, },
set(val) { set(val) {
this.model.mtabut.clsflg = val ? "C" : "O"; this.model.mtabut.clsflg = val ? "X" : "";
}, },
}, },
focflg: { focflg: {
...@@ -473,21 +473,21 @@ export default { ...@@ -473,21 +473,21 @@ export default {
} }
}, },
change1() { change1() {
if (this.model.bodgrp.rec.focflg == "X") { // if (this.model.bodgrp.rec.focflg) {
this.model.bodgrp.rec.docsta == "D"; // this.model.bodgrp.rec.docsta = "D";
} else { // } else {
this.model.bodgrp.rec.docsta == "B"; // 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) { if (this.model.bodgrp.rec.focflg) {
this.model.setmod.redamt = this.model.setmod.docamt; this.model.setmod.redamt = this.model.setmod.docamt;
......
src/views/Business/Ditdla/Accp.vue
...@@ -339,7 +339,7 @@ ...@@ -339,7 +339,7 @@
<c-col :span="24"> <c-col :span="24">
<el-form-item label="Decrease limits stream" prop="decstm"> <el-form-item label="修改历史列表" prop="decstm">
<c-istream-table <c-istream-table
:list="model.decstm.rows || []" :list="model.decstm.rows || []"
:columns="trnData.columns" :columns="trnData.columns"
......
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