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