Skip to content

I
isc-web-vue
Commit f4c04215 by 李少勇
Options

Merge branch 'develop' of http://114.115.138.98:8900/isc-v3.1/isc-web-vue into develop

parents 0cc5070d 60684fe5
Showing with 166 additions and 30 deletions
src/page/Display/DisplayRouter.js
...@@ -2068,6 +2068,18 @@ const DisplayRouter = [ ...@@ -2068,6 +2068,18 @@ const DisplayRouter = [
meta: {keepAlive: true, title: "交易快照-头寸调拨"} meta: {keepAlive: true, title: "交易快照-头寸调拨"}
}, },
{
name: "DisplayFxtssb",
path: "fxtssb",
component: () => import("./Funds/DisplayFxtssb.vue"),
meta: {keepAlive: true, title: "交易快照-即期结汇"}
},
{
name: "DisplayFxtsss",
path: "fxtsss",
component: () => import("./Funds/DisplayFxtsss.vue"),
meta: {keepAlive: true, title: "交易快照-即期售汇"}
},
]; ];
export default DisplayRouter; export default DisplayRouter;
\ No newline at end of file
src/page/Display/Funds/DisplayFxtssb.vue 0 → 100644
<template>
<Fxtssb></Fxtssb>
</template>
<script>
import Fxtssb from "~/page/Funds/Fxtssb/views";
export default {
name: "display-fxtssb",
components: {Fxtssb},
created() {
},
mounted() {
}
};
</script>
<style></style>
\ No newline at end of file
src/page/Display/Funds/DisplayFxtsss.vue 0 → 100644
<template>
<Fxtsss></Fxtsss>
</template>
<script>
import Fxtsss from "~/page/Funds/Fxtsss/views";
export default {
name: "display-fxtsss",
components: {Fxtsss},
created() {
},
mounted() {
}
};
</script>
<style></style>
\ No newline at end of file
src/page/Funds/Fxtfcm/event/buildCommons.js
...@@ -28,6 +28,7 @@ export default { ...@@ -28,6 +28,7 @@ export default {
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, fxtyp:model.fxdgrp.rec.fxtyp,
swtflg:model.swtflg,
}, },
cbsMap: { cbsMap: {
MAX: model.fxdgrp.cbs.max, MAX: model.fxdgrp.cbs.max,
......
src/page/Funds/Fxtfcm/views/Cnfp.vue
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
</c-input> </c-input>
<template slot="footer"> <template slot="footer">
<c-button style="margin: 0 5px" size="small" type="primary" :disabled="getOwnrefFlg" <c-button style="margin: 0 5px" size="small" type="primary" :disabled="getOwnrefFlg"
@click="getOwnref" > >
获取 获取
</c-button> </c-button>
</template> </template>
......
src/page/Funds/Fxtfcm/views/index.vue
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<el-form :model="model" :rules="rules" ref="modelForm" label-width="150px" label-position="right" size="small" :validate-on-rule-change="false"> <el-form :model="model" :rules="rules" ref="modelForm" label-width="150px" label-position="right" size="small" :validate-on-rule-change="false">
<c-tabs v-model="tabVal" ref="elment" type="card" @tab-click="myTabClick"> <c-tabs v-model="tabVal" ref="elment" type="card" @tab-click="myTabClick">
<!--fxtfcm PD000001 Confirmation --> <!--fxtfcm PD000001 Confirmation -->
<el-tab-pane label="Confirmation" name="cnfp"> <el-tab-pane label="平盘确认" name="cnfp">
<m-cnfp :model="model" :codes="codes"/> <m-cnfp :model="model" :codes="codes"/>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="费用/账务" name="setpan"> <el-tab-pane label="费用/账务" name="setpan">
......
src/page/Funds/Fxtfop/event/index.js
...@@ -63,5 +63,33 @@ export default { ...@@ -63,5 +63,33 @@ export default {
// this.updateValueSet(res.codeSet); // this.updateValueSet(res.codeSet);
this.model.fxdgrp.cbs.nom1.amt =res.data.fxdgrp.cbs.nom1.amt; this.model.fxdgrp.cbs.nom1.amt =res.data.fxdgrp.cbs.nom1.amt;
}, },
async onMaxcurChange(){
if (this.model.fxdgrp.cbs.max.cur !== "" && this.model.fxdgrp.cbs.nom1.cur !== null) {
this.defaultRateN1000();
}
},
async onNom1curChange(){
if (this.model.fxdgrp.cbs.max.cur !== "" && this.model.fxdgrp.cbs.nom1.cur !== null) {
this.defaultRateN1000();
}
},
async onMaxamtChange(){
debugger
if (this.model.fxdgrp.cbs.max.amt > 0 && this.model.fxdgrp.rec.rat >0 ) {
this.defaultCalculateN1100();
}
},
async onRatChange(){
debugger
if (this.model.fxdgrp.cbs.max.amt > 0 && this.model.fxdgrp.rec.rat >0 ) {
this.defaultCalculateN1100();
}
},
} }
} }
\ No newline at end of file
src/page/Funds/Fxtfop/views/Regp.vue
...@@ -40,12 +40,13 @@ ...@@ -40,12 +40,13 @@
<c-col :span="24"> <c-col :span="24">
<c-col :span="12"> <c-col :span="12">
<el-form-item label="卖出金额" prop="fxdgrp.cbs.max.cur"> <el-form-item label="卖出金额" prop="fxdgrp.cbs.max.cur">
<c-select-cur v-model="model.fxdgrp.cbs.max.cur" style="width: 100%" dbCode="curtxt"> </c-select-cur> <c-select-cur @change="onMaxcurChange" v-model="model.fxdgrp.cbs.max.cur" style="width: 100%" dbCode="curtxt"> </c-select-cur>
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="12"> <c-col :span="12">
<el-form-item label-width="5px" prop="fxdgrp.cbs.max.amt"> <el-form-item label-width="5px" prop="fxdgrp.cbs.max.amt">
<c-input-currency <c-input-currency
@change="onMaxamtChange"
:currency="model.fxdgrp.cbs.max.cur" :currency="model.fxdgrp.cbs.max.cur"
v-model="model.fxdgrp.cbs.max.amt"></c-input-currency> v-model="model.fxdgrp.cbs.max.amt"></c-input-currency>
</el-form-item> </el-form-item>
...@@ -54,7 +55,7 @@ ...@@ -54,7 +55,7 @@
<c-col :span="24"> <c-col :span="24">
<c-col :span="12"> <c-col :span="12">
<el-form-item label="买入金额" prop="fxdgrp.cbs.nom1.cur"> <el-form-item label="买入金额" prop="fxdgrp.cbs.nom1.cur">
<c-select-cur v-model="model.fxdgrp.cbs.nom1.cur" style="width: 100%" dbCode="curtxt"> </c-select-cur> <c-select-cur @change="onNom1curChange" v-model="model.fxdgrp.cbs.nom1.cur" style="width: 100%" dbCode="curtxt"> </c-select-cur>
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="12"> <c-col :span="12">
...@@ -68,7 +69,7 @@ ...@@ -68,7 +69,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" placeholder="请输入平盘牌价"> <c-input-currency @change="onRatChange" 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>
...@@ -137,16 +138,16 @@ export default { ...@@ -137,16 +138,16 @@ export default {
computed: { computed: {
getOwnrefFlg: function () { getOwnrefFlg: function () {
//debugger
console.log(this.model) console.log(this.model)
return this.model.fxdgrp.rec.fxtyp == '' || this.model.fxdgrp.apl.pts.extkey == '' || this.model.fxdgrp.rec.ownref != ''; return this.model.fxdgrp.rec.fxtyp == '' || this.model.fxdgrp.apl.pts.extkey == '' || this.model.fxdgrp.rec.ownref != '';
}, },
defaultNam950: function () { defaultNam950: function () {
//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)
let nam= this.getCodelabel(this.model.fxdgrp.rec.fxtyp, "fxt_fxtyp") + "," let nam= this.getCodelabel(this.model.fxdgrp.rec.fxtyp, "fxt_fxtyp") + ","
+ this.model.fxdgrp.cbs.max.cur + " " + amount; + this.model.fxdgrp.cbs.max.cur + " " + amount;
debugger
console.log("nam---",nam) console.log("nam---",nam)
this.model.fxdgrp.rec.nam=nam; this.model.fxdgrp.rec.nam=nam;
return nam return nam
...@@ -180,32 +181,32 @@ export default { ...@@ -180,32 +181,32 @@ export default {
}, },
}, },
'model.fxdgrp.cbs.max.cur': { // 'model.fxdgrp.cbs.max.cur': {
handler(newValue) { // handler(newValue) {
if (newValue !== "" && newValue !== null) { // if (newValue !== "" && newValue !== null) {
this.defaultRateN1000(); // this.defaultRateN1000();
} // }
}, // },
}, // },
'model.fxdgrp.cbs.nom1.cur': { // 'model.fxdgrp.cbs.nom1.cur': {
handler(newValue) { // handler(newValue) {
if (newValue !== "" && newValue !== null) { // if (newValue !== "" && newValue !== null) {
this.defaultRateN1000(); // this.defaultRateN1000();
} // }
}, // },
}, // },
'model.fxdgrp.cbs.max.amt': { // 'model.fxdgrp.cbs.max.amt': {
handler(newValue) { // handler(newValue) {
if (newValue !== "" && newValue !== null) { // if (newValue !== "" && newValue !== null) {
this.defaultCalculateN1100(); // this.defaultCalculateN1100();
} // }
}, // },
}, // },
} }
} }
......
src/page/Funds/Fxtfop/views/index.vue
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<el-form :model="model" :rules="rules" ref="modelForm" label-width="150px" label-position="right" size="small" :validate-on-rule-change="false"> <el-form :model="model" :rules="rules" ref="modelForm" label-width="150px" label-position="right" size="small" :validate-on-rule-change="false">
<c-tabs v-model="tabVal" ref="elment" type="card" @tab-click="myTabClick"> <c-tabs v-model="tabVal" ref="elment" type="card" @tab-click="myTabClick">
<!--fxtfop PD000001 Registration --> <!--fxtfop PD000001 Registration -->
<el-tab-pane label="Registration" name="regp"> <el-tab-pane label="平盘登记" name="regp">
<m-regp :model="model" :codes="codes"/> <m-regp :model="model" :codes="codes"/>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="费用/账务" name="setpan"> <el-tab-pane label="费用/账务" name="setpan">
......
src/page/Review/Funds/ReviewFxtssb.vue 0 → 100644
<template>
<ReviewWrapper>
<Fxtssb></Fxtssb>
</ReviewWrapper>
</template>
<script>
import Fxtssb from "~/page/Funds/Fxtssb/views";
import ReviewWrapper from "~/components/business/ReviewWrapper.vue";
export default {
name: "review-fxtssb",
components: {ReviewWrapper, Fxtssb},
created() {
},
mounted() {
}
};
</script>
<style></style>
\ No newline at end of file
src/page/Review/Funds/ReviewFxtsss.vue 0 → 100644
<template>
<ReviewWrapper>
<Fxtsss></Fxtsss>
</ReviewWrapper>
</template>
<script>
import Fxtsss from "~/page/Funds/Fxtsss/views";
import ReviewWrapper from "~/components/business/ReviewWrapper.vue";
export default {
name: "review-fxtsss",
components: {ReviewWrapper, Fxtsss},
created() {
},
mounted() {
}
};
</script>
<style></style>
\ No newline at end of file
src/page/Review/ReviewRouter.js
...@@ -2184,6 +2184,19 @@ const ReviewRouter = [ ...@@ -2184,6 +2184,19 @@ const ReviewRouter = [
component: () => import("./Business/ReviewFcncan.vue"), component: () => import("./Business/ReviewFcncan.vue"),
meta: {keepAlive: true, title: "复核-分离式保函业务协议注销"} meta: {keepAlive: true, title: "复核-分离式保函业务协议注销"}
}, },
//以下为资金复核界面
{
name: "review-fxtssb",
path: "review-fxtssb",
component: () => import("./Funds/ReviewFxtssb.vue"),
meta: {keepAlive: true, title: "复核-即期结汇"}
},
{
name: "review-fxtsss",
path: "review-fxtsss",
component: () => import("./Funds/ReviewFxtsss.vue"),
meta: {keepAlive: true, title: "复核-即期结汇"}
},
]; ];
export default ReviewRouter; export default ReviewRouter;
\ 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