Commit dd85fb83 by WH

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

parents a47e2472 b5808143
...@@ -34,6 +34,7 @@ export default { ...@@ -34,6 +34,7 @@ export default {
let dataObj = { let dataObj = {
rec: { rec: {
objtyp: 'BED', objtyp: 'BED',
inr: model.bedgrp.rec.inr,
ownref: model.bedgrp.rec.ownref, ownref: model.bedgrp.rec.ownref,
predat: model.bedgrp.rec.predat, predat: model.bedgrp.rec.predat,
rcvdat: model.bedgrp.rec.rcvdat, rcvdat: model.bedgrp.rec.rcvdat,
...@@ -45,6 +46,7 @@ export default { ...@@ -45,6 +46,7 @@ export default {
docprbrol: model.bedgrp.rec.docprbrol, docprbrol: model.bedgrp.rec.docprbrol,
advdocflg: model.bedgrp.rec.advdocflg, advdocflg: model.bedgrp.rec.advdocflg,
rejpenins: model.rejpenins, rejpenins: model.rejpenins,
chato: model.ledgrp.rec.chato,
}, },
cbsMap: { cbsMap: {
...@@ -115,22 +117,22 @@ export default { ...@@ -115,22 +117,22 @@ export default {
buildLimitbody (model, trnName) { buildLimitbody (model, trnName) {
let params = { let params = {
...this.buildCommonData(model, trnName), ...this.buildCommonData(model, trnName),
rec: { // rec: {
objtyp: 'BED', // objtyp: 'BED',
objinr: model.bedgrp.rec.objinr, // objinr: model.bedgrp.rec.objinr,
ownref: model.bedgrp.rec.ownref, // ownref: model.bedgrp.rec.ownref,
}, // },
}; };
return params return params
}, },
buildDoctre (model, trnName) { buildDoctre (model, trnName) {
let params = { let params = {
...this.buildCommonData(model, trnName), ...this.buildCommonData(model, trnName),
rec: { // rec: {
objtyp: 'BED', // objtyp: 'BED',
objinr: model.bedgrp.rec.objinr, // objinr: model.bedgrp.rec.objinr,
ownref: model.bedgrp.rec.ownref, // ownref: model.bedgrp.rec.ownref,
}, // },
}; };
return params return params
}, },
......
...@@ -7,14 +7,15 @@ export default class Betdcr { ...@@ -7,14 +7,15 @@ export default class Betdcr {
adaflg: '', adaflg: '',
docgrdm:{ docgrdm:{
docgrd:'', docgrdVos:'',
}, },
}, },
advdisflg: '', advdisflg: '',
ledgrp: { ledgrp: {
rec: { rec: {
inr: '', inr: '',
ownref: '' ownref: '',
chato: ''
}, },
cbs: { cbs: {
opn1: { opn1: {
......
...@@ -113,7 +113,12 @@ export default { ...@@ -113,7 +113,12 @@ export default {
}, },
rejpenins: { rejpenins: {
get() { get() {
return this.model.rejpenins != ""; if(this.model.bedgrp.rec.advdocflg == ''){
return this.model.rejpenins = "X"
}
else{
return this.model.rejpenins = "";
}
}, },
set(val) { set(val) {
this.model.rejpenins = val ? "X" : ""; this.model.rejpenins = val ? "X" : "";
......
...@@ -162,7 +162,7 @@ ...@@ -162,7 +162,7 @@
<c-col :span="24"> <c-col :span="24">
<el-form-item label="单据简略信息" prop="bedgrp.rec.nam"> <el-form-item label="单据简略信息" prop="bedgrp.rec.nam">
<c-input v-model="model.bedgrp.rec.nam" maxlength="40" placeholder="请输入单据简略信息" disabled></c-input> <c-input v-model="bedgrprecnam" maxlength="40" placeholder="请输入单据简略信息" disabled></c-input>
</el-form-item> </el-form-item>
</c-col> </c-col>
...@@ -267,6 +267,10 @@ export default { ...@@ -267,6 +267,10 @@ export default {
this.model.advdisflg = val ? "X" : ""; this.model.advdisflg = val ? "X" : "";
}, },
}, },
bedgrprecnam(){
this.model.bedgrp.rec.nam =(this.model.bedgrp.cbs.max.cur + " " + this.model.bedgrp.cbs.max.amt + " " + this.model.bedgrp.prb.pts.nam).substring(0,40)
return this.model.bedgrp.rec.nam;
}
}, },
methods: {}, methods: {},
created: function () {}, created: function () {},
......
...@@ -48,7 +48,7 @@ export default { ...@@ -48,7 +48,7 @@ export default {
let dataObj = { let dataObj = {
rec: { rec: {
objtyp: 'BRD', objtyp: 'BRD',
objinr:model.brdgrp.rec.objinr, objinr:model.brdgrp.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,
......
...@@ -150,8 +150,8 @@ export default { ...@@ -150,8 +150,8 @@ export default {
], ],
'setmod.docamt': [ 'setmod.docamt': [
{ type: 'string', true: false, message: '必输项' }, { type: 'string', true: false, message: '必输项' },
{ max: 18, message: '整数位不能超过14位' }, { max: 18, message: '整数位不能超过18位' },
{ pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: '小数位不能超过3位' } { pattern: /(^[0-9])|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: '小数位不能超过3位' }
], ],
'brdgrp.prb.pts.adrblk': [ 'brdgrp.prb.pts.adrblk': [
{ type: 'string', required: false, message: '必输项' }, { type: 'string', required: false, message: '必输项' },
...@@ -163,7 +163,7 @@ export default { ...@@ -163,7 +163,7 @@ export default {
], ],
'aamset.utlamt': [ 'aamset.utlamt': [
{ type: 'string', required: false, message: '必输项' }, { type: 'string', required: false, message: '必输项' },
{ max: 18, message: '整数位不能超过14位' }, { max: 18, message: '整数位不能超过18位' },
{ pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: '小数位不能超过3位' } { pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: '小数位不能超过3位' }
], ],
'brdgrp.prb.adrelc': [ 'brdgrp.prb.adrelc': [
......
...@@ -111,8 +111,8 @@ export default class Brtudp { ...@@ -111,8 +111,8 @@ export default class Brtudp {
}, },
}, },
aamset: { aamset: {
utlamt: '', utlamt: '0.00',
utlamt2: '' utlamt2: '0.00'
}, },
cfabrt: { cfabrt: {
recgrp: { recgrp: {
...@@ -173,12 +173,13 @@ export default class Brtudp { ...@@ -173,12 +173,13 @@ export default class Brtudp {
expdat: '', expdat: '',
ownref: '', ownref: '',
branchinr:'', branchinr:'',
inr:'' inr:'',
avbby:'',
}, },
cbs: { cbs: {
opn1: { opn1: {
cur: '', cur: '',
amt: '' amt: '0.00'
} }
} }
}, },
......
...@@ -13,12 +13,12 @@ ...@@ -13,12 +13,12 @@
<el-collapse-item title="付款通知" name="mt754p" v-if="model.brdgrp.rec.advtyp == '754'"> <el-collapse-item title="付款通知" name="mt754p" v-if="model.brdgrp.rec.advtyp == '754'">
<m-mt754p :model="model" :codes="codes" /> <m-mt754p :model="model" :codes="codes" />
</el-collapse-item> </el-collapse-item>
<el-collapse-item title="其他通知" name="othadvtypp" v-if="model.brdgrp.rec.advtyp == 'oth'">
<m-othadvtypp :model="model" :codes="codes" />
</el-collapse-item>
<el-collapse-item title="装运详情" name="shpdet" v-if="model.brdgrp.rec.dscinsflg"> <el-collapse-item title="装运详情" name="shpdet" v-if="model.brdgrp.rec.dscinsflg">
<m-shpdet :model="model" :codes="codes" /> <m-shpdet :model="model" :codes="codes" />
</el-collapse-item> </el-collapse-item>
<el-collapse-item title="通知详情" name="othadvtypp" v-if="model.brdgrp.rec.advtyp == 'oth'">
<m-othadvtypp :model="model" :codes="codes" />
</el-collapse-item>
<el-collapse-item title="外债远期信用证数据采集" name="cfap"> <el-collapse-item title="外债远期信用证数据采集" name="cfap">
<m-cfap :model="model" :codes="codes" /> <m-cfap :model="model" :codes="codes" />
</el-collapse-item> </el-collapse-item>
......
...@@ -79,7 +79,6 @@ ...@@ -79,7 +79,6 @@
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"
disabled disabled
> >
</c-select> </c-select>
...@@ -105,7 +104,6 @@ ...@@ -105,7 +104,6 @@
v-model="model.brdgrp.cbs.opn1.cur" v-model="model.brdgrp.cbs.opn1.cur"
maxlength="3" maxlength="3"
placeholder="请输入金额" placeholder="请输入金额"
:code="codes.curtxt"
disabled disabled
> >
</c-select> </c-select>
...@@ -256,7 +254,7 @@ ...@@ -256,7 +254,7 @@
<c-col :span="13"> <c-col :span="13">
<el-form-item label="承兑金额" prop="setmod.doccur"> <el-form-item label="承兑金额" prop="setmod.doccur">
<c-input <c-input
v-model="model.setmod.doccur" v-model="doccur"
style="width: 100%" style="width: 100%"
placeholder="请输入承兑金额" placeholder="请输入承兑金额"
disabled disabled
...@@ -274,10 +272,9 @@ ...@@ -274,10 +272,9 @@
<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="model.brdgrp.cbs.opn2.cur" v-model="opn2cur"
style="width: 100%" style="width: 100%"
placeholder="请选择币种" placeholder="请选择币种"
:code="codes.curtxt1"
disabled disabled
> >
</c-select> </c-select>
...@@ -296,10 +293,9 @@ ...@@ -296,10 +293,9 @@
<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="model.brdgrp.cbs.opn2.cur" v-model="opn2cur"
style="width: 100%" style="width: 100%"
placeholder="请选择币种" placeholder="请选择币种"
:code="codes.curtxt1"
disabled disabled
> >
</c-select> </c-select>
...@@ -322,6 +318,7 @@ ...@@ -322,6 +318,7 @@
style="width: 100%" style="width: 100%"
placeholder="请选择类型" placeholder="请选择类型"
:code="paysmt" :code="paysmt"
@change="sftmtChange()"
> >
</c-select> </c-select>
</el-form-item> </el-form-item>
...@@ -479,8 +476,8 @@ ...@@ -479,8 +476,8 @@
:model="model" :model="model"
:argadr="{ :argadr="{
title: '', title: '',
grp: 'brtp', grp: 'brdgrp',
rol: 'oth', rol: 'apl',
}" }"
:disabled="true" :disabled="true"
:isAdrblk="false" :isAdrblk="false"
...@@ -516,9 +513,120 @@ export default { ...@@ -516,9 +513,120 @@ export default {
], ],
}; };
}, },
methods: {}, methods: {
sftmtChange:function () {
if(this,this.model.sftmt != ''){
this.model.brdgrp.tag72add='We acknowledge receipt of documents and will settle as follows:'
}
}
},
created: function () {}, created: function () {},
computed: {}, computed: {
opn2cur(){
this.model.brdgrp.cbs.opn2.cur = this.model.brdgrp.cbs.max.cur
return this.model.brdgrp.cbs.opn2.cur
},
doccur(){
this.model.setmod.doccur = this.model.brdgrp.cbs.max.cur
return this.model.setmod.doccur
} ,
},
watch :{
"model.sftmt":{
immediate: true,
handler(val, oldVal) {
if(val != ''){
this.model.brdgrp.tag72add='We acknowledge receipt of documents and will settle as follows:'
}
},
},
"model.setmod.docamt":{
immediate: true,
handler(val, oldVal) {
var utlamt=this.model.setmod.docamt-this.model.aamset.utlamt2;
this.model.aamset.utlamt = utlamt.toString();
},
},
"lidgrp.rec.avbby":{
handler(val, oldVal) {
this.model.brdgrp.rec.docflg = this.model.lidgrp.rec.avbby;
},
},
"brdgrp.rec": {
immediate: true,
handler(val, oldVal) {
var rec = this.model.brdgrp.rec;
if(rec.advdat != '' && rec.advtyp == '754'){
if(rec.relgodflg != ''){
if(rec.rcvdat == ''){
rec.docsta = 'A';
} else {
rec.docsta = 'B';
}
} else{
if(rec.rcvdat == ''){
rec.docsta = 'C';
} else {
rec.docsta = 'D';
}
}
}
if(rec.disdat != ''&& rec.advtyp == '750') {
if(rec.rcvdat == ''){
rec.docsta = 'E';
} else {
rec.docsta = 'F';
}
}
if(rec.advtyp == 'oth'){
if(rec.rcvdat == ''){
rec.docsta = 'O';
}
}
if(rec.disdat != '' && rec.Advdat != ''){
if( rec.rcvdat!='' && rec.dscinsflg == '' )
{
rec.docsta = 'G';
}
if( rec.rcvdat !='' && this.model.brdgrp.blk.docdis =='' && rec.dscinsflg !='' )
{
rec.docsta = 'H';
}
if( rec.rcvdat != '' && this.model.brdgrp.blk.docdis !='' && rec.dscinsflg !='' )
{
rec.docsta = 'I';
}
}
if( rec.relgodflg != '' )
{
if( rec.rcvdat == '')
{
rec.docsta = 'J';
}
else
{
rec.docsta = 'K';
}
}
if( rec.approvcod != '' )
{
rec.docsta = 'L';
}
if( rec.acpnowflg != '' )
{
rec.docsta = 'M';
}
if( rec.frepayflg != '' )
{
rec.docsta = 'N';
}
if( rec.advdocflg != '' )
{
rec.docsta = 'R';
}
},
},
},
}; };
</script> </script>
......
export default { export default {
buildPtspta (ptsptaObj) { buildPtspta(ptsptaObj) {
let pts = ptsptaObj.pts; let pts = ptsptaObj.pts;
let ptspta = { let ptspta = {
rol: pts.rol, rol: pts.rol,
...@@ -17,7 +17,7 @@ export default { ...@@ -17,7 +17,7 @@ export default {
}; };
return ptspta; return ptspta;
}, },
buildCommonData (model, trnName) { buildCommonData(model, trnName) {
let ptsptaList = []; let ptsptaList = [];
if (model.ledgrp.iss.pts.extkey) { if (model.ledgrp.iss.pts.extkey) {
ptsptaList.push(this.buildPtspta(model.ledgrp.iss)); ptsptaList.push(this.buildPtspta(model.ledgrp.iss));
...@@ -71,7 +71,7 @@ export default { ...@@ -71,7 +71,7 @@ export default {
}; };
return dataObj return dataObj
}, },
buildSetfeg (model, trnName) { buildSetfeg(model, trnName) {
let params = { let params = {
...this.buildCommonData(model, trnName), ...this.buildCommonData(model, trnName),
liaall: model.liaall, liaall: model.liaall,
...@@ -80,7 +80,7 @@ export default { ...@@ -80,7 +80,7 @@ export default {
}; };
return params return params
}, },
buildSetglg (model, trnName) { buildSetglg(model, trnName) {
let params = { let params = {
...this.buildCommonData(model, trnName), ...this.buildCommonData(model, trnName),
setfeg: model.setmod.setfeg, setfeg: model.setmod.setfeg,
...@@ -89,7 +89,7 @@ export default { ...@@ -89,7 +89,7 @@ export default {
}; };
return params return params
}, },
buildGlentry (model, trnName) { buildGlentry(model, trnName) {
let params = { let params = {
...this.buildCommonData(model, trnName), ...this.buildCommonData(model, trnName),
liaallg: model.liaall.liaallg, liaallg: model.liaall.liaallg,
...@@ -99,20 +99,20 @@ export default { ...@@ -99,20 +99,20 @@ export default {
}; };
return params return params
}, },
buildEngp (model, trnName) { buildEngp(model, trnName) {
let params = { let params = {
...this.buildCommonData(model, trnName), ...this.buildCommonData(model, trnName),
liaallg: model.liaall.liaallg, liaallg: model.liaall.liaallg,
}; };
return params return params
}, },
buildDocpan (model, trnName) { buildDocpan(model, trnName) {
let params = { let params = {
...this.buildCommonData(model, trnName), ...this.buildCommonData(model, trnName),
}; };
return params return params
}, },
buildCcvpan (model, trnName) { buildCcvpan(model, trnName) {
let params = { let params = {
...this.buildCommonData(model, trnName), ...this.buildCommonData(model, trnName),
liaccvg: model.liaccv.liaccvg, liaccvg: model.liaccv.liaccvg,
...@@ -122,7 +122,7 @@ export default { ...@@ -122,7 +122,7 @@ export default {
}; };
return params return params
}, },
buildLimitbody (model, trnName) { buildLimitbody(model, trnName) {
let params = { let params = {
...this.buildCommonData(model, trnName), ...this.buildCommonData(model, trnName),
rec: { rec: {
...@@ -133,7 +133,7 @@ export default { ...@@ -133,7 +133,7 @@ export default {
}; };
return params return params
}, },
buildDoctre (model, trnName) { buildDoctre(model, trnName) {
let params = { let params = {
...this.buildCommonData(model, trnName), ...this.buildCommonData(model, trnName),
rec: { rec: {
...@@ -146,7 +146,7 @@ export default { ...@@ -146,7 +146,7 @@ export default {
return params return params
}, },
// 公共组件setmod中dsp字段改变,触发联动时候的入参 // 公共组件setmod中dsp字段改变,触发联动时候的入参
buildSetgllAccts (model, trnName, setglg) { buildSetgllAccts(model, trnName, setglg) {
let params = { let params = {
...this.buildCommonData(model, trnName), ...this.buildCommonData(model, trnName),
setglg setglg
......
...@@ -20,21 +20,21 @@ export default { ...@@ -20,21 +20,21 @@ export default {
...ccvpan, ...ccvpan,
...limitbody, ...limitbody,
...doctre, ...doctre,
async init () { async init() {
const params = { const params = {
spt: JSON.parse(localStorage.getItem('row_' + this.trnName)), spt: JSON.parse(localStorage.getItem('row_' + this.trnName)),
trninr: this.$route.query.trninr, trninr: this.$route.query.trninr,
} }
if ( typeof(this.$route.query.inr) == 'string'){ if (typeof (this.$route.query.inr) == 'string') {
params.spt = null params.spt = null
} }
const res = await Api.post('/service/letamc/init', { const res = await Api.post('/service/letamc/init', {
...params, ...params,
transName: this.trnName, transName: this.trnName,
userId: window.sessionStorage.userId || 'ZL', userId: window.sessionStorage.userId || 'ZL',
ledgrp:{ ledgrp: {
rec:{ rec: {
inr: this.$route.query.inr inr: this.$route.query.inr
} }
}, },
...@@ -48,7 +48,7 @@ export default { ...@@ -48,7 +48,7 @@ export default {
this.copyValueFromVoData(this.model.setmod.setglg, res.data.setglg) this.copyValueFromVoData(this.model.setmod.setglg, res.data.setglg)
}, },
// 兼容处理在前端model中定义了字段,后端返回的数据中不存在字段的问题 // 兼容处理在前端model中定义了字段,后端返回的数据中不存在字段的问题
copyValueFromVoData (model, data) { copyValueFromVoData(model, data) {
let keysList = Object.keys(model) let keysList = Object.keys(model)
keysList.map((key) => { keysList.map((key) => {
if (data[key]) { if (data[key]) {
...@@ -133,7 +133,7 @@ export default { ...@@ -133,7 +133,7 @@ export default {
handleChangePurpos() { handleChangePurpos() {
this.queryHndtypCodeTableList(this.root.trnName); this.queryHndtypCodeTableList(this.root.trnName);
}, },
buildLiaccv () { buildLiaccv() {
let params = { let params = {
...buildFn.buildCommonData(this.model, this.trnName), ...buildFn.buildCommonData(this.model, this.trnName),
liaccvg: this.model.liaccv.liaccvg, liaccvg: this.model.liaccv.liaccvg,
...@@ -145,7 +145,7 @@ export default { ...@@ -145,7 +145,7 @@ export default {
return params return params
}, },
// 公共组件setmod处理方式改变触发联动 // 公共组件setmod处理方式改变触发联动
changeSetmodModel (emitParams) { changeSetmodModel(emitParams) {
let reqParams = {} let reqParams = {}
switch (emitParams.code) { switch (emitParams.code) {
case 'processMethods': case 'processMethods':
...@@ -155,12 +155,25 @@ export default { ...@@ -155,12 +155,25 @@ export default {
case 'changeDsp': case 'changeDsp':
let index = emitParams.index; let index = emitParams.index;
let setglgRequest = buildFn.buildSetglg(this.model, this.trnName); let setglgRequest = buildFn.buildSetglg(this.model, this.trnName);
setglgRequest.setglg = {setgll: emitParams.list}; setglgRequest.setglg = { setgll: emitParams.list };
this.setgllAccts(setglgRequest, index); this.setgllAccts(setglgRequest, index);
break break
default: default:
return return
} }
},
//最大金额
async cbsmax() {
let params = {
nom1cur: this.model.ledgrp.cbs.nom1.cur,
nom1amt: this.model.ledgrp.cbs.nom1.amt,
nomtop: this.model.ledgrp.rec.nomtop
};
let res = await Api.post('/service/letamc/cbsmax', params);
if (res.respCode == SUCCESS) {
this.model.ledgrp.cbs.max.cur = res.data.maxcur;
this.model.ledgrp.cbs.max.amt = res.data.maxamt;
} }
}, },
},
}; };
...@@ -50,10 +50,10 @@ export default { ...@@ -50,10 +50,10 @@ export default {
{max: 18,message:"整数位不能超过14位",trigger:"blur"}, {max: 18,message:"整数位不能超过14位",trigger:"blur"},
{pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" } {pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
], ],
// "ledgrp.rec.partcon":[ "ledgrp.rec.partcon":[
// {type: "string", required: false, message: "必输项",trigger:"blur"}, {type: "string", required: false, message: "必输项",trigger:"blur"},
// {max: 6,message:"长度不能超过6",trigger:"blur"} {max: 6,message:"长度不能超过6",trigger:"blur"}
// ], ],
"reqdat":[ "reqdat":[
{ required: false, message: "输入正确的日期"} { required: false, message: "输入正确的日期"}
], ],
......
export default { export default {
buildPtspta (ptsptaObj) { buildPtspta(ptsptaObj) {
let pts = ptsptaObj.pts; let pts = ptsptaObj.pts;
let ptspta = { let ptspta = {
rol: pts.rol, rol: pts.rol,
...@@ -17,7 +17,7 @@ export default { ...@@ -17,7 +17,7 @@ export default {
}; };
return ptspta; return ptspta;
}, },
buildCommonData (model, trnName) { buildCommonData(model, trnName) {
let ptsptaList = []; let ptsptaList = [];
if (model.ledgrp.a2b.pts.extkey) { if (model.ledgrp.a2b.pts.extkey) {
ptsptaList.push(this.buildPtspta(model.ledgrp.a2b)); ptsptaList.push(this.buildPtspta(model.ledgrp.a2b));
...@@ -62,7 +62,7 @@ export default { ...@@ -62,7 +62,7 @@ export default {
let dataObj = { let dataObj = {
rec: { rec: {
objinr:model.ledgrp.rec.inr, objinr: model.ledgrp.rec.inr,
objtyp: 'LED', objtyp: 'LED',
ownref: model.ledgrp.rec.ownref, ownref: model.ledgrp.rec.ownref,
opndat: model.ledgrp.rec.opndat, opndat: model.ledgrp.rec.opndat,
...@@ -81,6 +81,7 @@ export default { ...@@ -81,6 +81,7 @@ export default {
cnfsta: model.ledgrp.rec.cnfsta, cnfsta: model.ledgrp.rec.cnfsta,
maxamt: model.letamep.maxamt, maxamt: model.letamep.maxamt,
engamt: model.letamep.engamt, engamt: model.letamep.engamt,
newamt: model.trnmod.swiadd.newamt,
// advRolsetflg: model.ledgrp.Adv.Rolsetflg, // advRolsetflg: model.ledgrp.Adv.Rolsetflg,
// advPtainr: model.ledgrp.Adv.pts.ptainr, // advPtainr: model.ledgrp.Adv.pts.ptainr,
// advAdrblk: model.ledgrp.Adv.pts.adrblk, // advAdrblk: model.ledgrp.Adv.pts.adrblk,
...@@ -91,7 +92,6 @@ export default { ...@@ -91,7 +92,6 @@ export default {
// issRolsetflg: model.ledgrp.iss.Rolsetflg, // issRolsetflg: model.ledgrp.iss.Rolsetflg,
// issPtainr: model.ledgrp.iss.pts.ptainr, // issPtainr: model.ledgrp.iss.pts.ptainr,
// issAdrblk: model.ledgrp.iss.pts.adrblk, // issAdrblk: model.ledgrp.iss.pts.adrblk,
// newamt: model.letamep.Swiadd.newamt,
// engamt: model.letamep.engamt, // engamt: model.letamep.engamt,
// opn1Amt: model.oldledgrp.cbs.opn1.Amt, // opn1Amt: model.oldledgrp.cbs.opn1.Amt,
// opn2Amt: model.oldledgrp.cbs.opn2.Amt, // opn2Amt: model.oldledgrp.cbs.opn2.Amt,
...@@ -115,7 +115,7 @@ export default { ...@@ -115,7 +115,7 @@ export default {
}; };
return dataObj return dataObj
}, },
buildSetfeg (model, trnName) { buildSetfeg(model, trnName) {
let params = { let params = {
...this.buildCommonData(model, trnName), ...this.buildCommonData(model, trnName),
liaall: model.liaall, liaall: model.liaall,
...@@ -124,7 +124,7 @@ export default { ...@@ -124,7 +124,7 @@ export default {
}; };
return params return params
}, },
buildSetglg (model, trnName) { buildSetglg(model, trnName) {
let params = { let params = {
...this.buildCommonData(model, trnName), ...this.buildCommonData(model, trnName),
setfeg: model.setmod.setfeg, setfeg: model.setmod.setfeg,
...@@ -133,7 +133,7 @@ export default { ...@@ -133,7 +133,7 @@ export default {
}; };
return params return params
}, },
buildGlentry (model, trnName) { buildGlentry(model, trnName) {
let params = { let params = {
...this.buildCommonData(model, trnName), ...this.buildCommonData(model, trnName),
liaallg: model.liaall.liaallg, liaallg: model.liaall.liaallg,
...@@ -143,24 +143,24 @@ export default { ...@@ -143,24 +143,24 @@ export default {
}; };
return params return params
}, },
buildEngp (model, trnName) { buildEngp(model, trnName) {
let params = { let params = {
...this.buildCommonData(model, trnName), ...this.buildCommonData(model, trnName),
liaallg: model.liaall.liaallg, liaallg: model.liaall.liaallg,
amdRec:{ amdRec: {
maxamt: model.letamep.maxamt, maxamt: model.letamep.maxamt,
engamt: model.letamep.engamt, engamt: model.letamep.engamt,
} }
}; };
return params return params
}, },
buildDocpan (model, trnName) { buildDocpan(model, trnName) {
let params = { let params = {
...this.buildCommonData(model, trnName), ...this.buildCommonData(model, trnName),
}; };
return params return params
}, },
buildCcvpan (model, trnName) { buildCcvpan(model, trnName) {
let params = { let params = {
...this.buildCommonData(model, trnName), ...this.buildCommonData(model, trnName),
liaccvg: model.liaccv.liaccvg, liaccvg: model.liaccv.liaccvg,
...@@ -170,7 +170,7 @@ export default { ...@@ -170,7 +170,7 @@ export default {
}; };
return params return params
}, },
buildLimitbody (model, trnName) { buildLimitbody(model, trnName) {
let params = { let params = {
...this.buildCommonData(model, trnName), ...this.buildCommonData(model, trnName),
rec: { rec: {
...@@ -181,7 +181,7 @@ export default { ...@@ -181,7 +181,7 @@ export default {
}; };
return params return params
}, },
buildDoctre (model, trnName) { buildDoctre(model, trnName) {
let params = { let params = {
...this.buildCommonData(model, trnName), ...this.buildCommonData(model, trnName),
rec: { rec: {
...@@ -194,7 +194,7 @@ export default { ...@@ -194,7 +194,7 @@ export default {
return params return params
}, },
// 公共组件setmod中dsp字段改变,触发联动时候的入参 // 公共组件setmod中dsp字段改变,触发联动时候的入参
buildSetgllAccts (model, trnName, setglg) { buildSetgllAccts(model, trnName, setglg) {
let params = { let params = {
...this.buildCommonData(model, trnName), ...this.buildCommonData(model, trnName),
}; };
......
...@@ -20,7 +20,7 @@ export default { ...@@ -20,7 +20,7 @@ export default {
...ccvpan, ...ccvpan,
...limitbody, ...limitbody,
...doctre, ...doctre,
async init () { async init() {
const params = { const params = {
spt: JSON.parse(localStorage.getItem('row_' + this.trnName)), spt: JSON.parse(localStorage.getItem('row_' + this.trnName)),
trninr: this.$route.query.trninr, trninr: this.$route.query.trninr,
...@@ -29,9 +29,9 @@ export default { ...@@ -29,9 +29,9 @@ export default {
...params, ...params,
transName: this.trnName, transName: this.trnName,
userId: window.sessionStorage.userId || 'ZL', userId: window.sessionStorage.userId || 'ZL',
ledgrp:{ ledgrp: {
rec:{ rec: {
inr:this.$route.query.inr inr: this.$route.query.inr
} }
} }
...@@ -45,7 +45,7 @@ export default { ...@@ -45,7 +45,7 @@ export default {
this.copyValueFromVoData(this.model.setmod.setglg, res.data.setglg) this.copyValueFromVoData(this.model.setmod.setglg, res.data.setglg)
}, },
// 兼容处理在前端model中定义了字段,后端返回的数据中不存在字段的问题 // 兼容处理在前端model中定义了字段,后端返回的数据中不存在字段的问题
copyValueFromVoData (model, data) { copyValueFromVoData(model, data) {
let keysList = Object.keys(model) let keysList = Object.keys(model)
keysList.map((key) => { keysList.map((key) => {
if (data[key]) { if (data[key]) {
...@@ -171,7 +171,7 @@ export default { ...@@ -171,7 +171,7 @@ export default {
handleChangePurpos() { handleChangePurpos() {
this.queryHndtypCodeTableList(this.root.trnName); this.queryHndtypCodeTableList(this.root.trnName);
}, },
buildLiaccv () { buildLiaccv() {
let params = { let params = {
...buildFn.buildCommonData(this.model, this.trnName), ...buildFn.buildCommonData(this.model, this.trnName),
liaccvg: this.model.liaccv.liaccvg, liaccvg: this.model.liaccv.liaccvg,
...@@ -183,7 +183,7 @@ export default { ...@@ -183,7 +183,7 @@ export default {
return params return params
}, },
// 公共组件setmod处理方式改变触发联动 // 公共组件setmod处理方式改变触发联动
changeSetmodModel (emitParams) { changeSetmodModel(emitParams) {
let reqParams = {} let reqParams = {}
switch (emitParams.code) { switch (emitParams.code) {
case 'processMethods': case 'processMethods':
...@@ -193,13 +193,26 @@ export default { ...@@ -193,13 +193,26 @@ export default {
case 'changeDsp': case 'changeDsp':
let index = emitParams.index; let index = emitParams.index;
let setglgRequest = buildFn.buildSetglg(this.model, this.trnName); let setglgRequest = buildFn.buildSetglg(this.model, this.trnName);
setglgRequest.setglg = {setgll: emitParams.list}; setglgRequest.setglg = { setgll: emitParams.list };
this.setgllAccts(setglgRequest, index); this.setgllAccts(setglgRequest, index);
break break
default: default:
return return
} }
}, },
onSeainf() {}, //最大金额
async cbsmax() {
let params = {
nom1cur: this.model.oldledgrp.cbs.max.cur,
nom1amt: this.model.oldledgrp.cbs.max.amt,
nomtop: this.model.trnmod.swiadd.newnomtop,
};
let res = await Api.post('/service/letame/cbsmax', params);
if (res.respCode == SUCCESS) {
this.model.letamep.maxcur = res.data.maxcur;
this.model.letamep.maxamt = res.data.maxamt;
}
},
onSeainf() { },
}, },
}; };
...@@ -16,16 +16,16 @@ export default class Letame { ...@@ -16,16 +16,16 @@ export default class Letame {
}, },
cbs: { cbs: {
max: { max: {
cur:"", cur: "",
amt:"", amt: "",
}, },
max2: { max2: {
cur:"", cur: "",
amt:"", amt: "",
}, },
nom1: { nom1: {
cur:"", cur: "",
amt:"", amt: "",
} }
} }
}, },
...@@ -52,8 +52,8 @@ export default class Letame { ...@@ -52,8 +52,8 @@ export default class Letame {
lcrgodame: '' lcrgodame: ''
}, },
rec: { rec: {
inr:'', inr: '',
branchinr:'', branchinr: '',
tenmaxday: '', tenmaxday: '',
nomton: '', nomton: '',
expplc: '', expplc: '',
...@@ -187,7 +187,7 @@ export default class Letame { ...@@ -187,7 +187,7 @@ export default class Letame {
modmanflg: '', modmanflg: '',
usrblk: '' usrblk: ''
}, },
engamt: '', engamt: '0.00',
lcrgodame: { lcrgodame: {
buttxmsel: '' buttxmsel: ''
} }
...@@ -218,7 +218,7 @@ export default class Letame { ...@@ -218,7 +218,7 @@ export default class Letame {
newnomtop: '', newnomtop: '',
shpfro: '', shpfro: '',
shpper: '', shpper: '',
amedat:new Date(), amedat: new Date(),
pordis: '', pordis: '',
addamtcov: '', addamtcov: '',
newnomton: '', newnomton: '',
...@@ -229,7 +229,7 @@ export default class Letame { ...@@ -229,7 +229,7 @@ export default class Letame {
newamt: '', newamt: '',
shpto: '', shpto: '',
newexpdat: new Date(), newexpdat: new Date(),
ameamt: '', ameamt: '0.00',
newcur: '', newcur: '',
porloa: '', porloa: '',
nomspc: '' nomspc: ''
......
<template> <template>
<div class="eibs"> <div class="eibs">
<c-col :span="12" style="padding-right: 20px;"> <c-col :span="12" style="padding-right: 20px">
<!-- ======================= 左边 ========================= --> <!-- ======================= 左边 ========================= -->
<c-col :span="24"> <c-col :span="24">
<el-form-item <el-form-item
...@@ -83,11 +83,7 @@ ...@@ -83,11 +83,7 @@
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="11"> <c-col :span="11">
<el-form-item <el-form-item label="" label-width="5px" prop="trnmod.swiadd.ameamt">
label=""
label-width="5px"
prop="trnmod.swiadd.ameamt"
>
<c-input <c-input
v-model="model.trnmod.swiadd.ameamt" v-model="model.trnmod.swiadd.ameamt"
placeholder="请输入金额" placeholder="请输入金额"
...@@ -113,19 +109,11 @@ ...@@ -113,19 +109,11 @@
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="11"> <c-col :span="11">
<el-form-item <el-form-item label="" label-width="5px" prop="trnmod.swiadd.newamt">
label=""
label-width="5px"
prop="trnmod.swiadd.newamt"
>
<c-input <c-input
v-model="newamt" v-model="newamt"
placeholder="请输入金额" placeholder="请输入金额"
@keyup.enter.native=" @keyup.enter.native="eventFunction('trnmod.swiadd.newamt')"
eventFunction(
'trnmod.swiadd.newamt'
)
"
style="width: 100%" style="width: 100%"
class="m-input-currency" class="m-input-currency"
></c-input> ></c-input>
...@@ -167,10 +155,7 @@ ...@@ -167,10 +155,7 @@
</c-col> </c-col>
<c-col :span="24"> <c-col :span="24">
<c-col :span="13"> <c-col :span="13">
<el-form-item <el-form-item label="交单期限" prop="oldledgrp.rec.prepers18">
label="交单期限"
prop="oldledgrp.rec.prepers18"
>
<c-input <c-input
v-model.number="model.oldledgrp.rec.prepers18" v-model.number="model.oldledgrp.rec.prepers18"
placeholder="请输入交单期限(天)" placeholder="请输入交单期限(天)"
...@@ -203,10 +188,7 @@ ...@@ -203,10 +188,7 @@
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="24"> <c-col :span="24">
<el-form-item <el-form-item label="空运/装货港" prop="trnmod.swiadd.porloa">
label="空运/装货港"
prop="trnmod.swiadd.porloa"
>
<c-input <c-input
v-model="model.trnmod.swiadd.porloa" v-model="model.trnmod.swiadd.porloa"
maxlength="65" maxlength="65"
...@@ -215,10 +197,7 @@ ...@@ -215,10 +197,7 @@
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="24"> <c-col :span="24">
<el-form-item <el-form-item label="空运/卸货港" prop="trnmod.swiadd.pordis">
label="空运/卸货港"
prop="trnmod.swiadd.pordis"
>
<c-input <c-input
v-model="model.trnmod.swiadd.pordis" v-model="model.trnmod.swiadd.pordis"
maxlength="65" maxlength="65"
...@@ -238,7 +217,7 @@ ...@@ -238,7 +217,7 @@
</c-col> </c-col>
<!-- ======================= 右边 ========================= --> <!-- ======================= 右边 ========================= -->
<c-col :span="12" style="padding-left: 20px;"> <c-col :span="12" style="padding-left: 20px">
<c-col :span="24"> <c-col :span="24">
<el-form-item label="简略信息" prop="ledgrp.rec.nam"> <el-form-item label="简略信息" prop="ledgrp.rec.nam">
<c-input <c-input
...@@ -253,10 +232,7 @@ ...@@ -253,10 +232,7 @@
</c-col> </c-col>
<c-col :span="24"> <c-col :span="24">
<c-col :span="12"> <c-col :span="12">
<el-form-item <el-form-item label="收到修改日期" prop="trnmod.swiadd.amenbr">
label="收到修改日期"
prop="trnmod.swiadd.amenbr"
>
<c-input <c-input
v-model.number="model.trnmod.swiadd.amenbr" v-model.number="model.trnmod.swiadd.amenbr"
style="width: 100%" style="width: 100%"
...@@ -277,10 +253,7 @@ ...@@ -277,10 +253,7 @@
<c-col :span="24"> <c-col :span="24">
<c-col :span="12"> <c-col :span="12">
<c-col :span="17"> <c-col :span="17">
<el-form-item <el-form-item label="浮动(+/-)" prop="oldledgrp.rec.nomtop">
label="浮动(+/-)"
prop="oldledgrp.rec.nomtop"
>
<c-input <c-input
v-model.number="model.oldledgrp.rec.nomtop" v-model.number="model.oldledgrp.rec.nomtop"
placeholder="请输入上浮比例" placeholder="请输入上浮比例"
...@@ -306,10 +279,7 @@ ...@@ -306,10 +279,7 @@
</c-col> </c-col>
<c-col :span="12"> <c-col :span="12">
<el-form-item <el-form-item label="最大金额" prop="oldledgrp.cbs.max.amt">
label="最大金额"
prop="oldledgrp.cbs.max.amt"
>
<c-input <c-input
v-model="model.oldledgrp.cbs.max.amt" v-model="model.oldledgrp.cbs.max.amt"
placeholder="请输入金额" placeholder="请输入金额"
...@@ -333,15 +303,12 @@ ...@@ -333,15 +303,12 @@
<c-col :span="24"> <c-col :span="24">
<c-col :span="12"> <c-col :span="12">
<c-col :span="17"> <c-col :span="17">
<el-form-item <el-form-item label="浮动(+/-)" prop="trnmod.swiadd.newnomtop">
label="浮动(+/-)"
prop="trnmod.swiadd.newnomtop"
>
<c-input <c-input
v-model.number="model.trnmod.swiadd.newnomtop" v-model.number="model.trnmod.swiadd.newnomtop"
placeholder="请输入内容" placeholder="请输入内容"
style="width: 100%" style="width: 100%"
@keyup.enter.native="$event.target.blur()" @change="cbsmax"
></c-input> ></c-input>
</el-form-item> </el-form-item>
</c-col> </c-col>
...@@ -383,10 +350,7 @@ ...@@ -383,10 +350,7 @@
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="24"> <c-col :span="24">
<el-form-item <el-form-item label="装运日期(新)" prop="trnmod.swiadd.newshpdat">
label="装运日期(新)"
prop="trnmod.swiadd.newshpdat"
>
<c-date-picker <c-date-picker
type="date" type="date"
v-model="model.trnmod.swiadd.newshpdat" v-model="model.trnmod.swiadd.newshpdat"
...@@ -421,8 +385,7 @@ ...@@ -421,8 +385,7 @@
</c-col> </c-col>
<c-col :span="24"> <c-col :span="24">
<c-col :span="5"> <c-col :span="5">
<c-checkbox v-model="model.letp.aamp.aammod.addamtflg" <c-checkbox v-model="model.letp.aamp.aammod.addamtflg" disabled
disabled
>附加金额</c-checkbox >附加金额</c-checkbox
> >
</c-col> </c-col>
...@@ -437,7 +400,6 @@ ...@@ -437,7 +400,6 @@
v-model="model.ledgrp.cbs.max2.cur" v-model="model.ledgrp.cbs.max2.cur"
maxlength="3" maxlength="3"
placeholder="请输入附加金额" placeholder="请输入附加金额"
:code="codes.cur" :code="codes.cur"
disabled disabled
></c-select> ></c-select>
...@@ -459,12 +421,18 @@ ...@@ -459,12 +421,18 @@
</c-col> </c-col>
<c-col :span="24"> <c-col :span="24">
<c-col :span="12"> <c-col :span="12">
<c-checkbox v-model="model.letamep.benaccflg" class="checkbox-left" style="margin-left:120px" <c-checkbox
v-model="model.letamep.benaccflg"
class="checkbox-left"
style="margin-left: 120px"
>受益人接受修改</c-checkbox >受益人接受修改</c-checkbox
> >
</c-col> </c-col>
<c-col :span="12"> <c-col :span="12">
<c-checkbox v-model="model.letamep.cre707flg" class="checkbox-left" style="margin-left:120px" <c-checkbox
v-model="model.letamep.cre707flg"
class="checkbox-left"
style="margin-left: 120px"
>创建修改报文707</c-checkbox >创建修改报文707</c-checkbox
> >
</c-col> </c-col>
...@@ -473,47 +441,47 @@ ...@@ -473,47 +441,47 @@
</div> </div>
</template> </template>
<script> <script>
import Api from '~/service/Api' import Api from "~/service/Api";
import event from "../event" import event from "../event";
import CodeTable from '~/config/CodeTable' import CodeTable from "~/config/CodeTable";
import Utils from "~/utils" import Utils from "~/utils";
export default { export default {
inject: ['root'], inject: ["root"],
props: ['model', 'codes'], props: ["model", "codes"],
mixins: [event], mixins: [event],
data() { data() {
return {} return {};
},
methods: {
}, },
methods: {},
computed: { computed: {
amecur() { amecur() {
this.model.trnmod.swiadd.amecur = this.model.ledgrp.cbs.nom1.cur this.model.trnmod.swiadd.amecur = this.model.ledgrp.cbs.nom1.cur;
return this.model.trnmod.swiadd.amecur return this.model.trnmod.swiadd.amecur;
}, },
newcur() { newcur() {
this.model.trnmod.swiadd.newcur = this.model.ledgrp.cbs.nom1.cur this.model.trnmod.swiadd.newcur = this.model.ledgrp.cbs.nom1.cur;
return this.model.trnmod.swiadd.newcur return this.model.trnmod.swiadd.newcur;
}, },
nomspc() { nomspc() {
this.model.trnmod.swiadd.nomspc = this.model.ledgrp.rec.nomspc this.model.trnmod.swiadd.nomspc = this.model.ledgrp.rec.nomspc;
return this.model.trnmod.swiadd.nomspc return this.model.trnmod.swiadd.nomspc;
}, },
newamt() { newamt() {
const ameamt = this.model.trnmod.swiadd.ameamt const ameamt = this.model.trnmod.swiadd.ameamt;
const amt = this.model.oldledgrp.cbs.nom1.amt const amt = this.model.oldledgrp.cbs.nom1.amt;
this.model.trnmod.swiadd.newamt = parseFloat(isNaN(ameamt) || !ameamt ? 0 : ameamt) + this.model.trnmod.swiadd.newamt =
parseFloat(isNaN(amt) || !amt ? 0 : amt) parseFloat(isNaN(ameamt) || !ameamt ? 0 : ameamt) +
return this.model.trnmod.swiadd.newamt parseFloat(isNaN(amt) || !amt ? 0 : amt);
return this.model.trnmod.swiadd.newamt;
}, },
engamt(){ engamt() {
this.model.letamep.engamt = this.model.letamep.maxamt -this.model.oldledgrp.cbs.max.amt this.model.letamep.engamt =
return this.model.letamep.engamt this.model.letamep.maxamt - this.model.oldledgrp.cbs.max.amt;
return this.model.letamep.engamt;
} },
}, },
} };
</script> </script>
<style> <style>
.letame_amep_amt { .letame_amep_amt {
......
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