Skip to content

I
isc-web-vue
Commit 87811a33 by zenghuan
Options

Merge remote-tracking branch 'origin/develop' into develop

parents 0b6d9133 9774c576
Showing with 234 additions and 182 deletions
src/config/isc-baseData.js
...@@ -13,6 +13,9 @@ if (process.env.NODE_ENV === 'production') {//生产模式 ...@@ -13,6 +13,9 @@ if (process.env.NODE_ENV === 'production') {//生产模式
"hostDomlc": "", "hostDomlc": "",
"hostCollection": "", "hostCollection": "",
"hostDerivative": "", "hostDerivative": "",
"hostAdmin":"",
"hostFactoring": "",
"hostGjzf":"",
"basePath": "/webapi", "basePath": "/webapi",
"schemes": "", "schemes": "",
"message": { "message": {
......
src/page/Funds/Infftd1/event/index.js
...@@ -55,6 +55,11 @@ export default { ...@@ -55,6 +55,11 @@ export default {
this.model.infcon.opndatfrom = new Date(); this.model.infcon.opndatfrom = new Date();
this.model.infcon.opndatto = new Date(); this.model.infcon.opndatto = new Date();
this.model.infcon.nam = ""; this.model.infcon.nam = "";
this.model.infcon.ownusr = "";
this.model.infcon.usr = "";
this.model.infcon.bnktyp = "";
this.model.infcon.gzno = "";
this.model.infcon.seacur = ""; this.model.infcon.seacur = "";
this.model.infcon.eaamtfr = ""; this.model.infcon.eaamtfr = "";
this.model.infcon.eaamtto = ""; this.model.infcon.eaamtto = "";
...@@ -65,8 +70,8 @@ export default { ...@@ -65,8 +70,8 @@ export default {
this.model.infcon.seapty = ""; this.model.infcon.seapty = "";
this.model.infcon.searol = ""; this.model.infcon.searol = "";
this.model.infcon.usrextkey = ""; this.model.infcon.usrextkey = "";
this.model.infcon.seasta = ""; this.model.infcon.seasta = "";
this.model.infcon.accmng = "";
this.model.infcon.fttyp = ""; this.model.infcon.fttyp = "";
}, },
......
src/page/Funds/Infftd1/model/index.js
...@@ -8,23 +8,26 @@ export default class infftd { ...@@ -8,23 +8,26 @@ export default class infftd {
nam: "", // Name客户名称 .infcon.nam nam: "", // Name客户名称 .infcon.nam
opndatfrom: "", // 有效日期自 .infcon.opndatfrom opndatfrom: "", // 有效日期自 .infcon.opndatfrom
opndatto: "", // Open Date to .infcon.opndatto opndatto: "", // Open Date to .infcon.opndatto
seacur: "", // 币种 .infcon.seacur seacur: "", // 币种 .infcon.seacur
seaamtfr: "", // 金额自 .infcon.seaamtfr seaamtfr: "", // 金额自 .infcon.seaamtfr
seaamtto: "", // Amount to .infcon.seaamtto seaamtto: "", // Amount to .infcon.seaamtto
searef: "", //参与方参考号 ownusr:"", //客户名称
usr:"", //资金部经办人
bnktyp:"", //银行类型
gzno:"", //挂起编号
searef: "", //参与方参考号
ptyextkey: "", // 选择一个参与方 .infcon.pty.extkey ptyextkey: "", // 选择一个参与方 .infcon.pty.extkey
ptynam: "", // External Visible Name .infcon.pty.nam ptynam: "", // External Visible Name .infcon.pty.nam
seapty: "", // 参与方名称/BIC .infcon.seapty seapty: "", // 参与方名称/BIC .infcon.seapty
searol: "", searol: "",
usrextkey: "", // User ID .infcon.usr.extkey usrextkey: "", // User ID .infcon.usr.extkey
seasta: "", // Status .infcon.seasta seasta: "", // Status .infcon.seasta
accmng: "", // Account manager .infcon.accmng fttyp: "", //资金转账类型
fttyp: "", //类型
}, },
infbut: { infbut: {
......
src/page/Funds/Infftd1/views/Infsea.vue
...@@ -7,14 +7,14 @@ ...@@ -7,14 +7,14 @@
<c-col :span="24"> <c-col :span="24">
<c-col :span="8"> <c-col :span="8">
<el-form-item <el-form-item
label="资金调拨编号" label="业务编号"
prop="seaownref" prop="seaownref"
style="width: 100%" style="width: 100%"
> >
<c-input <c-input
v-model="model.infcon.seaownref" v-model="model.infcon.seaownref"
maxlength="40" maxlength="40"
placeholder="请输入资金调拨编号" placeholder="请输入业务编号"
> >
</c-input> </c-input>
</el-form-item> </el-form-item>
...@@ -60,124 +60,99 @@ ...@@ -60,124 +60,99 @@
<el-row v-show="searchSlot.searchToggle"> <el-row v-show="searchSlot.searchToggle">
<c-col :span="24"> <c-col :span="24">
<c-col :span="8"> <c-col :span="8">
<el-form-item label="币种" prop="seacur" style="width: 100%"> <el-form-item label="客户名称" prop="ownusr" style="width: 100%">
<c-select <c-input
v-model="model.infcon.cur" v-model="model.infcon.ownusr"
style="width: 100%" maxlength="40"
placeholder="请选择币种" placeholder="请输入客户名称"
:code="codes.seacur"
> >
</c-select> </c-input>
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="8"> <c-col :span="8">
<el-form-item :label="$t('lc.金额区间')" style="width: 100%"> <el-form-item label="银行类型" prop="bnktyp" style="width: 100%">
<c-col :span="11">
<c-input
v-model="model.infcon.amtmin"
:placeholder="$t('lc.请输入金额下限')"
style="width: 100%"
></c-input>
</c-col>
<c-col :span="2" style="text-align: center">
<label style="display: inline-block; width: 100%">-</label>
</c-col>
<c-col :span="11">
<c-input
v-model="model.infcon.amtmax"
:placeholder="$t('lc.请输入金额上限')"
style="width: 100%"
></c-input>
</c-col>
</el-form-item>
</c-col>
<c-col :span="8">
<el-form-item
label="参与方参考号"
prop="searef"
style="width: 100%"
>
<c-input <c-input
v-model="model.infcon.searef" v-model="model.infcon.bnktyp"
maxlength="40" maxlength="40"
placeholder="请输入参与方参考号" placeholder="请输入银行类型"
> >
</c-input> </c-input>
</el-form-item> </el-form-item>
</c-col> </c-col>
</c-col>
<c-col :span="24">
<c-col :span="8">
<el-form-item
label="Account manager" prop="accmng" style="width: 100%">
<c-input v-model="model.infcon.accmng" maxlength="40" placeholder="请输入Account manager">
</c-input>
</el-form-item>
</c-col>
<c-col :span="8"> <c-col :span="8">
<el-form-item <el-form-item
label="参与方名称" prop="seapty" style="width: 100%"> label="资金转账类型"
<c-input v-model="model.infcon.seapty" maxlength="40" placeholder="请输入参与方名称"> prop="fttyp"
</c-input> style="width: 100%"
</el-form-item> >
</c-col>
<c-col :span="8">
<el-form-item label="角色" prop="searol" style="width: 100%">
<c-select <c-select
v-model="model.infcon.searol" v-model="model.infcon.fttyp"
style="width: 100%" style="width: 100%"
placeholder="请选择角色" placeholder="请选择资金转账类型"
:code="codes.searol" :code="codes.fttyp"
> >
</c-select> </c-select>
</el-form-item> </el-form-item>
</c-col> </c-col>
</c-col> </c-col>
<c-col :span="24"> <c-col :span="24">
<c-col :span="8"> <c-col :span="8">
<el-form-item <el-form-item label="资金部经办人" prop="usr" style="width: 100%">
label="角色ID" prop="usrextkey" style="width: 100%"> <c-input
<c-input v-model="model.infcon.usrextkey" maxlength="40" placeholder="请输入角色ID"> v-model="model.infcon.usr"
maxlength="40"
placeholder="请输入资金部经办人名称"
>
</c-input> </c-input>
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="8"> <c-col :span="8">
<el-form-item label="状态" prop="seasta" style="width: 100%"> <el-form-item label="挂起编号" prop="gzno" style="width: 100%">
<c-select <c-input
v-model="model.infcon.seasta" v-model="model.infcon.gzno"
style="width: 100%" maxlength="40"
placeholder="请选择状态" placeholder="请输入挂起编号"
:code="codes.seasta"> >
</c-select> </c-input>
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="8"> <c-col :span="8">
<el-form-item label="定存拆借类型" prop="fttyp" style="width: 100%"> <el-form-item label="状态" prop="seasta" style="width: 100%">
<c-select <c-select
v-model="model.infcon.fttyp" v-model="model.infcon.seasta"
style="width: 100%" style="width: 100%"
placeholder="请选择定存拆借类型" placeholder="请选择状态"
:code="codes.fttyp"> :code="codes.seasta"
>
</c-select> </c-select>
</el-form-item> </el-form-item>
</c-col> </c-col>
</c-col> </c-col>
</el-row> </el-row>
</template> </template>
</c-list-search> </c-list-search>
<c-col :span="24" style="margin-top: 10px; margin-bottom: 10px"> <c-col :span="24" style="margin-top: 10px; margin-bottom: 10px">
<c-button class="medium_bcs" size="medium" type="primary" style="margin-top: 10px; margin-bottom: 10px" title="FTTFCM" <c-button
@click="toFttfcm"> class="medium_bcs"
size="medium"
type="primary"
style="margin-top: 10px; margin-bottom: 10px"
title="FTTFCM"
@click="toFttfcm"
>
拆借存放登记及确认 拆借存放登记及确认
</c-button> </c-button>
<c-button class="medium_bcs" size="medium" type="primary" style="margin-left: 20px" title="FTTPCM" <c-button
@click="toFttpcm"> class="medium_bcs"
size="medium"
type="primary"
style="margin-left: 20px"
title="FTTPCM"
@click="toFttpcm"
>
头寸调拨登记及确认 头寸调拨登记及确认
</c-button> </c-button>
</c-col> </c-col>
...@@ -186,7 +161,7 @@ ...@@ -186,7 +161,7 @@
<div style="height: 90%"> <div style="height: 90%">
<c-col :span="24"> <c-col :span="24">
<el-tabs v-model="activeTab" class="y-tabs"> <el-tabs v-model="activeTab" class="y-tabs">
<el-tab-pane label="资金调拨查询" name="zjdb"> <el-tab-pane label="资金拆借/头寸调拨查询" name="zjdb">
<el-table <el-table
:data="stmData.data" :data="stmData.data"
:columns="stmData.columns" :columns="stmData.columns"
...@@ -237,7 +212,7 @@ export default { ...@@ -237,7 +212,7 @@ export default {
stmData: { stmData: {
columns: [ columns: [
{ {
label: "资金调拨编号", label: "业务编号",
prop: "ownref", prop: "ownref",
width: "180px", width: "180px",
}, },
...@@ -257,41 +232,80 @@ export default { ...@@ -257,41 +232,80 @@ export default {
width: "120px", width: "120px",
}, },
{ {
label: "资金部负责人", label: "客户名称",
prop: "ownsur", prop: "ownusr",
width: "120px", width: "120px",
}, },
{ {
label: "清算中心负责人", label: "资金部经办人",
prop: "usr", prop: "usr",
width: "140px", width: "120px",
}, },
{ {
label: "定存拆借类型", label: "资金转账类型",
prop: "fttyp", prop: "fttyp",
width: "120px", width: "120px",
}, },
{ {
label: "确认日期",
prop: "cnfdat",
width: "120px",
},
{
label: "到期日", label: "到期日",
prop: "matdat", prop: "matdat",
width: "120px", width: "120px",
}, },
{ {
label: "关闭日期",
prop: "clsdat",
width: "120px",
},
{
label: "年利率", label: "年利率",
prop: "rat", prop: "rat",
width: "120px", width: "120px",
}, },
{ {
label: "计息方式", label: "计息方式",
prop: "cntfra", prop: "cntfra",
width: "120px", width: "120px",
}, },
{ {
label: "银行类型", label: "银行类型",
prop: "bnktyp", prop: "bnktyp",
width: "120px", width: "120px",
}, },
{
label: "挂起编号",
prop: "gzno",
width: "120px",
},
{
label: "版本",
prop: "ver",
width: "120px",
},
{
label: "天数",
prop: "cntfra",
width: "120px",
},
{
label: "分行内部识别码",
prop: "branchinr",
width: "160px",
},
{
label: "分行关键识别码",
prop: "bchkeyinr",
width: "160px",
},
{
label: "实体外部键",
prop: "etyextkey",
width: "120px",
},
], ],
data: [], data: [],
}, },
......
src/page/Funds/Inffxd/event/index.js
...@@ -58,6 +58,11 @@ export default { ...@@ -58,6 +58,11 @@ export default {
this.model.infcon.eaamtfr = ""; this.model.infcon.eaamtfr = "";
this.model.infcon.eaamtto = ""; this.model.infcon.eaamtto = "";
this.model.infcon.ownusr = "";
this.model.infcon.usr = "";
this.model.infcon.acc = "";
this.model.infcon.acc2 = "";
this.model.infcon.searef = ""; this.model.infcon.searef = "";
this.model.infcon.ptyextkey = ""; this.model.infcon.ptyextkey = "";
this.model.infcon.ptynam = ""; this.model.infcon.ptynam = "";
......
src/page/Funds/Inffxd/model/index.js
...@@ -5,24 +5,24 @@ export default class inffxd { ...@@ -5,24 +5,24 @@ export default class inffxd {
this.data = { this.data = {
infcon: { infcon: {
seaownref: "", // 业务编号 .infcon.seaownref seaownref: "", // 业务编号 .infcon.seaownref
nam: "", // Name客户名称 .infcon.nam nam: "", // 业务名称 .infcon.nam
opndat: "", // opndat: "", //
opndatfrom: "", // 有效日期自 .infcon.opndatfrom opndatfrom: "", // 有效日期自 .infcon.opndatfrom
opndatto: "", // Open Date to .infcon.opndatto opndatto: "", // Open Date to .infcon.opndatto
seacur: "", // 币种 .infcon.seacur seacur: "", // 币种 .infcon.seacur
seaamtfr: "", // 金额自 .infcon.seaamtfr seaamtfr: "", // 金额自 .infcon.seaamtfr
seaamtto: "", // Amount to .infcon.seaamtto seaamtto: "", // Amount to .infcon.seaamtto
ownusr:"",
usr:"",
acc:"",
acc2:"",
searef: "", //参与方参考号 searef: "",
ptyextkey: "", // 选择一个参与方 .infcon.pty.extkey ptyextkey: "", // 选择一个参与方 .infcon.pty.extkey
ptynam: "", // External Visible Name .infcon.pty.nam ptynam: "", // External Visible Name .infcon.pty.nam
seapty: "", // 参与方名称/BIC .infcon.seapty seapty: "", // 参与方名称/BIC .infcon.seapty
searol: "", searol: "",
usrextkey: "", // User ID .infcon.usr.extkey usrextkey: "", // User ID .infcon.usr.extkey
seasta: "", // Status .infcon.seasta seasta: "", // Status .infcon.seasta
accmng: "", // Account manager .infcon.accmng accmng: "", // Account manager .infcon.accmng
fxtyp: "", //类型 fxtyp: "", //类型
......
src/page/Funds/Inffxd/views/Infsea.vue
...@@ -62,89 +62,58 @@ ...@@ -62,89 +62,58 @@
<c-col :span="24"> <c-col :span="24">
<c-col :span="8"> <c-col :span="8">
<el-form-item label="币种" prop="seacur" style="width: 100%"> <el-form-item
<c-select label="客户名称" prop="ownusr" style="width: 100%">
v-model="model.infcon.cur" <c-input v-model="model.infcon.ownusr" maxlength="40" placeholder="请输入客户名称">
style="width: 100%" </c-input>
placeholder="请选择币种"
:code="codes.seacur"
>
</c-select>
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="8"> <c-col :span="8">
<el-form-item :label="$t('lc.金额区间')" style="width: 100%">
<c-col :span="11">
<c-input
v-model="model.infcon.amtmin"
:placeholder="$t('lc.请输入金额下限')"
style="width: 100%"
></c-input>
</c-col>
<c-col :span="2" style="text-align: center">
<label style="display: inline-block; width: 100%">-</label>
</c-col>
<c-col :span="11">
<c-input
v-model="model.infcon.amtmax"
:placeholder="$t('lc.请输入金额上限')"
style="width: 100%"
></c-input>
</c-col>
</el-form-item>
</c-col>
<c-col :span="8">
<el-form-item <el-form-item
label="参与方参考号" label="账户经理" prop="accmng" style="width: 100%">
prop="searef" <c-input v-model="model.infcon.accmng" maxlength="40" placeholder="请输入账户经理名称">
style="width: 100%"
>
<c-input
v-model="model.infcon.searef"
maxlength="40"
placeholder="请输入参与方参考号"
>
</c-input> </c-input>
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="8">
<el-form-item label="外汇交易类型" prop="fxtyp" style="width: 100%">
<c-select
v-model="model.infcon.fxtyp"
style="width: 100%"
placeholder="请选择外汇交易类型"
:code="codes.fxtyp">
</c-select>
</el-form-item>
</c-col>
</c-col> </c-col>
<c-col :span="24"> <c-col :span="24">
<c-col :span="8"> <c-col :span="8">
<el-form-item <el-form-item
label="Account manager" prop="accmng" style="width: 100%"> label="资金部经办人" prop="usr" style="width: 100%">
<c-input v-model="model.infcon.accmng" maxlength="40" placeholder="请输入Account manager"> <c-input v-model="model.infcon.usr" maxlength="40" placeholder="请输入资金部经办人名称">
</c-input> </c-input>
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="8"> <c-col :span="8">
<el-form-item <el-form-item
label="参与方名称" prop="seapty" style="width: 100%"> label="外币结算账户" prop="acc" style="width: 100%">
<c-input v-model="model.infcon.seapty" maxlength="40" placeholder="请输入参与方名称"> <c-input v-model="model.infcon.acc" maxlength="40" placeholder="请输入外币结算账户">
</c-input> </c-input>
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="8"> <c-col :span="8">
<el-form-item label="角色" prop="searol" style="width: 100%">
<c-select
v-model="model.infcon.searol"
style="width: 100%"
placeholder="请选择角色"
:code="codes.searol"
>
</c-select>
</el-form-item>
</c-col>
</c-col>
<c-col :span="24">
<c-col :span="8">
<el-form-item <el-form-item
label="角色ID" prop="usrextkey" style="width: 100%"> label="本币结算账户" prop="acc2" style="width: 100%">
<c-input v-model="model.infcon.usrextkey" maxlength="40" placeholder="请输入角色ID"> <c-input v-model="model.infcon.usr" maxlength="40" placeholder="请输入本币结算账户">
</c-input> </c-input>
</el-form-item> </el-form-item>
</c-col> </c-col>
</c-col>
<c-col :span="24">
<c-col :span="8"> <c-col :span="8">
<el-form-item label="状态" prop="seasta" style="width: 100%"> <el-form-item label="状态" prop="seasta" style="width: 100%">
<c-select <c-select
...@@ -155,16 +124,7 @@ ...@@ -155,16 +124,7 @@
</c-select> </c-select>
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="8">
<el-form-item label="结售汇类型" prop="fxtyp" style="width: 100%">
<c-select
v-model="model.infcon.fxtyp"
style="width: 100%"
placeholder="请选择结售汇类型"
:code="codes.fxtyp">
</c-select>
</el-form-item>
</c-col>
</c-col> </c-col>
</el-row> </el-row>
...@@ -256,11 +216,20 @@ export default { ...@@ -256,11 +216,20 @@ export default {
width: "180px", width: "180px",
}, },
{ {
label: "平盘类型", label: "客户名称",
prop: "bnktyp", prop: "ownusr",
width: "180px", width: "120px",
},
{
label: "资金部经办人",
prop: "usr",
width: "120px",
},
{
label: "外汇交易类型",
prop: "fxtyp",
width: "120px",
}, },
{ {
label: "成交日期", label: "成交日期",
prop: "opndat", prop: "opndat",
...@@ -292,30 +261,55 @@ export default { ...@@ -292,30 +261,55 @@ export default {
width: "120px", width: "120px",
}, },
{ {
label: "远期交割日", label: "平盘日期",
prop: "setdat", prop: "setdat",
width: "120px", width: "120px",
}, },
{ {
label: "择期交割起始日", label: "择期交割起始日",
prop: "setdatfrm", prop: "setdatfrm",
width: "120px", width: "160px",
}, },
{ {
label: "择期交割截止日", label: "择期交割截止日",
prop: "setdatto", prop: "setdatto",
width: "160px",
},
{
label: "结算日期",
prop: "clsdat",
width: "120px",
},
{
label: "版本",
prop: "ver",
width: "120px",
},
{
label: "分支机构编号",
prop: "branchinr",
width: "120px", width: "120px",
}, },
{ {
label: "分支机构关键编号",
prop: "bchkeyinr",
width: "160px",
},
{
label: "交易主体", label: "交易主体",
prop: "trnman", prop: "trnman",
width: "120px", width: "120px",
}, },
{ {
label: "结售汇类型", label: "交易内部编号",
prop: "trdint", prop: "trdint",
width: "120px", width: "120px",
}, },
{
label: "交易外部编号",
prop: "trdout",
width: "120px",
},
{ {
label: "外币结算账号", label: "外币结算账号",
...@@ -328,16 +322,44 @@ export default { ...@@ -328,16 +322,44 @@ export default {
width: "120px", width: "120px",
}, },
{ {
label: "资金部经办人", label: "处置1",
prop: "ownsur", prop: "dsp",
width: "120px", width: "120px",
}, },
{ {
label: "营运部经办人", label: "处置2",
prop: "usr", prop: "dsp2",
width: "120px",
},
{
label: "现金覆盖率",
prop: "cshpct",
width: "120px",
},
{
label: "账户经理",
prop: "accmng",
width: "120px",
},
{
label: "汇率",
prop: "rat1",
width: "120px",
},
{
label: "账户经理部门",
prop: "hdbch",
width: "120px",
},
{
label: "实体外部键",
prop: "etyextkey",
width: "120px", width: "120px",
}, },
], ],
data: [], data: [],
}, },
......
src/page/index.vue
...@@ -581,13 +581,13 @@ export default { ...@@ -581,13 +581,13 @@ export default {
let orgObj = this.header.orgList.find(item => item.id === param) let orgObj = this.header.orgList.find(item => item.id === param)
let roleObj = this.header.roleTypeList.find(item => item.key === this.header.curRole.id+"") let roleObj = this.header.roleTypeList.find(item => item.key === this.header.curRole.id+"")
this.initRoleList(orgObj); this.initRoleList(orgObj);
if(this.header.roleList && this.header.roleList.length>0 && ((orgObj.departmentNumber==="1000" && roleObj.value!=="HEAD") if(this.header.roleList && this.header.roleList.length>0 && ((orgObj.departmentnumber==="1000" && roleObj.value!=="HEAD")
||(orgObj.departmentNumber!=="1000" && roleObj.value==="HEAD"))){ ||(orgObj.departmentnumber!=="1000" && roleObj.value==="HEAD"))){
this.changeRoles(this.header.roleList[0].id); this.changeRoles(this.header.roleList[0].id);
sessionStorage.setItem('curRole', JSON.stringify(this.header.roleList[0])); sessionStorage.setItem('curRole', JSON.stringify(this.header.roleList[0]));
} }
if(this.header.roleList && this.header.roleList.length===0 ) { if(this.header.roleList && this.header.roleList.length===0 ) {
if (orgObj.departmentNumber === "1000") { if (orgObj.departmentnumber === "1000") {
this.$notify({title: "失败", message: "请先维护总行机构角色!", type: "error",}); this.$notify({title: "失败", message: "请先维护总行机构角色!", type: "error",});
} else { } else {
this.$notify({title: "失败", message: "请先维护分行机构角色!", type: "error",}); this.$notify({title: "失败", message: "请先维护分行机构角色!", type: "error",});
......
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