Skip to content

V
vue-gjjs
Commit 7964a004 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 e8dd3dfd 95168b15
Showing with 183 additions and 120 deletions
src/business/gitcan/event/buildCommons.js
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,
...@@ -13,36 +13,27 @@ export default { ...@@ -13,36 +13,27 @@ export default {
dftfeecur: pts.dftfeecur, dftfeecur: pts.dftfeecur,
dftactptainr: pts.dftactptainr, dftactptainr: pts.dftactptainr,
glggrpflg: pts.glggrpflg, glggrpflg: pts.glggrpflg,
adrblk: pts.adrblk adrblk: pts.adrblk,
}; };
return ptspta; return ptspta;
}, },
buildCommonData (model, trnName) { buildCommonData(model, trnName) {
let ptsptaList = []; let ptsptaList = [];
if (model.gidgrp.apl.pts.extkey) { if (model.gidgrp.apl.pts.extkey) {
ptsptaList.push(this.buildPtspta(model.gidgrp.apl)); ptsptaList.push(this.buildPtspta(model.gidgrp.apl));
} }
if (model.gidgrp.adv.pts.extkey) {
ptsptaList.push(this.buildPtspta(model.gidgrp.adv));
}
if (model.gidgrp.ben.pts.extkey) { if (model.gidgrp.ben.pts.extkey) {
ptsptaList.push(this.buildPtspta(model.gidgrp.ben)); ptsptaList.push(this.buildPtspta(model.gidgrp.ben));
} }
let dataObj = { let dataObj = {
rec: { rec: {
objtyp: 'GID', objtyp: 'GID',
objinr: model.gidgrp.rec.objinr,
ownref: model.gidgrp.rec.ownref, ownref: model.gidgrp.rec.ownref,
opndat: model.gidgrp.rec.opndat, segtyp: model.gidgrp.rec.segtyp,
expdat: model.gidgrp.rec.expdat,
branchInr: model.gidgrp.rec.branchInr,
hndtyp: model.gidgrp.rec.hndtyp,
gartyp: model.gidgrp.rec.gartyp,
fingua: model.gidgrp.rec.fingua,
segtyp: model.gidgrp.ghd.segtyp,
fromflg: model.gidgrp.rec.fromflg, fromflg: model.gidgrp.rec.fromflg,
othersno: model.gidgrp.rec.othersno, othersno: model.gidgrp.rec.othersno,
sndto: model.gidgrp.rec.sndto, sndto: model.gidgrp.rec.sndto,
swiftflg: model.gitp.swiftflg,
giduil: model.gidgrp.rec.giduil, giduil: model.gidgrp.rec.giduil,
purpos: model.gidgrp.rec.purpos, purpos: model.gidgrp.rec.purpos,
revflg: model.gidgrp.rec.revflg, revflg: model.gidgrp.rec.revflg,
...@@ -58,65 +49,104 @@ export default { ...@@ -58,65 +49,104 @@ export default {
}, },
ptsList: ptsptaList, ptsList: ptsptaList,
transName: trnName, transName: trnName,
userId: window.sessionStorage.userId ? window.sessionStorage.userId : 'ZL' userId: window.sessionStorage.userId
? window.sessionStorage.userId
: 'ZL',
}; };
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,
liaccv: model.liaccv, liaccv: model.liaccv,
doceot: model.trnmod.trndoc.doceot, doceot: model.trnmod.trndoc.doceot,
}; };
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,
}; };
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, rec: {
setfog: model.setmod.setfog, objtyp: 'GID',
setfeg: model.setmod.setfeg, segtyp: model.gidgrp.rec.segtyp,
setglg: model.setmod.setglg, fromflg: model.gidgrp.rec.fromflg,
othersno: model.gidgrp.rec.othersno,
sndto: model.gidgrp.rec.sndto,
giduil: model.gidgrp.rec.giduil,
purpos: model.gidgrp.rec.purpos,
revflg: model.gidgrp.rec.revflg,
cnfsta: model.gidgrp.rec.cnfsta,
},
liaccv: model.liaccv,
doceot: model.trnmod.trndoc.doceot,
transName: trnName,
}; };
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, cbsMap: {
CNF: model.gidgrp.cbs.cnf,
},
liaccv: model.liaccv,
doceot: model.trnmod.trndoc.doceot,
transName: trnName,
};
params.rec = {
...params.rec,
opndat: model.gidgrp.rec.opndat,
branchInr: model.gidgrp.rec.branchInr,
hndtyp: model.gidgrp.rec.hndtyp,
gartyp: model.gidgrp.rec.gartyp,
fingua: model.gidgrp.rec.fingua,
}; };
return params return params;
}, },
builDocpan (model, trnName) { buildDocpan(model, trnName) {
let params = { let params = {
...this.buildCommonData(model, trnName), ...this.buildCommonData(model, trnName),
rec: {
objtyp: 'GID',
fromflg: model.gidgrp.rec.fromflg,
othersno: model.gidgrp.rec.othersno,
sndto: model.gidgrp.rec.sndto,
giduil: model.gidgrp.rec.giduil,
purpos: model.gidgrp.rec.purpos,
cnfsta: model.gidgrp.rec.cnfsta,
revflg: model.gidgrp.rec.revflg,
},
liaccv: model.liaccv,
doceot: model.trnmod.trndoc.doceot,
transName: trnName,
}; };
return params return params;
}, },
builCcvpan (model, trnName) { buildCcvpan(model, trnName) {
let params = { let params = {
...this.buildCommonData(model, trnName), ...this.buildCommonData(model, trnName),
};
params.rec = {
...params.rec,
opndat: model.gidgrp.rec.opndat,
expdat: model.gidgrp.rec.expdat,
branchInr: model.gidgrp.rec.branchInr,
hndtyp: model.gidgrp.rec.hndtyp,
gartyp: model.gidgrp.rec.gartyp,
fingua: model.gidgrp.rec.fingua,
liaccvg: model.liaccv.liaccvg, liaccvg: model.liaccv.liaccvg,
oldamt: model.liaccv.oldamt, oldamt: model.liaccv.oldamt,
chgamt: model.liaccv.chgamt, chgamt: model.liaccv.chgamt,
concur: model.liaccv.concur, concur: model.liaccv.concur,
}; };
return params return params;
}, },
// 公共组件setmod中dsp字段改变，触发联动时候的入参 };
buildSetgllAccts (model, trnName, setglg) {
let params = {
...this.buildCommonData(model, trnName),
setglg
};
return params
}
}
\ No newline at end of file
src/business/gitcan/event/index.js
...@@ -17,26 +17,32 @@ export default { ...@@ -17,26 +17,32 @@ export default {
...ccvpan, ...ccvpan,
async init () { async init () {
const params = { const params = {
spt: { // spt: {
bchname: "中国光大银行北京分行", // bchname: "中国光大银行北京分行",
cxmflg: "N", // cxmflg: "N",
expdat: null, // expdat: null,
fromflg: "", // fromflg: "",
gartyp: "A", // gartyp: "A",
grtnam: "", // grtnam: "",
hndtyp: "OL", // hndtyp: "OL",
inr: "00000582", // inr: "00000582",
iscrotra: "", // iscrotra: "",
liadat: null, // liadat: null,
opndat: 1680537600000, // opndat: 1680537600000,
othersno: "", // othersno: "",
ownref: "LG3500231016AA", // ownref: "LG3500231016AA",
ownusr: "ZL", // ownusr: "ZL",
segtyp: "01" // segtyp: "01",
} // sta:"111"
// }
"transName":"gitcan",
"userId":"ZL",
"gidInr":"00000582"
} }
const res = await Api.post('/service/gitcan/init', { const res = await Api.post('/service/gitcan/init', {
...params, ...params,
sta:1122,
transName: this.trnName, transName: this.trnName,
userId: window.sessionStorage.userId || 'ZL', userId: window.sessionStorage.userId || 'ZL',
}); });
...@@ -62,17 +68,15 @@ export default { ...@@ -62,17 +68,15 @@ export default {
}) })
}, },
async tabClick(tab) { async tabClick(tab) {
if (this.isInDisplay) { console.log(tab)
return;
}
let name = tab.name; let name = tab.name;
switch (name) { switch (name) {
case 'ccvpan': case 'ccvpan':
let ccvpanRequest = buildFn.builCcvpan(this.model, this.trnName); let ccvpanRequest = buildFn.buildCcvpan(this.model, this.trnName);
this.processLiaccv(ccvpanRequest); this.processLiaccv(ccvpanRequest);
break; break;
case 'engp': case 'engp':
let engpRequest = buildFn.builDengp(this.model, this.trnName); let engpRequest = buildFn.buildEngp(this.model, this.trnName);
this.processLiaall(engpRequest); this.processLiaall(engpRequest);
break; break;
case 'setpan': case 'setpan':
...@@ -83,7 +87,7 @@ export default { ...@@ -83,7 +87,7 @@ export default {
}); });
break; break;
case 'docpan': case 'docpan':
let docpanRequest = buildFn.builDocpan(this.model, this.trnName); let docpanRequest = buildFn.buildDocpan(this.model, this.trnName);
this.processTrndoc(docpanRequest); this.processTrndoc(docpanRequest);
break; break;
case 'glepan': case 'glepan':
......
src/business/gitcan/views/index.vue
...@@ -34,22 +34,26 @@ ...@@ -34,22 +34,26 @@
<m-mt769p :model="model" :codes="codes" /> <m-mt769p :model="model" :codes="codes" />
</el-tab-pane> </el-tab-pane>
<!--PD000027 --> <!--PD000027 -->
<el-tab-pane label="费用/账务" name="engp,setpan,glepan"> <el-tab-pane label="表外记账" name="engp">
<c-content> <c-content>
<div class="eibs-tab"> <!-- 表外记账 -->
<el-collapse v-model="activeNames"> <m-engp :model="model" :codes="codes" />
<el-collapse-item title="表外记账" name="engp"> </c-content>
<!-- 表外记账 --> </el-tab-pane>
<m-engp :model="model" :codes="codes" />
</el-collapse-item> <!--PD000027 -->
<el-collapse-item title="结算" name="setpan"> <el-tab-pane label="费用/账务" name="setpan">
<!-- 结算 --> <c-content>
<m-setpan :model="model" :codes="codes" /> <m-setpan :model="model" :codes="codes" />
</el-collapse-item> </c-content>
</el-collapse> </el-tab-pane>
</div>
</c-content> <!--PD000027 -->
</el-tab-pane> <el-tab-pane label="会计分录" name="glepan">
<c-content>
<m-glentry :model="model" :codes="codes" />
</c-content>
</el-tab-pane>
<!--PD000000 --> <!--PD000000 -->
<el-tab-pane label="备查/附言" name="coninfp"> <el-tab-pane label="备查/附言" name="coninfp">
...@@ -93,6 +97,8 @@ import Doctre from "~/views/Public/Doctre"; ...@@ -93,6 +97,8 @@ import Doctre from "~/views/Public/Doctre";
import Ccvpan from "~/components/business/ccvpan/views"; import Ccvpan from "~/components/business/ccvpan/views";
import Docpan from "~/components/business/docpan/views"; import Docpan from "~/components/business/docpan/views";
import Setpan from "~/components/business/setmod/views"; import Setpan from "~/components/business/setmod/views";
import Setmod from "~/components/business/setmod/views";
import Glentry from "~/components/business/glentry/views";
import Coninfp from "~/views/Public/Coninfp"; import Coninfp from "~/views/Public/Coninfp";
import Mt769p from "./Mt769p"; import Mt769p from "./Mt769p";
import Ovwp from "./Ovwp"; import Ovwp from "./Ovwp";
...@@ -108,7 +114,9 @@ export default { ...@@ -108,7 +114,9 @@ export default {
"m-limitbody": Limitbody, "m-limitbody": Limitbody,
"m-mt769p": Mt769p, "m-mt769p": Mt769p,
"m-ovwp": Ovwp, "m-ovwp": Ovwp,
"m-ccvpan":Ccvpan "m-ccvpan":Ccvpan,
"m-setmod":Setmod,
"m-glentry":Glentry
}, },
provide() { provide() {
return { return {
......
src/business/gitopn/event/buildCommons.js
...@@ -88,20 +88,20 @@ export default { ...@@ -88,20 +88,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
}, },
builDocpan (model, trnName) { buildDocpan (model, trnName) {
let params = { let params = {
...this.buildCommonData(model, trnName), ...this.buildCommonData(model, trnName),
}; };
return params return params
}, },
builCcvpan (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,
...@@ -119,4 +119,4 @@ export default { ...@@ -119,4 +119,4 @@ export default {
}; };
return params return params
} }
} }
\ No newline at end of file \ No newline at end of file
src/business/gitopn/event/index.js
...@@ -53,11 +53,11 @@ export default { ...@@ -53,11 +53,11 @@ export default {
let name = tab.name; let name = tab.name;
switch (name) { switch (name) {
case 'ccvpan': case 'ccvpan':
let ccvpanRequest = buildFn.builCcvpan(this.model, this.trnName); let ccvpanRequest = buildFn.buildCcvpan(this.model, this.trnName);
this.processLiaccv(ccvpanRequest); this.processLiaccv(ccvpanRequest);
break; break;
case 'engp': case 'engp':
let engpRequest = buildFn.builDengp(this.model, this.trnName); let engpRequest = buildFn.buildEngp(this.model, this.trnName);
this.processLiaall(engpRequest); this.processLiaall(engpRequest);
break; break;
case 'setpan': case 'setpan':
...@@ -68,7 +68,7 @@ export default { ...@@ -68,7 +68,7 @@ export default {
}); });
break; break;
case 'docpan': case 'docpan':
let docpanRequest = buildFn.builDocpan(this.model, this.trnName); let docpanRequest = buildFn.buildDocpan(this.model, this.trnName);
this.processTrndoc(docpanRequest); this.processTrndoc(docpanRequest);
break; break;
case 'glepan': case 'glepan':
......
src/business/gitopn/views/index.vue
...@@ -138,7 +138,6 @@ import Engp from "~/components/business/engp/views"; ...@@ -138,7 +138,6 @@ import Engp from "~/components/business/engp/views";
import Ccvpan from "~/components/business/ccvpan/views"; import Ccvpan from "~/components/business/ccvpan/views";
import Setmod from "~/components/business/setmod/views"; import Setmod from "~/components/business/setmod/views";
import Glentry from "~/components/business/glentry/views"; import Glentry from "~/components/business/glentry/views";
import Coninfp from "~/views/Public/Coninfp";
import Docpan from "~/components/business/docpan/views"; import Docpan from "~/components/business/docpan/views";
import Doctre from "~/views/Public/Doctre"; import Doctre from "~/views/Public/Doctre";
import Limitbody from "~/views/Public/Limitbody"; import Limitbody from "~/views/Public/Limitbody";
...@@ -171,7 +170,6 @@ export default { ...@@ -171,7 +170,6 @@ export default {
"m-ccvpan": Ccvpan, "m-ccvpan": Ccvpan,
"m-setmod": Setmod, "m-setmod": Setmod,
"m-glentry": Glentry, "m-glentry": Glentry,
"m-coninfp": Coninfp,
"m-docpan": Docpan, "m-docpan": Docpan,
"m-doctre": Doctre, "m-doctre": Doctre,
"m-limitbody": Limitbody, "m-limitbody": Limitbody,
......
src/components/business/docpan/views/index.vue
<template> <template>
<div class="eibs-tab"> <div class="eibs-tab">
<c-col :span="24" style=""> <c-col :span="24" style="">
<c-istream-table-docpan :list="stmData.data" :columns="stmData.columns"> <el-table :data="stmData.data" :columns="stmData.columns">
<el-table-column label="介质" width="110px"> <el-table-column label="介质" width="110px">
<template slot-scope="scope"> <template slot-scope="scope">
<el-form-item <el-form-item
...@@ -157,7 +157,7 @@ ...@@ -157,7 +157,7 @@
> >
</template> </template>
</el-table-column> </el-table-column>
</c-istream-table-docpan> </el-table>
</c-col> </c-col>
<c-col :span="12" style="margin-top: 20px"> <c-col :span="12" style="margin-top: 20px">
<c-col :span="24"> <c-col :span="24">
...@@ -528,14 +528,7 @@ export default { ...@@ -528,14 +528,7 @@ export default {
watch: { watch: {
'model.docpan.doceot': { 'model.docpan.doceot': {
handler(val, oldVal) { handler(val, oldVal) {
var stm = []; this.stmData.data = val;
for (let i = 0; i < val.length; i++) {
if (val[i].role != '') {
val[i]['idx'] = i;
stm.push(val[i]);
}
}
this.stmData.data = stm;
}, },
immediate: true, immediate: true,
}, },
......
src/components/business/engp/event/index.js
import Api from '~/service/Api'; import Api from '~/service/Api';
import Utils from '~/utils';
export default { export default {
async processLiaall(liaallRequest) { async processLiaall(liaallRequest) {
...@@ -7,7 +6,7 @@ export default { ...@@ -7,7 +6,7 @@ export default {
let objtyp = liaallRequest.rec.objtyp; let objtyp = liaallRequest.rec.objtyp;
let rtnmsg = await Api.post(`/service/${ objtyp.toLowerCase() }/liaall/assertLiaall`, liaallRequest); let rtnmsg = await Api.post(`/service/${ objtyp.toLowerCase() }/liaall/assertLiaall`, liaallRequest);
if (rtnmsg.respCode == SUCCESS) { if (rtnmsg.respCode == SUCCESS) {
Utils.copyValueFromVO(this.model.liaall, rtnmsg.data); this.model.liaall.liaallg = rtnmsg.data.liaallg
} }
loading.close(); loading.close();
} }
......
src/components/business/glentry/views/index.vue
<template> <template>
<div class="eibs"> <div class="eibs">
<c-col :span="24" style=""> <c-col :span="24" style="">
<c-istream-table :list="data" :columns="columns"></c-istream-table> <el-table
:data="data"
:columns="columns"
:showButtonFlg="true"
>
<el-table-column
v-for="(item, key) in columns"
:key="key"
:label="item.label"
:prop="item.prop"
></el-table-column>
</el-table>
</c-col> </c-col>
</div> </div>
</template> </template>
...@@ -17,15 +28,38 @@ export default { ...@@ -17,15 +28,38 @@ export default {
data() { data() {
return { return {
columns: [ columns: [
'2 1 "借/贷" 80 1 0', {
'6 2 "账号" 200', label: '借/贷',
'3 3 "币种" 70', prop: 'dbtcdt'
'4 4 "金额" 150 2 8:1 2 5', },
'5 5 "起息日" 150', {
'7 6 "牌价类型" 100', label: '账号',
'8 7 "牌价" 100 2 0 1 0', prop: 'act'
'9 8 "会计科目" 100', },
'0 9 "分录序号" 100 1 0', {
label:'币种',
prop:'cur'
},
{
label:'金额',
prop:'amt'
},
{
label:'起息日',
prop:'valdat'
},
{
label:'牌价类型',
prop:'trmtyp'
},
{
label:'牌价',
prop:'sysamt'
},
{
label:'会计科目',
prop:'trnman'
},
], ],
data: [], data: [],
}; };
...@@ -33,12 +67,10 @@ export default { ...@@ -33,12 +67,10 @@ export default {
watch: { watch: {
//this.$refs.glepan.stmData.data = res.data.setmod_glemod_gleshwstm.rows; //this.$refs.glepan.stmData.data = res.data.setmod_glemod_gleshwstm.rows;
'model.setmod.glemod.gleshwstm': { 'model.setmod.glemod.gleshwstm': {
handler(val, oldVal) { handler(val) {
if (val.rows) { this.data = val;
this.data = val.rows;
}
}, },
immediate: true, deep: true,
}, },
}, },
methods: {}, methods: {},
......
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