Skip to content

V
vue-gjjs
Commit c7c87527 by WH
Options

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

# Conflicts:
#	src/business/betset/model/index.js
parents 2b48a0e4 57a45c16
Showing with 298 additions and 261 deletions
src/business/betamc/model/index.js
...@@ -98,6 +98,7 @@ export default class Betamc { ...@@ -98,6 +98,7 @@ export default class Betamc {
rcvdat:"", // 到单日期 .bedgrp.rec.rcvdat rcvdat:"", // 到单日期 .bedgrp.rec.rcvdat
predat:"", // Presentation Date .bedgrp.rec.predat predat:"", // Presentation Date .bedgrp.rec.predat
docsta:"", // 单据状态 .bedgrp.rec.docsta docsta:"", // 单据状态 .bedgrp.rec.docsta
branchinr:"",
}, },
cbs: { cbs: {
opn1: { opn1: {
......
src/business/betamc/views/index.vue
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
</c-content> </c-content>
</el-tab-pane> </el-tab-pane>
<!--PD000027 --> <!--PD000027 -->
<el-tab-pane label="费用/账务" name="setpan"> <el-tab-pane label="费用/账务" name="setmod">
<c-content> <c-content>
<m-setmod <m-setmod
:model="model" :model="model"
......
src/business/betdcr/event/buildCommons.js
...@@ -49,10 +49,10 @@ export default { ...@@ -49,10 +49,10 @@ export default {
cbsMap: { cbsMap: {
MAX: model.bedgrp.cbs.max, MAX: model.bedgrp.cbs.max,
OPN1: model.bedgrp.cbs.opn1, OPN1: model.bedgrp.cbs.opn1,
// MAC: model.bedgrp.cbs.mac, MAC: model.bedgrp.cbs.mac,
// MAC2: model.bedgrp.cbs.mac2, MAC2: model.bedgrp.cbs.mac2,
// OPC2: model.bedgrp.cbs.opc2, OPC2: model.bedgrp.cbs.opc2,
// CNF: model.bedgrp.cbs.cnf, CNF: model.bedgrp.cbs.cnf,
}, },
ptsList: ptsptaList, ptsList: ptsptaList,
transName: trnName, transName: trnName,
......
src/business/betdcr/model/index.js
...@@ -33,6 +33,7 @@ export default class Betdcr { ...@@ -33,6 +33,7 @@ export default class Betdcr {
intdis: '' intdis: ''
}, },
rec: { rec: {
inr:'',
predat: '', predat: '',
rcvdat: '', rcvdat: '',
doctypcod: '', doctypcod: '',
...@@ -42,6 +43,7 @@ export default class Betdcr { ...@@ -42,6 +43,7 @@ export default class Betdcr {
matdat: '', matdat: '',
nam: '', nam: '',
docprbrol: '', docprbrol: '',
branchinr:'',
advdocflg: '' advdocflg: ''
}, },
cbs: { cbs: {
......
src/business/betdcr/views/Betdcrs.vue
...@@ -58,7 +58,7 @@ ...@@ -58,7 +58,7 @@
<c-fullbox> <c-fullbox>
<c-input v-model="model.bedgrp.cbs.max.cur" maxlength="3" style="width: 50%" placeholder="请输入单据金额" disabled> <c-input v-model="model.bedgrp.cbs.max.cur" maxlength="3" style="width: 50%" placeholder="请输入单据金额" disabled>
</c-input> </c-input>
<c-input v-model="model.bedgrp.cbs.max.amt" style="width: 50%" placeholder="请输入金额" disabled></c-input> <c-input-currency v-model="model.bedgrp.cbs.max.amt" style="width: 50%" placeholder="请输入金额" disabled></c-input-currency>
<template slot="footer"> <template slot="footer">
<c-checkbox v-model="model.betp.adaflg" style="margin-left: 10px" disabled>附加金额</c-checkbox> <c-checkbox v-model="model.betp.adaflg" style="margin-left: 10px" disabled>附加金额</c-checkbox>
</template> </template>
...@@ -73,7 +73,7 @@ ...@@ -73,7 +73,7 @@
</c-col> </c-col>
<c-col :span="12"> <c-col :span="12">
<el-form-item label="" label-width="5px" prop="bedgrp.cbs.max.amt"> <el-form-item label="" label-width="5px" prop="bedgrp.cbs.max.amt">
<c-input v-model="model.bedgrp.cbs.max.amt" placeholder="请输入金额" disabled></c-input> <c-input-currency v-model="model.bedgrp.cbs.max.amt" placeholder="请输入金额" disabled></c-input-currency>
</el-form-item> </el-form-item>
</c-col> </c-col>
</c-col> </c-col>
......
src/business/betdrv/model/index.js
...@@ -55,6 +55,7 @@ export default class Betdrv { ...@@ -55,6 +55,7 @@ export default class Betdrv {
matdat: '', matdat: '',
dscinsflg: '', dscinsflg: '',
nam: '', nam: '',
branchinr:'',
docprbrol: '' docprbrol: ''
}, },
prb: { prb: {
......
src/business/betrcl/model/index.js
...@@ -45,7 +45,8 @@ export default class Betrcl { ...@@ -45,7 +45,8 @@ export default class Betrcl {
ownref: '', ownref: '',
lescom: '', lescom: '',
matdat: '', matdat: '',
nam: '' nam: '',
branchinr:'',
}, },
cbs: { cbs: {
opn1: { opn1: {
......
src/business/betrcl/views/Rclp.vue
...@@ -97,12 +97,12 @@ ...@@ -97,12 +97,12 @@
placeholder="请输入单据金额" placeholder="请输入单据金额"
disabled disabled
></c-input> ></c-input>
<c-input <c-input-currency
v-model="model.bedgrp.cbs.max.amt" v-model="model.bedgrp.cbs.max.amt"
style="width: 50%" style="width: 50%"
placeholder="请输入金额" placeholder="请输入金额"
disabled disabled
></c-input> ></c-input-currency>
<template slot="footer"> <template slot="footer">
<c-checkbox <c-checkbox
v-model="model.betp.adaflg" v-model="model.betp.adaflg"
...@@ -127,11 +127,11 @@ ...@@ -127,11 +127,11 @@
</c-col> </c-col>
<c-col :span="12"> <c-col :span="12">
<el-form-item label="" label-width="5px" prop="bedgrp.cbs.max.amt"> <el-form-item label="" label-width="5px" prop="bedgrp.cbs.max.amt">
<c-input <c-input-currency
v-model="model.bedgrp.cbs.max.amt" v-model="model.bedgrp.cbs.max.amt"
placeholder="请输入金额" placeholder="请输入金额"
disabled disabled
></c-input> ></c-input-currency>
</el-form-item> </el-form-item>
</c-col> </c-col>
</c-col> </c-col>
...@@ -160,7 +160,7 @@ ...@@ -160,7 +160,7 @@
v-model="model.bedgrp.rec.matdat" v-model="model.bedgrp.rec.matdat"
style="width: 100%" style="width: 100%"
placeholder="请选择到期日" placeholder="请选择到期日"
disabled
></c-date-picker> ></c-date-picker>
</el-form-item> </el-form-item>
</c-col> </c-col>
......
src/business/betset/model/index.js
import Pts from '~/components/business/commonModel/Pts'; import Pts from '~/components/business/commonModel/Pts';
import Pub from '~/components/business/commonModel/index.js'; import Pub from '~/components/business/commonModel/index.js';
export default class Betset { export default class Betset {
constructor() { constructor() {
this.data = { this.data = {
setmod: { setmod: {
redamt: '', redamt: '',
setamt: '', setamt: '',
doccur: '', doccur: '',
docamt: '' docamt: ''
},
cnybop: {
sbankname: '',
outflg: '',
cnyflg: '',
cnyinc: {
sorilevyno: '',
spayeeacct: '',
spayeeorgcode: '',
foffshoreamt: '',
cpayeeattr: '',
spayercountrycode: '',
fcustomsamt: '',
spayeracct: '',
frecordamt: '',
sbankorgcode: '',
sbanktrano: '',
fonshoreamt: '',
dpayeedate: '',
spayeecny: '',
spk: '',
ftotalamt: '',
iaccountperiod: '',
sbalancemode: '',
smidtransbank: '',
sswiftbic: '',
cpayeraccttyp: '',
fpayeeamt: '',
fprepayeeamt: '',
fnogoodsamt: ''
}, },
cnybop: { incscale: '',
sbankname: '', spayername: '',
outflg: '', traflg: '',
cnyflg: '', saddword: '',
cnyinc: { vouflg: '',
sorilevyno: '', libflg: '',
spayeeacct: '', spayeename: ''
spayeeorgcode: '', },
foffshoreamt: '', aamset: {
cpayeeattr: '', utlamt: '',
spayercountrycode: '', utlamt2: ''
fcustomsamt: '', },
spayeracct: '', recpan: {
frecordamt: '', trnlst: ''
sbankorgcode: '', },
sbanktrano: '', lendoc: {
fonshoreamt: '', actflg: '',
dpayeedate: '', decnum: '',
spayeecny: '', vercerref: '',
spk: '', account: ''
ftotalamt: '', },
iaccountperiod: '', betp: {
sbalancemode: '', adaflg: ''
smidtransbank: '', },
sswiftbic: '', ledgrp: {
cpayeraccttyp: '', rec: {
fpayeeamt: '', ownref: ''
fprepayeeamt: '',
fnogoodsamt: ''
},
incscale: '',
spayername: '',
traflg: '',
saddword: '',
vouflg: '',
libflg: '',
spayeename: ''
},
aamset: {
utlamt: '',
utlamt2: ''
}, },
recpan: { cbs: {
trnlst: '' opn1: {
cur: '',
amt: ''
}
}
},
bopmod: {
outchargeamt: '',
dbap: {
baspp: {
acp: ''
}
}, },
lendoc: { outchargeccy: '',
actflg: '', dbdp: {
decnum: '', baspp: {
vercerref: '', acp: ''
account: '' }
}, },
betp: { ownextkey: '',
adaflg: '' dbagrp: {
bas: {
actiontype: '',
custype: '',
buscode: '',
outchargeamt: '',
inchargeamt: '',
othacc: '',
custnm: '',
methods: '',
oppuser: '',
lcyacc: '',
inchargeccy: '',
rptno: '',
actiondesc: '',
txccy: '',
lcyamt: '',
outchargeccy: '',
ownextkey: '',
idcode: '',
fcyamt: '',
othamt: '',
exrate: '',
fcyacc: '',
txamt: '',
custcod: ''
}
}, },
ledgrp: { acttyp: '',
rec: { dbdgrp: {
ownref: '' bas: {
}, actiontype: '',
cbs: { custype: '',
opn1: { buscode: '',
cur: '', inchargeamt: '',
amt: '' othacc: '',
} custnm: '',
methods: '',
oppuser: '',
lcyacc: '',
inchargeccy: '',
rptno: '',
actiondesc: '',
txccy: '',
lcyamt: '',
ownextkey: '',
idcode: '',
fcyamt: '',
othamt: '',
exrate: '',
fcyacc: '',
txamt: '',
custcod: ''
} }
}, },
bopmod: { szflg: '',
outchargeamt: '', dbbmod: {
dbap: { dbbp: {
baspp: {
acp: ''
}
},
outchargeccy: '',
dbdp: {
baspp: { baspp: {
acp: '' cusnam: ''
} }
}, }
ownextkey: '',
dbagrp: {
bas: {
actiontype: '',
custype: '',
buscode: '',
outchargeamt: '',
inchargeamt: '',
othacc: '',
custnm: '',
methods: '',
oppuser: '',
lcyacc: '',
inchargeccy: '',
rptno: '',
actiondesc: '',
txccy: '',
lcyamt: '',
outchargeccy: '',
ownextkey: '',
idcode: '',
fcyamt: '',
othamt: '',
exrate: '',
fcyacc: '',
txamt: '',
custcod: ''
}
},
acttyp: '',
dbdgrp: {
bas: {
actiontype: '',
custype: '',
buscode: '',
inchargeamt: '',
othacc: '',
custnm: '',
methods: '',
oppuser: '',
lcyacc: '',
inchargeccy: '',
rptno: '',
actiondesc: '',
txccy: '',
lcyamt: '',
ownextkey: '',
idcode: '',
fcyamt: '',
othamt: '',
exrate: '',
fcyacc: '',
txamt: '',
custcod: ''
}
},
szflg: '',
dbbmod: {
dbbp: {
baspp: {
cusnam: ''
}
}
},
basflg: ''
},
mtabut: {
coninf: {
usr: {
extkey: ''
}
},
clsflg: '',
paydat: ''
}, },
bpdgrp: { basflg: ''
rec: { },
ffttyp: '' mtabut: {
coninf: {
usr: {
extkey: ''
} }
}, },
bedgrp: { clsflg: '',
prb: { paydat: ''
pts: new Pts().data, },
}, bpdgrp: {
rec: {
ffttyp: ''
apc: { }
pts: new Pts().data, },
}, bedgrp: {
ctc: { prb: {
pts: new Pts().data, pts: new Pts().data,
}, },
bec: {
pts: new Pts().data,
}, apc: {
ben: { pts: new Pts().data,
pts: new Pts().data, },
}, ctc: {
iss: { pts: new Pts().data,
pts: new Pts().data, },
}, bec: {
adv: { pts: new Pts().data,
pts: new Pts().data, },
}, ben: {
apl: { pts: new Pts().data,
pts: new Pts().data, },
}, iss: {
con: { pts: new Pts().data,
pts: new Pts().data, },
}, adv: {
ctr: { pts: new Pts().data,
pts: new Pts().data, },
}, apl: {
atb: { pts: new Pts().data,
pts: new Pts().data, },
}, con: {
avc: { pts: new Pts().data,
pts: new Pts().data, },
}, ctr: {
cnr: { pts: new Pts().data,
pts: new Pts().data, },
}, atb: {
at2: { pts: new Pts().data,
pts: new Pts().data, },
avc: {
pts: new Pts().data,
},
cnr: {
pts: new Pts().data,
},
at2: {
pts: new Pts().data,
},
rec: {
predat: '',
rcvdat: '',
doctypcod: '',
ownref: '',
docsta: '',
matdat: '',
nam: '',
branchinr:'',
frepayflg: ''
},
cbs: {
opn1: {
cur: ''
}, },
rec: { opn2: {
predat: '', cur: ''
rcvdat: '',
doctypcod: '',
ownref: '',
docsta: '',
matdat: '',
nam: '',
frepayflg: ''
}, },
cbs: { max: {
opn1: { cur: '',
cur: '' amt: ''
},
opn2: {
cur: ''
},
max: {
cur: '',
amt: ''
}
}
},
trnmod: {
trndoc: {
nar754: ''
} }
}, }
bptbck: { },
bptbckg: trnmod: {
[ trndoc: {
{ nar754: ''
ownref: '', }
opncur: '', },
opnamt: '', bptbck: {
bckamt: '' bptbckg:
}, [
] {ownref:'',
, opncur:'',
}, opnamt:'',
setmod: new Pub().data.Setmod, bckamt:''},
mtabut: new Pub().data.Mtabut, ]
trnmod: new Pub().data.Trnmod, ,
liaall: new Pub().data.Liaall, },
liaccv: new Pub().data.Liaccv, setmod: new Pub().data.Setmod,
docpan: new Pub().data.Docpan, mtabut: new Pub().data.Mtabut,
} trnmod: new Pub().data.Trnmod,
liaall: new Pub().data.Liaall,
liaccv: new Pub().data.Liaccv,
docpan: new Pub().data.Docpan,
}
} }
} }
\ No newline at end of file
src/business/brtset/event/buildCommons.js
...@@ -27,7 +27,7 @@ export default { ...@@ -27,7 +27,7 @@ export default {
} }
let dataObj = { let dataObj = {
rec: { rec: {
objtyp: 'lid', objtyp: 'brd',
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,
...@@ -36,7 +36,7 @@ export default { ...@@ -36,7 +36,7 @@ export default {
gartyp: model.brdgrp.rec.gartyp, gartyp: model.brdgrp.rec.gartyp,
fingua: model.brdgrp.rec.fingua, fingua: model.brdgrp.rec.fingua,
segtyp: model.brdgrp.ghd.segtyp, segtyp: model.brdgrp.ghd.segtyp,
fromflg: model.brdgrp.rec.fromflg, fromflg: model.brdgrp.rec.fromflg,
othersno: model.brdgrp.rec.othersno, othersno: model.brdgrp.rec.othersno,
sndto: model.brdgrp.rec.sndto, sndto: model.brdgrp.rec.sndto,
swiftflg: model.brtp.swiftflg, swiftflg: model.brtp.swiftflg,
...@@ -44,6 +44,27 @@ export default { ...@@ -44,6 +44,27 @@ 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,
docflg: model.brdgrp.rec.docflg,
ini: model.brdgrp.rec.ini,
paypsb: model.brdgrp.rec.paypsb,
matdat:model.brdgrp.rec.matdat,
mattxtflg:model.brdgrp.rec.mattxtflg,
advrefflg:model.brdgrp.rec.advrefflg,
advdocflg:model.brdgrp.rec.advdocflg,
docprbrol:model.brdgrp.rec.docprbrol,
cur:model.brdgrp.cbs.opn1.cur,
ptytyp:model.brdgrp.prb.ptytyp,
frepayflg:model.brdgrp.rec.frepayflg,
payrol:model.brdgrp.rec.payrol,
// dscbckamt:model.brdgrp.rec.dscbckamt,
totdat:model.brdgrp.rec.totdat,
// negate:model.brdgrp.rec.dscbckamt.negate,
pclbckamt:model.brdgrp.rec.pclbckamt,
docamt:model.brdgrp.rec.docamt,
doccur:model.brdgrp.rec.doccur,
}, },
cbsMap: { cbsMap: {
MAX: model.brdgrp.cbs.max, MAX: model.brdgrp.cbs.max,
......
src/business/brtset/model/index.js
...@@ -25,6 +25,16 @@ export default class Bctset { ...@@ -25,6 +25,16 @@ export default class Bctset {
docprbrol: '', docprbrol: '',
frepayflg: '', frepayflg: '',
inr:'', inr:'',
totdat:'',
ptytyp:'',
pclbckamt:'',
dscbckamt:{
negate:'',
},
docamt:'',
doccur:'',
}, },
cbs: { cbs: {
opn1: { opn1: {
......
src/business/inflid/views/Infsea.vue
...@@ -278,7 +278,7 @@ export default { ...@@ -278,7 +278,7 @@ export default {
stmData: { stmData: {
columns: [ columns: [
{ {
label: '保函编号', label: '信用证编号',
prop: 'seaownref' prop: 'seaownref'
}, },
{ {
......
src/business/letcan/model/index.js
...@@ -34,6 +34,7 @@ export default class Letcan { ...@@ -34,6 +34,7 @@ export default class Letcan {
pts: new Pts().data, pts: new Pts().data,
}, },
rec: { rec: {
inr:'',
revflg: '', revflg: '',
expdat: '', expdat: '',
expplc: '', expplc: '',
...@@ -44,6 +45,7 @@ export default class Letcan { ...@@ -44,6 +45,7 @@ export default class Letcan {
nam: '', nam: '',
opndat: '', opndat: '',
redclsflg: '', redclsflg: '',
branchinr:'',
}, },
cbs: { cbs: {
opn1: { opn1: {
......
src/business/letcan/views/Canp.vue
...@@ -85,13 +85,13 @@ ...@@ -85,13 +85,13 @@
</c-col> </c-col>
<c-col :span="8"> <c-col :span="8">
<el-form-item label="" label-width="5px" prop="ledgrp.cbs.opn1.amt"> <el-form-item label="" label-width="5px" prop="ledgrp.cbs.opn1.amt">
<c-input <c-input-currency
v-model="model.ledgrp.cbs.opn1.amt" v-model="model.ledgrp.cbs.opn1.amt"
style="text-align: left; width: 100%" style="text-align: left; width: 100%"
class="m-input-currency" class="m-input-currency"
placeholder="请输入金额" placeholder="请输入金额"
disabled disabled
></c-input> ></c-input-currency>
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="5"> <c-col :span="5">
......
src/business/litopn/model/index.js
...@@ -100,7 +100,7 @@ export default class Litopn { ...@@ -100,7 +100,7 @@ export default class Litopn {
}, },
rec: { rec: {
inr:'', inr:'',
tenmaxday: '', tenmaxday: 0,
expplc: '', expplc: '',
nomton: '', nomton: '',
stacty: '', stacty: '',
......
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