Commit 555ba47a by zhujiazhan

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

parents 6c522ab1 639a6a5d
......@@ -6726,8 +6726,8 @@ const CodeTable = {
// {label:"Issuance of the credit amendment", value:"ISSU"},
// ],
trnchato: [
{ label: "Applicant", value: "APPL" },
{ label: "Beneficiary", value: "BENE" },
{ label: "Applicant Side", value: "APPL" },
{ label: "Beneficiary Side", value: "BENE" },
{ label: "Other", value: "OTHR" }
],
bgftktyp: [
......@@ -7027,5 +7027,27 @@ const CodeTable = {
{label:"TEND",value:"TEND Tender or Bid"},
{label:"WARR",value:"WARR Warrantyimaintenance"},
],
legfrm1:[
{label:"Standby letter of credit ",value:"STBY" },
{label:"Uniform Rules for Contract Guarant. URCG",value:"URG" },
{label:"Undertaking (for example guarantee, surely)",value:"UNDK" },
{label:"Uniform Rules for Contract Bonds URCB",value:"URB" },
{label:"OTHER",value:"DEPU" },
{label:"Unit. Nations Convention ind. Guarantees",value:"UNC" },
{label:"Demand guarantee ",value:"DGAR" },
{label:"Guarantee (Standard)",value:"STD" },
{label:"Guarantee (Others)",value:"GUO" },
{label:"Surety Payable On First Demand ",value:"SPDM" },
{label:"Guarantee (ICC758)",value:"758" },
{label:"Guarantee (ICC458)",value:"458" },
{label:"Uniform Customs and Pract.Doc.Cre. UCP",value:"UCP" },
{label:"Standby Letter of Credit (ISP)",value:"ISP" },
],
delto1:[
{label:"Beneficiary",value:"BENE" },
{label:"Specified address",value:"OTHR" },
{label:"Applicant",value:"APPL" },
{label:"Obligor",value:"OBLI" },
],
}
export default CodeTable;
......@@ -21,7 +21,7 @@ export default {
"lidgrp.cbs.opn1.amt":[
{type: "string", required: false, message: "必输项"},
{max: 18,message:"整数位不能超过14位"},
{pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
//{pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
],
"brtp.recget.sdamod.dadsnd":[
{type: "string", required: false, message: "必输项"},
......@@ -130,7 +130,7 @@ export default {
],
"brdgrp.prb.pts.adrblk":[
{type: "string", required: false, message: "必输项"},
{max: 35,message:"长度不能超过35"}
{max: 140,message:"长度不能超过140"}
],
"brdgrp.prb.dbfadrblkcn":[
{type: "string", required: false, message: "必输项"},
......
......@@ -19,7 +19,7 @@ export default {
{max: 3,message:"长度不能超过3"}
],
"lidgrp.cbs.opn1.amt":[
{type: "number", required: false, message: "必输项"},
{type: "string", required: false, message: "必输项"},
{max: 18,message:"整数位不能超过14位"},
{pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
],
......@@ -45,7 +45,7 @@ export default {
],
"brdgrp.cbs.max.amt":[
{type: "number", required: false, message: "必输项"},
{type: "string", required: false, message: "必输项"},
{max: 18,message:"整数位不能超过14位"},
{pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
],
......@@ -58,7 +58,7 @@ export default {
{max: 3,message:"长度不能超过3"}
],
"brdgrp.cbs.opn1.amt":[
{type: "number", required: false, message: "必输项"},
{type: "string", required: false, message: "必输项"},
{max: 18,message:"整数位不能超过14位"},
{pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
],
......
......@@ -21,7 +21,7 @@ export default {
"lidgrp.cbs.opn1.amt":[
{type: "string", required: false, message: "必输项"},
{max: 18,message:"整数位不能超过14位"},
{pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
//{pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
],
"brtp.recget.sdamod.dadsnd":[
{type: "string", required: false, message: "必输项"},
......
......@@ -2,7 +2,7 @@ import Api from "~/service/Api"
import Utils from "~/utils"
export default {
async onInfbutSearow () {
async onInfbutSearow() {
let rtnmsg = await this.executeRule("infbut.searow")
if (rtnmsg.respCode == SUCCESS) {
//TODO 处理数据逻辑
......@@ -12,7 +12,7 @@ export default {
this.$notify.error({ title: '错误', message: '服务请求失败!' });
}
},
async handleSearch () {
async handleSearch() {
this.stmData.data = [];
let opndatfrom = this.model.infcon.opndatfrom;
if (!opndatfrom || opndatfrom == '') {
......@@ -34,11 +34,26 @@ export default {
this.$notify.error({ title: '错误', message: '服务请求失败!' });
}
},
async handleReset () {
async handleReset() {
this.model.infcon.seaownref = ""
this.model.infcon.opndatfrom = new Date();
this.model.infcon.opndatto = new Date();
this.model.mylx = "";
this.model.infcon.nam = "";
this.model.infcon.searef = "";
this.model.infcon.pty.extkey = "";
this.model.infcon.pty.nam = "";
this.model.infcon.seapty = "";
this.model.infcon.searol = "";
this.model.infcon.usr.extkey = "";
this.model.infcon.seasta = "";
this.model.infcon.seacur = "";
this.model.infcon.seaamtfr = "0.00";
this.model.infcon.seaamtto = "0.00";
this.model.sealcrtyp = "";
this.model.elcflg = "";
},
async onInfbutDsp () {
async onInfbutDsp() {
let rtnmsg = await this.executeRule("infbut.dsp")
if (rtnmsg.respCode == SUCCESS) {
//TODO 处理数据逻辑
......@@ -48,7 +63,7 @@ export default {
this.$notify.error({ title: '错误', message: '服务请求失败!' });
}
},
async onInfbutUserow () {
async onInfbutUserow() {
let rtnmsg = await this.executeRule("infbut.userow")
if (rtnmsg.respCode == SUCCESS) {
//TODO 处理数据逻辑
......@@ -58,7 +73,7 @@ export default {
this.$notify.error({ title: '错误', message: '服务请求失败!' });
}
},
async onInfbutClr () {
async onInfbutClr() {
let rtnmsg = await this.executeRule("infbut.clr")
if (rtnmsg.respCode == SUCCESS) {
//TODO 处理数据逻辑
......@@ -68,7 +83,7 @@ export default {
this.$notify.error({ title: '错误', message: '服务请求失败!' });
}
},
async onInfbutButprt () {
async onInfbutButprt() {
let rtnmsg = await this.executeRule("infbut.butprt")
if (rtnmsg.respCode == SUCCESS) {
//TODO 处理数据逻辑
......@@ -78,7 +93,7 @@ export default {
this.$notify.error({ title: '错误', message: '服务请求失败!' });
}
},
async onInfbutExi () {
async onInfbutExi() {
let rtnmsg = await this.executeRule("infbut.exi")
if (rtnmsg.respCode == SUCCESS) {
//TODO 处理数据逻辑
......@@ -88,7 +103,7 @@ export default {
this.$notify.error({ title: '错误', message: '服务请求失败!' });
}
},
async onRecpanButgetref () {
async onRecpanButgetref() {
let rtnmsg = await this.executeRule("recpan.butgetref")
if (rtnmsg.respCode == SUCCESS) {
//TODO 处理数据逻辑
......@@ -98,7 +113,7 @@ export default {
this.$notify.error({ title: '错误', message: '服务请求失败!' });
}
},
async onBenpDet () {
async onBenpDet() {
let rtnmsg = await this.executeRule("benp.det")
if (rtnmsg.respCode == SUCCESS) {
//TODO 处理数据逻辑
......@@ -108,7 +123,7 @@ export default {
this.$notify.error({ title: '错误', message: '服务请求失败!' });
}
},
async onAplpDet () {
async onAplpDet() {
let rtnmsg = await this.executeRule("aplp.det")
if (rtnmsg.respCode == SUCCESS) {
//TODO 处理数据逻辑
......@@ -118,7 +133,7 @@ export default {
this.$notify.error({ title: '错误', message: '服务请求失败!' });
}
},
async onLcrdftatButtxmsel () {
async onLcrdftatButtxmsel() {
let rtnmsg = await this.executeRule("lcrdftat.buttxmsel")
if (rtnmsg.respCode == SUCCESS) {
//TODO 处理数据逻辑
......@@ -128,7 +143,7 @@ export default {
this.$notify.error({ title: '错误', message: '服务请求失败!' });
}
},
async onPreperButtxmsel () {
async onPreperButtxmsel() {
let rtnmsg = await this.executeRule("preper.buttxmsel")
if (rtnmsg.respCode == SUCCESS) {
//TODO 处理数据逻辑
......@@ -138,7 +153,7 @@ export default {
this.$notify.error({ title: '错误', message: '服务请求失败!' });
}
},
async onLcrgodButtxmsel () {
async onLcrgodButtxmsel() {
let rtnmsg = await this.executeRule("lcrgod.buttxmsel")
if (rtnmsg.respCode == SUCCESS) {
//TODO 处理数据逻辑
......@@ -148,7 +163,7 @@ export default {
this.$notify.error({ title: '错误', message: '服务请求失败!' });
}
},
async onLcrdocButtxmsel () {
async onLcrdocButtxmsel() {
let rtnmsg = await this.executeRule("lcrdoc.buttxmsel")
if (rtnmsg.respCode == SUCCESS) {
//TODO 处理数据逻辑
......@@ -158,7 +173,7 @@ export default {
this.$notify.error({ title: '错误', message: '服务请求失败!' });
}
},
async onAdlcndButtxmsel () {
async onAdlcndButtxmsel() {
let rtnmsg = await this.executeRule("adlcnd.buttxmsel")
if (rtnmsg.respCode == SUCCESS) {
//TODO 处理数据逻辑
......@@ -168,7 +183,7 @@ export default {
this.$notify.error({ title: '错误', message: '服务请求失败!' });
}
},
async onInsbnkButtxmsel () {
async onInsbnkButtxmsel() {
let rtnmsg = await this.executeRule("insbnk.buttxmsel")
if (rtnmsg.respCode == SUCCESS) {
//TODO 处理数据逻辑
......@@ -178,7 +193,7 @@ export default {
this.$notify.error({ title: '错误', message: '服务请求失败!' });
}
},
async onInfconButshw () {
async onInfconButshw() {
let rtnmsg = await this.executeRule("infcon.butshw")
if (rtnmsg.respCode == SUCCESS) {
//TODO 处理数据逻辑
......@@ -188,7 +203,7 @@ export default {
this.$notify.error({ title: '错误', message: '服务请求失败!' });
}
},
async onInfconButshword () {
async onInfconButshword() {
let rtnmsg = await this.executeRule("infcon.butshword")
if (rtnmsg.respCode == SUCCESS) {
//TODO 处理数据逻辑
......
......@@ -214,7 +214,7 @@
</c-input>
</el-form-item>
</c-col> -->
<c-col :span="24">
<c-col :span="24" style="margin-top: 30px">
<c-col :span="11">
<c-edit-table :model="model" v-bind="docgrd">
</c-edit-table>
......
......@@ -82,7 +82,7 @@
<c-col :span="24">
<el-form-item label=" " prop="bodgrp.rec.matperbeg">
<c-select v-model="model.bodgrp.rec.matperbeg" style="width:100%"
placeholder="请选择Start of Maturity Period MATBEG" disabled>
placeholder="请选择Start of Maturity Period MATBEG" disabled :code="codes.matperbeg">
</c-select>
</el-form-item>
</c-col>
......@@ -133,7 +133,7 @@
</c-input>
<template slot="footer">
<c-button size="small" type="primary"
@click="showGridPromptDialog('botp.proins.buttxmsel',null,null,{TXT:'bodgrp.blk.resrej'},{TXT:false},'doxpDialog')">
@click="showGridPromptDialog('botp.resrej.buttxmsel',null,null,{TXT:'bodgrp.blk.resrej'},{TXT:false},'doxpDialog')">
...
</c-button>
</template>
......
......@@ -174,6 +174,7 @@
:argadr="{
title: '',
trans: 'brdgrp',
trans1:'brtp',
}"
:rol="[
{
......
......@@ -11,7 +11,7 @@
<c-select
v-model="model.brdgrp.cbs.max.cur"
style="width: 100%"
placeholder="请选择附加金额"
placeholder="请选择单据金额"
disabled
>
<el-option
......@@ -32,7 +32,7 @@
>
<c-input
v-model="model.brdgrp.cbs.max.amt"
placeholder="请输入附加金额"
placeholder="请输入单据金额"
disabled
></c-input>
</el-form-item>
......@@ -41,9 +41,9 @@
<c-col :span="24">
<c-col :span="13">
<el-form-item label="Drawn Add.Amount" prop="brdgrp.cbs.max2.cur">
<el-form-item label="Drawn Add.Amount" prop="brdgrp.cbs.opn2.cur">
<c-select
v-model="model.brdgrp.cbs.max2.cur"
v-model="model.brdgrp.cbs.opn2.cur"
style="width: 100%"
placeholder="请选择附加金额"
disabled
......
......@@ -62,8 +62,8 @@
<c-col :span="24">
<el-form-item label="Mode of Transport" prop="brdgrp.rec.tramod">
<c-select v-model="model.brdgrp.rec.tramod" disabled style="width:100%" placeholder="请选择Mode of Transport">
</c-select>
<c-input v-model="model.brdgrp.rec.tramod" disabled maxlength="40" placeholder="请选择Mode of Transport">
</c-input>
</el-form-item>
</c-col>
......@@ -95,7 +95,7 @@
<c-col :span="24">
<el-form-item label="Port of loading" prop="brdgrp.blk.porlod">
<c-input v-model="model.brdgrp.blk.porlod" maxlength="40" placeholder="请输入Port of loading"></c-input>
<c-input v-model="model.brdgrp.blk.porlod" disabled maxlength="40" placeholder="请输入Port of loading"></c-input>
</el-form-item>
</c-col>
......@@ -130,7 +130,7 @@
<c-col :span="24">
<c-checkbox v-model="model.brdgrp.rec.rtoaplflg" disabled
style="margin-left:140px;padding: 0 10px;"
>Release Goods to Applicant </c-checkbox>
>To Applicant </c-checkbox>
</c-col>
<c-col :span="24">
......@@ -142,7 +142,7 @@
</c-col>
<c-col :span="24">
<el-form-item label="External Key of Address" prop="brdgrp.shp.pts.extkey">
<el-form-item label="Shipping company" prop="brdgrp.shp.pts.extkey">
<c-fullbox>
<c-input v-model="model.brdgrp.shp.pts.extkey" disabled maxlength="16" placeholder="请输入External Key of Address"></c-input>
<template slot="footer">
......@@ -154,11 +154,12 @@
<span style="font-family: '宋体'; font-weight: bold">i</span>
</c-button>
<c-button
disabled
style="margin: 0 0"
size="small"
type="primary"
>
获取
Details
</c-button>
</template>
</c-fullbox>
......@@ -168,7 +169,7 @@
<c-col :span="24">
<el-form-item label="Address Block" prop="brdgrp.shp.pts.adrblk">
<el-form-item label="" prop="brdgrp.shp.pts.adrblk">
<c-input
:rows="4"
type="textarea" disabled v-model="model.brdgrp.shp.pts.adrblk" maxlength="35" show-word-limit placeholder="请输入Address Block" ></c-input>
......
......@@ -30,33 +30,41 @@
v-model="tabVal"
ref="elment"
type="card"
@tab-click="myTabClick"
@tab-click="tabClick"
>
<!--brtame PD000057 Release Goods -->
<el-tab-pane label="Release Goods" name="rog">
<c-content>
<m-rog :model="model" :codes="codes" />
</c-content>
</el-tab-pane>
<el-tab-pane label="Shipping Details" name="shpdet">
<c-content>
<m-shpdet :model="model" :codes="codes" />
</c-content>
</el-tab-pane>
<!--liaall PD000027 Liability -->
<el-tab-pane label="或有" name="engp">
<el-tab-pane label="Liability" name="engp">
<c-content>
<m-engp :model="model" :codes="codes" />
</c-content>
</el-tab-pane>
<!--setmod PD000000 Settlement -->
<el-tab-pane label="账务" name="setpan">
<el-tab-pane label="Settlement" name="setpan">
<c-content>
<m-setpan :model="model" :codes="codes" />
</c-content>
</el-tab-pane>
<!--coninf PD000000 Completion -->
<el-tab-pane label="附言" name="coninfp">
<el-tab-pane label="Completion" name="coninfp">
<m-coninfp :model="model" :codes="codes" />
</el-tab-pane>
<!--trndoc PD000529 &Messages -->
<el-tab-pane label="面函" name="docpan">
<el-tab-pane label="Messages" name="docpan">
<m-docpan :model="model" :codes="codes" />
</el-tab-pane>
<!--trndoc PD000546 Attachments -->
<el-tab-pane label="附件" name="doctre">
<el-tab-pane label="Attachments" name="doctre">
<m-doctre :model="model" :codes="codes" />
</el-tab-pane>
<!--limmod PD000001 统一授信 -->
......@@ -120,12 +128,12 @@ export default {
};
},
methods: {
myTabClick(tab) {
this.tabClick(tab);
// myTabClick(tab) {
// this.tabClick(tab);
/**
* do it yourself
**/
},
// },
},
created: async function () {
console.log("进入brtame交易");
......
<template>
<div class="eContainer">
<div class="bus-button">
<c-button type="primary" v-on:click="handleSave">{{ $t("buttons.save") }}</c-button>
<c-button type="primary" v-on:click="handleCheck">{{ $t("buttons.check") }}</c-button>
</div>
<c-function-btn
:handleSubmit="handleSubmit"
:handleCheck="handleCheck"
:handleStash="handleStash"
>
<el-button size="small">备忘录</el-button>
<el-button size="small">影像信息</el-button>
<el-button size="small">保存模板</el-button>
<el-button size="small">使用模板</el-button>
<el-button size="small">制裁信息</el-button>
<el-button size="small">拆分报文</el-button>
<el-button size="small">智能提示</el-button>
</c-function-btn>
<el-form :model="model" :rules="rules" ref="modelForm" label-width="150px" label-position="right" size="small" :validate-on-rule-change="false">
<c-tabs v-model="tabVal" ref="elment" type="card" @tab-click="myTabClick">
<c-tabs v-model="tabVal" ref="elment" type="card" @tab-click="tabClick">
<!--PD000016 -->
<el-tab-pane label="PD000016" name="canp">
<el-tab-pane label="Cancelation" name="canp">
<c-content>
<m-canp :model="model" :codes="codes"/>
</c-content>
</el-tab-pane>
<!--PD000027 -->
<el-tab-pane label="PD000027" name="engp">
<el-tab-pane label="Liability" name="engp">
<m-engp :model="model" :codes="codes"/>
</el-tab-pane>
<!--PD000000 -->
<el-tab-pane label="PD000000" name="setpan">
<el-tab-pane label="Settlement" name="setpan">
<c-content>
<m-setpan :model="model" :codes="codes"/>
</c-content>
</el-tab-pane>
<!--PD000001 -->
<el-tab-pane label="PD000001" name="glepan">
<el-tab-pane label="Bookings" name="glepan">
<m-glepan :model="model" :codes="codes"/>
</el-tab-pane>
<!--PD000000 -->
<el-tab-pane label="PD000000" name="coninfp">
<el-tab-pane label="Completion" name="coninfp">
<m-coninfp :model="model" :codes="codes"/>
</el-tab-pane>
<!--PD000529 -->
<el-tab-pane label="PD000529" name="docpan">
<el-tab-pane label="Messages" name="docpan">
<m-docpan :model="model" :codes="codes"/>
</el-tab-pane>
<!--PD000546 -->
<el-tab-pane label="PD000546" name="doctre">
<el-tab-pane label="Attachments" name="doctre">
<m-doctre :model="model" :codes="codes"/>
</el-tab-pane>
<!--PD000001 -->
<el-tab-pane label="PD000001" name="limitbody">
<el-tab-pane label="统一授信" name="limitbody">
<m-limitbody :model="model" :codes="codes"/>
</el-tab-pane>
</c-tabs>
......@@ -102,12 +116,12 @@ export default {
}
},
methods:{
myTabClick(tab){
this.tabClick(tab)
// myTabClick(tab){
// this.tabClick(tab)
/**
* do it yourself
**/
},
// },
async handleSave() {
let result = await this.save();
if (result.respCode == SUCCESS && Object.keys(result.fieldErrors).length == 0) {
......
......@@ -5,7 +5,7 @@
<el-form-item label="Discrepancies" prop="brdgrp.blk.docdis">
<c-fullbox>
<c-input
:disabled="model.advrefflg==''"
:disabled="model.advrefflg=='' && model.advdisflg==''"
type="textarea"
v-model="model.brdgrp.blk.docdis"
maxlength="3500"
......@@ -14,7 +14,7 @@
placeholder="请输入Discrepancies"
></c-input>
<template slot="footer">
<c-button :disabled="model.advrefflg==''" size="small" type="primary" icon="el-icon-search"
<c-button :disabled="model.advrefflg=='' && model.advdisflg==''" size="small" type="primary" icon="el-icon-search"
@click="showGridPromptDialog('brtp.docdis.buttxmsel', null, null,{TXT: 'brdgrp.blk.docdis'}, {TXT: false},'doxpDialog')"
>
...
......
......@@ -41,9 +41,9 @@
<c-col :span="24">
<c-col :span="13">
<el-form-item label="Drawn Add.Amount" prop="brdgrp.cbs.max2.cur">
<el-form-item label="Drawn Add.Amount" prop="brdgrp.cbs.opn2.cur">
<c-select
v-model="model.brdgrp.cbs.max2.cur"
v-model="model.brdgrp.cbs.opn2.cur"
style="width: 100%"
placeholder="请选择附加金额"
disabled
......
......@@ -161,6 +161,7 @@
:argadr="{
title: '',
trans: 'brdgrp',
trans1:'brtp',
}"
:rol="[
{
......@@ -305,7 +306,7 @@
</c-col>
<c-col :span="24">
<el-form-item label="" prop="advrefflg">
<el-form-item label="" >
<c-col :span="12">
<c-checkbox :disabled="model.brdgrp.blk.disdocflg =='X'" v-model="model.advrefflg"
@change="advrefflgChange" >Send Advice of Refusal MT734</c-checkbox
......@@ -320,7 +321,7 @@
</c-col>
<c-col :span="24">
<el-form-item label="" prop="brdgrp.rec.advdocflg">
<el-form-item label="" >
<c-col :span="12">
<c-checkbox v-model="model.brdgrp.rec.advdocflg"
@change="advdocflgChange">Return of Documents</c-checkbox
......@@ -419,6 +420,14 @@ export default {
this.model.brdgrp.rec.advdocflg = val ? "X" : "";
},
},
advdisflg: {
get() {
return this.model.advdisflg === "X";
},
set(val) {
this.model.advdisflg = val ? "X" : "";
},
},
},
methods: { ...Event,
async advrefflgChange() {
......
......@@ -30,7 +30,7 @@
</c-content>
</el-tab-pane>
<el-tab-pane label="Advice of Discrepancy" name="mt750p">
<el-tab-pane v-if="model.advdisflg=='X'" label="Advice of Discrepancy" name="mt750p">
<c-content>
<m-mt750p :model="model" :codes="codes"/>
</c-content>
......
......@@ -111,7 +111,7 @@
style="width: 100%"
placeholder="请选择Outgoing Purpose"
:code="codes.purpos"
disabled
>
</c-select>
</el-form-item>
......@@ -123,7 +123,7 @@
v-model="model.gidgrp.rec.gartyp"
style="width: 100%"
placeholder="请选择Type of Undertaking"
:code="codes.typgar"
:code="codes.typgar1"
disabled
>
</c-select>
......@@ -153,6 +153,7 @@
style="width: 100%"
placeholder="请选择Expiry Type"
:code="codes.exptyp"
disabled
>
</c-select>
</el-form-item>
......
......@@ -202,7 +202,7 @@
placeholder="请选择Type of Undertaking"
>
<el-option
v-for="item in codes.typgar"
v-for="item in codes.typgar1"
:key="item.value"
:label="item.label"
:value="item.value"
......@@ -250,7 +250,7 @@
style="width: 100%"
placeholder="请选择Form of Undertaking"
disabled
:code="codes.legfrm"
:code="codes.legfrm1"
>
</c-select>
</el-form-item>
......@@ -328,7 +328,7 @@
disabled
>
<el-option
v-for="item in codes.gtxinr"
v-for="item in codes.gtxinr2"
:key="item.value"
:label="item.label"
:value="item.value"
......@@ -453,7 +453,7 @@
v-model="model.gidgrp.rec.orddat"
style="width: 100%"
placeholder="请选择Order Date"
disabled
></c-date-picker>
</el-form-item>
</c-col>
......@@ -966,7 +966,7 @@
v-model="model.gidgrp.rec.orddat"
style="width: 100%"
placeholder="请选择Order Date"
disabled
></c-date-picker>
</el-form-item>
</c-col>
......
......@@ -2,7 +2,6 @@
<div class="eibs-tab">
<c-row>
<c-col :span="24">
<c-col :span="11">
<c-col :span="24">
<el-form-item
......@@ -16,7 +15,7 @@
placeholder="请选择Delivery of Undertak."
>
<el-option
v-for="item in codes.delori"
v-for="item in codes.delori1"
:key="item.value"
:label="item.label"
:value="item.value"
......@@ -47,6 +46,7 @@
v-model="model.gidgrp.rec.sndto"
style="width: 100%"
placeholder="请选择Undertaking Send to"
disabled
>
<el-option
v-for="item in codes.rolall"
......@@ -70,7 +70,7 @@
placeholder="请选择Deliv. To/Collection By"
>
<el-option
v-for="item in codes.delto"
v-for="item in codes.delto1"
:key="item.value"
:label="item.label"
:value="item.value"
......@@ -87,11 +87,11 @@
>
<c-input
:disabled="
model.gidgrp.rec.delto == '' ||
model.gidgrp.rec.delto == 'APPL' ||
model.gidgrp.rec.delto == 'BENE'
"
type="textarea"
:rows="4"
v-model="model.gidgrp.blk.deltoadr"
maxlength="35"
show-word-limit
......@@ -108,6 +108,7 @@
maxlength="65"
show-word-limit
placeholder="请输入Transfer Conditions"
disabled
></c-input>
</el-form-item>
</c-col>
......
......@@ -318,10 +318,19 @@ export default {
closeTrn(refId) {
this.$refs[refId].doClose();
},
async getTrnInfo(code) {
this.$router.history.push("/business/" + code)
this.$refs.childs.initdialog = false
async getTrnInfo(idx, row) {
this.model.infcon.objinr = row["INR"];
this.model.bodgrp.rec.inr = row["INR"];
this.model.infcon.chksubcon = "X";
this.dialogTableVisible = true;
let rtnmsg = await this.executeDefault("infcon.chksubcon");
if ((rtnmsg.respCode = SUCCESS)) {
this.trnData.data = rtnmsg.data.infcon_trnstm.rows;
console.log(this.trnData.data);
}
},
async getDitSelInfo(idx, row) {
//TD中选中行触发
......
......@@ -696,8 +696,8 @@ export default {
'5 11 "Expired" 150 ',
'6 12 "Closed" 150 ',
'13 13 "Cur" 150 ',
'15 14 "Cur" 150 ',
'14 15 "L/C Amount" 150 ',
'15 15 "Cur" 150 ',
'14 14 "L/C Amount" 150 ',
'16 16 "Open Amount" 150 ',
],
data: [],
......
......@@ -36,8 +36,8 @@
</c-col>
<c-col :span="12">
<div style="float: right;">
<span class="add_del_button add_button" @click="addTableValue" v-if="ifShowAdd">+</span>
<span class="add_del_button" @click="deleteTable" v-if="ifShowDelete">-</span>
<c-button @click="addTableValue" v-if="ifShowAdd">+</c-button><br>
<c-button @click="deleteTable" v-if="ifShowDelete">-</c-button>
</div>
</c-col>
</c-row>
......
......@@ -4,16 +4,37 @@
Liability
</c-col> -->
<c-col :span="24" style="">
<c-table :list="model.liaall.liaallg" style="width:80%,text-align:center,margin-bottom:18px" :border="true">
<el-table-column prop="bussec" label="BS" width="40px"> </el-table-column>
<el-table-column prop="cbtpfx" label="Type" width="60px"> </el-table-column>
<el-table-column prop="matdat" label="Maturity" width="100px"> </el-table-column>
<el-table-column prop="tenday" label="Tenor" width="70px"> </el-table-column>
<el-table-column prop="rol" label="Dbt." width="70px"> </el-table-column>
<c-table
:list="model.liaall.liaallg"
style="width:80%,text-align:center,margin-bottom:18px"
:border="true"
>
<el-table-column prop="bussec" label="BS" width="40px">
</el-table-column>
<el-table-column prop="cbtpfx" label="Type" width="60px">
</el-table-column>
<el-table-column prop="matdat" label="Maturity">
<template slot-scope="scope">
<c-date-picker
type="date"
v-model="scope.row.matdat"
value-format="yyyy-MM-dd"
placeholder="请选择Date"
style="width: 100%"
@change="executeDefault('liaall.liaallg.matdat')"
>
</c-date-picker>
</template>
</el-table-column>
<el-table-column prop="tenday" label="Tenor" width="70px">
</el-table-column>
<el-table-column prop="rol" label="Dbt." width="70px">
</el-table-column>
<!--
<el-table-column prop="nam" label="Name" width="300"> </el-table-column>
-->
<el-table-column prop="cdtrol" label="Cdt." width="70px"> </el-table-column>
<el-table-column prop="cdtrol" label="Cdt." width="70px">
</el-table-column>
<el-table-column prop="cur" label="Cur" width="55px"> </el-table-column>
<el-table-column prop="oldamt" label="Old Amount" width="150px">
<!-- <template slot-scope="scope">
......@@ -27,7 +48,8 @@
</el-table-column>
<el-table-column prop="tenpct" label="%" width="80px">
</el-table-column>
<el-table-column prop="acc" label="Account" width="150px"> </el-table-column>
<el-table-column prop="acc" label="Account" width="150px">
</el-table-column>
<el-table-column prop="valdat" label="Value Date" width="200px">
<!-- <template slot-scope="scope">
{{dateFormat(scope.row.valdat)}}
......@@ -53,12 +75,12 @@
</el-button>
</template>
<template slot-scope="scoped">
<el-button
<c-button
style="margin-left:0"
size="small"
type="primary"
@click="detail1(scoped.$index, scoped.row)"
>详情</el-button
>详情</c-button
>
</template>
</el-table-column>
......@@ -83,11 +105,28 @@
</el-form-item>
</c-col> -->
<c-col :span="16" style="margin-top:10px">
<c-col :span="16" style="margin-top: 10px">
<el-form-item label="Amount not yet assigned">
<c-input style="width:15%" disabled v-model="model.liaall.concur" maxlength="3" placeholder="请输入External Booking Amount"></c-input>
<c-input style="width:40%" disabled v-model="model.liaall.misamt" placeholder="请输入Amount not yet assigned"></c-input>
<c-button style="width:20%" size="small" disabled type="primary" @click="onLiaallButmisamt">
<c-input
style="width: 15%"
disabled
v-model="model.liaall.concur"
maxlength="3"
placeholder="请输入External Booking Amount"
></c-input>
<c-input
style="width: 40%"
disabled
v-model="model.liaall.misamt"
placeholder="请输入Amount not yet assigned"
></c-input>
<c-button
style="width: 20%"
size="small"
disabled
type="primary"
@click="onLiaallButmisamt"
>
Add to Current Line
</c-button>
</el-form-item>
......@@ -123,36 +162,29 @@
</div>
</template>
<script>
import Api from "~/service/Api"
import Api from "~/service/Api";
import commonProcess from "~/mixin/commonProcess";
import CodeTable from "~/config/CodeTable"
import CodeTable from "~/config/CodeTable";
export default {
inject: ['root'],
inject: ["root"],
mixins: [commonProcess],
props:["model","codes"],
data(){
return {
}
props: ["model", "codes"],
data() {
return {};
},
methods:{
methods: {
async onLiaallButmisamt() {
let rtnmsg = await this.executeRule("liaall_butmisamt")
let rtnmsg = await this.executeRule("liaall_butmisamt");
if (rtnmsg.respCode == SUCCESS) {
//TODO 处理数据逻辑
}
else {
this.$notify.error({ title: '错误', message: '服务请求失败!' });
} else {
this.$notify.error({ title: "错误", message: "服务请求失败!" });
}
},
},
created:function(){
}
}
created: function () {},
};
</script>
<style>
</style>
......@@ -114,12 +114,12 @@
<c-col :span="13">
<el-form-item
label="Maturity Date"
prop="brtp.matp.mattxtlab"
:prop="`${argadr.trans1}.matp.mattxtlab`"
>
<c-date-picker
type="date"
disabled
v-model="model.brtp.matp.mattxtlab"
v-model="model[argadr.trans1].matp.mattxtlab"
style="width: 100%"
></c-date-picker>
</el-form-item>
......@@ -143,12 +143,12 @@
<c-col :span="24">
<el-form-item
label="Maturity Date"
prop="brtp.matp.mattxtlab"
:prop="`${argadr.trans1}.matp.mattxtlab`"
>
<c-date-picker
type="date"
disabled
v-model="model.brtp.matp.mattxtlab"
v-model="model[argadr.trans1].matp.mattxtlab"
style="width: 100%"
></c-date-picker>
</el-form-item>
......@@ -178,12 +178,10 @@
label-width="90px"
:prop="`${argadr.trans}.rec.tenmaxday`"
>
<c-date-picker
type="date"
<c-input
disabled
v-model="model[argadr.trans].rec.tenmaxday"
style="width: 100%"
></c-date-picker>
></c-input>
</el-form-item>
</c-col>
</div>
......@@ -259,6 +257,7 @@ export default {
return {
title: "", //角色名称
trans: "", //所属模块
trans1:"",//所属模块
};
},
},
......
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