Skip to content

V
vue-gjjs
Commit a281f891 by huangxin
Options

brtdcr事件关联优化，,brtame页面布局

parent fe77ede1
Showing with 149 additions and 178 deletions
src/model/Brtacp/Pattern.js
......@@ -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: "必输项"},
......
src/model/Brtdcr/Pattern.js
......@@ -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: "必输项"},
......
src/views/Business/Brtacp/Mt750p.vue
......@@ -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
......
src/views/Business/Brtame/Rog.vue
......@@ -5,17 +5,14 @@
<c-col :span="12">
<c-col :span="24">
<el-form-item
:label="$t('brtp.S0000172')"
label="Reference"
prop="lidgrp.rec.ownref"
>
<c-fullbox>
<c-input
v-model="model.lidgrp.rec.ownref"
maxlength="16"
:placeholder="
$t('other.please_enter') +
$t('brtp.S0000172')
"
placeholder=""
disabled
></c-input>
<template slot="footer">
......@@ -35,14 +32,6 @@
>i</span
>
</c-button>
<c-button
style="margin: 0 0"
size="small"
type="primary"
:disabled="this.flag"
>
获取
</c-button>
</template>
</c-fullbox>
</el-form-item>
......@@ -52,15 +41,13 @@
<c-col :span="12">
<c-col :span="24">
<c-form-item
:label="$t('brtp.S0000183')"
label="Name"
prop="lidgrp.rec.nam"
>
<c-input
v-model="model.lidgrp.rec.nam"
maxlength="40"
:placeholder="
$t('other.please_enter') + $t('brtp.S0000183')
"
placeholder=""
disabled
></c-input>
</c-form-item>
......@@ -72,18 +59,15 @@
<!-- ---------------Left--------------- -->
<c-col :span="12">
<c-col :span="24">
<c-col :span="13">
<c-col :span="9">
<el-form-item
:label="$t('brtp.S0000173')"
label="L/C Amount"
prop="lidgrp.cbs.nom1.cur"
>
<c-select
v-model="model.lidgrp.cbs.nom1.cur"
style="width: 100%"
:placeholder="
$t('other.please_enter') +
$t('brtp.S0000173')
"
placeholder=""
:code="codes.cur"
disabled
>
......@@ -91,7 +75,7 @@
</el-form-item>
</c-col>
<c-col :span="11">
<c-col :span="10">
<c-form-item
label=""
label-width="5px"
......@@ -99,28 +83,31 @@
>
<c-input
v-model="model.lidgrp.cbs.nom1.amt"
:placeholder="
$t('other.please_enter') +
$t('brtp.S0000173')
"
placeholder=""
disabled
></c-input>
</c-form-item>
</c-col>
<c-col :span="5" >
<c-form-item
label=""
label-width="20px"
>
<c-checkbox disabled v-model="model.brtp.aammod.addamtflg">Add.Amount</c-checkbox>
</c-form-item>
</c-col>
</c-col>
<c-col :span="24">
<c-col :span="13">
<c-col :span="9">
<el-form-item
:label="$t('brtp.S0000174')"
label="Open Amount"
prop="lidgrp.cbs.opn1.cur"
>
<c-select
v-model="model.lidgrp.cbs.opn1.cur"
style="width: 100%"
:placeholder="
$t('other.please_enter') +
$t('brtp.S0000174')
"
placeholder=""
:code="codes.cur"
disabled
>
......@@ -128,7 +115,7 @@
</el-form-item>
</c-col>
<c-col :span="11">
<c-col :span="10">
<c-form-item
label=""
label-width="5px"
......@@ -136,147 +123,135 @@
>
<c-input
v-model="model.lidgrp.cbs.opn1.amt"
:placeholder="
$t('other.please_enter') +
$t('brtp.S0000173')
"
placeholder=""
disabled
></c-input>
</c-form-item>
</c-col>
<c-col :span="5">
<c-form-item
label=""
label-width="20px"
>
<c-checkbox disabled v-model="model.lidgrp.rec.revflg">Revolving L/C</c-checkbox>
</c-form-item>
</c-col>
</c-col>
<c-col :span="24">
<c-form-item
:label="$t('brtp.S0000176')"
label="Available With"
prop="lidgrp.avbnam"
>
<c-input
v-model="model.lidgrp.avbnam"
maxlength="40"
:placeholder="
$t('other.please_enter') + $t('brtp.S0000176')
"
placeholder=""
disabled
></c-input>
</c-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="Available by" prop="lidgrp.rec.avbby">
<c-col :span="19">
<el-form-item label="by" prop="lidgrp.rec.avbby">
<c-select
v-model="model.lidgrp.rec.avbby"
style="width: 100%"
:placeholder="
$t('other.please_enter') + 'Available by'
"
placeholder=""
disabled
:code="codes.avbby"
>
</c-select>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="">
<c-col :span="8">
<c-checkbox disabled v-model="model.brtp.aammod.addamtflg">{{
$t("brtp.CF000171")
}}</c-checkbox>
</c-col>
<c-col :span="8">
<c-checkbox disabled v-model="model.lidgrp.rec.revflg">{{
$t("brtp.CF000170")
}}</c-checkbox>
</c-col>
<c-col :span="8">
<c-checkbox disabled v-model="model.lidgrp.rec.redclsflg">{{
$t("brtp.CF000169")
}}</c-checkbox>
</c-col>
</el-form-item>
<c-col :span="5">
<c-form-item
label=""
label-width="20px"
>
<c-checkbox disabled v-model="model.lidgrp.rec.redclsflg">Red/Green Clause</c-checkbox>
</c-form-item>
</c-col>
<c-col :span="24">
<c-col :span="12">
<el-form-item
:label="$t('brtp.S0000182')"
label="Date Issued"
prop="lidgrp.rec.opndat"
>
<c-date-picker
type="date"
v-model="model.lidgrp.rec.opndat"
style="width: 100%"
:placeholder="
$t('other.please_enter') + $t('brtp.S0000182')
"
placeholder=""
disabled
></c-date-picker>
</el-form-item>
</c-col>
<c-col :span="24">
<c-col :span="12">
<el-form-item
:label="$t('brtp.S0000185')"
label="Shipment Date"
prop="lidgrp.rec.shpdat"
>
<c-date-picker
type="date"
v-model="model.lidgrp.rec.shpdat"
style="width: 100%"
:placeholder="
$t('other.please_enter') + $t('brtp.S0000185')
"
placeholder=""
disabled
></c-date-picker>
</el-form-item>
</c-col>
<c-col :span="24">
<c-col :span="12">
<el-form-item
:label="$t('brtp.S0000179')"
label="Date/Place of Expiry"
prop="lidgrp.rec.expdat"
>
<c-date-picker
type="date"
v-model="model.lidgrp.rec.expdat"
style="width: 100%"
:placeholder="
$t('other.please_enter') + $t('brtp.S0000179')
"
placeholder=""
disabled
></c-date-picker>
</el-form-item>
</c-col>
</c-col>
<!-- ---------------Right--------------- -->
<c-col :span="12">
<c-col :span="24">
<c-form-item
:label="$t('brtp.S0000179')"
label=""
prop="lidgrp.rec.expplc"
label-width="5px"
>
<c-input
v-model="model.lidgrp.rec.expplc"
maxlength="29"
:placeholder="
$t('other.please_enter') + $t('brtp.S0000179')
"
placeholder=""
disabled
></c-input>
</c-form-item>
</c-col>
<c-col :span="24">
<el-form-item
:label="$t('brtp.S0000178')"
label="Form of L/C"
prop="lidgrp.rec.lcrtyp"
>
<c-select
v-model="model.lidgrp.rec.lcrtyp"
style="width: 100%"
:placeholder="
$t('other.please_enter') + $t('brtp.S0000178')
"
:code="codes.lcrtyp"
placeholder=""
:code="codes.lcrtyp1"
disabled
>
</c-select>
</el-form-item>
</c-col>
</c-col>
<!-- ---------------Right--------------- -->
<c-col :span="12">
<c-col :span="24">
<c-appBenPre
:model="model"
......@@ -286,15 +261,15 @@
}"
:rol="[
{
title: '申请人',
title: 'Applicant',
trans: 'apl',
},
{
title: '开证行',
title: 'Beneficiary',
trans: 'ben',
},
{
title: '交单行',
title: 'Presented by',
trans: 'prb',
},
]"
......@@ -309,17 +284,14 @@
<c-col :span="12">
<c-col :span="24">
<el-form-item
:label="$t('brtame.S0000079')"
label="Document Set Ref."
prop="brdgrp.rec.ownref"
>
<c-fullbox>
<c-input
v-model="model.lidgrp.rec.ownref"
v-model="model.brdgrp.rec.ownref"
maxlength="16"
:placeholder="
$t('other.please_enter') +
$t('brtame.S0000079')
"
placeholder=""
disabled
></c-input>
<template slot="footer">
......@@ -339,48 +311,19 @@
>i</span
>
</c-button>
<c-button
style="margin: 0 0"
size="small"
type="primary"
:disabled="this.flag"
>
获取
</c-button>
</template>
</c-fullbox>
</el-form-item>
</c-col>
<c-col :span="24">
<c-form-item
:label="$t('brtame.SG000213')"
label="SG Reference"
prop="brdgrp.rec.shgref"
>
<c-input
v-model="model.brdgrp.rec.shgref"
maxlength="16"
:placeholder="
$t('other.please_enter') + $t('brtame.SG000213')
"
disabled
></c-input>
</c-form-item>
</c-col>
</c-col>
<!-- ---------------Right--------------- -->
<c-col :span="12">
<c-col :span="24">
<c-form-item
:label="$t('brtame.S0000078')"
prop="brdgrp.rec.nam"
>
<c-input
v-model="model.brdgrp.rec.nam"
maxlength="40"
:placeholder="
$t('other.please_enter') + $t('brtame.S0000078')
"
placeholder=""
disabled
></c-input>
</c-form-item>
......@@ -389,18 +332,16 @@
<c-col :span="24">
<c-col :span="13">
<c-form-item
:label="$t('brtame.SF000060')"
label="Amount of Shipment"
prop="brdgrp.cbs.max.cur"
>
<c-input
<c-select
v-model="model.brdgrp.cbs.max.cur"
maxlength="3"
:placeholder="
$t('other.please_enter') +
$t('brtame.SF000060')
"
style="width: 100%"
placeholder=""
:code="codes.cur"
disabled
></c-input>
></c-select>
</c-form-item>
</c-col>
<c-col :span="11">
......@@ -411,14 +352,29 @@
>
<c-input
v-model="model.brdgrp.cbs.max.amt"
:placeholder="
$t('other.please_enter') + 'Balance'
"
placeholder=""
></c-input>
</c-form-item>
</c-col>
</c-col>
</c-col>
<!-- ---------------Right--------------- -->
<c-col :span="12">
<c-col :span="24">
<c-form-item
label="Name"
prop="brdgrp.rec.nam"
>
<c-input
v-model="model.brdgrp.rec.nam"
maxlength="40"
placeholder=""
disabled
></c-input>
</c-form-item>
</c-col>
</c-col>
</c-col>
</div>
</template>
......
src/views/Business/Brtame/Shpdet.vue
......@@ -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>
......
src/views/Business/Brtame/index.vue
......@@ -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交易");
......
src/views/Business/Brtdcr/Brtdcrd.vue
......@@ -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')"
>
...
......
src/views/Business/Brtdcr/Mt750p.vue
......@@ -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
......
src/views/Business/Brtdcr/Utlp.vue
......@@ -305,7 +305,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 +320,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 +419,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() {
......
src/views/Business/Brtdcr/index.vue
......@@ -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>
......
src/views/Public/LitTemp.vue
......@@ -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>
......
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