Skip to content

V
vue-gjjs
Commit cc0ee5b2 by zhujiazhan
Options

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

parents 192618ba 5ea8afba
Showing with 142 additions and 71 deletions
src/model/Litame/Pattern.js
......@@ -794,7 +794,7 @@ export default {
],
"litamep.lcrdocamep.usrblk":[
{type: "string", required: true, message: "必输项"},
{max: 65,message:"长度不能超过65"}
{max: 1650,message:"长度不能超过1650"}
],
......@@ -811,7 +811,7 @@ export default {
],
"litamep.lcrgodamep.usrblk":[
{type: "string", required: true, message: "必输项"},
{max: 65,message:"长度不能超过65"}
{max: 1650,message:"长度不能超过1650"}
],
......@@ -830,7 +830,7 @@ export default {
"litamep.adlcndamep.usrblk":[
{type: "string", required: true, message: "必输项"},
{max: 65,message:"长度不能超过65"}
{max: 1650,message:"长度不能超过1650"}
],
......
src/views/Business/Bctset/Bctsus.vue
......@@ -116,7 +116,7 @@
<el-form-item label="Document Set Status" prop="bcdgrp.rec.docsta">
<c-select
style="width: 100%"
:code="codes.docsta"
:code="codes.docstabot"
disabled
v-model="model.bcdgrp.rec.docsta"
maxlength="1"
......
src/views/Business/Bctset/index.vue
......@@ -8,7 +8,7 @@
<c-tabs v-model="tabVal" ref="elment" type="card" @tab-click="tabClick">
<!--PD000005 -->
<el-tab-pane label="Settle BC " name="bctsus">
<el-tab-pane label="Settle BC at Maturity, " name="bctsus">
<m-bctsus :model="model" :codes="codes"/>
</el-tab-pane>
......
src/views/Business/BusRouter.js
......@@ -297,7 +297,7 @@ const BusRouter = [
{ path: 'litcan', component: Litcan, name: 'Litcan', meta: { title: '进口信用证注销' } },
{ path: 'litdav', component: Litdav, name: 'Litdav', meta: { title: '进口信用证通知到单 ' } },
{ path: 'litdck', component: Litdck, name: 'Litdck', meta: { title: '进口信用证到单' } },
{ path: 'inflid', component: Inflid, name: 'Inflid', meta: { title: '进口信用证查询' } },
{ path: 'inflid', component: Inflid, name: 'Inflid', meta: { title: '进口信用证交易查询' } },
{ path: 'inftrd', component: Inftrd, name: 'Inftrd', meta: { title: '进口押汇查询' } },
{ path: 'trtopn', component: Trtopn, name: 'Trtopn', meta: { title: '进口融资开立' } },
{ path: 'trtame', component: Trtame, name: 'Trtame', meta: { title: '进口融资修改' } },
......
src/views/Business/Infbfd/Infsea.vue
......@@ -447,7 +447,7 @@
</c-col>
</c-row>
-->
<m-busbtn ref="childs" :ownref="ownref" trnCode="detsel" ownrefPath="dedgrp" :model="detselModel" @onChoose="onChoose"></m-busbtn
<m-busbtn ref="childs" :ownref="ownref" trnCode="detsel" ownrefPath="dedgrp" tabIndex=3 :model="detselModel" @onChoose="onChoose"></m-busbtn
>
</div>
......
src/views/Business/Litame/Adcpame.vue
......@@ -4,62 +4,85 @@
<c-col :span="24">
<el-form-item label="Additional Conditions" prop="lidgrp.blk.adlcnd">
<c-input
:rows="12"
disabled
type="textarea" v-model="model.lidgrp.blk.adlcnd" maxlength="65" show-word-limit placeholder="请输入Additional Conditions" ></c-input>
type="textarea" v-model="model.lidgrp.blk.adlcnd" maxlength="1650" show-word-limit placeholder="请输入Additional Conditions" ></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.adlcndamep.usrblk">
<c-input
:rows="7"
type="textarea" v-model="model.litamep.adlcndamep.usrblk" maxlength="65" show-word-limit placeholder="请输入Block to enter additional info for Add/Delete" ></c-input>
:rows="22"
type="textarea" v-model="model.litamep.adlcndamep.usrblk" maxlength="1650" 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="showGridPromptDialog('litamep.adlcndame.buttxmsel',null,null,{TXT: 'litamep.adlcndamep.usrblk'}, {TXT: false},'doxpDialog')">
</c-button>
</c-col>
</el-col>
<el-col :span="11" :offset="1">
<c-col :span="24">
<el-form-item label="Historic Overview" prop="lidgrp.blk.adlcndame">
<c-input
:rows="12"
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>
<c-col :span="12">
<c-checkbox v-model="model.lidgrp.rec.redclsflg">Red/Green Clause</c-checkbox>
<c-checkbox
style=" margin: 0px 0 10px 150px;"
v-model="model.lidgrp.rec.redclsflg">Red/Green Clause</c-checkbox>
</c-col>
<c-col :span="12">
<c-checkbox v-model="model.lidgrp.rec.spcbenflg">Spec.Pay.Cond.for Beneficiary</c-checkbox>
<c-checkbox
style=" margin: 0px 0 10px 100px;"
v-model="model.lidgrp.rec.spcbenflg">Spec.Pay.Cond.for Beneficiary</c-checkbox>
</c-col>
<c-col :span="12">
<c-checkbox v-model="model.lidgrp.rec.spcrcbflg">Special Payment Conditions for Bank only</c-checkbox>
<c-checkbox
style=" margin: 0px 0 10px 150px;"
v-model="model.lidgrp.rec.spcrcbflg">Special Payment Conditions for Bank only</c-checkbox>
</c-col>
<c-col :span="12">
<c-checkbox v-model="model.litamep.adlcndamep.modflg">Modify Text to Replace</c-checkbox>
<c-checkbox
style=" margin: 0px 0 10px 100px;"
v-model="model.litamep.adlcndamep.modflg">Modify Text to Replace</c-checkbox>
</c-col>
<c-col :span="12">
<c-checkbox v-model="model.litamep.adlcndamep.modmanflg">Modify Text Internally</c-checkbox>
<c-checkbox
style=" margin: 0px 0 10px 150px;"
v-model="model.litamep.adlcndamep.modmanflg">Modify Text Internally</c-checkbox>
</c-col>
<c-col :span="24">
<c-button size="small" type="primary" @click="onAdlcndamepButdif">
<c-button
style=" margin: 0px 0 10px 150px;"
size="small" type="primary" @click="onAdlcndamepButdif">
Show Diff
</c-button>
</c-col>
<c-col :span="24">
<c-button size="small" type="primary" disabled @click="onAdlcndamepButadd">
<c-button
style=" margin: 0px 0 10px 150px;"
size="small" type="primary" disabled @click="onAdlcndamepButadd">
Add Text
</c-button>
</c-col>
<c-col :span="24">
<c-button size="small" type="primary" disabled icon="el-icon-delete" @click="onAdlcndamepButdel">
<c-button
style=" margin: 0px 0 10px 150px;"
size="small" type="primary" disabled icon="el-icon-delete" @click="onAdlcndamepButdel">
Delete text
</c-button>
</c-col>
......
src/views/Business/Litame/Detp.vue
......@@ -27,7 +27,6 @@
style="margin:0 10px 0 10px;padding: 0 12px;"
size="small"
type="primary"
@click="onSeainf('lidgrp.avb.pts.extkey')"
>
<span style="font-family:'宋体';font-weight:bold">i</span>
</c-button>
......@@ -58,13 +57,20 @@
</el-form-item>
</c-col> -->
<c-col :span="24">
<c-col :span="24" v-if="this.flag4">
<el-form-item label="Available in" prop="lidgrp.avb.pts.adrblk">
<c-input
: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>
<c-col :span="24" v-if="!this.flag4">
<el-form-item label="Available in" prop="lidgrp.blk.avbwthtxt">
<c-input
type="textarea" v-model="model.lidgrp.blk.avbwthtxt" maxlength="135" :rows="4" show-word-limit placeholder="请输入Available in" ></c-input>
</el-form-item>
</c-col>
<!--
<c-col :span="24">
<el-form-item label="Address Block" prop="lidgrp.avb.pts.adrblk">
......@@ -107,7 +113,7 @@
<c-input type="textarea"
v-model="model.lidgrp.blk.defdet"
maxlength="50"
:rows="4"
:rows="3"
show-word-limit
placeholder="请输入Deferred Payment Details"
:disabled="this.flag1"
......@@ -179,13 +185,17 @@
<c-col :span="24">
<el-form-item label="Address Block" prop="lidgrp.drw.pts.adrblk">
<c-input type="textarea"
disabled
v-model="model.lidgrp.drw.pts.adrblk" maxlength="35" :rows="4" show-word-limit placeholder="请输入Address Block" ></c-input>
:disabled="this.flag2"
v-model="model.lidgrp.drw.pts.adrblk" maxlength="135" :rows="4" show-word-limit placeholder="请输入Address Block" ></c-input>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="Dispatch from" prop="lidgrp.rec.shpfro">
<c-input v-model="model.lidgrp.rec.shpfro" maxlength="65" placeholder="请输入Dispatch from"></c-input>
</el-form-item>
</c-col>
......@@ -322,11 +332,7 @@
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="Dispatch from" prop="lidgrp.rec.shpfro">
<c-input v-model="model.lidgrp.rec.shpfro" maxlength="65" placeholder="请输入Dispatch from"></c-input>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="Tenor day" prop="lidgrp.rec.tenmaxday">
<c-input v-model="model.lidgrp.rec.tenmaxday" placeholder="请输入Maximum tenor in days"></c-input>
......@@ -356,7 +362,7 @@ export default {
flag3:true,
flag4:true,
flag5:false,
flag6:true
flag6:false
}
},
methods:{...Event,
......@@ -371,31 +377,31 @@ export default {
"model.lidgrp.rec.avbwth":{
immediate:true,
handler(val,oldVal){
//Any Bank
if(val == 'O'){
this.flag4=false;
this.changeFormItemRequired('lidgrp.avb.pts.adrblk',false)
this.flag6=false
}else if(val == 'A') {
}//Advising Bank
else if(val == 'A'){
this.flag4=true;
this.flag5=true;
this.flag6=true;
}else if(val == 'C' || val == 'R'|| val == 'T'){
}//Issuing Bank
else if(val == 'I'){
this.flag4=true;
this.flag5=true;
this.flag5=false;
this.flag6=true;
this.changeFormItemRequired('lidgrp.avb.pts.adrblk',false);
this.model.lidgrp.avb.pts.extkey='';
this.model.lidgrp.avb.pts.adrblk='';
}else if(val == 'I'){
}//Confirming Bank
else if(val == 'C'){
this.flag4=true;
this.flag5=false;
this.flag5=true;
this.flag6=true;
}else if(val == 'S'){
}//Specified Bank
else if(val == 'S'){
this.flag4=true;
this.flag5=false;
this.flag6=false;
this.model.lidgrp.avb.pts.extkey='';
this.model.lidgrp.avb.pts.adrblk='';
}
}
},
......
src/views/Business/Litame/Dogpame.vue
......@@ -5,20 +5,22 @@
<c-col :span="24">
<el-form-item label="Description of Goods and/or Services" prop="lidgrp.blk.lcrgod">
<c-input
:rows="12"
disabled
type="textarea" v-model="model.lidgrp.blk.lcrgod" maxlength="65" show-word-limit placeholder="请输入Description of Goods" ></c-input>
type="textarea" v-model="model.lidgrp.blk.lcrgod" maxlength="1650" show-word-limit placeholder="请输入Description of Goods" ></c-input>
</el-form-item>
</c-col>
<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>
:rows="22"
type="textarea" v-model="model.litamep.lcrgodamep.usrblk" maxlength="1650" 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 size="small" type="primary" icon="el-icon-search"
@click="showGridPromptDialog('litamep.lcrgodame.buttxmsel',null,null,{TXT: 'litamep.lcrgodamep.usrblk'}, {TXT: false},'doxpDialog')">
</c-button>
</c-col>
......@@ -28,27 +30,35 @@
<c-col :span="24">
<el-form-item label="History Overview" prop="lidgrp.blk.lcrgodame">
<c-input
:rows="12"
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>
<c-col :span="12">
<c-checkbox v-model="model.litamep.lcrgodamep.modflg">Modify Text to Replace</c-checkbox>
<c-checkbox
style=" margin: 0px 0 10px 150px;"
v-model="model.litamep.lcrgodamep.modflg">Modify Text to Replace</c-checkbox>
</c-col>
<c-col :span="12">
<c-checkbox v-model="model.litamep.lcrgodamep.modmanflg">Modify Text Internally</c-checkbox>
<c-checkbox
style=" margin: 0px 0 10px 125px;"
v-model="model.litamep.lcrgodamep.modmanflg">Modify Text Internally</c-checkbox>
</c-col>
<c-col :span="24">
<c-button size="small" type="primary" @click="onLcrgodamepButdif">
<c-button
style=" margin: 0px 0 10px 150px;"
size="small" type="primary" @click="onLcrgodamepButdif">
Show Diff
</c-button>
</c-col>
<c-col :span="24">
<c-button
style=" margin: 0px 0 10px 150px;"
disabled
size="small" type="primary" @click="onLcrgodamepButadd">
Add Text
......@@ -57,6 +67,7 @@
<c-col :span="24">
<c-button
style=" margin: 0px 0 10px 150px;"
disabled
size="small" type="primary" icon="el-icon-delete" @click="onLcrgodamepButdel">
Delete text
......
src/views/Business/Litame/Dorpame.vue
......@@ -4,6 +4,7 @@
<c-col :span="24">
<el-form-item label="Documents Required" prop="lidgrp.blk.lcrdoc">
<c-input
:rows="12"
disabled
type="textarea" v-model="model.lidgrp.blk.lcrdoc" maxlength="65" show-word-limit placeholder="请输入Documents Required" ></c-input>
</el-form-item>
......@@ -13,14 +14,15 @@
<el-form-item label="Adding / Deleting Text in current Amendment" prop="litamep.lcrdocamep.usrblk">
<c-input type="textarea"
v-model="model.litamep.lcrdocamep.usrblk"
maxlength="65"
maxlength="1650"
show-word-limit placeholder="请输入Block to enter additional info for Add/Delete"
:rows="5"
:rows="22"
></c-input>
</el-form-item>
</c-col>
<c-col :span="2">
<c-button size="small" type="primary" icon="el-icon-search" @click="">
<c-button size="small" type="primary" icon="el-icon-search"
@click="showGridPromptDialog('litamep.lcrdocame.buttxmsel',null,null,{TXT: 'litamep.lcrdocamep.usrblk'}, {TXT: false},'doxpDialog')">
</c-button>
</c-col>
</c-col>
......@@ -29,6 +31,7 @@
<c-col :span="24">
<el-form-item label="Historic Overview" prop="lidgrp.blk.lcrdocame">
<c-input
:rows="12"
disabled
type="textarea" v-model="model.lidgrp.blk.lcrdocame" maxlength="50" show-word-limit placeholder="请输入Documents Required Amendment History" ></c-input>
</el-form-item>
......@@ -40,24 +43,28 @@
<c-checkbox
style="margin-left:5px;padding: 0 10px;"
style=" margin: 0px 0 10px 150px;"
v-model="model.litamep.lcrdocamep.modflg">Modify Text to Replace</c-checkbox>
</c-col>
<c-col :span="12">
<c-checkbox v-model="model.litamep.lcrdocamep.modmanflg">Modify field for manual update</c-checkbox>
<c-checkbox
style=" margin: 0px 0 10px 125px;"
v-model="model.litamep.lcrdocamep.modmanflg">Modify field for manual update</c-checkbox>
</c-col>
<c-col :span="12">
<c-button size="small" type="primary" @click="onLcrdocamepButdif">
<c-button
style=" margin: 0px 0 10px 150px;"
size="small" type="primary" @click="onLcrdocamepButdif">
Show Diff
</c-button>
</c-col>
<c-col :span="24">
<c-button
style=" margin: 0px 0 10px 150px;"
disabled
size="small" type="primary" @click="onLcrdocamepButadd">
Add Text
......@@ -66,6 +73,7 @@
<c-col :span="24">
<c-button
style=" margin: 0px 0 10px 150px;"
disabled
size="small" type="primary" icon="el-icon-delete" @click="onLcrdocamepButdel">
Delete text
......
src/views/Business/Litame/index.vue
......@@ -116,9 +116,16 @@
<c-grid-ety-prompt-dialog
ref="etyDialog"
:promptData="promptData"
v-on:select-ety="selectEty"
@select-ety="selectEty"
>
</c-grid-ety-prompt-dialog>
<c-grid-ety-prompt-dialog
ref="doxpDialog"
:isPty="false"
:promptData="promptData"
@select-ety="selectMsg"
>
</c-grid-ety-prompt-dialog>
</div>
</template>
<script>
......
src/views/Business/Litopn/Detp.vue
......@@ -113,7 +113,7 @@
<c-input type="textarea"
v-model="model.lidgrp.blk.defdet"
maxlength="50"
:rows="4"
:rows="3"
show-word-limit
placeholder="请输入Deferred Payment Details"
:disabled="this.flag1"
......@@ -185,13 +185,17 @@
<c-col :span="24">
<el-form-item label="Address Block" prop="lidgrp.drw.pts.adrblk">
<c-input type="textarea"
disabled
v-model="model.lidgrp.drw.pts.adrblk" maxlength="35" :rows="4" show-word-limit placeholder="请输入Address Block" ></c-input>
:disabled="this.flag2"
v-model="model.lidgrp.drw.pts.adrblk" maxlength="135" :rows="4" show-word-limit placeholder="请输入Address Block" ></c-input>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="Dispatch from" prop="lidgrp.rec.shpfro">
<c-input v-model="model.lidgrp.rec.shpfro" maxlength="65" placeholder="请输入Dispatch from"></c-input>
</el-form-item>
</c-col>
......@@ -328,11 +332,7 @@
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="Dispatch from" prop="lidgrp.rec.shpfro">
<c-input v-model="model.lidgrp.rec.shpfro" maxlength="65" placeholder="请输入Dispatch from"></c-input>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="Tenor day" prop="lidgrp.rec.tenmaxday">
<c-input v-model="model.lidgrp.rec.tenmaxday" placeholder="请输入Maximum tenor in days"></c-input>
......@@ -362,7 +362,7 @@ export default {
flag3:true,
flag4:true,
flag5:false,
flag6:true
flag6:false
}
},
methods:{...Event,
......@@ -377,15 +377,31 @@ export default {
"model.lidgrp.rec.avbwth":{
immediate:true,
handler(val,oldVal){
//Any Bank
if(val == 'O'){
this.flag4=false;
this.changeFormItemRequired('lidgrp.avb.pts.adrblk',false)
this.flag6=false
}else{
}//Advising Bank
else if(val == 'A'){
this.flag4=true;
this.flag5=true;
this.flag6=true;
}//Issuing Bank
else if(val == 'I'){
this.flag4=true;
this.flag5=false;
this.flag6=true;
}//Confirming Bank
else if(val == 'C'){
this.flag4=true;
this.flag5=true;
this.flag6=true;
}//Specified Bank
else if(val == 'S'){
this.flag4=true;
// if(val == 'I'){
// this.model.lidgrp.avb.pts.adrblk='Any Bank'
// }
this.flag5=false;
this.flag6=false;
}
}
},
......
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