Skip to content

I
isc-web-vue
Commit 45bf0ea6 by 李少勇
Options

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

parents 8eae094b 0844be95
Showing with 350 additions and 350 deletions
src/page/Frontend/Batdis/event/index.js
......@@ -5,32 +5,36 @@ export default {
mixins: [commonFunctions],
methods: {
// 双击
async dbClickRow(row) {
let rtnmsg = await Api.post("/frontend/oftsel/dblclick", {
async dbClickRow (row) {
let rtnmsg = await Api.post("/frontend/batdis/dblclick", {
objtyp: row.objtyp,
smdinr: row.objinr,
objinr: row.objinr,
});
console.log(rtnmsg)
if (rtnmsg.respCode == SUCCESS) {
this.routerPush({
path: '/business/msgdtl',
query: {
mpsinr: rtnmsg.mpsinr
mpsinr: rtnmsg.data.mpsinr
}
})
}
},
// 详情
async toDetails(row) {
let rtnmsg = await Api.post("/frontend/oftsel/display", {
inr: row.inr
async toDetails () {
console.log(this.model.batgrp.dotlst)
console.log(this.model.batgrp.dotlst[0].inr)
let rtnmsg = await Api.post("/frontend/batdis/display", {
inr: this.model.batgrp.dotlst[0].inr
});
if (rtnmsg.respCode == SUCCESS) {
this.detailsInfo = rtnmsg.data;
this.detailsInfo = rtnmsg.data.batgrp.doelst;
this.$refs.infoShow.visible = true;
}
},
// 取消关联
toCancelRelate(row) {
toCancelRelate (row) {
console.log(row)
if (row.objtyp == 'smd') {
this.$notify.error({
title: '错误',
......@@ -45,6 +49,7 @@ export default {
});
return;
}
console.log("row:" + row.inr)
this.routerPush({
path: '/business/offrel',
query: {
......
src/page/Frontend/Batdis/views/Batdis.vue
......@@ -40,17 +40,17 @@
<c-col :span="12" style="padding-left: 20px">
<c-col :span="24">
<el-form-item label="状态" prop="batgrp.dot.sta">
<c-input type="text" v-model="model.batgrp.dot.sta"></c-input>
<c-select type="text" v-model="model.batgrp.dot.sta" :code="codes.zfqzsta"></c-select>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="记帐状态" prop="batgrp.dot.recsta">
<c-input type="text" v-model="model.batgrp.dot.recsta"></c-input>
<c-select type="text" v-model="model.batgrp.dot.recsta" :code="codes.recsta"></c-select>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="勾销标志" prop="batgrp.dot.offsta">
<c-input type="text" v-model="model.batgrp.dot.offsta"></c-input>
<c-select type="text" v-model="model.batgrp.dot.offsta" :code="codes.offsta"></c-select>
</el-form-item>
</c-col>
<c-col :span="24">
......@@ -66,6 +66,10 @@
</c-col>
</c-col>
<el-col :span="24" style="margin-top: 2px;margin-bottom: 1px;">
<c-button style="margin-left: 0" type='primary' size="medium" @click="toDetails()">详情</c-button>
</el-col>
<c-col :span="24">
<div class="e-table-wrapper">
<el-table
......@@ -131,7 +135,7 @@
</el-table-column>
<el-table-column fixed="right" label="操作" width="240px">
<template slot-scope="scope">
<c-button style="margin-left: 0" type='text' size="small" @click="toDetails(scope.row)">详情</c-button>
<!-- <c-button style="margin-left: 0" type='text' size="small" @click="toDetails(scope.row)">详情</c-button> -->
<c-button style="margin-left: 0" type='text' size="small" @click="toCancelRelate(scope.row)">取消关联</c-button>
</template>
</el-table-column>
......
src/page/Frontend/Batdis/views/index.vue
......@@ -60,16 +60,19 @@ export default {
traname1: ''
};
const rtnmsg = await Api.post(`/${this.moduleRouter()}/${this.trnName}/init`, params);
console.log(rtnmsg);
console.log(rtnmsg.respCode === SUCCESS);
if (rtnmsg.respCode === SUCCESS) {
Utils.copyValueFromVoData(this.model.batgrp, rtnmsg.data);
Utils.copyValueFromVoData(this.model.batgrp, rtnmsg.data.batgrp);
console.log(this.model.batgrp)
}
this.model.batgrp.dotlst = [
{
rsptim: '1',
valdat: '1',
ownref: '1',
}
]
// this.model.batgrp.dotlst = [
// {
// rsptim: '1',
// valdat: '1',
// ownref: '1',
// }
// ]
}
}
</script>
......
src/page/Frontend/Offrel/event/index.js
......@@ -4,8 +4,8 @@ import Api from '~/service/Api';
export default {
mixins: [commonFunctions],
methods: {
async toSubmit() {
let rtnmsg = await Api.post("/frontend/oftsel/sav", this.model);
async toSubmit () {
let rtnmsg = await Api.post("/frontend/offrel/sav", this.model);
if (rtnmsg.respCode == SUCCESS) {
this.$notify.success({
title: '成功',
......
src/page/Frontend/Offrel/views/Offrel.vue
......@@ -37,12 +37,12 @@
</c-col>
<c-col :span="24">
<el-form-item label="状态" prop="oftgrp.dot.sta">
<c-input type="text" v-model="model.oftgrp.dot.sta"></c-input>
<c-select type="text" v-model="model.oftgrp.dot.sta" :code="codes.zfqzsta"></c-select>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="勾销标志" prop="oftgrp.dot.offsta">
<c-input type="text" v-model="model.oftgrp.dot.offsta"></c-input>
<c-select type="text" v-model="model.oftgrp.dot.offsta" :code="codes.offsta" ></c-select>
</el-form-item>
</c-col>
</c-col>
......@@ -55,12 +55,12 @@
</c-col>
<c-col :span="24">
<el-form-item label="关联类型" prop="oftgrp.dot.objtyp">
<c-input type="text" v-model="model.oftgrp.dot.objtyp"></c-input>
<c-select type="text" v-model="model.oftgrp.dot.objtyp" :code="codes.dottyp"></c-select>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="记帐状态" prop="oftgrp.dot.recsta">
<c-input type="text" v-model="model.oftgrp.dot.recsta"></c-input>
<c-select type="text" v-model="model.oftgrp.dot.recsta" :code="codes.recsta"></c-select>
</el-form-item>
</c-col>
<c-col :span="24">
......
src/page/Frontend/Offrel/views/index.vue
......@@ -64,11 +64,13 @@ export default {
created: async function () {
console.log("进入offrel交易");
let params = {
inr: this.$route.query.inr || "",
dotinr: this.$route.query.inr || "",
};
console.log(params)
const rtnmsg = await Api.post(`/${this.moduleRouter()}/${this.trnName}/init`, params);
console.log(rtnmsg)
if (rtnmsg.respCode === SUCCESS) {
Utils.copyValueFromVoData(this.model.oftgrp, rtnmsg.data);
Utils.copyValueFromVoData(this.model.oftgrp, rtnmsg.data.oftgrp);
}
}
}
......
src/page/Frontend/Oftdtl/model/index.js
import Api from "~/service/Api"
import Pts from "~/page/Model/Common/Pts"
export default class Oftopn {
export default class Oftdtl {
constructor() {
this.data = {
oftp: {
......
src/page/Frontend/Oftsel/event/index.js
......@@ -53,25 +53,26 @@ export default {
async handleReset () {
this.model = new Oftsel().data;
},
async dbClickRow(row) {
// let rtnmsg = await Api.post("/frontend/oftsel/storeDate", {
// inr: row.inr
// });
// if (rtnmsg.respCode == SUCCESS) {
// this.routerPush({
// path: '/business/batdis',
// query: {
// inr: rtnmsg.data
// }
// })
// }
this.routerPush({
path: '/business/batdis',
query: {
inr: '0000000000001594'
}
})
async dbClickRow (row) {
let rtnmsg = await Api.post("/frontend/oftsel/storeDate", {
inr: row.inr
});
if (rtnmsg.respCode == SUCCESS) {
this.routerPush({
path: '/business/batdis',
query: {
inr: rtnmsg.data.dotinr,
traname1: rtnmsg.data.traname1
}
})
}
// this.routerPush({
// path: '/business/batdis',
// query: {
// inr: '0000000000001594'
// }
// })
},
// pageSize改变
handleSizeChange (val) {
......
src/page/Funds/Fxtfcm/event/index.js
import commonFunctions from '~/mixin/commonFunctions.js';
import Api from '~/service/Api';
import Utils from "~/utils";
export default {
mixins: [commonFunctions],
methods: {
async getOwnref() {
}
},
async onAccChange(){
console.log("~~~~~~~~~");
console.log(this.model.fxdgrp);
Utils.copyValueFromVoData(this.model.aplacc, this.model.fxdgrp.acc, ignoreModFlg);
// this.model.aplacc=this.model.fxdgrp.acc;
console.log("~~~~~~~~~");
console.log(this.model.fxdgrp);
},
}
}
\ No newline at end of file
src/page/Funds/Fxtfcm/views/Cnfp.vue
......@@ -138,6 +138,7 @@
<el-card class="box-card">
<c-ptap :model="model" :requiredExtkey="true" :disabledExtkey="false" :disabled="true" :isAdrblk="true" :haveAdrLabel="true"
:isShowCard="false"
@handleChange="onAccChange"
:argadr="{title: '平盘对手账户行', grp: 'fxdgrp', rol: 'acc',}"
:label="{labelExtkey:'平盘对手账户行',labelNam:'名称',labelAdrblk:'地址',}"
ptytyp="B">
......
src/page/Funds/Fxtfcn/event/index.js
import commonFunctions from '~/mixin/commonFunctions.js';
import Api from '~/service/Api';
import Utils from "~/utils";
export default {
mixins: [commonFunctions],
methods: {
async getOwnref() {
}
},
async onAccChange(){
console.log("~~~~~~~~~");
console.log(this.model.fxdgrp);
Utils.copyValueFromVoData(this.model.aplacc, this.model.fxdgrp.acc, ignoreModFlg);
// this.model.aplacc=this.model.fxdgrp.acc;
console.log("~~~~~~~~~");
console.log(this.model.fxdgrp);
},
}
}
\ No newline at end of file
src/page/Funds/Fxtlcm/event/buildCommons.js
......@@ -28,14 +28,15 @@ export default {
objinr: model.fxdgrp.rec.inr,
ownref: model.fxdgrp.rec.ownref,
fxtyp:model.fxdgrp.rec.fxtyp,
acc: model.fxdgrp.rec.acc,
acc2: model.fxdgrp.rec.acc2,
dsp: model.fxdgrp.rec.dsp,
dsp2: model.fxdgrp.rec.dsp2,
trdint: model.fxdgrp.rec.trdint,
trdout: model.fxdgrp.rec.trdout,
trnman: model.fxdgrp.rec.trnman,
rat: model.fxdgrp.rec.rat,
swtflg: model.swtflg,
acc1:model.acc1,
acc2:model.acc2,
},
cbsMap: {
MAX: model.fxdgrp.cbs.max,
......
src/page/Funds/Fxtlcm/event/index.js
import commonFunctions from '~/mixin/commonFunctions.js';
import Api from '~/service/Api';
import Utils from "~/utils";
export default {
mixins: [commonFunctions],
methods: {
async onAccChange(){
console.log("~~~~~~~~~");
console.log(this.model.fxdgrp);
Utils.copyValueFromVoData(this.model.aplacc, this.model.fxdgrp.acc, ignoreModFlg);
// this.model.aplacc=this.model.fxdgrp.acc;
console.log("~~~~~~~~~");
console.log(this.model.fxdgrp);
},
}
}
\ No newline at end of file
src/page/Funds/Fxtlcm/views/Cnfp.vue
......@@ -15,11 +15,11 @@
</c-input>
<template slot="footer">
<c-button
style="margin: 0 0"
style="margin: 0 5px"
size="small"
type="primary"
disabled
@click="getOwnref"
>
获取
</c-button>
......@@ -30,14 +30,29 @@
<!-- 资金部负责人 -->
<c-col :span="24">
<c-form-item :label="$t('fxtlcm.资金部负责人')" prop="fxdgrp.rec.ownusr">
<c-input v-model="model.fxdgrp.rec.ownusr" maxlength="8"></c-input>
</c-form-item>
<c-fullbox>
<c-input v-model="model.fxdgrp.rec.ownusr" maxlength="8"></c-input>
<template slot="footer">
<c-button style="margin: 0 5px" size="small" type="primary">
i
</c-button>
</template>
</c-fullbox>
</c-form-item>
</c-col>
<!-- 清算中心负责人 -->
<c-col :span="24">
<c-form-item :label="$t('fxtlcm.清算中心负责人')" prop="fxdgrp.rec.usr">
<c-input v-model="model.fxdgrp.rec.usr" maxlength="8"></c-input>
</c-form-item>
<c-fullbox>
<c-input v-model="model.fxdgrp.rec.usr" maxlength="8"></c-input>
<template slot="footer">
<c-button style="margin: 0 5px" size="small" type="primary">
i
</c-button>
</template>
</c-fullbox>
</c-form-item>
</c-col>
<!-- 平盘类型 -->
<c-col :span="24">
......@@ -106,6 +121,10 @@
</c-form-item>
</c-col>
<c-col :span="24">
<c-checkbox true-label="X" v-model="model.swtflg">发送MT300</c-checkbox>
</c-col>
</c-col>
<!-- ==============================右边============================== -->
......@@ -118,55 +137,78 @@
</c-col>
<c-col :span="24">
<el-card class="box-card">
<c-ptap
:model="model"
:requiredExtkey="true"
:disabledExtkey="true"
:disabled="true"
:isAdrblk="true"
:haveAdrLabel="true"
:argadr="{ title: '平盘对手', grp: 'fxdgrp', rol: 'apl' }"
:label="{
labelExtkey: '平盘对手',
labelNam: '名称',
labelAdrblk: '地址',
}"
ptytyp="C"
>
</c-ptap>
</el-card>
<el-card class="box-card">
<c-ptap
:model="model"
:requiredExtkey="true"
:disabledExtkey="true"
:disabled="true"
:isAdrblk="true"
:haveAdrLabel="true"
:argadr="{ title: '平盘对手', grp: 'fxdgrp', rol: 'apl' }"
:label="{
labelExtkey: '平盘对手',
labelNam: '名称',
labelAdrblk: '地址',
}"
ptytyp="C"
>
</c-ptap>
</el-card>
</c-col>
<!-- 平盘对手账号 对应model下面的aplacc ，优化时需要修改grp 和rol -->
<c-col :span="24">
<el-card class="box-card">
<c-ptap :model="model" :requiredExtkey="true" :disabledExtkey="false" :disabled="true" :isAdrblk="true" :haveAdrLabel="true"
:isShowCard="false"
@handleChange="onAccChange"
:argadr="{title: '平盘对手账户行', grp: 'fxdgrp', rol: 'acc',}"
:label="{labelExtkey:'平盘对手账户行',labelNam:'名称',labelAdrblk:'地址',}"
ptytyp="B">
</c-ptap>
</el-card>
</c-col>
<c-col :span="24">
<el-card class="box-card">
<c-ptap
:model="model"
:requiredExtkey="true"
:disabled="false"
:isAdrblk="true"
:haveAdrLabel="true"
:isShowCard="false"
:argadr="{ title: '平盘对手账号', grp: 'fxdgrp', rol: 'acc' }"
ptytyp="B"
>
</c-ptap>
</el-card>
<el-form-item label="Account" prop="acc2">
<el-select
v-model="model.acc2" clearablex
placeholder="请选择账号"
>
<el-option v-for="item in acc2List" :key="item" :label="item"
:value="item">
<span style="float: left">{{ item }}</span>
</el-option>
</el-select>
</el-form-item>
</c-col>
<c-col :span="24">
<el-card class="box-card">
<c-ptap :model="model" :requiredExtkey="true" :disabledExtkey="false" :disabled="true" :isAdrblk="true" :haveAdrLabel="true"
:isShowCard="false"
:argadr="{title: '我行账户行', grp: 'fxdgrp', rol: 'act',}"
:label="{labelExtkey:'我行账户行',labelNam:'名称',labelAdrblk:'地址',}"
ptytyp="B">
</c-ptap>
</el-card>
</c-col>
<c-col :span="24">
<el-card class="box-card">
<c-ptap
:model="model"
:requiredExtkey="true"
:disabled="false"
:isAdrblk="true"
:haveAdrLabel="true"
:isShowCard="false"
:argadr="{ title: '我行账户行', grp: 'fxdgrp', rol: 'act' }"
ptytyp="B"
>
</c-ptap>
</el-card>
<el-form-item label="Account" prop="acc1">
<el-select
v-model="model.acc1" clearablex
placeholder="请选择账号"
>
<el-option v-for="item in acc1List" :key="item" :label="item"
:value="item">
<span style="float: left">{{ item }}</span>
</el-option>
</el-select>
</el-form-item>
</c-col>
</c-col>
......@@ -175,17 +217,34 @@
<script>
import Api from "~/service/Api"
import commonProcess from "~/mixin/commonProcess";
import CodeTable from "~/config/CodeTable"
import Event from "../event"
export default {
inject: ['root'],
props:["model","codes"],
mixins: [commonProcess],
mixins: [Event,commonProcess],
data(){
return {}
return {
acc1List:['1111120209999','1111120209998'],
acc2List:['2222220209999','2222220209998'],
}
},
methods:{},
created:function(){}
methods:{...Event},
created:function(){},
watch: {
// "model.fxdgrp.acc.pts.ptainr": {
// immediate: true,
// handler(val, oldval) {
// console.log("~~~~~~~");
// if (val !== oldval){
// this.model.aplacc=this.model.fxdgrp.acc;
// console.log("~~~~~~~");
// console.log(this.model);
// }},
// },
}
}
</script>
<style>
......
src/page/Funds/Fxtlcm/views/Fxt300l1.vue
......@@ -12,7 +12,6 @@
import Api from "~/service/Api"
import commonProcess from "~/mixin/commonProcess";
import CodeTable from "~/config/CodeTable"
import Event from "../model/Event"
export default {
inject: ['root'],
......
src/page/Funds/Fxtlcm/views/Mt3001.vue
......@@ -62,7 +62,7 @@
import Api from "~/service/Api"
import commonProcess from "~/mixin/commonProcess";
import CodeTable from "~/config/CodeTable"
import Event from "../model/Event"
import Event from "../model/event"
export default {
inject: ['root'],
......
src/page/Funds/Fxtlcm/views/Ovwp.vue 0 → 100644
<template>
<div class="eibs-tab">
<c-collapse v-model="activeNames">
<el-collapse-item title="平盘确认信息" name="cnfp" >
<m-cnfp :model="model" :codes="codes" />
</el-collapse-item>
<el-collapse-item title="Mt300报文信息" name="mt300" v-if="model.swtflg=='X'">
<m-mt300 :model="model" :codes="codes" ref="mt300" />
</el-collapse-item>
</c-collapse>
</div>
</template>
<script>
import Api from "~/service/Api";
import CodeTable from "~/config/CodeTable";
import Event from "../event";
import Cnfp from "./Cnfp";
import Mt300 from "./Mt300";
export default {
components: {
"m-cnfp": Cnfp,
"m-mt300": Mt300,
},
inject: ["root"],
props: ["model", "codes"],
mixins: [Event],
data() {
return {
activeNames: ["cnfp", "mt300"],
};
},
methods: {
handleChange(val) {
console.log(val);
},
},
created: function () {},
};
</script>
<style>
.marginLable {
padding-left: 160px;
}
</style>
src/page/Funds/Fxtlcm/views/index.vue
......@@ -4,8 +4,8 @@
<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">
<!--fxtlcm PD000001 Confirmation -->
<el-tab-pane :label="$t('fxtlcm.Confirmation')" name="cnfp">
<m-cnfp :model="model" :codes="codes"/>
<el-tab-pane :label="$t('fxtlcm.业务信息')" name="ovwp">
<m-ovwp :model="model" :codes="codes"/>
</el-tab-pane>
<el-tab-pane :label="$t('commonModels.费用/账务')" name="setpan">
......@@ -36,18 +36,20 @@ import Api from "~/service/Api"
import CodeTable from "~/config/CodeTable"
import Fxtlcm from "../model"
import operationFunc from "~/mixin/operationFunc"
import Cnfp from "./Cnfp"
import Ovwp from "./Ovwp"
import Setpan from "~/components/business/setmod/views";
import Docpan from "~/components/business/docpan/views";
import event from "../event";
import Check from "../model/Check"
import commonDepend from "~/mixin/commonDepend";
import buildFn from "../event/buildCommons.js";
import commonProcess from "~/mixin/commonProcess"
export default {
name: "Fxtlcm",
components:{
"m-cnfp" : Cnfp,
"m-ovwp" : Ovwp,
"m-setpan": Setpan,
"m-docpan": Docpan
},
......@@ -56,15 +58,15 @@ export default {
root: this
}
},
mixins: [operationFunc, event, commonDepend, buildFn],
mixins: [operationFunc, event, commonDepend, buildFn,commonProcess],
data(){
return {
tabVal: "cnfp",
tabVal: "ovwp",
trnName: "fxtlcm",
trnType: "",
model: new Fxtlcm().data,
codes: { ...CodeTable },
rules: {},
rules: Check,
}
},
methods:{
......
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