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 {
let dataObj = {
rec: {
objtyp: 'BED',
inr: model.bedgrp.rec.inr,
ownref: model.bedgrp.rec.ownref,
predat: model.bedgrp.rec.predat,
rcvdat: model.bedgrp.rec.rcvdat,
......@@ -45,6 +46,7 @@ export default {
docprbrol: model.bedgrp.rec.docprbrol,
advdocflg: model.bedgrp.rec.advdocflg,
rejpenins: model.rejpenins,
chato: model.ledgrp.rec.chato,
},
cbsMap: {
......@@ -115,22 +117,22 @@ export default {
buildLimitbody (model, trnName) {
let params = {
...this.buildCommonData(model, trnName),
rec: {
objtyp: 'BED',
objinr: model.bedgrp.rec.objinr,
ownref: model.bedgrp.rec.ownref,
},
// rec: {
// objtyp: 'BED',
// objinr: model.bedgrp.rec.objinr,
// ownref: model.bedgrp.rec.ownref,
// },
};
return params
},
buildDoctre (model, trnName) {
let params = {
...this.buildCommonData(model, trnName),
rec: {
objtyp: 'BED',
objinr: model.bedgrp.rec.objinr,
ownref: model.bedgrp.rec.ownref,
},
// rec: {
// objtyp: 'BED',
// objinr: model.bedgrp.rec.objinr,
// ownref: model.bedgrp.rec.ownref,
// },
};
return params
},
......
......@@ -7,14 +7,15 @@ export default class Betdcr {
adaflg: '',
docgrdm:{
docgrd:'',
docgrdVos:'',
},
},
advdisflg: '',
ledgrp: {
rec: {
inr: '',
ownref: ''
ownref: '',
chato: ''
},
cbs: {
opn1: {
......
......@@ -113,7 +113,12 @@ export default {
},
rejpenins: {
get() {
return this.model.rejpenins != "";
if(this.model.bedgrp.rec.advdocflg == ''){
return this.model.rejpenins = "X"
}
else{
return this.model.rejpenins = "";
}
},
set(val) {
this.model.rejpenins = val ? "X" : "";
......
......@@ -162,7 +162,7 @@
<c-col :span="24">
<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>
</c-col>
......@@ -267,6 +267,10 @@ export default {
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: {},
created: function () {},
......
......@@ -48,7 +48,7 @@ export default {
let dataObj = {
rec: {
objtyp: 'BRD',
objinr:model.brdgrp.rec.objinr,
objinr:model.brdgrp.rec.inr,
ownref: model.brdgrp.rec.ownref,
opndat: model.brdgrp.rec.opndat,
expdat: model.brdgrp.rec.expdat,
......
......@@ -150,8 +150,8 @@ export default {
],
'setmod.docamt': [
{ type: 'string', true: false, message: '必输项' },
{ max: 18, message: '整数位不能超过14位' },
{ pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: '小数位不能超过3位' }
{ max: 18, message: '整数位不能超过18位' },
{ pattern: /(^[0-9])|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: '小数位不能超过3位' }
],
'brdgrp.prb.pts.adrblk': [
{ type: 'string', required: false, message: '必输项' },
......@@ -163,7 +163,7 @@ export default {
],
'aamset.utlamt': [
{ type: 'string', required: false, message: '必输项' },
{ max: 18, message: '整数位不能超过14位' },
{ max: 18, message: '整数位不能超过18位' },
{ pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: '小数位不能超过3位' }
],
'brdgrp.prb.adrelc': [
......
......@@ -111,8 +111,8 @@ export default class Brtudp {
},
},
aamset: {
utlamt: '',
utlamt2: ''
utlamt: '0.00',
utlamt2: '0.00'
},
cfabrt: {
recgrp: {
......@@ -173,12 +173,13 @@ export default class Brtudp {
expdat: '',
ownref: '',
branchinr:'',
inr:''
inr:'',
avbby:'',
},
cbs: {
opn1: {
cur: '',
amt: ''
amt: '0.00'
}
}
},
......
......@@ -13,12 +13,12 @@
<el-collapse-item title="付款通知" name="mt754p" v-if="model.brdgrp.rec.advtyp == '754'">
<m-mt754p :model="model" :codes="codes" />
</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">
<m-shpdet :model="model" :codes="codes" />
</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">
<m-cfap :model="model" :codes="codes" />
</el-collapse-item>
......
......@@ -79,7 +79,6 @@
v-model="model.brdgrp.cbs.max.cur"
style="width: 100%"
placeholder="请输入金额"
:code="codes.curtxt1"
disabled
>
</c-select>
......@@ -105,7 +104,6 @@
v-model="model.brdgrp.cbs.opn1.cur"
maxlength="3"
placeholder="请输入金额"
:code="codes.curtxt"
disabled
>
</c-select>
......@@ -256,7 +254,7 @@
<c-col :span="13">
<el-form-item label="承兑金额" prop="setmod.doccur">
<c-input
v-model="model.setmod.doccur"
v-model="doccur"
style="width: 100%"
placeholder="请输入承兑金额"
disabled
......@@ -274,10 +272,9 @@
<c-col :span="13">
<el-form-item label="单据金额" prop="brdgrp.cbs.opn2.cur">
<c-select
v-model="model.brdgrp.cbs.opn2.cur"
v-model="opn2cur"
style="width: 100%"
placeholder="请选择币种"
:code="codes.curtxt1"
disabled
>
</c-select>
......@@ -296,10 +293,9 @@
<c-col :span="13">
<el-form-item label="附加金额" prop="brdgrp.cbs.opn2.cur">
<c-select
v-model="model.brdgrp.cbs.opn2.cur"
v-model="opn2cur"
style="width: 100%"
placeholder="请选择币种"
:code="codes.curtxt1"
disabled
>
</c-select>
......@@ -322,6 +318,7 @@
style="width: 100%"
placeholder="请选择类型"
:code="paysmt"
@change="sftmtChange()"
>
</c-select>
</el-form-item>
......@@ -479,8 +476,8 @@
:model="model"
:argadr="{
title: '',
grp: 'brtp',
rol: 'oth',
grp: 'brdgrp',
rol: 'apl',
}"
:disabled="true"
:isAdrblk="false"
......@@ -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 () {},
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>
......
export default {
buildPtspta (ptsptaObj) {
buildPtspta(ptsptaObj) {
let pts = ptsptaObj.pts;
let ptspta = {
rol: pts.rol,
......@@ -17,7 +17,7 @@ export default {
};
return ptspta;
},
buildCommonData (model, trnName) {
buildCommonData(model, trnName) {
let ptsptaList = [];
if (model.ledgrp.iss.pts.extkey) {
ptsptaList.push(this.buildPtspta(model.ledgrp.iss));
......@@ -71,7 +71,7 @@ export default {
};
return dataObj
},
buildSetfeg (model, trnName) {
buildSetfeg(model, trnName) {
let params = {
...this.buildCommonData(model, trnName),
liaall: model.liaall,
......@@ -80,7 +80,7 @@ export default {
};
return params
},
buildSetglg (model, trnName) {
buildSetglg(model, trnName) {
let params = {
...this.buildCommonData(model, trnName),
setfeg: model.setmod.setfeg,
......@@ -89,7 +89,7 @@ export default {
};
return params
},
buildGlentry (model, trnName) {
buildGlentry(model, trnName) {
let params = {
...this.buildCommonData(model, trnName),
liaallg: model.liaall.liaallg,
......@@ -99,20 +99,20 @@ export default {
};
return params
},
buildEngp (model, trnName) {
buildEngp(model, trnName) {
let params = {
...this.buildCommonData(model, trnName),
liaallg: model.liaall.liaallg,
};
return params
},
buildDocpan (model, trnName) {
buildDocpan(model, trnName) {
let params = {
...this.buildCommonData(model, trnName),
};
return params
},
buildCcvpan (model, trnName) {
buildCcvpan(model, trnName) {
let params = {
...this.buildCommonData(model, trnName),
liaccvg: model.liaccv.liaccvg,
......@@ -122,7 +122,7 @@ export default {
};
return params
},
buildLimitbody (model, trnName) {
buildLimitbody(model, trnName) {
let params = {
...this.buildCommonData(model, trnName),
rec: {
......@@ -133,7 +133,7 @@ export default {
};
return params
},
buildDoctre (model, trnName) {
buildDoctre(model, trnName) {
let params = {
...this.buildCommonData(model, trnName),
rec: {
......@@ -146,7 +146,7 @@ export default {
return params
},
// 公共组件setmod中dsp字段改变,触发联动时候的入参
buildSetgllAccts (model, trnName, setglg) {
buildSetgllAccts(model, trnName, setglg) {
let params = {
...this.buildCommonData(model, trnName),
setglg
......
......@@ -20,21 +20,21 @@ export default {
...ccvpan,
...limitbody,
...doctre,
async init () {
async init() {
const params = {
spt: JSON.parse(localStorage.getItem('row_' + this.trnName)),
trninr: this.$route.query.trninr,
}
if ( typeof(this.$route.query.inr) == 'string'){
if (typeof (this.$route.query.inr) == 'string') {
params.spt = null
}
const res = await Api.post('/service/letamc/init', {
...params,
transName: this.trnName,
userId: window.sessionStorage.userId || 'ZL',
ledgrp:{
rec:{
ledgrp: {
rec: {
inr: this.$route.query.inr
}
},
......@@ -48,7 +48,7 @@ export default {
this.copyValueFromVoData(this.model.setmod.setglg, res.data.setglg)
},
// 兼容处理在前端model中定义了字段,后端返回的数据中不存在字段的问题
copyValueFromVoData (model, data) {
copyValueFromVoData(model, data) {
let keysList = Object.keys(model)
keysList.map((key) => {
if (data[key]) {
......@@ -133,7 +133,7 @@ export default {
handleChangePurpos() {
this.queryHndtypCodeTableList(this.root.trnName);
},
buildLiaccv () {
buildLiaccv() {
let params = {
...buildFn.buildCommonData(this.model, this.trnName),
liaccvg: this.model.liaccv.liaccvg,
......@@ -141,11 +141,11 @@ export default {
chgamt: this.model.liaccv.chgamt,
concur: this.model.liaccv.concur,
};
return params
},
// 公共组件setmod处理方式改变触发联动
changeSetmodModel (emitParams) {
changeSetmodModel(emitParams) {
let reqParams = {}
switch (emitParams.code) {
case 'processMethods':
......@@ -155,12 +155,25 @@ export default {
case 'changeDsp':
let index = emitParams.index;
let setglgRequest = buildFn.buildSetglg(this.model, this.trnName);
setglgRequest.setglg = {setgll: emitParams.list};
setglgRequest.setglg = { setgll: emitParams.list };
this.setgllAccts(setglgRequest, index);
break
default:
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 {
{max: 18,message:"整数位不能超过14位",trigger:"blur"},
{pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
],
// "ledgrp.rec.partcon":[
// {type: "string", required: false, message: "必输项",trigger:"blur"},
// {max: 6,message:"长度不能超过6",trigger:"blur"}
// ],
"ledgrp.rec.partcon":[
{type: "string", required: false, message: "必输项",trigger:"blur"},
{max: 6,message:"长度不能超过6",trigger:"blur"}
],
"reqdat":[
{ required: false, message: "输入正确的日期"}
],
......
export default {
buildPtspta (ptsptaObj) {
buildPtspta(ptsptaObj) {
let pts = ptsptaObj.pts;
let ptspta = {
rol: pts.rol,
......@@ -17,7 +17,7 @@ export default {
};
return ptspta;
},
buildCommonData (model, trnName) {
buildCommonData(model, trnName) {
let ptsptaList = [];
if (model.ledgrp.a2b.pts.extkey) {
ptsptaList.push(this.buildPtspta(model.ledgrp.a2b));
......@@ -62,7 +62,7 @@ export default {
let dataObj = {
rec: {
objinr:model.ledgrp.rec.inr,
objinr: model.ledgrp.rec.inr,
objtyp: 'LED',
ownref: model.ledgrp.rec.ownref,
opndat: model.ledgrp.rec.opndat,
......@@ -81,6 +81,7 @@ export default {
cnfsta: model.ledgrp.rec.cnfsta,
maxamt: model.letamep.maxamt,
engamt: model.letamep.engamt,
newamt: model.trnmod.swiadd.newamt,
// advRolsetflg: model.ledgrp.Adv.Rolsetflg,
// advPtainr: model.ledgrp.Adv.pts.ptainr,
// advAdrblk: model.ledgrp.Adv.pts.adrblk,
......@@ -91,7 +92,6 @@ export default {
// issRolsetflg: model.ledgrp.iss.Rolsetflg,
// issPtainr: model.ledgrp.iss.pts.ptainr,
// issAdrblk: model.ledgrp.iss.pts.adrblk,
// newamt: model.letamep.Swiadd.newamt,
// engamt: model.letamep.engamt,
// opn1Amt: model.oldledgrp.cbs.opn1.Amt,
// opn2Amt: model.oldledgrp.cbs.opn2.Amt,
......@@ -115,7 +115,7 @@ export default {
};
return dataObj
},
buildSetfeg (model, trnName) {
buildSetfeg(model, trnName) {
let params = {
...this.buildCommonData(model, trnName),
liaall: model.liaall,
......@@ -124,7 +124,7 @@ export default {
};
return params
},
buildSetglg (model, trnName) {
buildSetglg(model, trnName) {
let params = {
...this.buildCommonData(model, trnName),
setfeg: model.setmod.setfeg,
......@@ -133,7 +133,7 @@ export default {
};
return params
},
buildGlentry (model, trnName) {
buildGlentry(model, trnName) {
let params = {
...this.buildCommonData(model, trnName),
liaallg: model.liaall.liaallg,
......@@ -143,24 +143,24 @@ export default {
};
return params
},
buildEngp (model, trnName) {
buildEngp(model, trnName) {
let params = {
...this.buildCommonData(model, trnName),
liaallg: model.liaall.liaallg,
amdRec:{
amdRec: {
maxamt: model.letamep.maxamt,
engamt: model.letamep.engamt,
}
};
return params
},
buildDocpan (model, trnName) {
buildDocpan(model, trnName) {
let params = {
...this.buildCommonData(model, trnName),
};
return params
},
buildCcvpan (model, trnName) {
buildCcvpan(model, trnName) {
let params = {
...this.buildCommonData(model, trnName),
liaccvg: model.liaccv.liaccvg,
......@@ -170,7 +170,7 @@ export default {
};
return params
},
buildLimitbody (model, trnName) {
buildLimitbody(model, trnName) {
let params = {
...this.buildCommonData(model, trnName),
rec: {
......@@ -181,7 +181,7 @@ export default {
};
return params
},
buildDoctre (model, trnName) {
buildDoctre(model, trnName) {
let params = {
...this.buildCommonData(model, trnName),
rec: {
......@@ -194,7 +194,7 @@ export default {
return params
},
// 公共组件setmod中dsp字段改变,触发联动时候的入参
buildSetgllAccts (model, trnName, setglg) {
buildSetgllAccts(model, trnName, setglg) {
let params = {
...this.buildCommonData(model, trnName),
};
......
......@@ -20,7 +20,7 @@ export default {
...ccvpan,
...limitbody,
...doctre,
async init () {
async init() {
const params = {
spt: JSON.parse(localStorage.getItem('row_' + this.trnName)),
trninr: this.$route.query.trninr,
......@@ -29,12 +29,12 @@ export default {
...params,
transName: this.trnName,
userId: window.sessionStorage.userId || 'ZL',
ledgrp:{
rec:{
inr:this.$route.query.inr
ledgrp: {
rec: {
inr: this.$route.query.inr
}
}
});
if (!res.data) {
return
......@@ -45,7 +45,7 @@ export default {
this.copyValueFromVoData(this.model.setmod.setglg, res.data.setglg)
},
// 兼容处理在前端model中定义了字段,后端返回的数据中不存在字段的问题
copyValueFromVoData (model, data) {
copyValueFromVoData(model, data) {
let keysList = Object.keys(model)
keysList.map((key) => {
if (data[key]) {
......@@ -94,7 +94,7 @@ export default {
let doctreRequest = buildFn.buildDoctre(this.model, this.trnName);
this.processDoctre(doctreRequest);
break;
default:
return;
}
......@@ -171,7 +171,7 @@ export default {
handleChangePurpos() {
this.queryHndtypCodeTableList(this.root.trnName);
},
buildLiaccv () {
buildLiaccv() {
let params = {
...buildFn.buildCommonData(this.model, this.trnName),
liaccvg: this.model.liaccv.liaccvg,
......@@ -179,11 +179,11 @@ export default {
chgamt: this.model.liaccv.chgamt,
concur: this.model.liaccv.concur,
};
return params
},
// 公共组件setmod处理方式改变触发联动
changeSetmodModel (emitParams) {
changeSetmodModel(emitParams) {
let reqParams = {}
switch (emitParams.code) {
case 'processMethods':
......@@ -193,13 +193,26 @@ export default {
case 'changeDsp':
let index = emitParams.index;
let setglgRequest = buildFn.buildSetglg(this.model, this.trnName);
setglgRequest.setglg = {setgll: emitParams.list};
setglgRequest.setglg = { setgll: emitParams.list };
this.setgllAccts(setglgRequest, index);
break
default:
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 {
},
cbs: {
max: {
cur:"",
amt:"",
cur: "",
amt: "",
},
max2: {
cur:"",
amt:"",
cur: "",
amt: "",
},
nom1: {
cur:"",
amt:"",
cur: "",
amt: "",
}
}
},
......@@ -52,8 +52,8 @@ export default class Letame {
lcrgodame: ''
},
rec: {
inr:'',
branchinr:'',
inr: '',
branchinr: '',
tenmaxday: '',
nomton: '',
expplc: '',
......@@ -187,7 +187,7 @@ export default class Letame {
modmanflg: '',
usrblk: ''
},
engamt: '',
engamt: '0.00',
lcrgodame: {
buttxmsel: ''
}
......@@ -218,7 +218,7 @@ export default class Letame {
newnomtop: '',
shpfro: '',
shpper: '',
amedat:new Date(),
amedat: new Date(),
pordis: '',
addamtcov: '',
newnomton: '',
......@@ -229,7 +229,7 @@ export default class Letame {
newamt: '',
shpto: '',
newexpdat: new Date(),
ameamt: '',
ameamt: '0.00',
newcur: '',
porloa: '',
nomspc: ''
......
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