Skip to content

I
isc-web-vue
Commit bbc7201e by youbaofeng
Options

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

parents 7cf93e33 11d057d8
Showing with 108 additions and 70 deletions
src/page/Frontend/FTRouter.js
......@@ -2,7 +2,7 @@
const BusRouter = [
{ path: 'batchg', component: ()=>import("./Batchg/views"), name: 'Batchg', meta: { title: 'Batchg' } ,module:'frontend'},
{ path: 'cpsmsg', component: ()=>import("./Cpsmsg/views"), name: 'Cpsmsg', meta: { title: 'Cpsmsg' } ,module:'frontend'},
{ path: 'cpssxf', component: ()=>import("./Cpssxf/views"), name: 'Cpssxf', meta: { title: 'Cpssxf' } ,module:'frontend'},
{ path: 'cpssxf', component: ()=>import("./Cpssxf/views"), name: 'Cpssxf', meta: { title: '手续费管理' } ,module:'frontend'},
{ path: 'cpysel', component: ()=>import("./Cpysel/views"), name: 'Cpysel', meta: { title: 'Cpysel' } ,module:'frontend'},
{ path: 'cpzsel', component: ()=>import("./Cpzsel/views"), name: 'Cpzsel', meta: { title: 'Cpzsel' } ,module:'frontend'},
{ path: 'ctmsel', component: ()=>import("./Ctmsel/views"), name: 'Ctmsel', meta: { title: 'Ctmsel' } ,module:'frontend'},
......
src/page/Frontend/Fxpjrbsel/views/Schpnl.vue
......@@ -152,7 +152,7 @@ export default {
{
label: "被封装20域编号",
prop: "bfzybh",
width: "120px"
width: "160px"
},
{
label: "处理状态",
......
src/page/Funds/Crtcri/model/index.js
......@@ -68,6 +68,9 @@ export default class Crtcri {
setmod: new Pub().data.Setmod,
docpan: new Pub().data.Docpan,
trndia: new Pub().data.Trndia,
doctre: new Pub().data.Doctre,
mtabut: new Pub().data.Mtabut,
trnmod: new Pub().data.Trnmod,
}
}
}
\ No newline at end of file
src/page/Funds/Crtcri/views/Clip.vue
......@@ -97,7 +97,7 @@
<c-col :span="12">
<el-form-item :label="$t('crtp.业务种类')" prop="crdgrp.rec.rcvobjtyp">
<c-select v-model="model.crdgrp.rec.rcvobjtyp" style="width:100%">
<c-select dbCode="RMB122" v-model="model.crdgrp.rec.rcvobjtyp" style="width:100%">
</c-select>
</el-form-item>
</c-col>
......@@ -146,7 +146,7 @@
<c-col :span="12">
<el-form-item :label="$t('crtp.客户类型')" prop="crdgrp.rec.custyp">
<c-select v-model="model.crdgrp.rec.custyp" style="width:100%" dbCode="custyp">
<c-select dbCode="SZPTY" v-model="model.crdgrp.rec.custyp" style="width:100%">
</c-select>
</el-form-item>
</c-col>
......
src/page/Funds/Crtcri/views/index.vue
......@@ -17,6 +17,16 @@
<m-docpan :codes="codes" :model="model" />
</c-content>
</el-tab-pane>
<el-tab-pane label="附件信息" name="doctre">
<c-content>
<m-doctre :model="model" :codes="codes" />
</c-content>
</el-tab-pane>
<el-tab-pane label="附言" name="coninfp">
<c-content>
<m-coninfp :codes="codes" :model="model" />
</c-content>
</el-tab-pane>
</c-tabs>
</el-form>
<c-function-btn
......@@ -36,6 +46,8 @@ import Crtcri from "../model"
import Clip from "./Clip"
import Setpan from "~/components/business/setmod/views";
import Docpan from "~/components/business/docpan/views";
import Doctre from "~/components/business/doctre/views";
import Coninfp from "~/components/business/coninfp/views";
import operationFunc from "~/mixin/operationFunc";
import commonDepend from "~/mixin/commonDepend";
......@@ -48,6 +60,8 @@ export default {
"m-clip": Clip,
"m-setpan": Setpan,
"m-docpan": Docpan,
"m-doctre": Doctre,
"m-coninfp": Coninfp
},
provide() {
return {
......
src/page/Funds/Crtcro/model/index.js
......@@ -63,6 +63,9 @@ export default class Crtcri {
setmod: new Pub().data.Setmod,
docpan: new Pub().data.Docpan,
trndia: new Pub().data.Trndia,
doctre: new Pub().data.Doctre,
mtabut: new Pub().data.Mtabut,
trnmod: new Pub().data.Trnmod,
}
}
}
\ No newline at end of file
src/page/Funds/Crtcro/views/Clop.vue
......@@ -68,7 +68,7 @@
<c-col :span="12">
<el-form-item :label="$t('crtp.清算币种及金额')" prop="crdgrp.cbs.max.cur">
<c-select v-model="model.crdgrp.cbs.max.cur" style="width:100%">
<c-select v-model="model.crdgrp.cbs.max.cur" style="width:100%" dbCode="curtxt">
</c-select>
</el-form-item>
</c-col>
......@@ -89,7 +89,7 @@
<c-col :span="12">
<el-form-item :label="$t('crtp.业务种类')" prop="crdgrp.rec.rcvobjtyp">
<c-select v-model="model.crdgrp.rec.rcvobjtyp" style="width:100%">
<c-select dbCode="RMB122" v-model="model.crdgrp.rec.rcvobjtyp" style="width:100%">
</c-select>
</el-form-item>
</c-col>
......
src/page/Funds/Crtcro/views/index.vue
......@@ -18,6 +18,16 @@
<m-docpan :codes="codes" :model="model" />
</c-content>
</el-tab-pane>
<el-tab-pane label="附件信息" name="doctre">
<c-content>
<m-doctre :model="model" :codes="codes" />
</c-content>
</el-tab-pane>
<el-tab-pane label="附言" name="coninfp">
<c-content>
<m-coninfp :codes="codes" :model="model" />
</c-content>
</el-tab-pane>
</c-tabs>
</el-form>
<c-function-btn
......@@ -37,6 +47,8 @@ import Crtcro from "../model"
import Clop from "./Clop"
import Setpan from "~/components/business/setmod/views";
import Docpan from "~/components/business/docpan/views";
import Doctre from "~/components/business/doctre/views";
import Coninfp from "~/components/business/coninfp/views";
import operationFunc from "~/mixin/operationFunc";
import commonDepend from "~/mixin/commonDepend";
......@@ -49,6 +61,8 @@ export default {
"m-clop": Clop,
"m-setpan": Setpan,
"m-docpan": Docpan,
"m-doctre": Doctre,
"m-coninfp": Coninfp
},
provide() {
return {
......
src/page/Funds/FundsRouter.js
......@@ -33,6 +33,8 @@ const BusRouter = [
},
{ path: 'fxtssb', component: () => import("./Fxtssb/views"), name: 'Fxtssb', meta: { title: '即期结汇交易' }, module: 'Funds' },
{ path: 'fxtsss', component: () => import("./Fxtsss/views"), name: 'Fxtsss', meta: { title: '即期售汇交易' }, module: 'Funds' },
{ path: 'crtcri', component: () => import("./Crtcri/views"), name: 'Crtcri', meta: { title: '汇入清算' }, module: 'Funds' },
{ path: 'crtcro', component: () => import("./Crtcro/views"), name: 'Crtcro', meta: { title: '汇出清算' }, module: 'Funds' },
{ path: 'fxtsqo', component: () => import("./Fxtsqo/views"), name: 'Fxtsqo', meta: { title: '结售汇报价' }, module: 'Funds' },
{ path: 'crtcbk', component: () => import("./Crtcbk/views"), name: 'Crtcbk', meta: { title: '退汇清算' }, module: 'Funds' },
{ path: 'crtctf', component: () => import("./Crtctf/views"), name: 'Crtctf', meta: { title: '转汇清算' }, module: 'Funds' },
......
src/page/Funds/Fxtlcm/views/Cnfp.vue
......@@ -42,7 +42,7 @@
<!-- 平盘类型 -->
<c-col :span="24">
<el-form-item :label="$t('fxtlcm.平盘类型')" prop="fxdgrp.rec.fxtyp">
<c-select v-model="model.fxdgrp.rec.fxtyp" style="width:100%" >
<c-select v-model="model.fxdgrp.rec.fxtyp" :code="codes.fxt_fxtyp" style="width:100%" >
</c-select>
</el-form-item>
......@@ -51,7 +51,7 @@
<c-col :span="24">
<c-col :span="12">
<el-form-item :label="$t('fxtsqo.卖出金额')" prop="fxdgrp.cbs.max.cur">
<c-select v-model="model.fxdgrp.cbs.max.cur" style="width:100%">
<c-select v-model="model.fxdgrp.cbs.max.cur" :code="codes.bopcur" style="width:100%">
</c-select>
</el-form-item>
</c-col>
......@@ -65,7 +65,7 @@
<c-col :span="24">
<c-col :span="12">
<el-form-item :label="$t('fxtsqo.买入金额')" prop="fxdgrp.cbs.nom1.cur">
<c-select v-model="model.fxdgrp.cbs.nom1.cur" style="width:100%">
<c-select v-model="model.fxdgrp.cbs.nom1.cur" :code="codes.bopcur" style="width:100%">
</c-select>
</el-form-item>
</c-col>
......@@ -175,7 +175,6 @@
<script>
import Api from "~/service/Api"
import commonProcess from "~/mixin/commonProcess";
import CodeTable from "~/config/CodeTable"
export default {
......
src/page/Funds/Fxtlcm/views/index.vue
......@@ -61,11 +61,15 @@ export default {
trnName: "fxtlcm",
trnType: "",
model: new Fxtlcm().data,
codes: {},
codes: { ...CodeTable },
rules: {},
}
},
methods:{},
methods:{
myTabClick(tab) {
this.tabClick(tab);
},
},
created:async function(){},
mounted() {
console.log("fxtlcm");
......
src/page/Funds/Fxtlop/views/Regp.vue
......@@ -32,7 +32,6 @@
<c-input
v-model="model.fxdgrp.rec.ownusr"
placeholder="请输入业务负责人"
disabled
/>
</c-form-item>
</c-col>
......@@ -42,7 +41,7 @@
v-model="model.fxdgrp.rec.fxtyp"
style="width: 100%"
placeholder="请输入平盘类型"
dbCode=""
:code="codes.fxt_fxtyp"
>
</c-select>
</el-form-item>
......@@ -53,7 +52,7 @@
<c-select-cur
v-model="model.fxdgrp.cbs.max.cur"
style="width: 100%"
dbCode="curtxt"
:code="codes.bopcur"
>
</c-select-cur>
</el-form-item>
......@@ -73,7 +72,8 @@
<c-select-cur
v-model="model.fxdgrp.cbs.nom1.cur"
style="width: 100%"
dbCode="curtxt"
:code="codes.bopcur"
disabled
>
</c-select-cur>
</el-form-item>
......@@ -94,7 +94,6 @@
v-model="model.fxdgrp.rec.rat"
style="width: 100%"
:precision="6"
disabled
placeholder="请输入平盘牌价"
>
</c-input-currency>
......
src/page/Funds/Fxtlop/views/index.vue
......@@ -28,6 +28,13 @@
</el-tab-pane>
</c-tabs>
</el-form>
<c-function-btn
:handleCheck="handleCheck"
:handleStash="handleStash"
:handleSubmit="handleSubmit"
@handleSureWarning="handleSureWarning"
ref="commonBtn">
</c-function-btn>
</div>
</template>
<script>
......@@ -61,28 +68,28 @@ export default {
trnName: "fxtlop",
trnType: "",
model: new Fxtlop().data,
codes: {},
codes: {...CodeTable},
rules: {},
};
},
methods: {
myTabClick(tab) {
this.tabClick(tab);
/**
* do it yourself
**/
},
},
created() {
console.log("进入fxtlop交易");
let rtnmsg = this.init({});
if (rtnmsg.respCode == SUCCESS) {
this.updateModel(rtnmsg.data);
//TODO 处理数据逻辑
} else {
this.$notify.error({ title: "错误", message: "服务请求失败！" });
created() {},
mounted() {
console.log("fxtlop");
let params = {
transName: this.trnName,
fxdgrp: {
rec: {
inr: this.$route.query.inr || "",
},
},
};
this.init(params)
}
},
};
</script>
<style></style>
src/page/Funds/Fxtsqo/views/index.vue
<template>
<div class="eContainer">
<c-page title="结售汇报价">
<!-- <c-page title="结售汇报价"> -->
<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" >
<!--Quote -->
......@@ -25,11 +25,6 @@
<!-- <el-tab-pane :label="$t('fxtsqo.外汇买卖水单/客户回单')" name="fxtapll2">
<m-fxtapll2 :model="model" :codes="codes"/>
</el-tab-pane> -->
<el-tab-pane :label="$t('commonModels.保证金')" name="ccvpan">
<c-content>
<m-ccvpan :model="model" :codes="codes"></m-ccvpan>
</c-content>
</el-tab-pane>
</c-tabs>
</el-form>
<c-function-btn
......@@ -38,20 +33,19 @@
:handleSubmit="handleSubmit"
@handleSureWarning="handleSureWarning"
ref="commonBtn"></c-function-btn>
</c-page>
<!-- </c-page> -->
</div>
</template>
<script>
import Api from "~/service/Api";
import CodeTable from "~/config/CodeTable";
import Fxtsqo from "../model";
import commonProcess from "~/mixin/commonProcess";
import commonDepend from "~/mixin/commonDepend";
import operationFunc from "~/mixin/operationFunc";
import Quop from "./Quop";
import Fxtapll1 from "./Fxtapll1";
import Setmod from "~/components/business/setmod/views";
import Docpan from "~/components/business/docpan/views";
import Ccvpan from "~/components/business/ccvpan/views";
import event from "../event";
import buildFn from "../event/buildCommons.js";
......@@ -62,28 +56,25 @@ export default {
"m-fxtapll1" : Fxtapll1,
"m-setmod": Setmod,
"m-docpan": Docpan,
"m-ccvpan": Ccvpan,
},
provide() {
return {
root: this
}
},
mixins: [commonProcess,event,buildFn,commonDepend,operationFunc], // 里面包含了Default、Check等的公共处理
mixins: [event,buildFn,commonDepend,operationFunc], // 里面包含了Default、Check等的公共处理
data(){
return {
tabVal: "quop",
trnName: "fxtsqo",
trnType: "",
model: new Fxtsqo().data,
rules: null,
codes: {
},
rules: {},
codes: {...CodeTable}
}
},
methods:{},
created:async function(){
},
created:async function(){},
mounted() {
console.log("进入fxtsqo交易");
let params = {
......
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