Skip to content

V
vue-gjjs
Commit e55e57f2 by WH
Options

Merge remote-tracking branch 'origin/settle-test-20230110' into settle-test-20230110 

# Conflicts:
#	src/business/brtdck/views/Brtdckp.vue
parents d0319fbd a8311b8d
Showing with 197 additions and 179 deletions
src/business/brtdck/event/buildCommons.js
......@@ -22,15 +22,13 @@ export default {
if (model.brdgrp.apl.pts.extkey) {
ptsptaList.push(this.buildPtspta(model.brdgrp.apl));
}
if (model.brdgrp.adv.pts.extkey) {
ptsptaList.push(this.buildPtspta(model.brdgrp.adv));
}
if (model.brdgrp.ben.pts.extkey) {
ptsptaList.push(this.buildPtspta(model.brdgrp.ben));
if (model.brdgrp.prb.pts.extkey) {
ptsptaList.push(this.buildPtspta(model.brdgrp.prb));
}
let dataObj = {
rec: {
objtyp: 'LID',
inr: model.lidgrp.rec.inr,
ownref: model.brdgrp.rec.ownref,
opndat: model.brdgrp.rec.opndat,
expdat: model.brdgrp.rec.expdat,
......@@ -47,6 +45,7 @@ export default {
purpos: model.brdgrp.rec.purpos,
revflg: model.brdgrp.rec.revflg,
cnfsta: model.brdgrp.rec.cnfsta,
mhtyp: model.mhtyp,
},
cbsMap: {
MAX: model.brdgrp.cbs.max,
......
src/business/brtdck/event/index.js
......@@ -124,7 +124,7 @@ export default {
let params = {
userId: window.sessionStorage.userId || 'ZL',
ptytyp: ptytyp,
extkey: this.model.gidgrp[type.toLowerCase()].pts.extkey,
extkey: this.model.brdgrp[type.toLowerCase()].pts.extkey,
};
let res = await Api.post('/service/ptspta/list', params);
if (res.respCode == SUCCESS) {
......@@ -140,7 +140,7 @@ export default {
};
let res = await Api.post('/service/ptspta/fetch', params);
if (res.respCode == SUCCESS) {
this.$set(this.model.gidgrp, row.role.toLowerCase(), res.data);
this.$set(this.model.brdgrp, row.role.toLowerCase(), res.data);
}
},
// 业务信息=》基本信息=》支出目的
......
src/business/brtdck/views/Brtdckp.vue
......@@ -9,17 +9,17 @@
<c-form-item label="信用证编号" prop="lidgrp.rec.ownref">
<c-fullbox>
<c-input
v-model="model.lidgrp.rec.ownref"
maxlength="16"
placeholder=""
style="width: 100%"
disabled
v-model="model.lidgrp.rec.ownref"
maxlength="16"
placeholder=""
style="width: 100%"
disabled
></c-input>
<template slot="footer">
<c-button
style="margin: 0 0 0 10px; padding: 0 12px"
size="small"
type="primary"
style="margin: 0 0 0 10px; padding: 0 12px"
size="small"
type="primary"
>
<i class="el-icon-info"></i>
</c-button>
......@@ -31,31 +31,31 @@
<c-col :span="24">
<el-form-item label="生效日期" prop="lidgrp.rec.expdat">
<c-date-picker
type="date"
v-model="model.lidgrp.rec.expdat"
style="width: 100%"
placeholder="请输入生效日期"
value-format="yyyy-MM-dd"
disabled
type="date"
v-model="model.lidgrp.rec.expdat"
style="width: 100%"
placeholder="请输入生效日期"
value-format="yyyy-MM-dd"
disabled
></c-date-picker>
</el-form-item>
</c-col>
<!-- S0000196 : 单据参考号 -->
<c-col :span="24">
<c-form-item label="单据编号" prop="brdgrp.rec.ownref">
<c-fullbox>
<c-input
v-model="model.brdgrp.rec.ownref"
maxlength="16"
placeholder=""
disabled
v-model="model.brdgrp.rec.ownref"
maxlength="16"
placeholder=""
disabled
></c-input>
<template slot="footer">
<c-button
style="margin: 0 0 0 10px; padding: 0 12px"
size="small"
type="primary"
style="margin: 0 0 0 10px; padding: 0 12px"
size="small"
type="primary"
>
<i class="el-icon-info"></i>
</c-button>
......@@ -68,11 +68,11 @@
<c-col :span="13">
<el-form-item label="单据金额" prop="brdgrp.cbs.max.cur">
<c-select
v-model="model.brdgrp.cbs.max.cur"
style="width: 100%"
placeholder="请选择单据金额币种"
:code="codes.curtxt1"
disabled
v-model="model.brdgrp.cbs.max.cur"
style="width: 100%"
placeholder="请选择单据金额币种"
:code="codes.curtxt1"
disabled
>
</c-select>
</el-form-item>
......@@ -81,10 +81,10 @@
<c-col :span="11">
<c-form-item label="" label-width="5px" prop="brdgrp.cbs.max.amt">
<c-input
v-model="model.brdgrp.cbs.max.amt"
placeholder=""
class="m-input-currency"
:disabled="model.mhtyp=='R'"
v-model="model.brdgrp.cbs.max.amt"
placeholder=""
class="m-input-currency"
:disabled="model.mhtyp=='R'"
></c-input>
</c-form-item>
</c-col>
......@@ -95,11 +95,11 @@
<c-col :span="13">
<c-form-item label="单据余额" prop="brdgrp.cbs.opn1.cur">
<c-select
v-model="model.brdgrp.cbs.opn1.cur"
style="width: 100%"
placeholder="请选择单据余额币种"
:code="codes.curtxt1"
disabled
v-model="model.brdgrp.cbs.opn1.cur"
style="width: 100%"
placeholder="请选择单据余额币种"
:code="codes.curtxt1"
disabled
></c-select>
</c-form-item>
</c-col>
......@@ -107,10 +107,10 @@
<c-col :span="11">
<c-form-item label="" label-width="5px" prop="brdgrp.cbs.opn1.amt">
<c-input
v-model="model.brdgrp.cbs.opn1.amt"
placeholder=""
class="m-input-currency"
disabled
v-model="model.brdgrp.cbs.opn1.amt"
placeholder=""
class="m-input-currency"
disabled
></c-input>
</c-form-item>
</c-col>
......@@ -120,12 +120,12 @@
<c-col :span="12">
<el-form-item label="收入日期" prop="brdgrp.rec.rcvdat">
<c-date-picker
type="date"
v-model="model.brdgrp.rec.rcvdat"
style="width: 100%"
placeholder="请输入"
value-format="yyyy-MM-dd"
disabled
type="date"
v-model="model.brdgrp.rec.rcvdat"
style="width: 100%"
placeholder="请输入"
value-format="yyyy-MM-dd"
disabled
></c-date-picker>
</el-form-item>
</c-col>
......@@ -133,12 +133,12 @@
<c-col :span="12">
<el-form-item label="通知日期" prop="brdgrp.rec.advdat">
<c-date-picker
type="date"
v-model="model.brdgrp.rec.advdat"
style="width: 100%"
placeholder="请选择日期"
value-format="yyyy-MM-dd"
disabled
type="date"
v-model="model.brdgrp.rec.advdat"
style="width: 100%"
placeholder="请选择日期"
value-format="yyyy-MM-dd"
disabled
></c-date-picker>
</el-form-item>
</c-col>
......@@ -146,12 +146,12 @@
<c-col :span="24">
<el-form-item label="到期日期" prop="brdgrp.rec.matdat">
<c-date-picker
type="date"
v-model="model.brdgrp.rec.matdat"
style="width: 100%"
placeholder="请选择日期"
value-format="yyyy-MM-dd"
:disabled="model.brdgrp.blk.matper!=''||model.brdgrp.rec.docflg=='P'"
type="date"
v-model="model.brdgrp.rec.matdat"
style="width: 100%"
placeholder="请选择日期"
value-format="yyyy-MM-dd"
:disabled="model.brdgrp.blk.matper!=''||model.brdgrp.rec.docflg=='P'"
></c-date-picker>
</el-form-item>
</c-col>
......@@ -159,12 +159,12 @@
<c-col :span="24">
<el-form-item label="开始日期" prop="brdgrp.rec.stadat">
<c-date-picker
type="date"
v-model="model.brdgrp.rec.stadat"
style="width: 100%"
placeholder="请选择日期"
value-format="yyyy-MM-dd"
disabled
type="date"
v-model="model.brdgrp.rec.stadat"
style="width: 100%"
placeholder="请选择日期"
value-format="yyyy-MM-dd"
disabled
></c-date-picker>
</el-form-item>
</c-col>
......@@ -172,11 +172,11 @@
<c-col :span="16">
<el-form-item label="单据类型" prop="brdgrp.rec.docflg">
<c-select
v-model="model.brdgrp.rec.docflg"
style="width: 100%"
placeholder="请输入单据类型"
:code="codes.docflg"
disabled
v-model="model.brdgrp.rec.docflg"
style="width: 100%"
placeholder="请输入单据类型"
:code="codes.docflg"
disabled
>
</c-select>
</el-form-item>
......@@ -184,14 +184,14 @@
<!-- SG000233 : Tenor -->
<c-col :span="8">
<c-form-item
label="期限（天）"
label-width="100px"
prop="brdgrp.rec.tenmaxday"
label="期限（天）"
label-width="100px"
prop="brdgrp.rec.tenmaxday"
>
<c-input
v-model="model.brdgrp.rec.tenmaxday"
placeholder="请输入天数"
disabled
v-model="model.brdgrp.rec.tenmaxday"
placeholder="请输入天数"
disabled
></c-input>
</c-form-item>
</c-col>
......@@ -199,11 +199,11 @@
<c-col :span="24">
<el-form-item label="单据状态" prop="brdgrp.rec.docsta">
<c-select
v-model="model.brdgrp.rec.docsta"
style="width: 100%"
placeholder="请选择状态"
:code="codes.docsta1"
disabled
v-model="model.brdgrp.rec.docsta"
style="width: 100%"
placeholder="请选择状态"
:code="codes.docsta1"
disabled
>
</c-select>
</el-form-item>
......@@ -212,10 +212,10 @@
<c-col :span="24">
<el-form-item label="单据类型" prop="brdgrp.rec.docflg">
<c-select
v-model="model.brdgrp.rec.docflg"
style="width: 100%"
placeholder="请选择单据类型"
:code="codes.docflg"
v-model="model.brdgrp.rec.docflg"
style="width: 100%"
placeholder="请选择单据类型"
:code="codes.docflg"
>
</c-select>
</el-form-item>
......@@ -225,10 +225,10 @@
<c-col :span="13">
<el-form-item label="单据金额" prop="brdgrp.cbs.max.cur">
<c-select
v-model="model.brdgrp.cbs.max.cur"
style="width: 100%"
placeholder=""
:code="codes.curtxt1"
v-model="model.brdgrp.cbs.max.cur"
style="width: 100%"
placeholder=""
:code="codes.curtxt1"
>
</c-select>
</el-form-item>
......@@ -236,29 +236,29 @@
<c-col :span="11">
<c-form-item label="" label-width="5px" prop="brdgrp.cbs.max.amt">
<c-input
v-model="model.brdgrp.cbs.max.amt"
placeholder=""
class="m-input-currency"
:disabled="model.mhtyp=='R'"
v-model="model.brdgrp.cbs.max.amt"
placeholder=""
class="m-input-currency"
:disabled="model.mhtyp=='R'"
></c-input>
</c-form-item>
</c-col>
</c-col>
<!-- =====================================当单据金额Document Amount没变时隐藏====================================================== -->
<!-- =====================================当单据金额Document Amount没变时隐藏====================================================== -->
<c-col :span="24">
<c-col :span="13">
<span v-text="model.oridoclab" data-path=".oridoclab"
class="span_oridoclab"
v-show="model.brdgrp.cbs.max.amt!=model.oldbrdgrp.cbs.max.amt"> </span>
<span v-text="model.oridoclab" data-path=".oridoclab"
class="span_oridoclab"
v-show="model.brdgrp.cbs.max.amt!=model.oldbrdgrp.cbs.max.amt"> </span>
</c-col>
<c-col :span="11">
<c-form-item label="" label-width="5px" prop="oldbrdgrp.cbs.max.amt">
<c-input v-model="model.oldbrdgrp.cbs.max.amt" placeholder=""
class="m-input-currency"
style="width: 100%"
disabled
v-show="model.brdgrp.cbs.max.amt!=model.oldbrdgrp.cbs.max.amt"
<c-input v-model="model.oldbrdgrp.cbs.max.amt" placeholder=""
class="m-input-currency"
style="width: 100%"
disabled
v-show="model.brdgrp.cbs.max.amt!=model.oldbrdgrp.cbs.max.amt"
></c-input>
</c-form-item>
</c-col>
......@@ -269,10 +269,10 @@
<c-col :span="13">
<el-form-item label="提取附加金额" prop="brdgrp.cbs.opn2.cur">
<c-select
v-model="opn2cur"
style="width: 100%"
placeholder="请选择币种"
:code="codes.curtxt1"
v-model="model.brdgrp.cbs.opn2.cur"
style="width: 100%"
placeholder="请选择币种"
:code="codes.curtxt1"
>
</c-select>
</el-form-item>
......@@ -281,29 +281,29 @@
<c-col :span="11">
<c-form-item label="" label-width="5px" prop="brdgrp.cbs.max2.amt">
<c-input
v-model="model.brdgrp.cbs.max2.amt"
class="m-input-currency"
placeholder=""
:disabled="model.mhtyp=='R'"
v-model="model.brdgrp.cbs.max2.amt"
class="m-input-currency"
placeholder=""
:disabled="model.mhtyp=='R'"
></c-input>
</c-form-item>
</c-col>
</c-col>
<!-- =====================================当附加金额没变时隐藏====================================================== -->
<!-- =====================================当附加金额没变时隐藏====================================================== -->
<c-col :span="24">
<c-col :span="13">
<span v-text="model.oriaddlab" data-path=".oriaddlab"
class="span_oridoclab"
v-show="model.brdgrp.cbs.max2.amt!=model.oldbrdgrp.cbs.max2.amt"> </span>
class="span_oridoclab"
v-show="model.brdgrp.cbs.max2.amt!=model.oldbrdgrp.cbs.max2.amt"> </span>
</c-col>
<c-col :span="11">
<c-form-item label="" label-width="5px" prop="oldbrdgrp.cbs.max2.amt">
<c-input v-model="model.oldbrdgrp.cbs.max2.amt" :placeholder="$t('other.please_enter')+'Balance'"
class="m-input-currency"
style="width: 100%"
disabled
v-show="model.brdgrp.cbs.max2.amt!=model.oldbrdgrp.cbs.max2.amt"></c-input>
<c-input v-model="model.oldbrdgrp.cbs.max2.amt" :placeholder="$t('other.please_enter')+'Balance'"
class="m-input-currency"
style="width: 100%"
disabled
v-show="model.brdgrp.cbs.max2.amt!=model.oldbrdgrp.cbs.max2.amt"></c-input>
</c-form-item>
</c-col>
</c-col>
......@@ -312,11 +312,11 @@
<c-col :span="12">
<el-form-item label="交单日期" prop="brdgrp.rec.predat">
<c-date-picker
type="date"
v-model="model.brdgrp.rec.predat"
style="width: 100%"
placeholder="请选择日期"
value-format="yyyy-MM-dd"
type="date"
v-model="model.brdgrp.rec.predat"
style="width: 100%"
placeholder="请选择日期"
value-format="yyyy-MM-dd"
></c-date-picker>
</el-form-item>
</c-col>
......@@ -324,23 +324,23 @@
<c-col :span="12">
<el-form-item label="收入日期" prop="brdgrp.rec.rcvdat">
<c-date-picker
type="date"
v-model="model.brdgrp.rec.rcvdat"
style="width: 100%"
placeholder="请选择日期"
value-format="yyyy-MM-dd"
type="date"
v-model="model.brdgrp.rec.rcvdat"
style="width: 100%"
placeholder="请选择日期"
value-format="yyyy-MM-dd"
></c-date-picker>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="到期日期" prop="brdgrp.rec.matdat">
<c-date-picker
type="date"
v-model="model.brdgrp.rec.matdat"
style="width: 100%"
placeholder="请选择到期日"
value-format="yyyy-MM-dd"
:disabled="model.brdgrp.blk.matper!=''||model.brdgrp.rec.docflg=='P'"
type="date"
v-model="model.brdgrp.rec.matdat"
style="width: 100%"
placeholder="请选择到期日"
value-format="yyyy-MM-dd"
:disabled="model.brdgrp.blk.matper!=''||model.brdgrp.rec.docflg=='P'"
></c-date-picker>
</el-form-item>
</c-col>
......@@ -348,11 +348,11 @@
<c-col :span="24">
<el-form-item label="装运日期" prop="brdgrp.rec.shpdat">
<c-date-picker
type="date"
v-model="model.brdgrp.rec.shpdat"
style="width: 100%"
placeholder="请选择日期"
value-format="yyyy-MM-dd"
type="date"
v-model="model.brdgrp.rec.shpdat"
style="width: 100%"
placeholder="请选择日期"
value-format="yyyy-MM-dd"
></c-date-picker>
</el-form-item>
</c-col>
......@@ -360,10 +360,10 @@
<c-col :span="12">
<el-form-item label="交易类型" prop="mhtyp">
<c-select
v-model="model.mhtyp"
style="width: 100%"
placeholder="请输入交易类型"
:code="codes.mhtyp"
v-model="model.mhtyp"
style="width: 100%"
placeholder="请输入交易类型"
:code="codes.mhtyp"
>
</c-select>
</el-form-item>
......@@ -371,8 +371,8 @@
<c-col :span="12">
<c-form-item label="信笺日" prop="days">
<c-input
v-model="model.days"
placeholder="请输入天数"
v-model="model.days"
placeholder="请输入天数"
></c-input>
</c-form-item>
</c-col>
......@@ -380,12 +380,12 @@
<c-col :span="24">
<c-form-item label="到期期限" prop="brdgrp.blk.matper">
<c-input
type="textarea"
v-model="model.brdgrp.blk.matper"
maxlength="65"
show-word-limit
placeholder="请输入到期期限"
:disabled="model.brdgrp.rec.matdat!=null&&model.brdgrp.rec.matdat!=''||model.brdgrp.rec.docflg=='P'"
type="textarea"
v-model="model.brdgrp.blk.matper"
maxlength="65"
show-word-limit
placeholder="请输入到期期限"
:disabled="model.brdgrp.rec.matdat!=null&&model.brdgrp.rec.matdat!=''||model.brdgrp.rec.docflg=='P'"
></c-input>
</c-form-item>
</c-col>
......@@ -393,32 +393,31 @@
<c-col :span="12">
<c-form-item label="申请人参考号" prop="lidgrp.rec.aplref">
<c-input
v-model="model.lidgrp.rec.aplref"
maxlength="16"
placeholder="请输入申请人参考号"
v-model="model.lidgrp.rec.aplref"
maxlength="16"
placeholder="请输入申请人参考号"
></c-input>
</c-form-item>
</c-col>
<c-col :span="12">
<c-checkbox
style="float: right; text-align: center"
v-model="model.brdgrp.rec.dscinsflg"
:disabled="model.brdgrp.blk.docdisflg!=''"
>输入单据、不符点、指示和运输信息
</c-checkbox
style="float: right; text-align: center"
v-model="model.brdgrp.rec.dscinsflg"
:disabled="model.brdgrp.blk.docdisflg!=''"
>输入单据、不符点、指示和运输信息</c-checkbox
>
</c-col>
<c-col :span="24">
<c-form-item
label="本信用证下前手图纸"
prop="lidgrp.rec.utlnbr"
label="本信用证下前手图纸"
prop="lidgrp.rec.utlnbr"
>
<c-input
v-model="model.lidgrp.rec.utlnbr"
:placeholder="
v-model="model.lidgrp.rec.utlnbr"
:placeholder="
$t('other.please_enter') + 'Count of Received Document Sets'
"
disabled
disabled
></c-input>
</c-form-item>
</c-col>
......@@ -509,10 +508,13 @@
grp: 'brdgrp',
rol: 'prb',
}"
:disabled="this.flag2"
:disabledExtkey="this.flag"
:isAdrblk="true"
:noRef="true"
@keyup.enter.native="
queryGridEtyPromptDialogData('PRB', 'C')
"
:disabled="this.flag2"
:disabledExtkey="this.flag"
:isAdrblk="true"
:noRef="true"
>
</c-ptap>
</c-col>
......
src/business/brtlat/model/check.js
......@@ -40,7 +40,7 @@ export default {
],
"brdgrp.cbs.max.amt":[
{type: "string", required: true, message: "必输项"},
{type: "number", required: true, message: "必输项"},
{max: 18,message:"整数位不能超过14位"},
{pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
],
......
src/business/brtlat/model/index.js
......@@ -39,7 +39,7 @@ export default class Brtlat{
cbs:{
max:{
cur:"", // 单据金额 .brdgrp.cbs.max.cur
amt:"", // 单据金额 .brdgrp.cbs.max.amt
amt:"0.0", // 单据金额 .brdgrp.cbs.max.amt
},
opn1:{
cur:"", // 单据余额 .brdgrp.cbs.opn1.cur
......
src/business/litame/event/buildCommons.js
......@@ -34,6 +34,7 @@ export default {
let dataObj = {
rec: {
objtyp: 'LID',
objinr: model.lidgrp.rec.inr,
ownref: model.lidgrp.rec.ownref,
opndat: model.lidgrp.rec.opndat,
expdat: model.lidgrp.rec.expdat,
......@@ -52,9 +53,20 @@ export default {
cnfsta: model.lidgrp.rec.cnfsta,
cre707flg: model.litamep.cre707flg,
},
amdRec: {
engamt: model.litamep.engamt,
maxamt: model.litamep.maxamt,
ameamt: model.swiadd.ameamt,
amecur: model.swiadd.amecur,
newamt: model.swiadd.newamt,
newcur: model.swiadd.newcur,
amedat: model.swiadd.amedat,
newexpdat: model.swiadd.newexpdat,
},
cbsMap: {
MAX: model.lidgrp.cbs.max,
OLDMAX: model.lidgrp.cbs.oldmax,
OLDMAX: model.oldlidgrp.cbs.max,
OLDMAX2: model.oldlidgrp.cbs.max2,
MAX2: model.lidgrp.cbs.max2,
NOM1: model.lidgrp.cbs.nom1,
OPN1: model.lidgrp.cbs.opn1,
......
src/business/litame/model/index.js
......@@ -78,6 +78,10 @@ export default class Litame {
},
nom1: {
amt: ''
},
max2: {
cur: '',
amt: '0.00',
}
}
},
......@@ -160,7 +164,7 @@ export default class Litame {
cbs: {
opn2: {
cur: '',
amt: '',
amt: '0.00',
},
max: {
cur: '',
......@@ -172,7 +176,7 @@ export default class Litame {
},
max2: {
cur: '',
amt: '',
amt: '0.00',
}
},
rmb: {
......
src/business/litdav/event/buildCommons.js
......@@ -47,6 +47,7 @@ export default {
purpos: model.lidgrp.rec.purpos,
revflg: model.lidgrp.rec.revflg,
cnfsta: model.lidgrp.rec.cnfsta,
advtyp: model.brdgrp.rec.advtyp,
},
cbsMap: {
MAX: model.lidgrp.cbs.max,
......
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