Commit 9b005c19 by xionglin

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 47264f5e a046a6bb
......@@ -28,6 +28,7 @@ export default {
...params,
transName: this.trnName,
userId: window.sessionStorage.userId || 'ZL',
brtInr:'00000029',
});
if (!res.data) {
return
......
......@@ -171,6 +171,9 @@ export default {
}
},
methods: { },
mounted () {
this.init()
},
}
</script>
<style></style>
......@@ -19,7 +19,6 @@ export default {
{ type: 'string', required: false, message: '必输项' },
{ max: 3, message: '长度不能超过3' },
],
'gidgrp.cbs.max.cur': [
{ type: 'string', required: false, message: '必输项' },
{ max: 3, message: '长度不能超过3' },
......
......@@ -36,8 +36,8 @@
<!--PD000027 -->
<el-tab-pane label="表外记账" name="engp">
<c-content>
<!-- 表外记账 -->
<m-engp :model="model" :codes="codes" />
<!-- 表外记账 -->
<m-engp :model="model" :codes="codes" />
</c-content>
</el-tab-pane>
......@@ -51,7 +51,7 @@
<!--PD000027 -->
<el-tab-pane label="会计分录" name="glepan">
<c-content>
<m-glentry :model="model" :codes="codes" />
<m-glentry :model="model" :codes="codes" />
</c-content>
</el-tab-pane>
......
<template>
<div class="eibs-tab">
<el-collapse v-model="activeNames">
<el-collapse v-model="activeNames">
<el-collapse-item title="收费详情" name="gitsetp1">
<m-gitsetp1 :model="model" :codes="codes" />
</el-collapse-item>
</el-collapse>
</div>
</template>
......@@ -17,7 +16,6 @@
export default {
components:{
"m-gitsetp1" : Gitsetp1,
},
inject: ["root"],
props: ["model", "codes"],
......@@ -25,7 +23,6 @@
data() {
return {
activeNames: ["gitsetp1"],
};
},
methods: { },
......
<template>
<div class="eContainer">
<c-page title="进口保函定期收费">
<!-- <el-button size="small">流程附言</el-button>
<el-button size="small">交易历史</el-button>
<el-button size="small">备忘录</el-button>
......@@ -9,7 +8,6 @@
<el-button size="small">制裁信息</el-button>
<el-button size="small">智能提示</el-button>
</c-function-btn> -->
<el-form
:model="model"
:rules="rules"
......@@ -20,20 +18,17 @@
:validate-on-rule-change="false"
>
<c-tabs v-model="tabVal" ref="elment" type="card" @tab-click="tabClick">
<el-tab-pane label="业务信息" name="ovwp">
<c-content>
<m-ovwp :model="model" :codes="codes"/>
</c-content>
</el-tab-pane>
<!--PD000001 -->
<el-tab-pane label="统一授信" name="limitbody">
<c-content>
<m-limitbody :model="model" :codes="codes"/>
</c-content>
</el-tab-pane>
<!--PD000027 -->
<el-tab-pane label="表外记账" name="engp">
<c-content>
......@@ -41,7 +36,6 @@
<m-engp :model="model" :codes="codes" />
</c-content>
</el-tab-pane>
<!--PD000027 -->
<el-tab-pane label="费用/账务" name="setpan">
<c-content>
......@@ -51,14 +45,12 @@
/>
</c-content>
</el-tab-pane>
<!--PD000027 -->
<el-tab-pane label="会计分录" name="glepan">
<c-content>
<m-glentry :model="model" :codes="codes" />
</c-content>
</el-tab-pane>
<!--PD000000 -->
<el-tab-pane label="备查/附言" name="coninfp">
<c-content>
......@@ -71,31 +63,25 @@
</div>
</c-content>
</el-tab-pane>
<!--PD000529 -->
<el-tab-pane label="报文/面函" name="docpan">
<c-content>
<m-docpan :model="model" :codes="codes"/>
</c-content>
</el-tab-pane>
<!--PD000546 -->
<el-tab-pane label="附件信息" name="doctre">
<c-content>
<m-doctre :model="model" :codes="codes"/>
</c-content>
</el-tab-pane>
</c-tabs>
</el-form>
<c-function-btn
:handleSubmit="handleSubmit"
:handleCheck="handleCheck"
:handleStash="handleStash">
</c-function-btn>
<c-function-btn
:handleSubmit="handleSubmit"
:handleCheck="handleCheck"
:handleStash="handleStash">
</c-function-btn>
</c-page>
</div>
</template>
......
......@@ -17,7 +17,6 @@
import event from '../event'
import Gitsetp1 from "./Gitsetp1"
import Gitbin from "./Gitbin"
export default {
components:{
......
......@@ -86,7 +86,6 @@
@select-ety="selectGridEtyPromptData"
>
</c-grid-ety-prompt-dialog>
<c-function-btn
:handleSubmit="handleSubmit"
:handleCheck="handleCheck"
......
......@@ -37,7 +37,7 @@ export default {
</script>
<style>
.marginLable {
padding-left: 160px;
padding-left: 160px;
}
</style>
\ No newline at end of file
......@@ -3,6 +3,7 @@ import Pub from '~/components/business/commonModel/index.js';
export default class Gitopn {
constructor() {
this.data = {
busType: 'gid',
addbcb: {
label1: '', // 国际部意见 .addbcb.label1
label2: '', // 国际部意见 .addbcb.label2
......
......@@ -700,19 +700,19 @@ export default {
immediate: true,
handler(val,oldval) {
if(this.model.paypsb=="X"&&this.model.gcdgrp.rec.frepayflg =="X"){
this.flag1=true;
this.model.paypsb="";
this.model.mtabut.clsflg="X"
this.flag1=true;
this.model.paypsb="";
this.model.mtabut.clsflg="X"
}
else if(this.model.gcdgrp.rec.frepayflg =="X"){
this.flag1=true;
this.model.paypsb="";
}else if(this.model.gcdgrp.rec.frepayflg ==""){
this.model.paypsb="";
this.flag1=false;
}
else if(this.model.gcdgrp.rec.frepayflg =="X"){
this.flag1=true;
this.model.paypsb="";
}else if(this.model.gcdgrp.rec.frepayflg ==""){
this.model.paypsb="";
this.flag1=false;
}
},
} ,
},
"model.paypsb" :{
immediate: true,
handler(val,oldval){
......
export default {
buildPtspta (ptsptaObj) {
let pts = ptsptaObj.pts;
let ptspta = {
rol: pts.rol,
name: pts.nam,
ptyinr: pts.ptyinr,
ptainr: pts.ptainr,
extkey: pts.extkey,
dftdsp: pts.dftdsp,
dftcur: pts.dftcur,
dftact: pts.dftact,
dftfeecur: pts.dftfeecur,
dftactptainr: pts.dftactptainr,
glggrpflg: pts.glggrpflg,
adrblk: pts.adrblk
};
return ptspta;
},
buildCommonData (model, trnName) {
let ptsptaList = [];
if (model.gidgrp.apl.pts.extkey) {
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) {
ptsptaList.push(this.buildPtspta(model.gidgrp.ben));
}
let dataObj = {
rec: {
objtyp: 'GID',
ownref: model.gidgrp.rec.ownref,
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,
segtyp: model.gidgrp.ghd.segtyp,
fromflg: model.gidgrp.rec.fromflg,
othersno: model.gidgrp.rec.othersno,
sndto: model.gidgrp.rec.sndto,
swiftflg: model.gitp.swiftflg,
giduil: model.gidgrp.rec.giduil,
purpos: model.gidgrp.rec.purpos,
revflg: model.gidgrp.rec.revflg,
cnfsta: model.gidgrp.rec.cnfsta,
},
cbsMap: {
MAX: model.gidgrp.cbs.max,
OPN1: model.gidgrp.cbs.opn1,
MAC: model.gidgrp.cbs.mac,
MAC2: model.gidgrp.cbs.mac2,
OPC2: model.gidgrp.cbs.opc2,
CNF: model.gidgrp.cbs.cnf,
},
ptsList: ptsptaList,
transName: trnName,
userId: window.sessionStorage.userId ? window.sessionStorage.userId : 'ZL'
};
return dataObj
},
buildSetfeg (model, trnName) {
let params = {
...this.buildCommonData(model, trnName),
liaall: model.liaall,
liaccv: model.liaccv,
doceot: model.trnmod.trndoc.doceot,
};
return params
},
buildSetglg (model, trnName) {
let params = {
...this.buildCommonData(model, trnName),
setfeg: model.setmod.setfeg,
liaall: model.liaall,
liaccv: model.liaccv,
};
return params
},
buildGlentry (model, trnName) {
let params = {
...this.buildCommonData(model, trnName),
liaallg: model.liaall.liaallg,
setfog: model.setmod.setfog,
setfeg: model.setmod.setfeg,
setglg: model.setmod.setglg,
};
return params
},
buildEngp (model, trnName) {
let params = {
...this.buildCommonData(model, trnName),
liaallg: model.liaall.liaallg,
};
return params
},
buildDocpan (model, trnName) {
let params = {
...this.buildCommonData(model, trnName),
};
return params
},
buildCcvpan (model, trnName) {
let params = {
...this.buildCommonData(model, trnName),
liaccvg: model.liaccv.liaccvg,
oldamt: model.liaccv.oldamt,
chgamt: model.liaccv.chgamt,
concur: model.liaccv.concur,
};
return params
},
buildLimitbody (model, trnName) {
let params = {
...this.buildCommonData(model, trnName),
rec: {
objtyp: 'GID',
objinr: model.gidgrp.rec.objinr,
ownref: model.gidgrp.rec.ownref,
},
};
return params
},
buildDoctre (model, trnName) {
let params = {
...this.buildCommonData(model, trnName),
rec: {
objtyp: 'GID',
objinr: model.gidgrp.rec.objinr,
ownref: model.gidgrp.rec.ownref,
swiftflg: model.gitp.swiftflg,
},
};
return params
},
// 公共组件setmod中dsp字段改变,触发联动时候的入参
buildSetgllAccts (model, trnName, setglg) {
let params = {
...this.buildCommonData(model, trnName),
setglg
};
return params
}
}
\ No newline at end of file
......@@ -32,7 +32,9 @@ export default class Infbrd {
nam: '',
seapty: '',
searef: ''
}
},
pageId:'',
};
}
}
<template>
<el-dialog
:visible.sync="initdialog"
:title="'交易列表'"
append-to-body
:before-close="beforeClose"
@opened="opened"
>
<div class="m-list-btns">
<div class="busnavbar">
<div class="busnavbar-items">
<c-button
style="margin-left: 7px"
size="medium"
type="primary"
class="medium_bcs"
v-for="(item, index) in navcode"
v-bind:key="index"
:title="item.title"
:disabled="item.isDis === 'N'"
>{{ item.label }}</c-button
>
<div style="margin-top: 15px; margin-left: 10px">
<div
v-for="(str, idx) in tState"
:key="idx"
style="margin-bottom: 5px; font-weight: bold"
>
{{ str }}
</div>
</div>
</div>
</div>
</div>
</el-dialog>
</template>
<script>
import event from "../event"
export default {
props: {
ownref: {
required: true,
},
trnCode: {
required: true,
},
model: {
required: true,
},
ownrefPath: {
required: false,
default: "didgrp",
},
tabIndex: {
required: false,
default: 1,
},
},
components: {},
mixins: [event], // 里面包含了Default、Check等的公共处理
data() {
return {
initdialog: false,
navcode: [
// {code:"",label:"",isDis:"",title:""},
],
tState: [],
};
},
methods: {
getIndex(module) {
for (let i = 1; i <= 12; i++) {
var temp = this.model.cfgfil[`subtxt${i}`];
if (module == temp) {
return i;
}
}
return 1;
},
opened() {
this.tState = [];
this.$emit("childmethods");
},
beforeClose() {
this.navcode = [];
this.initdialog = false;
},
},
mounted() {},
};
</script>
<style>
</style>
......@@ -9,7 +9,6 @@
size="small"
:validate-on-rule-change="false"
>
<c-content>
<m-infsea :model="model" :codes="codes" ref="infsea" />
</c-content>
......@@ -20,7 +19,6 @@
import CodeTable from "~/config/CodeTable";
import Infbrd from "../model";
import event from "../event"
import formRules from '../model/check'
import Infsea from "./Infsea";
export default {
......@@ -39,7 +37,7 @@ export default {
tabVal: "infsea",
trnName: "infbrd",
model: new Infbrd().data,
rules: formRules,
rules: null,
codes: {
...CodeTable,
},
......
......@@ -8,24 +8,18 @@ export default class Infgid{
opndatfrom: new Date(), // Opening between .infcon.opndatfrom
opndatto: new Date(), // Open Date to .infcon.opndatto
nam: '', // Name .infcon.nam
etyextkey: '', // Select Single Party .infcon.pty.etyextkey
nam: '', // External Visible Name .infcon.pty.nam
seapty: '', // 当事人编号 .infcon.seapty
relflg: '', // Release Status .infcon.relflg
hndtyp: '', // Handling Type .infcon.hndtyp
searol: '', // Role .infcon.searol
extkey: '', // User ID .infcon.usr.extkey
statsus: '', // statsus .infcon.statsus
seacur: '', // Currency .infcon.seacur
cxmflg: '', // 是否显示查询码 .infcon.cxmflg
amtdown: '0.00', // Amount between .infcon.seaamtfr
amtup: '0.00', // Amount to .infcon.seaamtto
amtdown: '0.00', // Amount between .infcon.seaamtfr amtup: '0.00', // Amount to .infcon.seaamtto
segtyp: '', // 特殊保函类型 .infcon.segtyp
searef: '', // Party Reference .infcon.searef
},
fenlishi: '', // 是否分离式保函 .fenlishi
seapurpos: '', //会议目的 .seapurpos
......
......@@ -220,7 +220,25 @@
</div>
</c-col>
</div>
<!-- 点击处理弹框 -->
<el-dialog
:visible.sync="initdialog"
title="交易列表"
append-to-body
width="60%"
>
<div class="dialog-wrap">
<div class="btn-group-wrap">
<div class="btn-item" v-for="(item, index) in handlerDataList" :key="index">
<el-button
type="primary"
:disabled="item.value === 'N'"
@click="handleClick(item)"
>{{ item.label }}</el-button>
</div>
</div>
</div>
</el-dialog>
<!-- <m-busbtn ref="childs" :ownref="ownref" trnCode="litsel" :model="litselModel" ownrefPath="lidget.lid.ownref">
</m-busbtn> -->
......@@ -332,27 +350,27 @@ export default {
btnRouteMap: [
{
label: '注销',
route: '/business-new/gitcan'
route: '/business-new/litcan'
},
{
label: '修改',
route: '/business-new/gitame'
route: '/business-new/litame'
},
{
label: '保函索赔登记',
route: '/business-new/gitcrq'
route: '/business-new/litcrq'
},
{
label:'保函收费',
route:'/business-new/gitfee'
route:'/business-new/litfee'
},
{
label:'绑定电子凭证',
route:'/business-new/gitatt'
route:'/business-new/litatt'
},
{
label:'保证金收取',
route:'/business-new/fctopn'
route:'/business-new/lctopn'
}
],
currentHandleRow: {}
......
......@@ -3,59 +3,60 @@ import Pub from '~/components/business/commonModel/index.js';
export default class Litopn {
constructor() {
this.data = {
gidgrp:{
rec:{
purpos:''
}
busType: 'lid',
gidgrp: {
rec: {
purpos: '',
},
},
gitp:{
swiftflg:''
gitp: {
swiftflg: '',
},
litp: {
avblab: '',
usr: {
extkey: ''
extkey: '',
},
aamp: {
aammod: {
addamtflg: ''
}
}
},
bccls5: '',
godnam: '',
label4: '',
bccls6: '',
number: '',
label5: '',
bccls7: '',
label6: '',
hmdmod2: {
bennam: ''
},
bccls1: '',
bccls2: '',
bccls3: '',
bccls4: '',
bcbtyp6: '',
cnybop: {
aammod: {
addamtflg: '',
},
},
},
bccls5: '',
godnam: '',
label4: '',
bccls6: '',
number: '',
label5: '',
bccls7: '',
label6: '',
hmdmod2: {
bennam: '',
},
bccls1: '',
bccls2: '',
bccls3: '',
bccls4: '',
bcbtyp6: '',
cnybop: {
cnylib: {
doccurdate: '',
stermtype: '',
sorgcode: '',
dcreditenddate: '',
dexchangeenddate: '',
sbankorgcode: '',
sbanktrano: '',
currencycode: '',
stranstype: '',
famt: '',
sforbankswiftbic: '',
spk: '',
denddate: '',
dexchangedate: '',
stransattr: '',
sforeigncountrycode: ''
doccurdate: '',
stermtype: '',
sorgcode: '',
dcreditenddate: '',
dexchangeenddate: '',
sbankorgcode: '',
sbanktrano: '',
currencycode: '',
stranstype: '',
famt: '',
sforbankswiftbic: '',
spk: '',
denddate: '',
dexchangedate: '',
stransattr: '',
sforeigncountrycode: '',
},
fexchangeamt: '',
sbankname: '',
......@@ -66,75 +67,75 @@ export default class Litopn {
saddwordlib: '',
vouflg: '',
libflg: '',
sorgname: ''
},
bcbtyp7: '',
bcbtyp4: '',
bcbtyp5: '',
bcbtyp2: '',
bcbtyp3: '',
bcbtyp1: '',
bcbdat: '',
label1: '',
label2: '',
label3: '',
lidgrp: {
sorgname: '',
},
bcbtyp7: '',
bcbtyp4: '',
bcbtyp5: '',
bcbtyp2: '',
bcbtyp3: '',
bcbtyp1: '',
bcbdat: '',
label1: '',
label2: '',
label3: '',
lidgrp: {
a2b: {
pts: new Pts().data,
},
blk: {
insbnk: '',
feetxt: '',
mixdet: '',
shpper: '',
adlcnd: '',
addamtcov: '',
avbwthtxt: '',
defdet: '',
lcrdoc: '',
lcrgod: '',
spcben: '',
dftat: '',
spcrcb: ''
insbnk: '',
feetxt: '',
mixdet: '',
shpper: '',
adlcnd: '',
addamtcov: '',
avbwthtxt: '',
defdet: '',
lcrdoc: '',
lcrgod: '',
spcben: '',
dftat: '',
spcrcb: '',
},
rec: {
tenmaxday: '',
expplc: '',
nomton: '',
stacty: '',
dkflg: '',
rmbflg: '',
avbwth: '',
opndat: '',
nomtop: '',
revflg: '',
stagod: '',
spcbenflg: '',
shpdat: '',
oppbnk: '',
nam: '',
prepertxts18: '',
redclsflg: '',
nomspc: '',
shptrss18: '',
spcrcbflg: '',
shpfro: '',
lcrtyp: '',
ownref: '',
preadvdt: '',
avbby: '',
pordis: '',
shppar: '',
apprul: '',
prepers18: '',
guaflg: '',
expdat: '',
shpto: '',
rptref: '',
cnfdet: '',
regref: '',
porloa: '',
apprultxt: ''
tenmaxday: '',
expplc: '',
nomton: '',
stacty: '',
dkflg: '',
rmbflg: '',
avbwth: '',
opndat: '',
nomtop: '',
revflg: '',
stagod: '',
spcbenflg: '',
shpdat: '',
oppbnk: '',
nam: '',
prepertxts18: '',
redclsflg: '',
nomspc: '',
shptrss18: '',
spcrcbflg: '',
shpfro: '',
lcrtyp: '',
ownref: '',
preadvdt: '',
avbby: '',
pordis: '',
shppar: '',
apprul: '',
prepers18: '',
guaflg: '',
expdat: '',
shpto: '',
rptref: '',
cnfdet: '',
regref: '',
porloa: '',
apprultxt: '',
},
adv: {
pts: new Pts().data,
......@@ -146,22 +147,22 @@ export default class Litopn {
pts: new Pts().data,
},
cbs: {
opn2: {
cur: '',
amt: '0.00'
},
max: {
cur: '',
amt: '0.00'
},
nom1: {
cur: '',
amt:'0.00'
},
max2: {
cur: '',
amt: '0.00'
}
opn2: {
cur: '',
amt: '0.00',
},
max: {
cur: '',
amt: '0.00',
},
nom1: {
cur: '',
amt: '0.00',
},
max2: {
cur: '',
amt: '0.00',
},
},
rmb: {
pts: new Pts().data,
......@@ -177,8 +178,8 @@ export default class Litopn {
},
apl: {
pts: new Pts().data,
}
},
},
},
statusInfo: '',
setmod: new Pub().data.Setmod,
mtabut: new Pub().data.Mtabut,
......
......@@ -52,23 +52,19 @@
</template>
<script>
import Api from "~/service/Api"
import commonProcess from "~/mixin/commonProcess";
import CodeTable from "~/config/CodeTable"
import event from "../event"
export default {
inject: ['root'],
props:["model","codes"],
mixins: [commonProcess, event],
mixins: [event],
data(){
return {
}
},
methods:{},
created:function(){
}
}
</script>
<style>
......
......@@ -501,15 +501,6 @@ export default {
columns: [],
data: [],
},
gitopn: {
gidgrp: {},
gitp: {},
trnmodVo: {},
addbcb: {},
cnybop: {},
codcny: {},
doceot: {},
},
suppress: false,
};
},
......@@ -562,6 +553,8 @@ export default {
);
},
async handleDisplay(index, row) {
console.log('row', row)
console.log('ind', index)
//后续要根据快照模式切换请求方式
let cortyp = row.cortyp;
let docnam = row.docnam;
......@@ -580,17 +573,16 @@ export default {
// }
let params = {
docVo: row,
[this.model.busType + 'grp']: this.model[this.model.busType + 'grp'],
[this.model.busType + 'p']: this.model[this.model.busType + 'p'],
trnmodVo: this.model.trnmod,
addbcb: this.model.addbcb,
cnybop: this.model.cnybop,
doceot: this.model.doceot,
};
this.gitopn.gidgrp = this.model.gidgrp;
this.gitopn.gitp = this.model.gitp;
this.gitopn.trnmodVo = this.model.trnmod;
this.gitopn.addbcb = this.model.addbcb;
this.gitopn.cnybop = this.model.cnybop;
this.gitopn.doceot = this.model.docpan.doceot;
console.log(this.gitopn);
rtnmsg = await Api.post(
`${this.requestPrefix}/executeDocpan`,
this.gitopn
params
);
if (rtnmsg.respCode == SUCCESS) {
if (cortyp == 'SWT' || cortyp == 'FMT' || cortyp == 'CMT') {
......
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