Skip to content

V
vue-gjjs
Commit fe1ea1cf by 闫泽浩
Options

Merge branch 'settle-test-20230110' of http://114.115.138.98:8900/fukai/vue-gjjs… 

Merge branch 'settle-test-20230110' of http://114.115.138.98:8900/fukai/vue-gjjs into settle-test-20230110
parents 0d9d758d a22ce94c
Showing with 67 additions and 179 deletions
src/business/brtacp/views/index.vue
...@@ -106,7 +106,6 @@ ...@@ -106,7 +106,6 @@
"m-ccvpan": Ccvpan, "m-ccvpan": Ccvpan,
"m-setmod": Setmod, "m-setmod": Setmod,
"m-glentry": Glentry, "m-glentry": Glentry,
"m-docpan": Docpan,
"m-doctre": Doctre, "m-doctre": Doctre,
"m-limitbody": Limitbody, "m-limitbody": Limitbody,
"m-glepan": Glepan, "m-glepan": Glepan,
......
src/business/brtudp/event/buildCommons.js
...@@ -19,12 +19,25 @@ export default { ...@@ -19,12 +19,25 @@ export default {
}, },
buildCommonData(model, trnName) { buildCommonData(model, trnName) {
let ptsptaList = []; let ptsptaList = [];
if (model.brdgrp.apl.pts.extkey) { if (model.brdgrp.prb.pts.extkey) {
ptsptaList.push(this.buildPtspta(model.brdgrp.apl)); ptsptaList.push(this.buildPtspta(model.brdgrp.prb));
} }
if (model.brdgrp.ben.pts.extkey) { if (model.brdgrp.acb.pts.extkey) {
ptsptaList.push(this.buildPtspta(model.brdgrp.ben)); ptsptaList.push(this.buildPtspta(model.brdgrp.acb));
} }
if (model.brdgrp.rmb.pts.extkey) {
ptsptaList.push(this.buildPtspta(model.brdgrp.rmb));
}
if (model.brdgrp.beb.pts.extkey) {
ptsptaList.push(this.buildPtspta(model.brdgrp.beb));
}
if (model.brdgrp.shp.pts.extkey) {
ptsptaList.push(this.buildPtspta(model.brdgrp.shp));
}
if (model.brtp.oth.pts.extkey) {
ptsptaList.push(this.buildPtspta(model.brtp.oth));
}
let dataObj = { let dataObj = {
rec: { rec: {
objtyp: 'BRD', objtyp: 'BRD',
...@@ -44,6 +57,8 @@ export default { ...@@ -44,6 +57,8 @@ 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,
sftmt: model.sftmt,
docprbrol: model.brdgrp.rec.docprbrol,
}, },
cbsMap: { cbsMap: {
MAX: model.brdgrp.cbs.max, MAX: model.brdgrp.cbs.max,
...@@ -115,8 +130,8 @@ export default { ...@@ -115,8 +130,8 @@ export default {
...this.buildCommonData(model, trnName), ...this.buildCommonData(model, trnName),
rec: { rec: {
objtyp: 'BRD', objtyp: 'BRD',
objinr: model.gidgrp.rec.objinr, objinr: model.brdgrp.rec.inr,
ownref: model.gidgrp.rec.ownref, ownref: model.brdgrp.rec.ownref,
}, },
}; };
return params return params
...@@ -126,9 +141,9 @@ export default { ...@@ -126,9 +141,9 @@ export default {
...this.buildCommonData(model, trnName), ...this.buildCommonData(model, trnName),
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,
swiftflg: model.brtp.swiftflg, // swiftflg: model.brtp.swiftflg,
}, },
}; };
return params return params
......
src/business/brtudp/event/index.js
...@@ -121,7 +121,7 @@ export default { ...@@ -121,7 +121,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) {
...@@ -137,7 +137,7 @@ export default { ...@@ -137,7 +137,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);
} }
}, },
// 业务信息=》基本信息=》支出目的 // 业务信息=》基本信息=》支出目的
...@@ -145,31 +145,31 @@ export default { ...@@ -145,31 +145,31 @@ export default {
this.handleChangeForm(key, value); this.handleChangeForm(key, value);
}, },
// 初始化保函开立类型码表下拉列表 // 初始化保函开立类型码表下拉列表
async queryHndtypCodeTableList(trnName) { // async queryHndtypCodeTableList(trnName) {
let params = { // let params = {
gitp: { // gitp: {
swiftflg: this.model.gitp.swiftflg, // swiftflg: this.model.gitp.swiftflg,
}, // },
gidgrp: { // gidgrp: {
rec: { // rec: {
purpos: this.model.gidgrp.rec.purpos, // purpos: this.model.gidgrp.rec.purpos,
}, // },
}, // },
transName: trnName.toUpperCase(), // transName: trnName.toUpperCase(),
}; // };
let res = await Api.post('/service/brtudp/initHndtyp', params); // let res = await Api.post('/service/brtudp/initHndtyp', params);
if (res.respCode == SUCCESS) { // if (res.respCode == SUCCESS) {
this.$set(this.codes, 'voHndtyp', res.data); // this.$set(this.codes, 'voHndtyp', res.data);
} // }
}, // },
// 是否SWIFT格式修改--联动保函开立类型 // 是否SWIFT格式修改--联动保函开立类型
handleChangeSwiftflg() { // handleChangeSwiftflg() {
this.queryHndtypCodeTableList(this.root.trnName); // this.queryHndtypCodeTableList(this.root.trnName);
}, // },
// 支出目的修改--联动保函开立类型 // 支出目的修改--联动保函开立类型
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),
......
src/business/brtudp/model/check.js
...@@ -131,7 +131,7 @@ export default { ...@@ -131,7 +131,7 @@ export default {
{ max: 35, message: '长度不能超过35' } { max: 35, message: '长度不能超过35' }
], ],
'brdgrp.rec.relgodflg': [ 'brdgrp.rec.relgodflg': [
{ required: true, message: '必输项' }, { required: false, message: '必输项' },
], ],
'brdgrp.rec.reltyp': [ 'brdgrp.rec.reltyp': [
{ required: true, message: '必输项' }, { required: true, message: '必输项' },
......
src/business/brtudp/model/index.js
...@@ -5,36 +5,6 @@ export default class Brtudp { ...@@ -5,36 +5,6 @@ export default class Brtudp {
constructor() { constructor() {
this.data = { this.data = {
brdgrp: { brdgrp: {
acb: {
pts: new Pts().data,
},
apl: {
pts: new Pts().data,
},
shp: {
pts: new Pts().data,
},
adv: {
pts: new Pts().data,
},
ctr: {
pts: new Pts().data,
},
con: {
pts: new Pts().data,
},
iss: {
pts: new Pts().data,
},
ben: {
pts: new Pts().data,
},
atb: {
pts: new Pts().data,
},
avc: {
pts: new Pts().data,
},
blk: { blk: {
docdisflg: '', docdisflg: '',
notpty: '', notpty: '',
...@@ -54,13 +24,21 @@ export default class Brtudp { ...@@ -54,13 +24,21 @@ export default class Brtudp {
relstoadr: '' relstoadr: ''
}, },
prb: { prb: {
pts: { pts:new Pts().data
extkey: '' },
} acb: {
pts:new Pts().data
},
rmb: {
pts:new Pts().data
},
beb: {
pts:new Pts().data
},
shp: {
pts:new Pts().data
}, },
rec: { rec: {
inr:'',
branchinr:'',
tenmaxday: '', tenmaxday: '',
predat: '', predat: '',
relgodflg: '', relgodflg: '',
...@@ -99,87 +77,25 @@ export default class Brtudp { ...@@ -99,87 +77,25 @@ export default class Brtudp {
amt: '' amt: ''
}, },
opn2: { opn2: {
cur: '' cur: '',
amt: ''
}, },
max: { max: {
cur: '', cur: '',
amt: '' amt: ''
}, },
max2: { max2: {
amt: ''
}
},
tag72add: ''
},
gidgrp: {
rec: {
expdat: '',
liadat: '',
ownref: '',
gartyp: ''
},
ghd: {
wahnum: '',
remark: '',
bustyp: '',
segtyp: ''
},
cbs: {
opn1: {
cur: '', cur: '',
amt: '' amt: ''
} }
}, },
ctr: { tag72add: ''
pts: new Pts().data,
},
con: {
pts: new Pts().data,
},
iss: {
pts: new Pts().data,
},
ben: {
pts: new Pts().data,
},
atb: {
pts: new Pts().data,
},
avc: {
pts: new Pts().data,
},
adv: {
pts: new Pts().data,
},
apl: {
pts: new Pts().data,
},
},
cbsMap: {
MAX: {
cur: ''
}
},
rol: {
pts: new Pts().data,
},
gitp: {
swiftflg: '',
}, },
brtp: { brtp: {
docgrdm: { connum: '',
docgrd: {
splice: '',
push: ''
}
},
oth: { oth: {
pts: new Pts().data, pts:new Pts().data
}, },
cre732flg: '',
furide: '',
connum: '',
cre752flg: ''
}, },
aamset: { aamset: {
utlamt: '', utlamt: '',
...@@ -241,8 +157,6 @@ export default class Brtudp { ...@@ -241,8 +157,6 @@ export default class Brtudp {
}, },
lidgrp: { lidgrp: {
rec: { rec: {
inr: '',
branchinr: '',
expdat: '', expdat: '',
ownref: '' ownref: ''
}, },
...@@ -254,46 +168,6 @@ export default class Brtudp { ...@@ -254,46 +168,6 @@ export default class Brtudp {
} }
}, },
sftmt: '', sftmt: '',
gcdgrp: {
prb: {
adrelc: '',
dbfadrblkcn: '',
namelc: '',
pts: new Pts().data,
},
rec: {
clmdat: '',
ownref: '',
payrol: '',
nam: '',
docprbrol: '',
},
oth: {
adrelc: '',
dbfadrblkcn: '',
namelc: '',
pts: new Pts().data,
},
cbs: {
opn1: {
cur: '',
amt: ''
},
max: {
cur: '',
amt: ''
}
},
ben: {
pts: new Pts().data,
},
adv: {
pts: new Pts().data,
},
apl: {
pts: new Pts().data,
},
},
setmod: new Pub().data.Setmod, setmod: new Pub().data.Setmod,
mtabut: new Pub().data.Mtabut, mtabut: new Pub().data.Mtabut,
trnmod: new Pub().data.Trnmod, trnmod: new Pub().data.Trnmod,
......
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