Skip to content

V
vue-gjjs
Commit 53b3bd8e by WF1020
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 6e6cad29 a53edd0e
Showing with 307 additions and 167 deletions
src/business/betcan/event/buildCommons.js
......@@ -113,9 +113,9 @@ export default {
let params = {
...this.buildCommonData(model, trnName),
rec: {
objtyp: 'GID',
objinr: model.gidgrp.rec.objinr,
ownref: model.gidgrp.rec.ownref,
objtyp: 'bed',
objinr: model.bedgrp.rec.objinr,
ownref: model.bedgrp.rec.ownref,
},
};
return params
......@@ -124,9 +124,9 @@ export default {
let params = {
...this.buildCommonData(model, trnName),
rec: {
objtyp: 'lid',
objinr: model.brdgrp.rec.objinr,
ownref: model.brdgrp.rec.ownref,
objtyp: 'bed',
objinr: model.bedgrp.rec.objinr,
ownref: model.bedgrp.rec.ownref,
swiftflg: model.brtp.swiftflg,
},
};
......
src/business/betcan/model/index.js
import Pts from '~/components/business/commonModel/Pts';
import Pub from '~/components/business/commonModel/index.js';
export default class Betcan {
constructor() {
this.data = {
sndmsg: '',
ledgrp: {
rec: {
ownref: ''
},
cbs: {
opn1: {
cur: '',
amt: ''
}
}
},
rebkpflg: '',
strinf: '',
bedgrp: {
rec: {
predat: '',
rcvdat: '',
doctypcod: '',
docsta: '',
ownref: '',
orddat: '',
matdat: '',
nam: ''
},
cbs: {
opn1: {
cur: '',
amt: ''
},
opn2: {
amt: ''
},
max: {
cur: '',
amt: ''
}
},
iss: {
pts: {
ref: '',
nam: ''
}
},
ben: {
pts: {
ref: '',
nam: ''
}
},
apl: {
pts: {
ref: '',
nam: ''
}
}
},
setmod: new Pub().data.Setmod,
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,
};
}
constructor() {
this.data = {
brdgrp: {
adv: {
pts: new Pts().data,
},
prb: {
adrelc: '',
dbfadrblkcn: '',
namelc: '',
pts: new Pts().data,
},
acb: {
adrelc: '',
dbfadrblkcn: '',
namelc: '',
pts: new Pts().data,
},
apl: {
adrelc: '',
dbfadrblkcn: '',
namelc: '',
pts: new Pts().data,
},
ben: {
adrelc: '',
dbfadrblkcn: '',
namelc: '',
pts: new Pts().data,
},
blk: {
chaded: '',
docdisflg: '',
chaadd: '',
docdis: '',
},
rec: {
inr: '',
branchinr: '',
totcur: '',
ownref: '',
disdat: '',
totamt: '',
nam: '',
docprbrol: ''
},
cbs: {
opn1: {
cur: ''
},
opn2: {
cur: ''
},
max: {
cur: '',
amt: ''
},
max2: {
amt: ''
}
},
matp: {
mattxtlab: ''
}
},
brtp: {
furide: '',
matp: {
mattxtlab: ''
}
},
gidgrp: {
blk: {
chaded: '',
amtspc: '',
accspc: '',
},
acb: {
pts: new Pts().data,
},
apl: {
pts: new Pts().data,
},
ben: {
pts: new Pts().data,
},
ctr: {
pts: new Pts().data,
},
iss: {
pts: new Pts().data,
},
rec: {
expdat: '',
purpos: '',
liadat: '',
ownref: '',
exptyp: '',
purcan: '',
nam: '',
gartyp: '',
purposin: '',
reddat: '',
redamt: '0',
outcur: '',
redcur: '',
outamt: '0',
branchinr: '',
},
cbs: {
opn1: {
cur: '',
amt: '0',
},
max: {
cur: '',
amt: '0',
},
},
},
sndmsg: '',
ledgrp: {
adv: {
pts: new Pts().data,
},
prb: {
adrelc: '',
dbfadrblkcn: '',
namelc: '',
pts: new Pts().data,
},
acb: {
adrelc: '',
dbfadrblkcn: '',
namelc: '',
pts: new Pts().data,
},
rec: {
ownref: ''
},
cbs: {
opn1: {
cur: '',
amt: ''
}
}
},
rebkpflg: '',
strinf: '',
bedgrp: {
rec: {
predat: '',
rcvdat: '',
doctypcod: '',
docsta: '',
ownref: '',
orddat: '',
matdat: '',
nam: ''
},
cbs: {
opn1: {
cur: '',
amt: ''
},
opn2: {
amt: ''
},
max: {
cur: '',
amt: ''
}
},
iss: {
pts: {
ref: '',
nam: ''
}
},
ben: {
pts: {
ref: '',
nam: ''
}
},
apl: {
pts: {
ref: '',
nam: ''
}
}
},
setmod: new Pub().data.Setmod,
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,
};
}
}
src/business/betcan/views/Canp.vue
......@@ -43,13 +43,13 @@
</c-col>
<c-col :span="7">
<el-form-item label="" label-width="5px" prop="bedgrp.cbs.max.amt">
<c-input-currency v-model="model.bedgrp.cbs.max.amt" style="text-align: left; width: 100%"
placeholder="请输入金额" @keyup.enter.native="
<c-input-currency v-model="model.bedgrp.cbs.max.amt" style="text-align: left; width: 100%" placeholder="请输入金额"
@keyup.enter.native="
defaultFunction(
'bedgrp.cbs.max.amt',
model.bedgrp.cbs.max.amt
)
" disabled></c-input-currency>
" disabled></c-input-currency>
</el-form-item>
</c-col>
<c-col :span="7">
......@@ -213,6 +213,4 @@ export default {
created: function () { },
}
</script>
<style>
</style>
<style></style>
src/business/betcan/views/index.vue
......@@ -18,30 +18,26 @@
</el-tab-pane>
<!--PD000027 -->
<el-tab-pane label="表外记账" name="engp">
<c-content>
<!-- 表外记账 -->
<m-engp :model="model" :codes="codes" />
</c-content>
</el-tab-pane>
<el-tab-pane label="表外记账" name="engp">
<c-content>
<!-- 表外记账 -->
<m-engp :model="model" :codes="codes" />
</c-content>
</el-tab-pane>
<!--PD000027 -->
<el-tab-pane label="费用/账务" name="setmod">
<c-content>
<m-setmod
:model="model"
:codes="codes"
@changeSetmodModel="changeSetmodModel"
/>
</c-content>
</el-tab-pane>
<!--PD000027 -->
<el-tab-pane label="费用/账务" name="setmod">
<c-content>
<m-setmod :model="model" :codes="codes" @changeSetmodModel="changeSetmodModel" />
</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>
<!--PD000027 -->
<el-tab-pane label="会计分录" name="glepan">
<c-content>
<m-glentry :model="model" :codes="codes" />
</c-content>
</el-tab-pane>
<!--PD000510 -->
<el-tab-pane label="备查/附言" name="addbcb">
......@@ -64,8 +60,8 @@
</el-tab-pane>
</c-tabs>
</el-form>
<c-grid-ety-prompt-dialog ref="etyDialog" :promptData="promptData" v-on:select-ety="selectEty">
</c-grid-ety-prompt-dialog>
<!-- <c-grid-ety-prompt-dialog ref="etyDialog" :promptData="promptData" v-on:select-ety="selectEty">
</c-grid-ety-prompt-dialog> -->
<c-function-btn :handleSubmit="handleSubmit" :handleCheck="handleCheck" :handleStash="handleStash">
<!-- <el-button size="small">用户确认</el-button>
<el-button size="small">检核</el-button>
......@@ -79,21 +75,26 @@
</div>
</template>
<script>
import Betcan from "~/model/Betcan";
import event from '../event';
import operationFunc from "~/mixin/operationFunc";
import CodeTable from "~/config/CodeTable"
import formRules from '../model/check'
import Betcan from "../model";
import Ovwp from './Ovwp'
import Canp from './Canp'
import Addbcb from "./Addbcb"
import Limitbody from "~/components/business/limitbody/views";
import Engp from "~/components/business/engp/views";
// import Ccvpan from "~/components/business/ccvpan/views";
import Setmod from "~/components/business/setmod/views";
// import Glepan from "~/components/business/glepan/views";
import Glentry from "~/components/business/glentry/views";
import Docpan from "~/components/business/docpan/views";
import Doctre from "~/components/business/doctre/views";
import Limitbody from "~/components/business/limitbody/views";
import Glepan from "~/components/business/glentry/views";
export default {
name: 'Betcan',
......@@ -103,10 +104,10 @@ export default {
'm-canp': Canp,
'm-limitbody': Limitbody,
'm-engp': Engp,
"m-ccvpan": Ccvpan,
// "m-ccvpan": Ccvpan,
"m-setmod": Setmod,
"m-glentry": Glentry,
// 'm-glepan': Glepan,
'm-glepan': Glepan,
'm-addbcb': Addbcb,
'm-docpan': Docpan,
'm-doctre': Doctre,
......@@ -124,19 +125,17 @@ export default {
trnType: '',
model: new Betcan().data,
rules: formRules,
codes: {
...CodeTable
},
activeNames: ["setpan"],
codes: {
...CodeTable
},
activeNames: ["setpan"],
}
},
methods: {},
mounted () {
this.init()
mounted() {
this.init()
},
}
</script>
<style>
</style>
<style></style>
src/business/infled/views/Infsea.vue
......@@ -383,6 +383,31 @@
</el-pagination>
</div>
</c-col>
<!-- 点击处理ba弹框 -->
<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>
</div>
<m-busbtn
......@@ -541,22 +566,38 @@ export default {
initdialog: false,
handlerDataList: [],
btnRouteMap: [
// {
// label: '出口信用证预开立',
// route: '/business-new/betnot'
// },
// {
// label: '出口信用证开立',
// route: '/business-new/letopn'
// },
// {
// label: '非我行通知及收单行登记',
// route: '/business-new/letdrw'
// },
// {
// label:'出口信用证补通知',
// route:'/business-new/letrsv'
// },
{
label: '收单',
route: '/business-new/letdrv'
},
{
label: '修改通知',
route: '/business-new/letame'
},
{
label: '注销',
route: '/business-new/letcan'
},
{
label:'收单加补录',
route:'/business-new/letdrw'
},
{
label:'转让证开立',
route:'/business-new/lttopn'
},
{
label:'开证',
route:'/business-new/letopn'
},
{
label:'保兑',
route:'/business-new/letamc'
},
{
label:'通知到单',
route:'/business-new/letdav'
},
],
currentHandleRow: {},
};
......
src/business/letcan/model/check.js
export default {
'liaall.misamt' :null,
'liaall.limmod.limpts.oth.pts.extkey' :null,
'rmbclm.rmbrmb.pts.extkey' :null,
'liaall.limmod.ownref' :null,
'rmbclm.acwacw.pts.extkey' :null,
'liaall.limmod.ecifno' :null,
'liaall.limmod.othp.ptsget.sdamod.dadsnd' :null,
'liaall.limmod.limpts.oth.pts.nam' :null,
'rmbclm.acwacw.pts.adrblk' :null,
'setmod.dspflg' :null,
'letp0.recget.sdamod.dadsnd' :null,
'liaall.limmod.limpts.wrk.pts.nam' :null,
'sndmsg' :null,
'rmbclm.bebbeb.adrelc' :null,
'liaall.limmod.limpts.wrk.pts.extkey' :null,
'rmbclm.acwacw.namelc' :null,
'mtabut.coninf.conexedat' :null,
'rmbclm.bebbeb.namelc' :null,
'liaall.limmod.limpts.nonrevflg1' :null,
'liaall.limmod.wrkp.ptsget.sdamod.dadsnd' :null,
'rmbclm.rmbrmb.pts.adrblk' :null,
'letcanf.strinf' :null,
'setmod.docamt' :null,
'rmbclm.rmbrmb.adrelc' :null,
'rmbclm.bebbeb.pts.adrblk' :null,
'rmbclm.acwacw.adrelc' :null,
'rmbclm.rmbrmb.namelc' :null,
'rmbclm.bebbeb.pts.extkey' :null,
'letp0.recget.sdamod.dadsnd':[
{type: 'string', required: false, message: '必输项'},
{max: 16,message:'长度不能超过16'}
......
src/business/letcan/model/index.js
......@@ -87,12 +87,6 @@ export default class Letcan {
namelc: '',
pts: new Pts().data,
},
apl: {
adrelc: '',
dbfadrblkcn: '',
namelc: '',
pts: new Pts().data,
},
rec: {
revflg: '',
expdat: '',
......
src/business/litopn/views/Ovwp1.vue
......@@ -650,9 +650,9 @@ export default {
deep: true,
handler(val,oldval){
const res = this.model.lidgrp
if(res.cbs.nom1.cur !== "" && res.cbs.nom1.amt !== "" && res.apl.pts.adrblk !== ""){
this.model.lidgrp.cbs.max.cur=this.model.lidgrp.cbs.nom1.cur
this.model.lidgrp.cbs.max.amt=this.model.lidgrp.cbs.nom1.amt
if(res.cbs.nom1.cur !== "" || res.cbs.nom1.amt !== "" || res.apl.pts.adrblk !== ""){
this.model.lidgrp.cbs.max.cur=this.model.lidgrp.cbs.nom1.cur;
this.model.lidgrp.cbs.max.amt=this.model.lidgrp.cbs.nom1.amt;
this.model.lidgrp.rec.nam = `${res.apl.pts.adrblk.substring(0,15)}${res.cbs.nom1.cur}${res.cbs.nom1.amt}`
}
}
......
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