Commit 5094b49d by jianglong

修改fxtfop交易

parent 14481c37
...@@ -27,6 +27,7 @@ export default { ...@@ -27,6 +27,7 @@ export default {
objtyp: "FXD", objtyp: "FXD",
objinr: model.fxdgrp.rec.inr, objinr: model.fxdgrp.rec.inr,
ownref: model.fxdgrp.rec.ownref, ownref: model.fxdgrp.rec.ownref,
fxtyp:model.fxdgrp.rec.fxtyp,
}, },
cbsMap: { cbsMap: {
MAX: model.fxdgrp.cbs.max, MAX: model.fxdgrp.cbs.max,
......
...@@ -5,7 +5,63 @@ export default { ...@@ -5,7 +5,63 @@ export default {
mixins: [commonFunctions], mixins: [commonFunctions],
methods: { methods: {
async getOwnref(){ async getOwnref(){
if (this.model.fxdgrp.rec.fxtyp == "") {
this.$notify.warning({
title: '提示',
message: '请先选择平盘类型!'
});
return;
}
const loading = this.loading();
let res = await Api.post(`/${this.moduleRouter()}/fxtfop/getRef`, this.model);
loading.close();
if (res.respCode !== SUCCESS) {
this.$message.error(res.respMsg);
return;
}
this.model.fxdgrp.rec.ownref = res.data;
},
async defaultRateN1000() {
if (this.model.fxdgrp.cbs.max.cur == "") {
return;
}
if (this.model.fxdgrp.cbs.nom1.cur == "") {
return;
}
const loading = this.loading();
let res = await Api.post(`/${this.moduleRouter()}/fxtfop/defaultRateN1000`, this.model);
loading.close();
if (res.respCode !== SUCCESS) {
this.$message.error(res.respMsg);
return;
}
// this.updateValueSet(res.codeSet);
this.model.fxdgrp.rec.midrat =res.data.fxdgrp.rec.midrat;
},
async defaultCalculateN1100() {
if (this.model.fxdgrp.cbs.max.cur == "") {
return;
}
if (this.model.fxdgrp.cbs.nom1.cur == "") {
return;
}
const loading = this.loading();
let res = await Api.post(`/${this.moduleRouter()}/fxtfop/defaultCalculateN1100`, this.model);
loading.close();
if (res.respCode !== SUCCESS) {
this.$message.error(res.respMsg);
return;
} }
// this.updateValueSet(res.codeSet);
this.model.fxdgrp.cbs.nom1.amt =res.data.fxdgrp.cbs.nom1.amt;
},
} }
} }
\ No newline at end of file
export default {
"fxdgrp.rec.ownref": [
{type: "string", required: true, message: "必输项"},
{max: 16, message: "长度不能超过16"}
],
"fxdgrp.rec.nam": [
{type: "string", required: false, message: "必输项"},
{max: 40, message: "长度不能超过40"}
],
"fxdgrp.apl.pts.ref": [
{type: "string", required: false, message: "必输项"},
{max: 20, message: "长度不能超过20"}
],
"fxdgrp.rec.usr": [
{type: "string", required: false, message: "必输项"},
{max: 8, message: "长度不能超过8"}
],
"fxdgrp.apl.pts.extkey": [
{type: "string", required: true, message: "必输项"},
{max: 16, message: "长度不能超过16"}
],
"fxdgrp.apl.pts.adrblk": [
{type: "string", required: true, message: "必输项"},
{max: 35*4, message: "长度不能超过35*4"}
],
"fxdgrp.cbs.max.amt": [
{type: "string", required: true, message: "必输项"},
{max: 18, message: "整数位不能超过14位"},
{pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位"}
],
"fxdgrp.cbs.nom1.amt": [
{type: "string", required: false, message: "必输项"},
{max: 18, message: "整数位不能超过14位"},
{pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位"}
],
"fxdgrp.rec.rat": [
{required: true, message: "必输项"},
{max: 14, message: "长度不能超过14"}
],
"fxdgrp.rec.midrat": [
{required: true, message: "必输项"},
],
"fxdgrp.rec.opndat": [
{type: "string", required: true, message: "输入正确的日期"}
],
"fxdgrp.rec.valdat": [
{type: "string", required: true, message: "输入正确的日期"}
],
"fxdgrp.blk.remark": [
{type: "string", required: false, message: "必输项"},
{max: 35, message: "长度不能超过35"}
],
}
\ No newline at end of file
import commonFunctions from "~/mixin/commonFunctions.js";
import commonDepend from "~/mixin/commonDepend";
export default {
mixins: [commonFunctions, commonDepend],
methods: {
},
};
import Api from "~/service/Api" import Pub from "~/components/business/commonModel/index.js";
import Pts from "~/page/Model/Common/Pts" import Fxdgrp from '~/components/business/commonModel/fxdgrp';
import Pub from "../../../../components/business/commonModel/index.js";
export default class Fxtfop{ export default class Fxtfop{
constructor () { constructor () {
this.data = { this.data = {
fxdgrp:{ fxdgrp: new Fxdgrp().data,
rec:{
ownref:"", // 业务编号 .fxdgrp.rec.ownref
nam:"", // 业务名称 .fxdgrp.rec.nam
fxtyp:"", // 平盘类型 .fxdgrp.rec.fxtyp
opndat:"", // 成交日 .fxdgrp.rec.opndat
valdat:"", // 起息日 .fxdgrp.rec.valdat
rat:"", // 平盘牌价 .fxdgrp.rec.rat
midrat:"", // 中间价 .fxdgrp.rec.midrat
ownusr:"",
},
apl:{
pts:new Pts().data,
},
blk:{
remark:"", // 备注 .fxdgrp.blk.remark
},
cbs:{
max:{
cur:"", // Currency .fxdgrp.cbs.max.cur
amt:"", // Balance .fxdgrp.cbs.max.amt
},
nom1:{
cur:"", // Currency .fxdgrp.cbs.nom1.cur
amt:"", // Balance .fxdgrp.cbs.nom1.amt
},
},
},
fxtp:{ fxtp:{
frgchk:"X"
}, },
setmod: new Pub().data.Setmod, setmod: new Pub().data.Setmod,
docpan: new Pub().data.Docpan, docpan: new Pub().data.Docpan,
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
<c-input v-model="model.fxdgrp.rec.ownref" maxlength="16" placeholder="请输入业务编号" disabled> <c-input v-model="model.fxdgrp.rec.ownref" maxlength="16" placeholder="请输入业务编号" disabled>
</c-input> </c-input>
<template slot="footer"> <template slot="footer">
<c-button style="margin: 0 5px" size="small" type="primary" :disabled="model.fxdgrp.apl.pts.ptainr === ''" <c-button style="margin: 0 5px" size="small" type="primary" :disabled="getOwnrefFlg"
@click="getOwnref"> @click="getOwnref">
获取 获取
</c-button> </c-button>
...@@ -19,9 +19,9 @@ ...@@ -19,9 +19,9 @@
</c-col> </c-col>
<c-col :span="24"> <c-col :span="24">
<c-form-item label="业务负责人" prop="fxdgrp.rec.ownusr"> <c-form-item label="业务负责人" prop="fxdgrp.rec.usr">
<c-fullbox> <c-fullbox>
<c-input v-model="model.fxdgrp.rec.ownusr" placeholder="请输入业务负责人" disabled></c-input> <c-input v-model="model.fxdgrp.rec.usr" placeholder="请输入业务负责人" ></c-input>
<template slot="footer"> <template slot="footer">
<c-button style="margin: 0 5px" size="small" type="primary"> <c-button style="margin: 0 5px" size="small" type="primary">
i i
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
</c-col> </c-col>
<c-col :span="24"> <c-col :span="24">
<el-form-item label="平盘类型" prop="fxdgrp.rec.fxtyp"> <el-form-item label="平盘类型" prop="fxdgrp.rec.fxtyp">
<c-select v-model="model.fxdgrp.rec.fxtyp" style="width:100%" :code="codes.fxt_fxtyp"> <c-select v-model="model.fxdgrp.rec.fxtyp" style="width:100%" :code="codes.fxt_fxtyp" :filterKey="['FS', 'FB']">
</c-select> </c-select>
</el-form-item> </el-form-item>
</c-col> </c-col>
...@@ -68,7 +68,7 @@ ...@@ -68,7 +68,7 @@
</c-col> </c-col>
<c-col :span="24"> <c-col :span="24">
<c-form-item label="平盘牌价" prop="fxdgrp.rec.rat"> <c-form-item label="平盘牌价" prop="fxdgrp.rec.rat">
<c-input-currency v-model="model.fxdgrp.rec.rat" style="width:100%" :precision="6" disabled placeholder="请输入平盘牌价"> <c-input-currency v-model="model.fxdgrp.rec.rat" style="width:100%" :precision="6" placeholder="请输入平盘牌价">
</c-input-currency> </c-input-currency>
</c-form-item> </c-form-item>
</c-col> </c-col>
...@@ -95,7 +95,7 @@ ...@@ -95,7 +95,7 @@
<c-col :span="12" style="padding-right: 20px"> <c-col :span="12" style="padding-right: 20px">
<c-col :span="24"> <c-col :span="24">
<c-form-item label="业务名称" prop="fxdgrp.rec.nam"> <c-form-item label="业务名称" prop="fxdgrp.rec.nam">
<c-input v-model="model.fxdgrp.rec.nam" maxlength="40" ></c-input> <c-input v-model="defaultNam950" maxlength="40" disabled></c-input>
</c-form-item> </c-form-item>
</c-col> </c-col>
<c-col :span="24"> <c-col :span="24">
...@@ -104,7 +104,7 @@ ...@@ -104,7 +104,7 @@
:isShowCard="false" :isShowCard="false"
:argadr="{title: '平盘对手', grp: 'fxdgrp', rol: 'apl',}" :argadr="{title: '平盘对手', grp: 'fxdgrp', rol: 'apl',}"
:label="{labelExtkey:'平盘对手',labelNam:'名称',labelAdrblk:'地址',}" :label="{labelExtkey:'平盘对手',labelNam:'名称',labelAdrblk:'地址',}"
ptytyp="C"> ptytyp="B">
</c-ptap> </c-ptap>
</el-card> </el-card>
</c-col> </c-col>
...@@ -130,9 +130,80 @@ export default { ...@@ -130,9 +130,80 @@ export default {
props:["model","codes"], props:["model","codes"],
mixins: [event,commonProcess], mixins: [event,commonProcess],
data(){ data(){
return {} return {
}
},
computed: {
getOwnrefFlg: function () {
//debugger
console.log(this.model)
return this.model.fxdgrp.rec.fxtyp == '' || this.model.fxdgrp.apl.pts.extkey == '' || this.model.fxdgrp.rec.ownref != '';
},
defaultNam950: function () {
//debugger;
let amount = this.moneyFormat(this.model.fxdgrp.cbs.max.amt, this.model.fxdgrp.cbs.max.cur)
return this.getCodelabel(this.model.fxdgrp.rec.fxtyp, "fxt_fxtyp") + ","
+ this.model.fxdgrp.cbs.max.cur + " " + amount;
},
},
methods: {
//获取码值
getCodelabel(value, codenam) {
const codeobj = this.codes[codenam].find(obj => obj.value === value)
return codeobj ? codeobj.label : value;
},
},
created: function () {
},
watch: {
//申请人变得 本外币下拉框需变化
'model.fxdgrp.apl.pts.ptyinr': {
handler(newValue) {
// if (newValue == "" || newValue == null) {
// this.model.fxdgrp.rec.acc = "";
// this.model.fxdgrp.rec.acc2 = "";
// this.model.accLst = [];
// this.model.accLst2 = [];
// return
// }
// this.defaultAccountsN1000();
},
}, },
created() {}
'model.fxdgrp.cbs.max.cur': {
handler(newValue) {
if (newValue !== "" && newValue !== null) {
this.defaultRateN1000();
}
},
},
'model.fxdgrp.cbs.nom1.cur': {
handler(newValue) {
if (newValue !== "" && newValue !== null) {
this.defaultRateN1000();
}
},
},
'model.fxdgrp.cbs.max.amt': {
handler(newValue) {
if (newValue !== "" && newValue !== null) {
this.defaultCalculateN1100();
}
},
},
}
} }
</script> </script>
<style> <style>
......
...@@ -41,11 +41,12 @@ import Setpan from "~/components/business/setmod/views"; ...@@ -41,11 +41,12 @@ import Setpan from "~/components/business/setmod/views";
import Docpan from "~/components/business/docpan/views"; import Docpan from "~/components/business/docpan/views";
import buildFn from "../event/buildCommons.js"; import buildFn from "../event/buildCommons.js";
import Fxtfop from "../model/index"; import Fxtfop from "../model";
import operationFunc from "~/mixin/operationFunc"; import operationFunc from "~/mixin/operationFunc";
import commonDepend from "~/mixin/commonDepend"; import commonDepend from "~/mixin/commonDepend";
import Regp from "./Regp"; import Regp from "./Regp";
import event from "../event"; import event from "../event";
import Check from "../model/Check.js";
export default { export default {
name: "Fxtfop", name: "Fxtfop",
...@@ -64,8 +65,9 @@ export default { ...@@ -64,8 +65,9 @@ export default {
return { return {
tabVal: "regp", tabVal: "regp",
trnName: "fxtfop", trnName: "fxtfop",
trnType: "",
model: new Fxtfop().data, model: new Fxtfop().data,
rules: "", rules: Check,
codes: { ...CodeTable }, codes: { ...CodeTable },
} }
}, },
...@@ -74,7 +76,7 @@ export default { ...@@ -74,7 +76,7 @@ export default {
this.tabClick(tab) this.tabClick(tab)
} }
}, },
mounted() { created: async function () {
console.log("进入fxtfop交易"); console.log("进入fxtfop交易");
let params = { let params = {
transName: this.trnName, transName: this.trnName,
...@@ -84,7 +86,7 @@ export default { ...@@ -84,7 +86,7 @@ export default {
}, },
}, },
}; };
// this.init(params) this.init(params)
}, },
} }
</script> </script>
......
...@@ -270,7 +270,7 @@ ...@@ -270,7 +270,7 @@
return this.model.fxdgrp.rec.fxtyp == '' || this.model.fxdgrp.rec.ownref != ''; return this.model.fxdgrp.rec.fxtyp == '' || this.model.fxdgrp.rec.ownref != '';
}, },
defaultNam950: function () { defaultNam950: function () {
debugger; //debugger;
let amount = this.moneyFormat(this.model.fxdgrp.cbs.max.amt, this.model.fxdgrp.cbs.max.cur) let amount = this.moneyFormat(this.model.fxdgrp.cbs.max.amt, this.model.fxdgrp.cbs.max.cur)
return this.getCodelabel(this.model.fxdgrp.rec.fxtyp, "fxt_fxtyp") + "," return this.getCodelabel(this.model.fxdgrp.rec.fxtyp, "fxt_fxtyp") + ","
+ this.model.fxdgrp.cbs.max.cur + " " + amount; + this.model.fxdgrp.cbs.max.cur + " " + amount;
......
...@@ -199,9 +199,9 @@ toFxtfop() { ...@@ -199,9 +199,9 @@ toFxtfop() {
//Info //Info
toInfo(row,objtyp,subobjtyp){ toInfo(row,objtyp,subobjtyp){
console.log('activeTab:', this.activeTab.toLowerCase() == 'sg' ? 'br' : this.activeTab.toLowerCase() )
this.routerPush({ this.routerPush({
path: "/business/" + (this.activeTab.toLowerCase() == 'sg' ? 'br' : this.activeTab.toLowerCase()) + "dinf", path: "/business/fxdinf",
query: { inr: row.inr,objtyp:objtyp,pntinr:row.pntinr,subobjtyp:subobjtyp} query: { inr: row.inr,objtyp:objtyp,pntinr:row.pntinr,subobjtyp:subobjtyp}
}); });
}, },
......
<template>
<Xxdinf></Xxdinf>
</template>
<script>
import Xxdinf from "~/page/Statics/Xxdinf/views";
export default {
name: "Info-Fxd",
components: { Xxdinf },
created() { },
mounted() { }
};
</script>
<style></style>
\ No newline at end of file
...@@ -113,6 +113,12 @@ const DisplayRouter = [ ...@@ -113,6 +113,12 @@ const DisplayRouter = [
component: () => import("./InfoMcd.vue"), component: () => import("./InfoMcd.vue"),
meta: {keepAlive: true, title: "Info-万能交易"} meta: {keepAlive: true, title: "Info-万能交易"}
}, },
{
name: "InfoFxd",
path: "fxdinf",
component: () => import("./InfoFxd.vue"),
meta: {keepAlive: true, title: "Info-结售汇/兑换平盘交易"}
},
]; ];
export default DisplayRouter; export default DisplayRouter;
\ No newline at end of file
...@@ -217,6 +217,9 @@ export default { ...@@ -217,6 +217,9 @@ export default {
case 'MCD': case 'MCD':
trnUrl = '/Derivative/mctsel' trnUrl = '/Derivative/mctsel'
break; break;
case 'FXD':
trnUrl = '/funds/fxtsel'
break;
default: default:
break; break;
} }
......
...@@ -57,6 +57,9 @@ ...@@ -57,6 +57,9 @@
<div v-else-if="obj.objtyp === 'MCD' "> <div v-else-if="obj.objtyp === 'MCD' ">
<m-mcdovwp :model="model" :codes="codes" /> <m-mcdovwp :model="model" :codes="codes" />
</div> </div>
<div v-else-if="obj.objtyp === 'FXD' ">
<m-fxdovwp :model="model" :codes="codes" />
</div>
<div v-else-if="obj.objtyp === 'CPD' && obj.paytyp === 'I'"> <div v-else-if="obj.objtyp === 'CPD' && obj.paytyp === 'I'">
<m-cpdovwp :model="model" :codes="codes" /> <m-cpdovwp :model="model" :codes="codes" />
</div> </div>
...@@ -212,6 +215,7 @@ import trdOvwp from "~/page/Financing/Trtopn/views/ovwp"; ...@@ -212,6 +215,7 @@ import trdOvwp from "~/page/Financing/Trtopn/views/ovwp";
import bpdOvwp from "~/page/Financing/Bptopn/views/Ovwp"; import bpdOvwp from "~/page/Financing/Bptopn/views/Ovwp";
import dfdOvwp from "~/page/Financing/Dftame/views/Ovwp1"; import dfdOvwp from "~/page/Financing/Dftame/views/Ovwp1";
import mcdOvwp from "~/page/Derivative/Mctopn/views/Ovwp"; import mcdOvwp from "~/page/Derivative/Mctopn/views/Ovwp";
import fxdOvwp from "~/page/Funds/Fxtfop/views/Regp";
import cptOvwp from "~/page/Remittance/Cptopn/views/Ovwp"; import cptOvwp from "~/page/Remittance/Cptopn/views/Ovwp";
import cpdOvwp from "~/page/Remittance/Cptadv/views/Ovwp"; import cpdOvwp from "~/page/Remittance/Cptadv/views/Ovwp";
import jsdopnOvwp from "~/page/Derivative/Jstopn/views/Ovwp"; import jsdopnOvwp from "~/page/Derivative/Jstopn/views/Ovwp";
...@@ -253,6 +257,7 @@ export default { ...@@ -253,6 +257,7 @@ export default {
"m-bpdovwp": bpdOvwp, "m-bpdovwp": bpdOvwp,
"m-dfdovwp": dfdOvwp, "m-dfdovwp": dfdOvwp,
"m-mcdovwp": mcdOvwp, "m-mcdovwp": mcdOvwp,
"m-fxdovwp": fxdOvwp,
"m-cpdovwp": cpdOvwp, "m-cpdovwp": cpdOvwp,
"m-cptovwp": cptOvwp, "m-cptovwp": cptOvwp,
"m-jsdopnOvwp": jsdopnOvwp, "m-jsdopnOvwp": jsdopnOvwp,
......
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