Commit c13718ce 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 f62a954d 8ebe91bb
...@@ -169,7 +169,7 @@ export default { ...@@ -169,7 +169,7 @@ export default {
"brdgrp.tag72add":[ "brdgrp.tag72add":[
{type: "string", required: true, message: "必输项"}, {type: "string", required: true, message: "必输项"},
{max: 50,message:"长度不能超过50"} {max: 1750,message:"长度不能超过1750"}
], ],
"brtp.oth.namelc":[ "brtp.oth.namelc":[
{type: "string", required: true, message: "必输项"}, {type: "string", required: true, message: "必输项"},
...@@ -191,7 +191,7 @@ export default { ...@@ -191,7 +191,7 @@ export default {
"brdgrp.blk.docdis":[ "brdgrp.blk.docdis":[
{type: "string", required: true, message: "必输项"}, {type: "string", required: true, message: "必输项"},
{max: 50,message:"长度不能超过50"} {max: 3500,message:"长度不能超过3500"}
], ],
...@@ -223,11 +223,11 @@ export default { ...@@ -223,11 +223,11 @@ export default {
], ],
"brdgrp.blk.chaded":[ "brdgrp.blk.chaded":[
{type: "string", required: true, message: "必输项"}, {type: "string", required: true, message: "必输项"},
{max: 35,message:"长度不能超过35"} {max: 210,message:"长度不能超过210"}
], ],
"brdgrp.blk.chaadd":[ "brdgrp.blk.chaadd":[
{type: "string", required: true, message: "必输项"}, {type: "string", required: true, message: "必输项"},
{max: 35,message:"长度不能超过35"} {max: 210,message:"长度不能超过210"}
], ],
"brdgrp.rec.totcur":[ "brdgrp.rec.totcur":[
{type: "string", required: false, message: "必输项"}, {type: "string", required: false, message: "必输项"},
...@@ -269,7 +269,7 @@ export default { ...@@ -269,7 +269,7 @@ export default {
], ],
"brdgrp.blk.nartxt77a":[ "brdgrp.blk.nartxt77a":[
{type: "string", required: true, message: "必输项"}, {type: "string", required: true, message: "必输项"},
{max: 35,message:"长度不能超过35"} {max: 700,message:"长度不能超过700"}
], ],
"brtp.rmbp.ptsget.sdamod.dadsnd":[ "brtp.rmbp.ptsget.sdamod.dadsnd":[
{type: "string", required: false, message: "必输项"}, {type: "string", required: false, message: "必输项"},
...@@ -290,7 +290,7 @@ export default { ...@@ -290,7 +290,7 @@ export default {
], ],
"brdgrp.rmb.pts.adrblk":[ "brdgrp.rmb.pts.adrblk":[
{type: "string", required: true, message: "必输项"}, {type: "string", required: true, message: "必输项"},
{max: 35,message:"长度不能超过35"} {max: 140,message:"长度不能超过140"}
], ],
"brdgrp.rmb.dbfadrblkcn":[ "brdgrp.rmb.dbfadrblkcn":[
{type: "string", required: true, message: "必输项"}, {type: "string", required: true, message: "必输项"},
...@@ -319,7 +319,7 @@ export default { ...@@ -319,7 +319,7 @@ export default {
], ],
"brdgrp.beb.pts.adrblk":[ "brdgrp.beb.pts.adrblk":[
{type: "string", required: true, message: "必输项"}, {type: "string", required: true, message: "必输项"},
{max: 35,message:"长度不能超过35"} {max: 140,message:"长度不能超过140"}
], ],
"brdgrp.beb.dbfadrblkcn":[ "brdgrp.beb.dbfadrblkcn":[
{type: "string", required: true, message: "必输项"}, {type: "string", required: true, message: "必输项"},
......
...@@ -343,13 +343,13 @@ export default { ...@@ -343,13 +343,13 @@ export default {
{max: 35,message:"长度不能超过35"} {max: 35,message:"长度不能超过35"}
], ],
"bddgrp.blk.docdis":[ "bddgrp.blk.docdis":[
{type: "string", required: true, message: "必输项"}, //{type: "string", required: true, message: "必输项"},
{max: 50,message:"长度不能超过50"} {max: 3500,message:"长度不能超过3500"}
], ],
"bddgrp.blk.nartxt77a":[ "bddgrp.blk.nartxt77a":[
//{type: "string", required: true, message: "必输项"}, //{type: "string", required: true, message: "必输项"},
{max: 35,message:"长度不能超过35"} {max: 700,message:"长度不能超过700"}
], ],
"bdtp.rmbp.ptsget.sdamod.dadsnd":[ "bdtp.rmbp.ptsget.sdamod.dadsnd":[
{type: "string", required: false, message: "必输项"}, {type: "string", required: false, message: "必输项"},
......
...@@ -7,7 +7,12 @@ export default { ...@@ -7,7 +7,12 @@ export default {
if(rtnmsg.respCode == SUCCESS) if(rtnmsg.respCode == SUCCESS)
{ {
//TODO 处理数据逻辑 //TODO 处理数据逻辑
this.updateModel(rtnmsg.data)
// console.log(this.model.bedgrp.rec.ownref)
this.$message({
type: 'success',
message: '获取成功!'
});
} }
else else
{ {
......
...@@ -20,7 +20,7 @@ export default { ...@@ -20,7 +20,7 @@ export default {
{max: 3,message:"长度不能超过3"} {max: 3,message:"长度不能超过3"}
], ],
"ledgrp.cbs.nom1.amt":[ "ledgrp.cbs.nom1.amt":[
{type: "number", required: false, message: "必输项"}, {type: "string", required: false, message: "必输项"},
{max: 18,message:"整数位不能超过14位"}, {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位" }
], ],
...@@ -34,7 +34,7 @@ export default { ...@@ -34,7 +34,7 @@ export default {
{max: 3,message:"长度不能超过3"} {max: 3,message:"长度不能超过3"}
], ],
"ledgrp.cbs.opn1.amt":[ "ledgrp.cbs.opn1.amt":[
{type: "number", required: false, message: "必输项"}, {type: "string", required: false, message: "必输项"},
{max: 18,message:"整数位不能超过14位"}, {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位" }
], ],
...@@ -155,7 +155,7 @@ export default { ...@@ -155,7 +155,7 @@ export default {
], ],
"bedgrp.prb.pts.adrblk":[ "bedgrp.prb.pts.adrblk":[
{type: "string", required: true, message: "必输项"}, {type: "string", required: true, message: "必输项"},
{max: 35,message:"长度不能超过35"} {max: 140,message:"长度不能超过140"}
], ],
"bedgrp.prb.dbfadrblkcn":[ "bedgrp.prb.dbfadrblkcn":[
{type: "string", required: true, message: "必输项"}, {type: "string", required: true, message: "必输项"},
...@@ -163,7 +163,7 @@ export default { ...@@ -163,7 +163,7 @@ export default {
], ],
"bedgrp.oth.pts.adrblk":[ "bedgrp.oth.pts.adrblk":[
{type: "string", required: true, message: "必输项"}, {type: "string", required: true, message: "必输项"},
{max: 35,message:"长度不能超过35"} {max: 140,message:"长度不能超过140"}
], ],
"bedgrp.oth.dbfadrblkcn":[ "bedgrp.oth.dbfadrblkcn":[
{type: "string", required: true, message: "必输项"}, {type: "string", required: true, message: "必输项"},
...@@ -182,7 +182,7 @@ export default { ...@@ -182,7 +182,7 @@ export default {
{max: 3,message:"长度不能超过3"} {max: 3,message:"长度不能超过3"}
], ],
"bedgrp.cbs.max.amt":[ "bedgrp.cbs.max.amt":[
{type: "number", required: false, message: "必输项"}, {type: "string", required: true, message: "必输项"},
{max: 18,message:"整数位不能超过14位"}, {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位" }
], ],
...@@ -193,12 +193,12 @@ export default { ...@@ -193,12 +193,12 @@ export default {
{pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" } {pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
], ],
"bedgrp.blk.chaded":[ "bedgrp.blk.chaded":[
{type: "string", required: true, message: "必输项"}, {type: "string", required: false, message: "必输项"},
{max: 35,message:"长度不能超过35"} {max: 210,message:"长度不能超过210"}
], ],
"bedgrp.blk.chaadd":[ "bedgrp.blk.chaadd":[
{type: "string", required: true, message: "必输项"}, {type: "string", required: false, message: "必输项"},
{max: 35,message:"长度不能超过35"} {max: 210,message:"长度不能超过210"}
], ],
"bedgrp.rec.totcur":[ "bedgrp.rec.totcur":[
{type: "string", required: false, message: "必输项"}, {type: "string", required: false, message: "必输项"},
...@@ -227,8 +227,8 @@ export default { ...@@ -227,8 +227,8 @@ export default {
{max: 35,message:"长度不能超过35"} {max: 35,message:"长度不能超过35"}
], ],
"bedgrp.acb.pts.adrblk":[ "bedgrp.acb.pts.adrblk":[
{type: "string", required: true, message: "必输项"}, {type: "string", required: false, message: "必输项"},
{max: 35,message:"长度不能超过35"} {max: 140,message:"长度不能超过140"}
], ],
"bedgrp.acb.dbfadrblkcn":[ "bedgrp.acb.dbfadrblkcn":[
{type: "string", required: true, message: "必输项"}, {type: "string", required: true, message: "必输项"},
...@@ -239,8 +239,8 @@ export default { ...@@ -239,8 +239,8 @@ export default {
{max: 35,message:"长度不能超过35"} {max: 35,message:"长度不能超过35"}
], ],
"bedgrp.blk.docdis":[ "bedgrp.blk.docdis":[
{type: "string", required: true, message: "必输项"}, {type: "string", required: false, message: "必输项"},
{max: 50,message:"长度不能超过50"} {max: 3500,message:"长度不能超过3500"}
], ],
"liaall.outamt":[ "liaall.outamt":[
...@@ -422,8 +422,8 @@ export default { ...@@ -422,8 +422,8 @@ export default {
], ],
"bedgrp.blk.nartxt77a":[ "bedgrp.blk.nartxt77a":[
{type: "string", required: true, message: "必输项"}, {type: "string", required: false, message: "必输项"},
{max: 35,message:"长度不能超过35"} {max: 700,message:"长度不能超过700"}
], ],
"betp.rmbp.ptsget.sdamod.dadsnd":[ "betp.rmbp.ptsget.sdamod.dadsnd":[
{type: "string", required: false, message: "必输项"}, {type: "string", required: false, message: "必输项"},
...@@ -443,8 +443,8 @@ export default { ...@@ -443,8 +443,8 @@ export default {
{max: 35,message:"长度不能超过35"} {max: 35,message:"长度不能超过35"}
], ],
"bedgrp.rmb.pts.adrblk":[ "bedgrp.rmb.pts.adrblk":[
{type: "string", required: true, message: "必输项"}, {type: "string", required: false, message: "必输项"},
{max: 35,message:"长度不能超过35"} {max: 140,message:"长度不能超过140"}
], ],
"bedgrp.rmb.dbfadrblkcn":[ "bedgrp.rmb.dbfadrblkcn":[
{type: "string", required: true, message: "必输项"}, {type: "string", required: true, message: "必输项"},
...@@ -472,8 +472,8 @@ export default { ...@@ -472,8 +472,8 @@ export default {
{max: 35,message:"长度不能超过35"} {max: 35,message:"长度不能超过35"}
], ],
"ledgrp.beb.pts.adrblk":[ "ledgrp.beb.pts.adrblk":[
{type: "string", required: true, message: "必输项"}, {type: "string", required: false, message: "必输项"},
{max: 35,message:"长度不能超过35"} {max: 140,message:"长度不能超过140"}
], ],
"ledgrp.beb.dbfadrblkcn":[ "ledgrp.beb.dbfadrblkcn":[
{type: "string", required: true, message: "必输项"}, {type: "string", required: true, message: "必输项"},
......
...@@ -16,11 +16,11 @@ export default { ...@@ -16,11 +16,11 @@ export default {
{max: 40,message:"长度不能超过40"} {max: 40,message:"长度不能超过40"}
], ],
"lidgrp.cbs.nom1.amt":[ // "lidgrp.cbs.nom1.amt":[
{type: "number", required: false, message: "必输项"}, // {type: "number", required: false, },
{max: 18,message:"整数位不能超过14位"}, // {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位" }
], // ],
"brdgrp.apl.pts.ref":[ "brdgrp.apl.pts.ref":[
{type: "string", required: false, message: "必输项"}, {type: "string", required: false, message: "必输项"},
{max: 16,message:"长度不能超过16"} {max: 16,message:"长度不能超过16"}
...@@ -30,11 +30,11 @@ export default { ...@@ -30,11 +30,11 @@ export default {
{type: "string", required: false, message: "必输项"}, {type: "string", required: false, message: "必输项"},
{max: 3,message:"长度不能超过3"} {max: 3,message:"长度不能超过3"}
], ],
"lidgrp.cbs.opn1.amt":[ // "lidgrp.cbs.opn1.amt":[
{type: "number", required: false, message: "必输项"}, // {type: "number", required: false,},
{max: 18,message:"整数位不能超过14位"}, // {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位" }
], // ],
"brdgrp.apl.pts.nam":[ "brdgrp.apl.pts.nam":[
{type: "string", required: false, message: "必输项"}, {type: "string", required: false, message: "必输项"},
...@@ -99,21 +99,21 @@ export default { ...@@ -99,21 +99,21 @@ export default {
{max: 16,message:"长度不能超过16"} {max: 16,message:"长度不能超过16"}
], ],
"brdgrp.cbs.max.amt":[ // "brdgrp.cbs.max.amt":[
{type: "number", required: false, message: "必输项"}, // {type: "number", required: false},
{max: 18,message:"整数位不能超过14位"}, // {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位" }
], // ],
"brtp.prbp.ptsget.sdamod.dadsnd":[ "brtp.prbp.ptsget.sdamod.dadsnd":[
{type: "string", required: false, message: "必输项"}, {type: "string", required: false, message: "必输项"},
{max: 16,message:"长度不能超过16"} {max: 16,message:"长度不能超过16"}
], ],
"brdgrp.cbs.max2.amt":[ // "brdgrp.cbs.max2.amt":[
{type: "number", required: false, message: "必输项"}, // {type: "number", required: false},
{max: 18,message:"整数位不能超过14位"}, // {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位" }
], // ],
"brdgrp.prb.pts.extkey":[ "brdgrp.prb.pts.extkey":[
{type: "string", required: true, message: "必输项"}, {type: "string", required: true, message: "必输项"},
{max: 16,message:"长度不能超过16"} {max: 16,message:"长度不能超过16"}
...@@ -163,16 +163,16 @@ export default { ...@@ -163,16 +163,16 @@ export default {
{max: 65,message:"长度不能超过65"} {max: 65,message:"长度不能超过65"}
], ],
"lidgrp.rec.utlnbr":[ // "lidgrp.rec.utlnbr":[
{type: "string", required: false, message: "必输项"}, // {type: "string", required: false, message: "必输项"},
{max: 3,message:"长度不能超过3"} // {max: 3,message:"长度不能超过3"}
], // ],
"brdgrp.blk.docdis":[ "brdgrp.blk.docdis":[
{type: "string", required: true, message: "必输项"}, {type: "string", required: true, message: "必输项"},
{max: 50,message:"长度不能超过50"} {max: 500,message:"长度不能超过500"}
], ],
...@@ -192,7 +192,7 @@ export default { ...@@ -192,7 +192,7 @@ export default {
"brdgrp.blk.setinsbr":[ "brdgrp.blk.setinsbr":[
{type: "string", required: true, message: "必输项"}, {type: "string", required: true, message: "必输项"},
{max: 65,message:"长度不能超过65"} {max: 500,message:"长度不能超过500"}
], ],
......
...@@ -105,7 +105,7 @@ export default class Litdck{ ...@@ -105,7 +105,7 @@ export default class Litdck{
disdat:"", // Discrepancy Advice Dated .brdgrp.rec.disdat disdat:"", // Discrepancy Advice Dated .brdgrp.rec.disdat
approvcod:"", // Documents on Approval Basis .brdgrp.rec.approvcod approvcod:"", // Documents on Approval Basis .brdgrp.rec.approvcod
stadat:"", //Start Date stadat:"", //Start Date
tenmaxday:"", //Tenor day tenmaxday:"", //Tenor day brdgrp.rec.tenmaxday
rptref:"", //合同号 rptref:"", //合同号
invref:"", invref:"",
}, },
......
...@@ -209,7 +209,6 @@ export default class Utils { ...@@ -209,7 +209,6 @@ export default class Utils {
this.executeNotify().then(res => { this.executeNotify().then(res => {
if (res.respCode == SUCCESS){ if (res.respCode == SUCCESS){
const data = res.data; const data = res.data;
console.log(data)
Utils.copyValueFromVO(this.model, data) Utils.copyValueFromVO(this.model, data)
if (typeof callback === "function") { if (typeof callback === "function") {
callback() callback()
......
...@@ -66,12 +66,6 @@ ...@@ -66,12 +66,6 @@
<m-limitbody :model="model" :codes="codes" /> <m-limitbody :model="model" :codes="codes" />
</el-tab-pane> </el-tab-pane>
</c-tabs> </c-tabs>
<c-grid-ety-prompt-dialog
ref="etyDialog"
:promptData="promptData"
v-on:select-ety="selectEty"
>
</c-grid-ety-prompt-dialog>
</el-form> </el-form>
</div> </div>
</template> </template>
......
...@@ -67,7 +67,7 @@ ...@@ -67,7 +67,7 @@
<c-col :span="24"> <c-col :span="24">
<el-form-item label="Type of Advice Received" prop="brdgrp.rec.advtyp"> <el-form-item label="Type of Advice Received" prop="brdgrp.rec.advtyp">
<c-select v-model="model.brdgrp.rec.advtyp" style="width: 100%" placeholder="请选择Type of Advice Received" <c-select v-model="model.brdgrp.rec.advtyp" style="width: 100%" placeholder="请选择Type of Advice Received"
:code="codes.advtyp"> :code="codes.advtyp0">
</c-select> </c-select>
</el-form-item> </el-form-item>
</c-col> </c-col>
......
...@@ -2,54 +2,89 @@ ...@@ -2,54 +2,89 @@
<div class="eibs-tab"> <div class="eibs-tab">
<!-- ====================================不符点通知 左边 ================================= --> <!-- ====================================不符点通知 左边 ================================= -->
<c-col :span="12"> <c-col :span="12">
<!-- 单据金额 --> <!-- 单据金额 -->
<c-col :span="12"> <c-col :span="12">
<el-form-item label="Document Amount" prop="brdgrp.cbs.max.cur"> <el-form-item label="Document Amount" prop="brdgrp.cbs.max.cur">
<c-select v-model="model.brdgrp.cbs.max.cur" style="width:100%" placeholder="请选择单据金额" disabled> <c-select
v-model="model.brdgrp.cbs.max.cur"
style="width: 100%"
placeholder="请选择单据金额"
disabled
>
</c-select> </c-select>
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="12"> <c-col :span="12">
<el-form-item label="" label-width="10px" prop="brdgrp.cbs.max.amt"> <el-form-item label="" label-width="10px" prop="brdgrp.cbs.max.amt">
<c-input v-model="model.brdgrp.cbs.max.amt" placeholder="请输入单据金额" disabled></c-input> <c-input
v-model="model.brdgrp.cbs.max.amt"
placeholder="请输入单据金额"
disabled
></c-input>
</el-form-item> </el-form-item>
</c-col> </c-col>
<!-- 附加金额 --> <!-- 附加金额 -->
<c-col :span="12"> <c-col :span="12">
<el-form-item label="Drawn Add.Amount" prop="brdgrp.cbs.opn2.cur"> <el-form-item label="Drawn Add.Amount" prop="brdgrp.cbs.opn2.cur">
<c-select v-model="model.brdgrp.cbs.opn2.cur" style="width:100%" placeholder="请选择附加金额" disabled> <c-select
v-model="model.brdgrp.cbs.opn2.cur"
style="width: 100%"
placeholder="请选择附加金额"
disabled
>
</c-select> </c-select>
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="12"> <c-col :span="12">
<el-form-item label="" label-width="10px" prop="brdgrp.cbs.max2.amt"> <el-form-item label="" label-width="10px" prop="brdgrp.cbs.max2.amt">
<c-input v-model="model.brdgrp.cbs.max2.amt" placeholder="请输入附加金额" disabled></c-input> <c-input
v-model="model.brdgrp.cbs.max2.amt"
placeholder="请输入附加金额"
disabled
></c-input>
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="24"> <c-col :span="24">
<el-form-item label="Charges Deducted" prop="brdgrp.blk.chaded"> <el-form-item label="Charges Deducted" prop="brdgrp.blk.chaded">
<c-input type="textarea" v-model="model.brdgrp.blk.chaded" maxlength="35" show-word-limit <c-input
placeholder="请输入Charges Deducted" disabled rows="4"></c-input> type="textarea"
v-model="model.brdgrp.blk.chaded"
maxlength="210"
show-word-limit
placeholder="请输入Charges Deducted"
disabled
:rows="4"
></c-input>
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="24"> <c-col :span="24">
<el-form-item label="Charges Added" prop="brdgrp.blk.chaadd"> <el-form-item label="Charges Added" prop="brdgrp.blk.chaadd">
<c-input type="textarea" v-model="model.brdgrp.blk.chaadd" maxlength="35" show-word-limit <c-input
placeholder="请输入Charges" disabled rows="4"></c-input> type="textarea"
v-model="model.brdgrp.blk.chaadd"
maxlength="210"
show-word-limit
placeholder="请输入Charges"
disabled
:rows="4"
></c-input>
</el-form-item> </el-form-item>
</c-col> </c-col>
<!-- Total Amount Claimed --> <!-- Total Amount Claimed -->
<c-col :span="12"> <c-col :span="12">
<el-form-item label="Amount to be Paid" prop="brdgrp.rec.totcur"> <el-form-item label="Amount to be Paid" prop="brdgrp.rec.totcur">
<c-input v-model="model.brdgrp.rec.totcur" maxlength="3" placeholder="请输入Total Amount Claimed" disabled> <c-input
v-model="model.brdgrp.rec.totcur"
maxlength="3"
placeholder="请输入Total Amount Claimed"
disabled
>
</c-input> </c-input>
</el-form-item> </el-form-item>
</c-col> </c-col>
...@@ -57,33 +92,52 @@ ...@@ -57,33 +92,52 @@
<!-- Total Amount to be Paid --> <!-- Total Amount to be Paid -->
<c-col :span="12"> <c-col :span="12">
<el-form-item label="" label-width="10px" prop="brdgrp.rec.totamt"> <el-form-item label="" label-width="10px" prop="brdgrp.rec.totamt">
<c-input v-model="model.brdgrp.rec.totamt" placeholder="请输入Total Amount to be Paid" disabled></c-input> <c-input
v-model="model.brdgrp.rec.totamt"
placeholder="请输入Total Amount to be Paid"
disabled
></c-input>
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="24"> <c-col :span="24">
<c-ptap1 :model="model" :argadr="{ <c-ptap1
title: 'Amount with Bank', :model="model"
:argadr="{
title: 'Account with Bank',
grp: 'brdgrp', grp: 'brdgrp',
rol: 'acb', rol: 'acb',
}" :disabled="true" :isAdrblk="false" disabled1> }"
:disabled="true"
:isAdrblk="false"
disabled1
@onSeainf="onSeainf"
@onAplpDet="onAcbpDet"
>
</c-ptap1> </c-ptap1>
</c-col> </c-col>
<!-- =======================================加Docpre页面中的Discrepancies部分小组件================================ --> <!-- =======================================加Docpre页面中的Discrepancies部分小组件================================ -->
<!-- Discrepancies --> <!-- Discrepancies -->
<c-col :span="24"> <c-col :span="24">
<el-form-item label="Discrepancies" prop="brdgrp.blk.docdis"> <el-form-item label="Discrepancies" prop="brdgrp.blk.docdis">
<c-input type="textarea" v-model="model.brdgrp.blk.docdis" maxlength="50" show-word-limit <c-input
placeholder="请输入Discrepancies" rows="5" disabled></c-input> type="textarea"
</el-form-item> v-model="model.brdgrp.blk.docdis"
</c-col> maxlength="3500"
<c-col :span="17" :offset="7"> show-word-limit
<c-checkbox v-model="model.brdgrp.blk.docdisflg" disabled>discrepancies modified</c-checkbox> placeholder="请输入Discrepancies"
:rows="5"
disabled
></c-input>
</el-form-item>
</c-col>
<c-col :span="18" :offset="6">
<c-checkbox v-model="model.brdgrp.blk.docdisflg" disabled
>Discrepancies modified</c-checkbox
>
<!-- <c-checkbox v-model="model.brdgrp.blk.docdisflg">discrepancies modified</c-checkbox> --> <!-- <c-checkbox v-model="model.brdgrp.blk.docdisflg">discrepancies modified</c-checkbox> -->
</c-col> </c-col>
</c-col> </c-col>
<!-- <c-col :span="12"> <!-- <c-col :span="12">
...@@ -141,32 +195,29 @@ ...@@ -141,32 +195,29 @@
</div> </div>
</template> </template>
<script> <script>
import Api from "~/service/Api" import Api from '~/service/Api'
import commonProcess from "~/mixin/commonProcess"; import commonProcess from '~/mixin/commonProcess'
import CodeTable from "~/config/CodeTable" import CodeTable from '~/config/CodeTable'
import Event from "~/model/Brtudp/Event" import Event from '~/model/Brtudp/Event'
import Ptap1 from "~/views/Public/Ptap1"; import Ptap1 from '~/views/Public/Ptap1'
export default { export default {
components: { components: {
"c-ptap1": Ptap1, 'c-ptap1': Ptap1,
// "c-ptap": Ptap, // "c-ptap": Ptap,
// "c-ptsmsg": Ptsmsg, // "c-ptsmsg": Ptsmsg,
}, },
inject: ['root'], inject: ['root'],
props: ["model", "codes"], props: ['model', 'codes'],
mixins: [commonProcess], mixins: [commonProcess],
data() { data() {
return { return {}
}
}, },
methods: { ...Event }, methods: {
created: function () { ...Event,
onSeainf(){},
}, },
created: function () {},
} }
</script> </script>
<style> <style></style>
</style>
...@@ -34,15 +34,15 @@ ...@@ -34,15 +34,15 @@
<c-col :span="24"> <c-col :span="24">
<el-form-item label="Charges Deducted" prop="brdgrp.blk.chaded"> <el-form-item label="Charges Deducted" prop="brdgrp.blk.chaded">
<c-input type="textarea" v-model="model.brdgrp.blk.chaded" maxlength="35" show-word-limit <c-input type="textarea" v-model="model.brdgrp.blk.chaded" maxlength="210" show-word-limit
placeholder="请输入Charges Deducted" disabled rows="4"></c-input> placeholder="请输入Charges Deducted" disabled :rows="4"></c-input>
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="24"> <c-col :span="24">
<el-form-item label="Charges Added" prop="brdgrp.blk.chaadd"> <el-form-item label="Charges Added" prop="brdgrp.blk.chaadd">
<c-input type="textarea" v-model="model.brdgrp.blk.chaadd" maxlength="35" show-word-limit <c-input type="textarea" v-model="model.brdgrp.blk.chaadd" maxlength="210" show-word-limit
placeholder="请输入Charges" disabled rows="4"></c-input> placeholder="请输入Charges" disabled :rows="4"></c-input>
</el-form-item> </el-form-item>
</c-col> </c-col>
...@@ -66,7 +66,9 @@ ...@@ -66,7 +66,9 @@
title: 'Reimbursing Bank', title: 'Reimbursing Bank',
grp: 'brdgrp', grp: 'brdgrp',
rol: 'rmb', rol: 'rmb',
}" :disabled="true" disabled1> }" :disabled="true" disabled1
@onSeainf="onSeainf"
@onAplpDet="onRmbpDet">
</c-ptap1> </c-ptap1>
</c-col> </c-col>
<!-- 加Mt750p页面的Amount with Bank --> <!-- 加Mt750p页面的Amount with Bank -->
...@@ -75,14 +77,16 @@ ...@@ -75,14 +77,16 @@
title: 'Amount with Bank', title: 'Amount with Bank',
grp: 'brdgrp', grp: 'brdgrp',
rol: 'acb', rol: 'acb',
}" :disabled="true" disabled1> }" :disabled="true" disabled1
@onSeainf="onSeainf"
@onAplpDet="onAcbpDet">
</c-ptap1> </c-ptap1>
</c-col> </c-col>
<!-- 加Docpre.vue页面中的date to paied --> <!-- 加Docpre.vue页面中的date to paied -->
<c-col :span="24"> <c-col :span="24">
<el-form-item label="Date to be Paid" prop="brdgrp.rec.totdat"> <el-form-item label="Date to be Paid" prop="brdgrp.rec.totdat">
<c-date-picker type="date" v-model="model.brdgrp.rec.totdat" style="width: 100%" placeholder="请选择付款日期" <c-date-picker type="date" v-model="model.brdgrp.rec.totdat" style="width: 100%" placeholder="请选择付款日期"
disabled> disabled value-format="yyyy-MM-dd">
</c-date-picker> </c-date-picker>
</el-form-item> </el-form-item>
</c-col> </c-col>
...@@ -92,8 +96,8 @@ ...@@ -92,8 +96,8 @@
<c-col :span="11" :offset="1"> <c-col :span="11" :offset="1">
<c-col :span="24"> <c-col :span="24">
<el-form-item label="Narrative (TAG 77A of MT754)" prop="brdgrp.blk.nartxt77a"> <el-form-item label="Narrative (TAG 77A of MT754)" prop="brdgrp.blk.nartxt77a">
<c-input type="textarea" v-model="model.brdgrp.blk.nartxt77a" maxlength="35" show-word-limit <c-input type="textarea" v-model="model.brdgrp.blk.nartxt77a" maxlength="700" show-word-limit
placeholder="请输入Narrative TAG 77A of MT754" disabled rows="16"></c-input> placeholder="请输入Narrative TAG 77A of MT754" disabled :rows="16"></c-input>
</el-form-item> </el-form-item>
</c-col> </c-col>
...@@ -102,7 +106,9 @@ ...@@ -102,7 +106,9 @@
title: `Beneficiary's Bank`, title: `Beneficiary's Bank`,
grp: 'brdgrp', grp: 'brdgrp',
rol: 'beb', rol: 'beb',
}" :disabled="true" disabled1> }" :disabled="true" disabled1
@onSeainf="onSeainf"
@onAplpDet="onBebpDet">
</c-ptap1> </c-ptap1>
</c-col> </c-col>
...@@ -237,7 +243,10 @@ export default { ...@@ -237,7 +243,10 @@ export default {
} }
}, },
methods: { ...Event }, methods: {
...Event,
onSeainf(){},
},
created: function () { created: function () {
} }
......
...@@ -202,7 +202,7 @@ ...@@ -202,7 +202,7 @@
<c-col :span="24"> <c-col :span="24">
<el-form-item label="" prop="brdgrp.tag72add"> <el-form-item label="" prop="brdgrp.tag72add">
<c-fullbox> <c-fullbox>
<c-input type="textarea" v-model="model.brdgrp.tag72add" maxlength="50" show-word-limit <c-input type="textarea" v-model="model.brdgrp.tag72add" maxlength="1750" show-word-limit
placeholder="请输入TAG72" :disabled="model.sftmt==''? true : false"></c-input> placeholder="请输入TAG72" :disabled="model.sftmt==''? true : false"></c-input>
<template slot="footer"> <template slot="footer">
<c-button size="small" type="primary" icon="el-icon-search" @click="onAcctagButtxmsel" <c-button size="small" type="primary" icon="el-icon-search" @click="onAcctagButtxmsel"
......
...@@ -79,7 +79,7 @@ ...@@ -79,7 +79,7 @@
<c-input <c-input
type="textarea" type="textarea"
v-model="model.dedgrp.rec.sdsrfs" v-model="model.dedgrp.rec.sdsrfs"
:disabled="this.mytypeFlag" :disabled="model.dedgrp.rec.tratyp!='08' && model.dedgrp.rec.mytype!='F'"
maxlength="140" maxlength="140"
show-word-limit show-word-limit
placeholder="请输入" placeholder="请输入"
...@@ -214,9 +214,6 @@ export default { ...@@ -214,9 +214,6 @@ export default {
props: ["model", "codes"], props: ["model", "codes"],
mixins: [commonProcess], mixins: [commonProcess],
data() { data() {
return {
mytypeFlag: true,
};
}, },
methods: { ...Event }, methods: { ...Event },
created: function () {}, created: function () {},
......
...@@ -119,7 +119,7 @@ ...@@ -119,7 +119,7 @@
<c-col> <c-col>
<c-col :span="12"> <c-col :span="12">
<el-form-item label="Discrepancies" prop="bddgrp.blk.docdis"> <el-form-item label="Discrepancies" prop="bddgrp.blk.docdis">
<c-input type="textarea" :disabled="model.bddgrp.blk.docdisflg!='X'" v-model="model.bddgrp.blk.docdis" :rows="6" maxlength="50" show-word-limit placeholder="请输入Discrepancies" ></c-input> <c-input type="textarea" :disabled="model.bddgrp.blk.docdisflg!='X'" v-model="model.bddgrp.blk.docdis" :rows="6" maxlength="3500" show-word-limit placeholder="请输入Discrepancies" ></c-input>
</el-form-item> </el-form-item>
</c-col> </c-col>
</c-col> </c-col>
......
...@@ -228,7 +228,7 @@ ...@@ -228,7 +228,7 @@
<c-col :span="11" :offset="1"> <c-col :span="11" :offset="1">
<c-col :span="24"> <c-col :span="24">
<el-form-item label="Narrative TAG 77A of MT754" prop="bddgrp.blk.nartxt77a"> <el-form-item label="Narrative TAG 77A of MT754" prop="bddgrp.blk.nartxt77a">
<c-input type="textarea" v-model="model.bddgrp.blk.nartxt77a" :rows="15" maxlength="35" show-word-limit placeholder="请输入Narrative TAG 77A of MT754" ></c-input> <c-input type="textarea" v-model="model.bddgrp.blk.nartxt77a" :rows="15" maxlength="700" show-word-limit placeholder="请输入Narrative TAG 77A of MT754" ></c-input>
</el-form-item> </el-form-item>
</c-col> </c-col>
......
...@@ -232,7 +232,7 @@ ...@@ -232,7 +232,7 @@
<c-input <c-input
v-if="model.gitp.swiftflg == 'N'" v-if="model.gitp.swiftflg == 'N'"
v-model="model.gidgrp.blk.apprultxt" v-model="model.gidgrp.blk.apprultxt"
style="margin: 0 0 0 10px; width: 80%" style="margin: 0 0 0 8px; width: 97%"
placeholder="请输入Applicable Rules" placeholder="请输入Applicable Rules"
disabled disabled
></c-input> ></c-input>
...@@ -250,14 +250,8 @@ ...@@ -250,14 +250,8 @@
style="width: 100%" style="width: 100%"
placeholder="请选择Form of Undertaking" placeholder="请选择Form of Undertaking"
disabled disabled
:code="codes.legfrm"
> >
<el-option
v-for="item in codes.legfrm"
:key="item.value"
:label="item.label"
:value="item.value"
>
</el-option>
</c-select> </c-select>
</el-form-item> </el-form-item>
</c-col> </c-col>
...@@ -426,6 +420,7 @@ ...@@ -426,6 +420,7 @@
v-model="model.gidgrp.blk.apprul" v-model="model.gidgrp.blk.apprul"
style="width: 100%" style="width: 100%"
placeholder="请选择Applicable Rules" placeholder="请选择Applicable Rules"
> >
</c-select> </c-select>
</el-form-item> </el-form-item>
......
...@@ -77,7 +77,7 @@ ...@@ -77,7 +77,7 @@
</el-tab-pane> </el-tab-pane>
<!--PD000529 --> <!--PD000529 -->
<el-tab-pane label="Massages" name="docpan"> <el-tab-pane label="Messages" name="docpan">
<m-docpan :model="model" :codes="codes" /> <m-docpan :model="model" :codes="codes" />
</el-tab-pane> </el-tab-pane>
......
...@@ -242,14 +242,12 @@ ...@@ -242,14 +242,12 @@
</c-istream-table> </c-istream-table>
</c-col> </c-col>
<m-busbtn ref="childs" :ownref="ownref" :model="BotselModel" ownrefPath="bodgrp" trnCode="botsel" <m-busbtn ref="childs" :ownref="ownref" :model="BotselModel" ownrefPath="bodgrp" trnCode="botsel"
@onChoose="onChoose">11</m-busbtn> @onChoose="onChoose">11</m-busbtn>
</div> </div>
</template> </template>
<script> <script>
import Utils from "~/utils/index";
import Api from "~/service/Api"; import Api from "~/service/Api";
import commonProcess from "~/mixin/commonProcess"; import commonProcess from "~/mixin/commonProcess";
import CodeTable from "~/config/CodeTable"; import CodeTable from "~/config/CodeTable";
...@@ -286,21 +284,22 @@ export default { ...@@ -286,21 +284,22 @@ export default {
columns: [ columns: [
'1 1 "Reference" 150', '1 1 "Reference" 150',
'2 2 "Resp. User" 100', '2 2 "Resp. User" 100',
'3 3 "Opened" 200 4 7', '3 3 "Opened" 150 4 7',
'4 4 "Closed" 200 4 7', '4 4 "Closed" 150 4 7',
'5 5 "分行名称" 200', '5 5 "分行名称" 200',
'6 6 "Party Number" 150', '6 6 "Drawee Party Number" 150',
'7 7 "Drawee" 133', '7 7 "Drawee" 133',
'8 8 "PTA NO." 100', '8 8 "PTA NO." 100',
'9 9 "Party Number" 150', '9 9 "Drawer Party Number" 150',
'10 10 "Drawer" 300', '10 10 "Drawer" 300',
'11 11 "Invoice No." 133', '11 11 "Invoice No." 133',
'12 12 "Drawer CN" 150', '12 12 "Drawer CN" 150',
'13 13 "Party Number" 150', '13 13 "Collecting Party Number" 200',
'14 14 "Collecting Bank" 200', '14 14 "Collecting Bank" 200',
'15 15 "Cur" 50', '15 15 "Doc.Amount Cur" 130',
'16 16 "Doc.Amount" 150 2 8 1 15', '16 16 "Doc.Amount" 100 2 8 1 15',
'17 17 "Cur" 50', '17 17 "Open Amount Cur" 130',
'18 18 "Open Amount" 100 2 8 1 -1'
], ],
data: [], data: [],
}, },
...@@ -309,16 +308,14 @@ export default { ...@@ -309,16 +308,14 @@ export default {
methods: { methods: {
...Event, ...Event,
async getButtons(ownref) { async getButtons(ownref) {
this.ownref = ownref
this.$refs.childs.initdialog = true this.$refs.childs.initdialog = true
console.log("ownref:" +ownref); this.ownref = ownref
console.log("ownref:" + ownref);
}, },
async onChoose(code) { async onChoose(code) {
//跳转交易 //跳转交易
this.$router.history.push("/business/" + code) this.$router.history.push("/business/" + code)
this.$refs.childs.initdialog = false this.$refs.childs.initdialog = false
}, },
closeTrn(refId) { closeTrn(refId) {
this.$refs[refId].doClose(); this.$refs[refId].doClose();
......
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
</el-tab-pane> </el-tab-pane>
<!--PD000147 --> <!--PD000147 -->
<el-tab-pane label="PD000147" name="mt754p" v-if="model.bedgrp.rec.advtyp=='754'"> <el-tab-pane label="Advice of Payment" name="mt754p" v-if="model.bedgrp.rec.advtyp=='754'">
<c-content> <c-content>
<m-mt754p :model="model" :codes="codes" /> <m-mt754p :model="model" :codes="codes" />
</c-content> </c-content>
......
...@@ -451,39 +451,39 @@ ...@@ -451,39 +451,39 @@
</div> </div>
</template> </template>
<script> <script>
import Api from '~/service/Api' import Api from "~/service/Api";
import commonProcess from '~/mixin/commonProcess' import commonProcess from "~/mixin/commonProcess";
import CodeTable from '~/config/CodeTable' import CodeTable from "~/config/CodeTable";
import Event from '~/model/Letopn/Event' import Event from "~/model/Letopn/Event";
import Utils from '~/utils' import Utils from "~/utils";
import Ptap from '~/views/Public/Ptap' import Ptap from "~/views/Public/Ptap";
// import Amtpanl from "~/views/Public/Amtpanl"; // import Amtpanl from "~/views/Public/Amtpanl";
export default { export default {
components: { 'c-ptap': Ptap }, components: { "c-ptap": Ptap },
inject: ['root'], inject: ["root"],
props: ['model', 'codes'], props: ["model", "codes"],
mixins: [commonProcess], mixins: [commonProcess],
data() { data() {
return {} return {};
}, },
methods: { methods: {
...Event, ...Event,
nom1CurEvent() { nom1CurEvent() {
this.executeDefault('ledgrp.cbs.nom1.cur').then((res) => { this.executeDefault("ledgrp.cbs.nom1.cur").then((res) => {
if (res.respCode == SUCCESS) { if (res.respCode == SUCCESS) {
Utils.copyValueFromVO(this.model, res.data) Utils.copyValueFromVO(this.model, res.data);
} }
}) });
}, },
apprulChange(v) { apprulChange(v) {
if (v !== 'OTHR') { if (v !== "OTHR") {
this.model.ledgrp.rec.apprultxt = '' this.model.ledgrp.rec.apprultxt = "";
} }
}, },
}, },
created: function () {}, created: function () {},
} };
</script> </script>
<style> <style>
.centerLable { .centerLable {
...@@ -493,6 +493,6 @@ export default { ...@@ -493,6 +493,6 @@ export default {
padding-bottom: 2px; padding-bottom: 2px;
} }
.marginLable { .marginLable {
padding-left: 150px; padding-left: 160px;
} }
</style> </style>
<template> <template>
<div class="eibs-tab"> <div class="eibs-tab">
<!-- left -->
<c-col :span="11"> <c-col :span="11">
<c-col :span="24"> <c-col :span="24">
<c-col :span="12"> <c-col :span="12">
...@@ -22,6 +22,9 @@ ...@@ -22,6 +22,9 @@
v-model="model.ledgrp.cbs.max2.amt" v-model="model.ledgrp.cbs.max2.amt"
style="width: 100%" style="width: 100%"
placeholder="Please input Additional Amount" placeholder="Please input Additional Amount"
@keyup.enter.native="
defaultFunction('ledgrp.cbs.max2.amt', model.ledgrp.cbs.max2.amt)
"
></c-input-currency> ></c-input-currency>
</el-form-item> </el-form-item>
</c-col> </c-col>
...@@ -52,10 +55,6 @@ ...@@ -52,10 +55,6 @@
</el-form-item> </el-form-item>
</c-col> </c-col>
</c-col> </c-col>
</c-col>
<!-- right -->
<c-col :span="11" :offset="1">
<c-col :span="24"> <c-col :span="24">
<el-form-item label="Covered" prop="ledgrp.blk.addamtcov"> <el-form-item label="Covered" prop="ledgrp.blk.addamtcov">
<c-input <c-input
...@@ -69,6 +68,7 @@ ...@@ -69,6 +68,7 @@
</c-col> </c-col>
</c-col> </c-col>
<!-- <c-col :span="12"> <!-- <c-col :span="12">
<el-form-item label="Additional Amount" prop="ledgrp.cbs.max2.cur"> <el-form-item label="Additional Amount" prop="ledgrp.cbs.max2.cur">
<c-select <c-select
......
...@@ -33,7 +33,10 @@ ...@@ -33,7 +33,10 @@
<!--PD000063 --> <!--PD000063 -->
<el-tab-pane label="Details" name="detp"> <el-tab-pane label="Details" name="detp">
<c-content>
<m-detp :model="model" :codes="codes"/> <m-detp :model="model" :codes="codes"/>
</c-content>
</el-tab-pane> </el-tab-pane>
<!--PD000042 --> <!--PD000042 -->
...@@ -97,6 +100,12 @@ ...@@ -97,6 +100,12 @@
</el-tab-pane> </el-tab-pane>
</c-tabs> </c-tabs>
</el-form> </el-form>
<c-grid-ety-prompt-dialog
ref="etyDialog"
:promptData="promptData"
v-on:select-ety="selectEty"
>
</c-grid-ety-prompt-dialog>
</div> </div>
</template> </template>
<script> <script>
......
...@@ -7,8 +7,9 @@ ...@@ -7,8 +7,9 @@
<c-input <c-input
:disabled="this.typ1" :disabled="this.typ1"
type="textarea" type="textarea"
:rows="5"
v-model="model.brdgrp.blk.docdis" v-model="model.brdgrp.blk.docdis"
maxlength="50" maxlength="500"
show-word-limit show-word-limit
placeholder="请输入Discrepancies" placeholder="请输入Discrepancies"
></c-input> ></c-input>
...@@ -17,7 +18,8 @@ ...@@ -17,7 +18,8 @@
size="small" size="small"
type="primary" type="primary"
icon="el-icon-search" icon="el-icon-search"
@click="onDocdisButtxmsel" @click="showGridPromptDialog('brtp.docdis.buttxmsel', null, null,{TXT: 'brdgrp.blk.docdis'}, {TXT: false},'doxpDialog')"
:disabled="this.typ1"
> >
... ...
</c-button> </c-button>
...@@ -43,9 +45,10 @@ ...@@ -43,9 +45,10 @@
> >
<c-fullbox> <c-fullbox>
<c-input <c-input
:rows="6"
type="textarea" type="textarea"
v-model="model.brdgrp.blk.setinsbr" v-model="model.brdgrp.blk.setinsbr"
maxlength="65" maxlength="500"
show-word-limit show-word-limit
placeholder="请输入Settlement Instructions BR" placeholder="请输入Settlement Instructions BR"
></c-input> ></c-input>
...@@ -54,7 +57,7 @@ ...@@ -54,7 +57,7 @@
size="small" size="small"
type="primary" type="primary"
icon="el-icon-search" icon="el-icon-search"
@click="onSetinstxmButtxmsel" @click="showGridPromptDialog('brtp.setinstxm.buttxmsel', null, null,{TXT: 'brdgrp.blk.setinsbr'}, {TXT: false},'doxpDialog')"
> >
... ...
</c-button> </c-button>
...@@ -172,7 +175,7 @@ export default { ...@@ -172,7 +175,7 @@ export default {
mixins: [commonProcess], mixins: [commonProcess],
data() { data() {
return { return {
typ1: false, typ1: true,
}; };
}, },
watch: { watch: {
......
...@@ -245,14 +245,16 @@ ...@@ -245,14 +245,16 @@
</c-col> </c-col>
<c-col :span="12"> <c-col :span="12">
<el-form-item label="款项去向" prop="outlen.acttyp"> <el-form-item label="款项去向" prop="outlen.acttyp">
<c-select v-model="model.outlen.acttyp" <c-select
:code="codes.acttyp" disabled
v-model="model.outlen.acttyp"
:code="codes.acttyp1"
></c-select> ></c-select>
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="12"> <c-col :span="12">
<el-form-item label="Tenor day" prop="outlen.acttyp"> <el-form-item label="Tenor day" prop="brdgrp.rec.tenmaxday">
<c-input v-model="model.outlen.acttyp" disabled ></c-input> <c-input v-model="model.brdgrp.rec.tenmaxday" disabled ></c-input>
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="24"> <c-col :span="24">
...@@ -389,7 +391,7 @@ ...@@ -389,7 +391,7 @@
<el-form-item label="Document Set Status" prop="brdgrp.rec.docsta"> <el-form-item label="Document Set Status" prop="brdgrp.rec.docsta">
<c-select <c-select
disabled disabled
:code="codes.docsta" :code="codes.docsta1"
v-model="model.brdgrp.rec.docsta" v-model="model.brdgrp.rec.docsta"
style="width:100%" style="width:100%"
placeholder="请输入Document Set Status"></c-select> placeholder="请输入Document Set Status"></c-select>
......
...@@ -63,7 +63,14 @@ ...@@ -63,7 +63,14 @@
<c-grid-ety-prompt-dialog <c-grid-ety-prompt-dialog
ref="etyDialog" ref="etyDialog"
:promptData="promptData" :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> </c-grid-ety-prompt-dialog>
</div> </div>
......
...@@ -96,14 +96,14 @@ export default { ...@@ -96,14 +96,14 @@ export default {
// { inifrm: "bctset", ininam: "进口代收付款", pntmiu: "5" }, // { inifrm: "bctset", ininam: "进口代收付款", pntmiu: "5" },
// { inifrm: "bctcan", ininam: "进口代收注销", pntmiu: "5" }, // { inifrm: "bctcan", ininam: "进口代收注销", pntmiu: "5" },
{ inifrm: "infbcd", ininam: "进口代收查询", pntmiu: "5" }, { inifrm: "infbcd", ininam: "进口代收查询", pntmiu: "5" },
{ inifrm: "6", ininam: "出口托收", pntmiu: "" },
{ inifrm: "infbod", ininam: "出口托收入口交易", pntmiu: "6" }, { inifrm: "6", ininam: "出口托收", pntmiu: "" },
{ inifrm: "botdav", ininam: "出口托收寄单", pntmiu: "6" }, { inifrm: "infbod", ininam: "出口托收查询", pntmiu: "6" },
{ inifrm: "botame", ininam: "出口托收修改", pntmiu: "6" }, // { inifrm: "botdav", ininam: "出口托收寄单", pntmiu: "6" },
{ inifrm: "botdcr", ininam: "出口托收拒付/不符点", pntmiu: "6" }, // { inifrm: "botame", ininam: "出口托收修改", pntmiu: "6" },
{ inifrm: "botset", ininam: "出口托收收汇", pntmiu: "6" }, // { inifrm: "botdcr", ininam: "出口托收拒付/不符点", pntmiu: "6" },
{ inifrm: "botcan", ininam: "出口托收闭卷", pntmiu: "6" }, // { inifrm: "botset", ininam: "出口托收收汇", pntmiu: "6" },
// { inifrm: "botcan", ininam: "出口托收闭卷", pntmiu: "6" },
{ inifrm: "7", ininam: "转让信用证", pntmiu: "" }, { inifrm: "7", ininam: "转让信用证", pntmiu: "" },
{ inifrm: "lttopn", ininam: "转让证开立", pntmiu: "7" }, { inifrm: "lttopn", ininam: "转让证开立", pntmiu: "7" },
{ inifrm: "lttame", ininam: "转让证修改", pntmiu: "7" }, { inifrm: "lttame", ininam: "转让证修改", pntmiu: "7" },
......
...@@ -55,7 +55,7 @@ ...@@ -55,7 +55,7 @@
type="textarea" type="textarea"
:rows="4" :rows="4"
v-model="model[argadr.grp][argadr.rol].pts.adrblk" v-model="model[argadr.grp][argadr.rol].pts.adrblk"
maxlength="35" maxlength="140"
show-word-limit show-word-limit
placeholder="请输入" placeholder="请输入"
:disabled="disabled || disabled1" :disabled="disabled || disabled1"
......
...@@ -61,8 +61,8 @@ ...@@ -61,8 +61,8 @@
:border="true"> :border="true">
<el-table-column label="Payer" prop="ptydbt" width="101px"> <el-table-column label="Payer" prop="ptydbt" width="101px">
<template slot-scope="scope"> <template slot-scope="scope">
<c-select v-model="scope.row.ptydbt"> <c-select v-model="scope.row.ptydbt" @change="defaultFunction()">
<el-option v-for="item in codes.ptydbt" :key="item.value" :label="item.value" <el-option v-for="item in codes.ptydbt_setpan" :key="item.value" :label="item.value"
:value="item.value"> :value="item.value">
<span style="float: left">{{ item.label }}</span> <span style="float: left">{{ item.label }}</span>
</el-option> </el-option>
...@@ -71,8 +71,8 @@ ...@@ -71,8 +71,8 @@
</el-table-column> </el-table-column>
<el-table-column label="Payee" width="101px"> <el-table-column label="Payee" width="101px">
<template slot-scope="scope"> <template slot-scope="scope">
<c-select v-model="scope.row.ptypay"> <c-select v-model="scope.row.ptypay" @change="defaultFunction()">
<el-option v-for="item in codes.payee" :key="item.value" :label="item.value" <el-option v-for="item in codes.ptydbt_setpan" :key="item.value" :label="item.value"
:value="item.value"> :value="item.value">
<span style="float: left">{{ item.label }}</span> <span style="float: left">{{ item.label }}</span>
</el-option> </el-option>
...@@ -192,7 +192,7 @@ ...@@ -192,7 +192,7 @@
:border="true"> :border="true">
<el-table-column label="Role" width="101px"> <el-table-column label="Role" width="101px">
<template #default="scope"> <template #default="scope">
<c-select v-model="scope.row.rol"> <c-select v-model="scope.row.rol" @change="defaultFunction()">
<el-option v-for="item in codes.setfelRol" :key="item.value" :label="item.value" <el-option v-for="item in codes.setfelRol" :key="item.value" :label="item.value"
:value="item.value"> :value="item.value">
<span style="float: left">{{ item.label }}</span> <span style="float: left">{{ item.label }}</span>
...@@ -200,7 +200,15 @@ ...@@ -200,7 +200,15 @@
</c-select> </c-select>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="Code" prop="feecod" width="101px"> <el-table-column label="Code" width="101px">
<template #default="scope">
<c-select v-model="scope.row.feecod" @change="selectOrCheckboxRule('setmod.setfeg.setfel.feecod')">
<el-option v-for="item in codes.fepfeecod" :key="item.value" :label="item.value"
:value="item.value">
<span style="float: left">{{ item.label }}</span>
</el-option>
</c-select>
</template>
</el-table-column> </el-table-column>
<el-table-column label="Source" prop="src" width="70px"> <el-table-column label="Source" prop="src" width="70px">
</el-table-column> </el-table-column>
...@@ -220,8 +228,8 @@ ...@@ -220,8 +228,8 @@
</el-table-column> </el-table-column>
<el-table-column label="Currency" prop="cur" width="100px"> <el-table-column label="Currency" prop="cur" width="100px">
</el-table-column> </el-table-column>
<el-table-column label="Original Amount" prop="ogiamt" width="150px"> <!-- <el-table-column label="Original Amount" prop="ogiamt" v-model="ogiamt" width="150px"> -->
</el-table-column> <!-- </el-table-column> -->
<el-table-column label="Fee Amount" prop="amt" width="150px"> <el-table-column label="Fee Amount" prop="amt" width="150px">
</el-table-column> </el-table-column>
<el-table-column label="" prop="det" width="80px" fixed="right"> <el-table-column label="" prop="det" width="80px" fixed="right">
...@@ -954,9 +962,11 @@ export default { ...@@ -954,9 +962,11 @@ export default {
addRowSetfol() { addRowSetfol() {
let newRow = { ...this.dialog }; let newRow = { ...this.dialog };
this.model.setmod.setfog.setfol.splice(0, 0, newRow); this.model.setmod.setfog.setfol.splice(0, 0, newRow);
this.defaultFunction();
}, },
removeRowSetfol() { removeRowSetfol() {
this.model.setmod.setfog.setfol.shift(); this.model.setmod.setfog.setfol.shift();
this.defaultFunction();
}, },
saveDialog() { saveDialog() {
this.dialogVisible = false; this.dialogVisible = false;
...@@ -966,9 +976,11 @@ export default { ...@@ -966,9 +976,11 @@ export default {
addRowSetfel() { addRowSetfel() {
let newRow = { ...this.dialog2 }; let newRow = { ...this.dialog2 };
this.model.setmod.setfeg.setfel.splice(0, 0, newRow); this.model.setmod.setfeg.setfel.splice(0, 0, newRow);
this.defaultFunction();
}, },
removeRowSetfel() { removeRowSetfel() {
this.model.setmod.setfeg.setfel.shift(); this.model.setmod.setfeg.setfel.shift();
this.defaultFunction();
}, },
detail1(index, row) { detail1(index, row) {
this.executeDefault("setfel.det").then(res => { this.executeDefault("setfel.det").then(res => {
...@@ -977,13 +989,11 @@ export default { ...@@ -977,13 +989,11 @@ export default {
this.dialog = row; this.dialog = row;
this.index = index; this.index = index;
}) })
}, },
dispDefault(index) { dispDefault(index) {
this.executeDefault(`setmod.setfeg.setfel(${index}).mac`).then(res => { this.executeDefault(`setmod.setfeg.setfel(${index}).mac`).then(res => {
Utils.copyValueFromVO(this.model, res.data) Utils.copyValueFromVO(this.model, res.data)
}) })
}, },
// 第二个表格 // 第二个表格
detail2(index, row) { detail2(index, row) {
......
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