Skip to content

I
isc-web-vue
Commit 802b1af3 by zenghuan
Options

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

parents b6ae11ae b4beb861
Showing with 212 additions and 41 deletions
src/page/Business/Gitsel/event/index.js
......@@ -395,10 +395,12 @@ export default {
}
},
async getInitButtons() {
let rtnmsg = await Api.post(
"/business/gitsel/getInitButtons",
this.model
);
// let rtnmsg = await Api.post(
// "/business/gitsel/getInitButtons",
// this.model
// );
//新建模拟数据
let rtnmsg = {respCode:SUCCESS,data:['NITOPN','GITOPN','HITOPN']}
if (rtnmsg.respCode == SUCCESS) {
const length = rtnmsg.data.length;
let btnStr = rtnmsg.data;
......
src/page/Funds/FundsRouter.js
const BusRouter = [
{ path: 'inffxd', component: () => import("./Inffxd/views"), name: 'Inffxd', meta: { title: '资结售汇报表交易查询' }, module: 'Funds' },
{ path: 'infftd', component: () => import("./Infftd/views"), name: 'Infftd', meta: { title: '资金拆借/头寸调拨报表交易查询' }, module: 'Funds' },
{ path: 'infftd', component: () => import("./Infftd1/views"), name: 'Infftd1', meta: { title: '资金拆借/头寸调拨报表交易查询' }, module: 'Funds' },
{ path: 'fttatt', component: () => import("./Fttatt/views"), name: 'Fttatt', meta: { title: 'Fttatt' }, module: 'Funds' },
{ path: 'fttfcm', component: () => import("./Fttfcm/views"), name: 'Fttfcm', meta: { title: 'Fttfcm' }, module: 'Funds' },
{ path: 'fttfcn', component: () => import("./Fttfcn/views"), name: 'Fttfcn', meta: { title: 'Fttfcn' }, module: 'Funds' },
......
src/page/Funds/infftd/event/index.js → src/page/Funds/Infftd1/event/index.js
......@@ -49,6 +49,7 @@ export default {
}
this.load = false;
},
//nothing
async handleReset() {
this.model.infcon.seaownref = "";
this.model.infcon.opndatfrom = new Date();
......@@ -70,5 +71,18 @@ export default {
this.pagination.pageNum = val;
this.handleSearch();
},
//拆借存放登记及确认
toFttfcm() {
this.routerPush({
path: '/business/fttfcm',
});
},
//头寸调拨登记及确认
toFttpcm() {
this.routerPush({
path: '/business/fttpcm',
});
},
},
};
src/page/Funds/infftd/views/Infsea.vue → src/page/Funds/Infftd1/views/Infsea.vue
......@@ -21,7 +21,7 @@
</c-col>
<c-col :span="8">
<el-form-item
label="开立有效日期"
label="交易有效日期"
prop="opndatfrom"
style="width: 100%"
>
......@@ -97,6 +97,17 @@
</template>
</c-list-search>
<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"
@click="toFttfcm">
拆借存放登记及确认
</c-button>
<c-button class="medium_bcs" size="medium" type="primary" style="margin-left: 20px" title="FTTPCM"
@click="toFttpcm">
头寸调拨登记及确认
</c-button>
</c-col>
<el-col :span="24" style="margin-top: 10px">
<div style="height: 90%">
<c-col :span="24">
......
src/page/Funds/Inffxd/event/index.js
......@@ -51,7 +51,6 @@ export default {
},
async handleReset() {
this.model.infcon.seaownref = "";
this.model.infcon.opndat = new Date();
this.model.infcon.opndatfrom = new Date();
this.model.infcon.opndatto = new Date();
this.model.infcon.nam = "";
......@@ -59,6 +58,15 @@ export default {
this.model.infcon.eaamtfr = "";
this.model.infcon.eaamtto = "";
this.model.infcon.searef = "";
this.model.infcon.ptyextkey = "";
this.model.infcon.ptynam = "";
this.model.infcon.seapty = "";
this.model.infcon.searol = "";
this.model.infcon.usrextkey = "";
this.model.infcon.seasta = "";
this.model.infcon.accmng = "";
this.model.infcon.fxtyp = "";
},
// pageSize改变
handleSizeChange(val) {
......@@ -71,5 +79,32 @@ export default {
this.pagination.pageNum = val;
this.handleSearch();
},
//进入即期结汇交易
toFxtssb() {
this.routerPush({
path: '/business/fxtssb',
});
},
//进入即期售汇交易
toFxtsss() {
this.routerPush({
path: '/business/fxtsss',
});
},
//进入结售汇平盘登记交易
toFxtlop() {
this.routerPush({
path: '/business/fxtlop',
});
},
//进入外币兑换平盘登记交易
toFxtfop() {
this.routerPush({
path: '/business/fxtfop',
});
},
},
};
src/page/Funds/Inffxd/model/index.js
import Api from "~/service/Api"
export default class inffxd{
constructor () {
this.data = {
infcon:{
seaownref:"", // 业务编号 .infcon.seaownref
nam:"", // Name客户名称 .infcon.nam
opndat:"", //
opndatfrom:"", // 有效日期自 .infcon.opndatfrom
opndatto:"", // Open Date to .infcon.opndatto
seacur:"", // 币种 .infcon.seacur
seaamtfr:"", // 金额自 .infcon.seaamtfr
seaamtto:"", // Amount to .infcon.seaamtto
},
infbut:{
dspstm:"", // display stream .infbut.dspstm
},
fttyp:"", // Funds Trans. Type .fttyp
pageId: "" // ctx的key
}
}
export default class inffxd {
constructor() {
this.data = {
infcon: {
seaownref: "", // 业务编号 .infcon.seaownref
nam: "", // Name客户名称 .infcon.nam
opndat: "", //
opndatfrom: "", // 有效日期自 .infcon.opndatfrom
opndatto: "", // Open Date to .infcon.opndatto
seacur: "", // 币种 .infcon.seacur
seaamtfr: "", // 金额自 .infcon.seaamtfr
seaamtto: "", // Amount to .infcon.seaamtto
searef: "", //参与方参考号
ptyextkey: "", // 选择一个参与方 .infcon.pty.extkey
ptynam: "", // External Visible Name .infcon.pty.nam
seapty: "", // 参与方名称/BIC .infcon.seapty
searol: "",
usrextkey: "", // User ID .infcon.usr.extkey
seasta: "", // Status .infcon.seasta
accmng: "", // Account manager .infcon.accmng
fxtyp: "", //类型
},
infbut: {
dspstm: "", // display stream .infbut.dspstm
},
fttyp: "", // Funds Trans. Type .fttyp
pageId: "" // ctx的key
}
}
}
\ No newline at end of file
src/page/Funds/Inffxd/views/Infsea.vue
......@@ -94,13 +94,103 @@
</c-col>
</el-form-item>
</c-col>
<c-col :span="8">
<el-form-item
label="参与方参考号"
prop="searef"
style="width: 100%"
>
<c-input
v-model="model.infcon.searef"
maxlength="40"
placeholder="请输入参与方参考号"
>
</c-input>
</el-form-item>
</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">
<el-form-item
label="参与方名称" prop="seapty" style="width: 100%">
<c-input v-model="model.infcon.seapty" maxlength="40" placeholder="请输入参与方名称">
</c-input>
</el-form-item>
</c-col>
<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
label="角色ID" prop="usrextkey" style="width: 100%">
<c-input v-model="model.infcon.usrextkey" maxlength="40" placeholder="请输入角色ID">
</c-input>
</el-form-item>
</c-col>
<c-col :span="8">
<el-form-item label="状态" prop="seasta" style="width: 100%">
<c-select
v-model="model.infcon.seasta"
style="width: 100%"
placeholder="请选择状态"
:code="codes.seasta">
</c-select>
</el-form-item>
</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>
</el-row>
</template>
</c-list-search>
<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="FXTSSB"
@click="toFxtssb">
即期结汇
</c-button>
<c-button class="medium_bcs" size="medium" type="primary" style="margin-left: 20px" title="FXTSSS"
@click="toFxtsss">
即期售汇
</c-button>
<c-button class="medium_bcs" size="medium" type="primary" style="margin-left: 20px" title="FXTLOP"
@click="toFxtlop">
结售汇平盘登记
</c-button>
<c-button class="medium_bcs" size="medium" type="primary" style="margin-left: 20px" title="FXTFOP"
@click="toFxtfop">
外币兑换平盘登记
</c-button>
</c-col>
<el-col :span="24" style="margin-top: 10px">
<div style="height: 90%">
<c-col :span="24">
......
src/page/Statics/Gtx/Dblgtx/infsea.vue
......@@ -492,7 +492,10 @@
onDblgtxSearch() {
this.searchLoading = true;
let currentOrg = this.$store.state.UserContext.currentOrg;
if (currentOrg.departmentNumber != '1000') {
console.log("===============")
console.log(this.$store.state.UserContext)
console.log(currentOrg+"=========================")
if (currentOrg != null && currentOrg.departmentNumber != '1000') {
this.model.objextkey = currentOrg.departmentNumber;
}
queryByPage(this.model).then(res => {
......
src/service/manage/gtxarg.js
import Api from "~/service/Api"
// 列表分页查询保函文本模板变量信息
export function queryByPage(data) {
return Api.post("/gtxArg/listPagingInfo", data);
export function queryByPage (data) {
return Api.post("/manager/gtxArg/listPagingInfo", data);
}
// 新增保函文本模板变量信息
export function addInfo(data){
return Api.post("/gtxArg/addInfo",data);
export function addInfo (data) {
return Api.post("/manager/gtxArg/addInfo", data);
}
// 编辑保函文本模板变量信息
export function editInfo(data){
return Api.post("/gtxArg/editInfo",data);
export function editInfo (data) {
return Api.post("/manager/gtxArg/editInfo", data);
}
// 查看保函文本模板变量信息
export function getInfo(data){
return Api.post("/gtxArg/getInfo",data);
export function getInfo (data) {
return Api.post("/manager/gtxArg/getInfo", data);
}
// 删除保函文本模板变量信息
export function deleteInfo(data){
return Api.post("/gtxArg/deleteInfo",data);
export function deleteInfo (data) {
return Api.post("/manager/gtxArg/deleteInfo", data);
}
// 根据交易类型获取保函文本模板变量列表
export function listInfo(data){
return Api.post("/gtxArg/listInfo",data);
export function listInfo (data) {
return Api.post("/manager/gtxArg/listInfo", data);
}
\ No newline at end of file
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