Commit b221e105 by gechengyang

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

parents 0ab985ba e11ab582
import Utils from "~/utils";
export default {
methods: {
buildPtspta(ptsptaObj) {
let pts = ptsptaObj.pts;
return {
rol: pts.rol,
name: pts.nam,
ptyinr: pts.ptyinr,
ptainr: pts.ptainr,
extkey: pts.extkey,
dftdsp: pts.dftdsp,
dftcur: pts.dftcur,
dftact: pts.dftact,
dftfeecur: pts.dftfeecur,
dftactptainr: pts.dftactptainr,
glggrpflg: pts.glggrpflg,
adrblk: pts.adrblk,
pts,
};
},
buildCommonData(model, trnName) {
let ptsptaList = Utils.formatPtspta(model.fxdgrp, this.buildPtspta);
return {
rec: {
objtyp: "FXD",
objinr: model.fxdgrp.rec.inr,
ownref: model.fxdgrp.rec.ownref,
fxtyp:model.fxdgrp.rec.fxtyp,
swtflg:model.swtflg,
cancur:model.cancur,
canamt:model.canamt,
},
cbsMap: {
MAX: model.fxdgrp.cbs.max,
NOM1: model.fxdgrp.cbs.nom1,
},
ptsList: ptsptaList,
transName: trnName,
userId: window.sessionStorage.userId ? window.sessionStorage.userId : "ZL",
};
},
},
};
import commonFunctions from '~/mixin/commonFunctions.js';
import Api from '~/service/Api';
export default {
mixins: [commonFunctions],
methods: {
async getOwnref() {
}
}
}
\ No newline at end of file
import Utils from "~/utils"
/**
* Fxtfcn Check规则
*/
let checkObj = {
"canamt" :null,
"fxdgrp.apl.pts.adrblk" :null,
"fxtp.usr.extkey" :null,
"fxdgrp.cbs.opn2.amt" :null,
"fxdgrp.act.pts.adrblk" :null,
"fxdgrp.act.pts.extkey" :null,
"fxdgrp.rec.ownref" :null,
"fxdgrp.apl.pts.extkey" :null,
"mtabut.clsflg" :null,
}
for (const key in checkObj) {
if (Object.hasOwnProperty.call(checkObj, key)) {
checkObj[key] = checkObj[key] ? checkObj[key] : Utils.reflectCheck(key)
}
}
export default checkObj
export default {
"fxtfcn.canamt":[
{type: "number", required: false, message: "必输项"},
{max: 18,message:"整数位不能超过14位"},
{pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
],
}
\ No newline at end of file
import Api from "~/service/Api"
import Pts from "~/page/Model/Common/Pts"
import Pub from "~/components/business/commonModel/index.js";
import Fxdgrp from '~/components/business/commonModel/fxdgrp';
export default class Fxtfcn{
constructor () {
this.data = {
fxdgrp:{
rec:{
ownref:"", // 平盘业务参考号 .fxdgrp.rec.ownref
nam:"", // 名称 .fxdgrp.rec.nam
fxtyp:"", // 平盘类型 .fxdgrp.rec.fxtyp
opndat:"", // 平盘日期 .fxdgrp.rec.opndat
valdat:"", // 起息日 .fxdgrp.rec.valdat
},
apl:{
pts:new Pts().data,
dbfadrblkcn:"", // Chinese address .fxdgrp.apl.dbfadrblkcn
},
blk:{
remark:"", // 备注 .fxdgrp.blk.remark
},
cbs:{
opn2:{
cur:"", // Orig.Amount .fxdgrp.cbs.opn2.cur
amt:"", // Balance .fxdgrp.cbs.opn2.amt
},
nom1:{
amt:"", // Balance .fxdgrp.cbs.nom1.amt
cur:"", // 待销账金额 .fxdgrp.cbs.nom1.cur
},
},
act:{
pts:new Pts().data,
dbfadrblkcn:"", // Chinese address .fxdgrp.act.dbfadrblkcn
},
},
fxtp:{
aplp:{
ptsget:{
sdamod:{
seainf:"", // .fxtp.aplp.ptsget.sdamod.seainf
dadsnd:"", // Drag Drop Sender .fxtp.aplp.ptsget.sdamod.dadsnd
},
},
},
usrget:{
sdamod:{
seainf:"", // .fxtp.usrget.sdamod.seainf
},
},
usr:{
extkey:"", // 资金部负责人 .fxtp.usr.extkey
},
actp:{
ptsget:{
sdamod:{
seainf:"", // .fxtp.actp.ptsget.sdamod.seainf
dadsnd:"", // Drag Drop Sender .fxtp.actp.ptsget.sdamod.dadsnd
},
},
},
},
mtabut:{
clsflg:"", // Close Flag .mtabut.clsflg
},
canamt:"", // Cancel Amount .canamt
cancur:"", // 实际销账金额 .cancur
pageId: "" // ctx的key
}
fxdgrp: new Fxdgrp().data,
fxtp:{
frgchk:"X"
},
cancur:"",
canamt:0,
oldactinr:"",
relcur:"",
relamt:0,
f21:"",
acc2:"", // APLACC's Account .acc2
acc1:"",
cancuruse:"",
canamtuse:0,
aplacc:{
pts:new Pts().data,
},
setmod: new Pub().data.Setmod,
docpan: new Pub().data.Docpan,
trndia: new Pub().data.Trndia,
}
}
}
\ No newline at end of file
<template>
<div class="eContainer">
<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">
<!--fxtfcn PD000001 Cancellation -->
<el-tab-pane :label="$t('fxtfcn.PD000001')" name="canp">
<el-tab-pane label="业务信息" name="canp">
<c-content>
<m-canp :model="model" :codes="codes"/>
</c-content>
</el-tab-pane>
<el-tab-pane label="费用/账务" name="setpan">
<c-content>
<m-setpan :codes="codes" :model="model" />
</c-content>
</el-tab-pane>
<el-tab-pane label="报文/面函" name="docpan">
<c-content>
<m-docpan :codes="codes" :model="model" />
</c-content>
</el-tab-pane>
</c-tabs>
</el-form>
<c-function-btn
:handleCheck="handleCheck"
:handleStash="handleStash"
:handleSubmit="handleSubmit"
@handleSureWarning="handleSureWarning"
ref="commonBtn"
></c-function-btn>
</c-page>
</div>
</template>
<script>
......@@ -15,6 +39,13 @@ import Api from "~/service/Api"
import CodeTable from "~/config/CodeTable"
import Fxtfcn from "../model"
import commonProcess from "~/mixin/commonProcess"
import Setpan from "~/components/business/setmod/views";
import Docpan from "~/components/business/docpan/views";
import buildFn from "../event/buildCommons.js";
import operationFunc from "~/mixin/operationFunc";
import commonDepend from "~/mixin/commonDepend";
import event from "../event";
import Check from "../model/Check"
import Default from "../model/Default"
import Pattern from "../model/Pattern"
......@@ -25,24 +56,26 @@ export default {
name: "Fxtfcn",
components:{
"m-canp" : Canp,
"m-setpan": Setpan,
"m-docpan": Docpan,
},
provide() {
return {
root: this
}
},
mixins: [commonProcess], // 里面包含了Default、Check等的公共处理
mixins: [commonProcess,operationFunc,commonDepend,event,buildFn], // 里面包含了Default、Check等的公共处理
data(){
return {
tabVal: "canp",
trnName: "fxtfcn",
trnType: "",
model: new Fxtfcn().data,
checkRules: Check,
defaultRules: Default,
pattern: Pattern,
rules: null,
codes: {
// checkRules: Check,
// defaultRules: Default,
// pattern: Pattern,
rules: Check,
codes: {...CodeTable
},
}
},
......@@ -55,18 +88,16 @@ export default {
}
},
created:async function(){
console.log("进入fxtfcn交易");
let rtnmsg = {}; // await this.init({})
if(rtnmsg.respCode == SUCCESS)
{
this.updateModel(rtnmsg.data)
//TODO 处理数据逻辑
}
else
{
this.$notify.error({title: '错误',message: '服务请求失败!'});
}
console.log("进入fxtfcn交易.."+this.trnName);
let params = {
transName: this.trnName,
fxdgrp: {
rec: {
inr: this.$route.query.inr || "",
},
},
};
this.init(params)
}
}
</script>
......
export default {
data() {
return {
rules: {
}
}
}
}
export default class Infhmd {
constructor() {
this.data = {
khh: '',
ywlx: '',
gj: '',
zjhm: '',
wl: '',
}
}
}
\ No newline at end of file
<template>
<div class="eibs-tab">
<c-list-search @form-reset="handleReset" @form-search="formSubmit">
<!-- 持续展示区 -->
<template v-slot="searchSlot">
<el-form class="m-table-search-form" ref="paramsForm" label-position="right" label-width="110px" size="small"
:model="model">
<el-row>
<c-col :span="8">
<el-form-item label="客户号" style="width: 100%">
<c-input v-model="model.khh" maxlength="18" placeholder="请输入客户号"></c-input>
</el-form-item>
</c-col>
<c-col :span="8">
<el-form-item label="业务类型" style="width: 100%">
<c-select v-model="model.ywlx" style="width: 100%" placeholder="请选择业务类型" :clearable="true" :code="extCodes.ywlx">
</c-select>
</el-form-item>
</c-col>
<c-col :span="8">
<el-form-item label="国籍" style="width: 100%">
<c-input v-model="model.gj" maxlength="18" placeholder="请输入国籍"></c-input>
</el-form-item>
</c-col>
</el-row>
<!-- 可控展示区 -->
<el-row v-show="searchSlot.searchToggle">
<c-col :span="24">
<c-col :span="8">
<el-form-item label="证件号码" style="width: 100%">
<c-input v-model="model.zjhm" maxlength="18" placeholder="请输入证件号码"></c-input>
</el-form-item>
</c-col>
<c-col :span="8">
<el-form-item label="物类" style="width: 100%">
<c-select v-model="model.wl" style="width: 100%" placeholder="请选择物类" :clearable="true" :code="[]">
</c-select>
</el-form-item>
</c-col>
</c-col>
</el-row>
</el-form>
</template>
</c-list-search>
<el-col :span="24" style="margin-top: 10px;margin-bottom: 10px;">
<c-button class="medium_bcs" size="medium" type="primary" @click="toAdd()" style="margin-left: 0px">
黑名单维护
</c-button>
</el-col>
<el-col :span="24" style="margin-top: 10px">
<c-col :span="24">
<el-table id='infgidBSTableRef' v-loading="load" :data="tableData" style="width:100%" size="small" :border="true"
height="calc(100vh - 480px)" :highlight-current-row="true">
<el-table-column label="客户名称" prop="khmc" align="left" fixed="left" min-width="150">
</el-table-column>
<el-table-column label="证件号码" prop="zjhm" align="left" fixed="left" min-width="150">
</el-table-column>
<el-table-column label="国籍" prop="gj" align="left" fixed="left" min-width="150">
</el-table-column>
<el-table-column label="注册地" prop="zcd" align="left" fixed="left" min-width="150">
</el-table-column>
<el-table-column label="制裁种类" prop="zczl" align="left" fixed="left" min-width="150">
</el-table-column>
<el-table-column label="制裁方" prop="zcf" align="left" fixed="left" min-width="150">
</el-table-column>
<el-table-column label="制裁时间" prop="zcsj" align="left" fixed="left" min-width="150">
</el-table-column>
<el-table-column label="制裁原因" prop="zcyy" align="left" fixed="left" min-width="150">
</el-table-column>
</el-table>
</c-col>
</el-col>
<add-hmd :codes="codes" ref="addHmd"></add-hmd>
</div>
</template>
<script>
import addHmd from './addHmd'
export default {
inject: ["root"],
props: ["model", "codes"],
mixins: [],
components: {
addHmd
},
data() {
return {
load: false,
tableData: [],
extCodes: {
ywlx: [
{
label: '汇入汇款',
value: '1'
},
{
label: '汇出汇款',
value: '2'
},
]
},
isVisible: false
};
},
watch: {
},
computed: {},
mounted() {
},
methods: {
handleReset() {
},
formSubmit() {
},
toAdd() {
this.$refs.addHmd.visible = true
}
}
};
</script>
<style scoped lang="less">
.eibs-tabs /deep/ {
.m-table-search {
padding: 20px 0px 10px 0px;
}
}
.header-wrap {
height: 36px;
display: flex;
justify-content: space-between;
align-items: center;
.title {
font-size: 16px;
color: #000;
}
.close-btn {
padding: 3px;
cursor: pointer;
}
}
.m-list-btns {
height: 300px;
overflow: auto;
}
.medium_bcs {
border-radius: 5px;
}
</style>
\ No newline at end of file
<template>
<div>
<el-dialog v-if="visible" v-dialogDrag :visible="visible" :modal-append-to-body="false" :close-on-click-modal="false"
title="黑名单维护" destroy-on-close width="80%">
<c-col :span="24">
<!-- ==================左边================ -->
<c-col :span="12" style="padding-right: 20px">
<c-col :span="24">
<el-form-item label="客户号" style="width: 100%">
<c-input v-model="model.khh" maxlength="18" placeholder="请输入客户号"></c-input>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="客户名称" style="width: 100%">
<c-input v-model="model.khmc" maxlength="18" placeholder="请输入客户名称"></c-input>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="国籍" style="width: 100%">
<c-input v-model="model.gj" maxlength="18" placeholder="请输入国籍"></c-input>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="证件号码" style="width: 100%">
<c-input v-model="model.zjhm" maxlength="18" placeholder="请输入证件号码"></c-input>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="物类" style="width: 100%">
<c-select v-model="model.wl" style="width: 100%" placeholder="请选择物类" :clearable="true" :code="[]">
</c-select>
</el-form-item>
</c-col>
</c-col>
<!-- ============右边================= -->
<c-col :span="12">
<c-col :span="24">
<el-form-item label="注册地" style="width: 100%">
<c-input v-model="model.zcd" maxlength="18" placeholder="请输入注册地"></c-input>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="制裁种类" style="width: 100%">
<c-input v-model="model.zczl" maxlength="18" placeholder="请输入制裁种类"></c-input>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="制裁方" style="width: 100%">
<c-input v-model="model.zcf" maxlength="18" placeholder="请输入制裁方"></c-input>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="制裁时间" prop="crtp.valdat">
<c-date-picker type="date" v-model="model.zcsj" style="width:100%"></c-date-picker>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="制裁原因" style="width: 100%">
<c-input v-model="model.zcyy" maxlength="18" placeholder="请输入制裁原因"></c-input>
</el-form-item>
</c-col>
</c-col>
</c-col>
<span slot="footer" class="dialog-footer">
<el-button type="primary" @click="handleSubmit()">确 定</el-button>
<el-button @click="handleCancel()">取 消</el-button>
</span>
</el-dialog>
</div>
</template>
<script>
export default {
mixins: [],
props: ['codes'],
computed: {
},
data() {
return {
visible: false,
model: {
khh: '',
khmc: '',
gj: '',
zjhm: '',
ywlx: '',
wl: '',
zcd: '',
zczl: '',
zcf: '',
zcsj: '',
zcyy: '',
}
};
},
watch: {
},
methods: {
handleSubmit() {
this.visible = false;
},
handleCancel() {
this.visible = false;
}
}
};
</script>
<style scoped lang="less"></style>
\ No newline at end of file
<template>
<div class="eContainer-search">
<c-tabs ref="elment" type="card" v-model="tabVal">
<el-tab-pane label="黑名单查询" name="infent">
<el-form :model="model" :rules="rules" ref="modelForm" label-width="120px" label-position="right" size="small"
:validate-on-rule-change="false">
<c-content>
<m-infsea :model="model" :codes="codes" ref="infsea" />
</c-content>
</el-form>
</el-tab-pane>
</c-tabs>
</div>
</template>
<script>
import CodeTable from "~/config/CodeTable";
import Infhmd from "../model";
import Infsea from "./Infsea";
import Check from "../model/check"
export default {
name: 'Infhmd',
components: {
"m-infsea": Infsea,
},
provide() {
return {
root: this
}
},
mixins: [Check],
data() {
return {
tabVal: "infent",
model: new Infhmd().data,
codes: { ...CodeTable },
}
},
methods: {
},
mounted() {
},
}
</script>
<style scoped></style>
......@@ -239,6 +239,7 @@ const StaticsRouter = [
{ path: 'infent', component: Infent, name: 'Infent', meta: { keepAlive: true, title: '企业名录查询'} },
{ path: 'infanb', component: Infanb, name: 'Infanb', meta: { keepAlive: true, title: '2120对账'} },
{ path: 'inffxq', component: () => import('./Inffxq/views'), name: 'Inffxq', meta: { keepAlive: true, title: '反洗钱报送'} },
{ path: 'infhmd', component: () => import('./Infhmd/views'), name: 'Infhmd', meta: { keepAlive: true, title: '黑名单查询'} },
]
......
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