Commit 0319d7af by wangna

Merge branch 'development-202206' of http://114.115.138.98:8900/fukai/vue-gjjs…

Merge branch 'development-202206' of http://114.115.138.98:8900/fukai/vue-gjjs into development-202206
parents 2f97628a 415206f1
...@@ -65,7 +65,7 @@ export default { ...@@ -65,7 +65,7 @@ export default {
/* overflow: hidden; */ /* overflow: hidden; */
border: 1px solid rgba(0,0,0,0); border: 1px solid rgba(0,0,0,0);
border-radius: 5px; border-radius: 5px;
margin: -1px; /* margin: -1px; */
} }
.c-highlight-content.change-light { .c-highlight-content.change-light {
border: 1px solid rgb(201, 171, 1); border: 1px solid rgb(201, 171, 1);
......
This source diff could not be displayed because it is too large. You can view the blob instead.
<template> <template>
<div class="eibs-tab"> <div class="eibs-tab">
<c-col :span="24"> <c-col :span="24">
<c-col :span="12"> <c-col :span="12" style="padding-right: 20px;">
<c-col :span="24"> <c-col :span="24">
<c-fullbox> <c-fullbox>
<el-form-item label="申请人" prop="fcdgrp.apl.pts.extkey"> <el-form-item label="申请人" prop="fcdgrp.apl.pts.extkey">
...@@ -21,111 +21,101 @@ ...@@ -21,111 +21,101 @@
</template> </template>
</c-fullbox> </c-fullbox>
</c-col> </c-col>
<c-col :span="24">
<el-form-item label="" prop="fcdgrp.apl.pts.nam">
<c-input
v-model="model.fcdgrp.apl.pts.nam"
maxlength="40"
placeholder="请输入"
></c-input>
</el-form-item>
</c-col>
<c-col :span="24"> <c-col :span="24">
<el-form-item label="" prop="fcdgrp.apl.pta.nam1"> <el-form-item label="" prop="fcdgrp.apl.pts.nam">
<c-input <c-input
v-model="model.fcdgrp.apl.pta.nam1" v-model="model.fcdgrp.apl.pts.nam"
maxlength="40" maxlength="40"
placeholder="请输入Externally Visible Name of Address" placeholder="请输入"
></c-input> ></c-input>
</el-form-item> </el-form-item>
</c-col> </c-col>
</c-col>
</c-col>
<!-- <c-col :span="12">
<el-form-item label="" prop="aplp.ptsget.sdamod.seainf">
<c-input v-model="model.aplp.ptsget.sdamod.seainf" placeholder="请输入"></c-input>
</el-form-item>
</c-col> -->
<c-col :span="24"> <c-col :span="24">
<c-col :span="12"> <el-form-item label="" prop="fcdgrp.apl.pta.nam1">
<c-col :span="14"> <c-input
<el-form-item label="保证金账号" prop="cashacc"> v-model="model.fcdgrp.apl.pta.nam1"
<!-- <c-select maxlength="40"
v-model="model.cashacc" placeholder="请输入Externally Visible Name of Address"
style="width: 100%" ></c-input>
placeholder="请选择account" </el-form-item>
> </c-col>
</c-select> -->
<c-input
v-model="model.cashacc"
placeholder="请选择account"
></c-input>
</el-form-item>
</c-col>
<c-col :span="10">
<el-form-item label="科目" label-width="60px" prop="trmtyp">
<c-select
v-model="model.trmtyp"
style="width: 100%"
placeholder="请选择科目"
>
<el-option v-for="k in codes.trmtyp" :label="k" :value="k.split('\t')[0]" :key="k"></el-option>
</c-select>
</el-form-item>
</c-col>
</c-col>
<c-col :span="12">
<el-form-item label="说明" prop="reason">
<c-input
v-model="model.reason"
maxlength="40"
placeholder="请输入collect reason"
></c-input>
</el-form-item>
</c-col> </c-col>
</c-col> <c-col :span="12" style="padding-left: 20px;">
<c-col :span="24">
<c-col :span="24"> <c-col :span="13">
<c-col :span="12"> <el-form-item label="保证金账号" prop="cashacc">
<c-fullbox> <!-- <c-select
<c-col :span="12"> v-model="model.cashacc"
<el-form-item label="金额" prop="cashcur"> style="width: 100%"
placeholder="请选择account"
>
</c-select> -->
<c-select <c-select
v-model="model.cashcur" v-model="model.cashacc"
placeholder="请选择account"
></c-select>
</el-form-item>
</c-col>
<c-col :span="11">
<el-form-item label="科目" label-width="60px" prop="trmtyp">
<c-select
v-model="model.trmtyp"
style="width: 100%" style="width: 100%"
placeholder="请选择currency" placeholder="请选择科目"
> >
<el-option v-for="k in codes.cashcur" :label="k" :value="k" :key="k"></el-option> <el-option v-for="k in codes.trmtyp" :label="k" :value="k.split('\t')[0]" :key="k"></el-option>
</c-select> </c-select>
</el-form-item> </el-form-item>
</c-col> </c-col>
</c-col>
<c-col :span="24">
<c-fullbox>
<c-col :span="12">
<el-form-item label="金额" prop="cashcur">
<c-select
v-model="model.cashcur"
style="width: 100%"
placeholder="请选择currency"
:code="codes.infled_Cur"
>
</c-select>
</el-form-item>
</c-col>
<c-col :span="12"> <c-col :span="12">
<el-form-item label="" label-width="20px" prop="cashamt"> <el-form-item label="" label-width="5px" prop="cashamt">
<c-input-currency
v-model="model.cashamt"
placeholder="请输入金额"
></c-input-currency>
</el-form-item>
</c-col>
<template slot="footer">
<c-button size="small" type="primary" @click="onGet" disabled>
Get
</c-button>
</template>
</c-fullbox>
</c-col>
<c-col :span="24">
<c-col :span="20">
<el-form-item label="说明" prop="reason">
<c-input <c-input
v-model="model.cashamt" v-model="model.reason"
placeholder="请输入金额" maxlength="40"
placeholder="请输入collect reason"
></c-input> ></c-input>
</el-form-item> </el-form-item>
</c-col> </c-col>
<template slot="footer"> <c-col :span="4">
<c-button size="small" type="primary" @click="onGet" disabled> <el-form-item label="" prop="gleflg" label-width="0px">
Get <c-checkbox v-model="model.gleflg">是否过帐</c-checkbox>
</c-button> </el-form-item>
</template> </c-col>
</c-fullbox> </c-col>
</c-col>
<c-col :span="12">
<el-form-item label="" prop="gleflg">
<c-checkbox v-model="model.gleflg">是否过帐</c-checkbox>
</el-form-item>
</c-col> </c-col>
</c-col> </c-col>
<c-col :span="24"> <c-col :span="24">
<c-istream-table <c-istream-table
:list="model.cshstm.rows || []" :list="model.cshstm.rows || []"
......
<template> <template>
<c-page title="保证金收取"> <div class="eContainer">
<div class="eContainer"> <c-page title="保证金收取">
<div class="bus-button">
<c-button type="primary" v-on:click="handleSave">{{ $t("buttons.save") }}</c-button>
<c-button type="primary" v-on:click="handleCheck">{{ $t("buttons.check") }}</c-button>
</div>
<el-form :model="model" :rules="rules" ref="modelForm" label-width="120px" label-position="right" size="small" :validate-on-rule-change="false"> <el-form :model="model" :rules="rules" ref="modelForm" label-width="120px" 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">
<!--PD000002 --> <!--PD000002 -->
<el-tab-pane label="PD000002" name="opnp1"> <el-tab-pane label="概要" name="opnp1">
<c-content> <c-content>
<m-opnp1 :model="model" :codes="codes"/> <m-opnp1 :model="model" :codes="codes"/>
</c-content> </c-content>
...@@ -21,9 +16,15 @@ ...@@ -21,9 +16,15 @@
v-on:select-ety="selectEty" v-on:select-ety="selectEty"
> >
</c-grid-ety-prompt-dialog> </c-grid-ety-prompt-dialog>
<c-function-btn
:handleSubmit="handleSubmit"
:handleCheck="handleCheck"
:handleStash="handleStash"
>
</c-function-btn>
</el-form> </el-form>
</div> </c-page>
</c-page> </div>
</template> </template>
<script> <script>
import Api from "~/service/Api" import Api from "~/service/Api"
...@@ -59,7 +60,8 @@ export default { ...@@ -59,7 +60,8 @@ export default {
rules: null, rules: null,
codes: { codes: {
cashcur: [], cashcur: [],
trmtyp: [] trmtyp: [],
...CodeTable,
}, },
} }
}, },
...@@ -109,6 +111,9 @@ export default { ...@@ -109,6 +111,9 @@ export default {
//TODO 处理数据逻辑 //TODO 处理数据逻辑
this.codes.cashcur = rtnmsg.codeSet.cashcur this.codes.cashcur = rtnmsg.codeSet.cashcur
this.codes.trmtyp = rtnmsg.codeSet.trmtyp this.codes.trmtyp = rtnmsg.codeSet.trmtyp
if (this.isInDisplay) {
this.restoreDisplay();
}
} }
else else
{ {
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<div class="eibs-tab"> <div class="eibs-tab">
<el-collapse v-model="activeNames" @change="handleChange"> <el-collapse v-model="activeNames" @change="handleChange">
<el-collapse-item title="重新开" name="rop"> <el-collapse-item title="重新开" name="rop">
<m-rop :model="model" :codes="codes" /> <m-rop :model="model" :codes="codes" />
</el-collapse-item> </el-collapse-item>
</el-collapse> </el-collapse>
......
<template>
<ReviewWrapper>
<Fctopn></Fctopn>
</ReviewWrapper>
</template>
<script>
import Fctopn from "~/views/Business/Fctopn";
import { ReviewWrapper } from "~/components/gj-common.min.js";
export default {
name: "ReviewFctopn",
components: { ReviewWrapper, Fctopn },
created() {},
mounted() {},
};
</script>
<style></style>
\ No newline at end of file
...@@ -136,6 +136,7 @@ import ReviewBttdck from "./Business/ReviewBttdck.vue"; ...@@ -136,6 +136,7 @@ import ReviewBttdck from "./Business/ReviewBttdck.vue";
import ReviewGctrop from "./Business/ReviewGctrop.vue"; import ReviewGctrop from "./Business/ReviewGctrop.vue";
import ReviewGitrop from "./Business/ReviewGitrop.vue"; import ReviewGitrop from "./Business/ReviewGitrop.vue";
import ReviewGctfee from "./Business/ReviewGctfee.vue"; import ReviewGctfee from "./Business/ReviewGctfee.vue";
import ReviewFctopn from "./Business/ReviewFctopn.vue";
const ReviewRouter = [ const ReviewRouter = [
...@@ -290,6 +291,8 @@ const ReviewRouter = [ ...@@ -290,6 +291,8 @@ const ReviewRouter = [
{ path: "gctrop", component: ReviewGctrop, name: "ReviewGctrop", meta: { title: "复核-Gctrop" } }, { path: "gctrop", component: ReviewGctrop, name: "ReviewGctrop", meta: { title: "复核-Gctrop" } },
{ path: "gitrop", component: ReviewGitrop, name: "ReviewGitrop", meta: { title: "复核-Gitrop" } }, { path: "gitrop", component: ReviewGitrop, name: "ReviewGitrop", meta: { title: "复核-Gitrop" } },
{ path: "gctfee", component: ReviewGitrop, name: "ReviewGctfee", meta: { title: "复核-Gctfee" } }, { path: "gctfee", component: ReviewGitrop, name: "ReviewGctfee", meta: { title: "复核-Gctfee" } },
{ path: "fctopn", component: ReviewFctopn, name: "ReviewFctopn", meta: { title: "复核-Fctopn" } },
]; ];
......
...@@ -10,15 +10,7 @@ ...@@ -10,15 +10,7 @@
</c-input> </c-input>
</el-form-item> </el-form-item>
</c-col> --> </c-col> -->
<c-col :span="24">
<el-form-item label="实体" prop="etyexkey">
<c-input
v-model="model.etyexkey"
placeholder="请输入实体"
>
</c-input>
</el-form-item>
</c-col>
<c-col :span="24"> <c-col :span="24">
<el-form-item label="机构编码" prop="branch"> <el-form-item label="机构编码" prop="branch">
<c-input <c-input
...@@ -28,35 +20,35 @@ ...@@ -28,35 +20,35 @@
</c-input> </c-input>
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="24"> <c-col :span="24">
<el-form-item label="经办机构编码" prop="bchkey"> <el-form-item label="核心机构号" prop="accbch">
<c-input <c-input
v-model="model.bchkey" v-model="model.accbch"
placeholder="请输入经办机构编码" placeholder="请输入核心机构号"
> >
</c-input> </c-input>
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="24"> <c-col :span="24">
<el-form-item label="机构名称" prop="bchname"> <el-form-item label="机构类型" prop="bchtyp">
<c-input <c-select style="width: 100%"
v-model="model.bchname" v-model="model.bchtyp"
placeholder="请输入机构名称" placeholder="请选择机构类型"
:code="getCodesByKey('bchtyp')"
> >
</c-input> </c-select>
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="24"> <c-col :span="24">
<el-form-item label="机构层次" prop="lev"> <el-form-item label="经办机构编码" prop="bchkey">
<c-select style="width: 100%" <c-input
v-model="model.lev" v-model="model.bchkey"
placeholder="请选择机构层次" placeholder="请输入经办机构编码"
:code="getCodesByKey('lev')"
> >
</c-select> </c-input>
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="24"> <c-col :span="24">
<el-form-item label="上级机构编码" prop="upbranch"> <el-form-item label="上级机构编码" prop="upbranch">
<c-input <c-input
v-model="model.upbranch" v-model="model.upbranch"
...@@ -66,43 +58,38 @@ ...@@ -66,43 +58,38 @@
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="24"> <c-col :span="24">
<el-form-item label="机构类型" prop="bchtyp"> <el-form-item label="中文地址" prop="adr">
<c-select style="width: 100%" <c-input
v-model="model.bchtyp" v-model="model.adr"
placeholder="请选择机构类型" placeholder="请输入地址"
:code="getCodesByKey('bchtyp')"
> >
</c-select> </c-input>
</el-form-item> </el-form-item>
</c-col> <el-form-item label="" prop="adr2">
<!-- <c-col :span="24"> <c-input
<el-form-item label="机构类型" prop="bchtyp"> v-model="model.adr2"
<c-select placeholder="请输入地址2"
v-model="model.bchtyp"
placeholder="请输入机构类型"
> >
</c-select> </c-input>
</el-form-item> </el-form-item>
</c-col> --> </c-col>
<c-col :span="24"> <c-col :span="24">
<el-form-item label="机构参考号标志" prop="bchflg"> <el-form-item label="英文地址" prop="adren">
<c-input <c-input
v-model="model.bchflg" v-model="model.adren"
placeholder="请输入机构参考号标志" placeholder="请输入英文地址"
> >
</c-input> </c-input>
</el-form-item> </el-form-item>
</c-col> <el-form-item label="" prop="adren2">
<c-col :span="24">
<el-form-item label="金融机构编码" prop="decnum">
<c-input <c-input
v-model="model.decnum" v-model="model.adren2"
placeholder="请输入金融机构编码" placeholder="请输入英文地址2"
> >
</c-input> </c-input>
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="24"> <c-col :span="24">
<el-form-item label="电话" prop="tel"> <el-form-item label="电话" prop="tel">
<c-input <c-input
v-model="model.tel" v-model="model.tel"
...@@ -111,7 +98,7 @@ ...@@ -111,7 +98,7 @@
</c-input> </c-input>
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="24"> <c-col :span="24">
<el-form-item label="传真" prop="fax"> <el-form-item label="传真" prop="fax">
<c-input <c-input
v-model="model.fax" v-model="model.fax"
...@@ -120,25 +107,65 @@ ...@@ -120,25 +107,65 @@
</c-input> </c-input>
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="24"> <c-col :span="24">
<el-form-item label="地址" prop="adr"> <el-form-item label="收支申报号" prop="decnum">
<c-input <c-input
v-model="model.adr" v-model="model.decnum"
placeholder="请输入地址" placeholder="请输入收支申报号"
> >
</c-input> </c-input>
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="24"> <c-col :span="24">
<el-form-item label="BIC码" prop="swfcod"> <el-form-item label="外汇管理局印单局代码" prop="ydjcod">
<c-input <c-input
v-model="model.swfcod" v-model="model.ydjcod"
placeholder="请输入BIC码" placeholder="请输入外汇管理局印单局代码"
> >
</c-input> </c-input>
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="24"> <c-col :span="24">
<el-form-item label="实体" prop="etyexkey">
<c-input
v-model="model.etyexkey"
placeholder="请输入实体"
>
</c-input>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="机构标识" prop="bchflg">
<c-input
v-model="model.bchflg"
placeholder="请输入机构标识"
>
</c-input>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="机构层次" prop="lev">
<c-select style="width: 100%"
v-model="model.lev"
placeholder="请选择机构层次"
:code="getCodesByKey('lev')"
>
</c-select>
</el-form-item>
</c-col>
<!-- <c-col :span="24">
<el-form-item label="机构类型" prop="bchtyp">
<c-select
v-model="model.bchtyp"
placeholder="请输入机构类型"
>
</c-select>
</el-form-item>
</c-col> -->
<!-- <c-col :span="24">
<el-form-item label="地址2" prop="adr2"> <el-form-item label="地址2" prop="adr2">
<c-input <c-input
v-model="model.adr2" v-model="model.adr2"
...@@ -146,8 +173,21 @@ ...@@ -146,8 +173,21 @@
> >
</c-input> </c-input>
</el-form-item> </el-form-item>
</c-col> -->
</c-col>
<c-col :span="12" class="col-right">
<c-col :span="24">
<el-form-item label="中文名称" prop="bchname">
<c-input
v-model="model.bchname"
placeholder="请输入中文名称"
>
</c-input>
</el-form-item>
</c-col> </c-col>
<c-col :span="24"> <c-col :span="24">
<el-form-item label="英文名称" prop="namen"> <el-form-item label="英文名称" prop="namen">
<c-input <c-input
v-model="model.namen" v-model="model.namen"
...@@ -156,45 +196,44 @@ ...@@ -156,45 +196,44 @@
</c-input> </c-input>
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="24"> <c-col :span="24">
<el-form-item label="英文地址" prop="adren"> <el-form-item label="电证联行行号" prop="dzlhhh">
<c-input <c-input
v-model="model.adren" v-model="model.dzlhhh"
placeholder="请输入英文地址" placeholder="请输入电证联行行号"
> >
</c-input> </c-input>
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="24"> <c-col :span="24">
<el-form-item label="英文地址2" prop="adren2"> <el-form-item label="机构负责人" prop="bchfzr">
<c-input <c-input
v-model="model.adren2" v-model="model.bchfzr"
placeholder="请输入英文地址2" placeholder="请输入机构负责人"
> >
</c-input> </c-input>
</el-form-item> </el-form-item>
</c-col> </c-col>
</c-col> <c-col :span="24">
<c-col :span="12" class="col-right"> <el-form-item label="自贸区标志" prop="zmqflg">
<c-col :span="24"> <c-checkbox
<el-form-item label="外汇管理局印单局代码" prop="ydjcod"> v-model="model.zmqflg"
<c-input placeholder="请输入自贸区标志"
v-model="model.ydjcod" disabled style="float: left;"
placeholder="请输入外汇管理局印单局代码"
> >
</c-input> </c-checkbox>
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="24"> <c-col :span="24">
<el-form-item label="收单行系统机构代号" prop="tid"> <el-form-item label="BIC码" prop="swfcod">
<c-input <c-input
v-model="model.tid" v-model="model.swfcod"
placeholder="请输入收单行系统机构代号" placeholder="请输入BIC码"
> >
</c-input> </c-input>
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="24"> <c-col :span="24">
<el-form-item label="所辖押汇中心" prop="upbchkey"> <el-form-item label="所辖押汇中心" prop="upbchkey">
<c-input <c-input
v-model="model.upbchkey" v-model="model.upbchkey"
...@@ -202,12 +241,27 @@ ...@@ -202,12 +241,27 @@
> >
</c-input> </c-input>
</el-form-item> </el-form-item>
<el-form-item label="" prop="bchgrp">
<c-input
v-model="model.bchgrp"
placeholder="请输入机构组"
>
</c-input>
</el-form-item>
</c-col> </c-col>
<c-col :span="24"> <c-col :span="24">
<el-form-item label="核心机构号" prop="accbch"> <el-form-item label="收单行系统机构代号" prop="tid">
<c-input <c-input
v-model="model.accbch" v-model="model.tid"
placeholder="请输入核心机构号" placeholder="请输入收单行系统机构代号"
>
</c-input>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="国内地区码" prop="tid">
<c-input
placeholder="DISCOD"
> >
</c-input> </c-input>
</el-form-item> </el-form-item>
...@@ -230,7 +284,16 @@ ...@@ -230,7 +284,16 @@
</c-input> </c-input>
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="24"> <c-col :span="24">
<el-form-item label="核心柜员2" prop="bchusr2">
<c-input
v-model="model.bchusr2"
placeholder="请输入核心柜员2"
>
</c-input>
</el-form-item>
</c-col>
<!-- <c-col :span="24">
<el-form-item label="状态" prop="sta"> <el-form-item label="状态" prop="sta">
<c-select style="width: 100%" <c-select style="width: 100%"
v-model="model.sta" v-model="model.sta"
...@@ -239,7 +302,7 @@ ...@@ -239,7 +302,7 @@
> >
</c-select> </c-select>
</el-form-item> </el-form-item>
</c-col> </c-col> -->
<c-col :span="24"> <c-col :span="24">
<el-form-item label="联行行号" prop="lhanum"> <el-form-item label="联行行号" prop="lhanum">
<c-input <c-input
...@@ -258,25 +321,9 @@ ...@@ -258,25 +321,9 @@
</c-input> </c-input>
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="24">
<el-form-item label="bchgrp" prop="bchgrp">
<c-input <!-- <c-col :span="24">
v-model="model.bchgrp"
placeholder="请输入bchgrp"
>
</c-input>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="自贸区标志" prop="zmqflg">
<c-input
v-model="model.zmqflg"
placeholder="请输入自贸区标志"
>
</c-input>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="包含的分支机构INR" prop="bchlst"> <el-form-item label="包含的分支机构INR" prop="bchlst">
<c-input <c-input
type="textarea" type="textarea"
...@@ -285,25 +332,8 @@ ...@@ -285,25 +332,8 @@
> >
</c-input> </c-input>
</el-form-item> </el-form-item>
</c-col> </c-col> -->
<c-col :span="24">
<el-form-item label="核心柜员2" prop="bchusr2">
<c-input
v-model="model.bchusr2"
placeholder="请输入核心柜员2"
>
</c-input>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="电证联行行号" prop="dzlhhh">
<c-input
v-model="model.dzlhhh"
placeholder="请输入电证联行行号"
>
</c-input>
</el-form-item>
</c-col>
<c-col :span="24"> <c-col :span="24">
<el-form-item label="电证联行名称" prop="dzlhmc"> <el-form-item label="电证联行名称" prop="dzlhmc">
<c-input <c-input
...@@ -313,15 +343,7 @@ ...@@ -313,15 +343,7 @@
</c-input> </c-input>
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="24">
<el-form-item label="机构负责人" prop="bchfzr">
<c-input
v-model="model.bchfzr"
placeholder="请输入机构负责人"
>
</c-input>
</el-form-item>
</c-col>
</c-col> </c-col>
</div> </div>
</template> </template>
......
...@@ -33,15 +33,15 @@ export const Pattern = { ...@@ -33,15 +33,15 @@ export const Pattern = {
], ],
"cod": [ "cod": [
{ "required": true, "message": "必输项", "type": "string", "trigger": "blur" }, { "required": true, "message": "必输项", "type": "string", "trigger": "blur" },
{ "max": 6, "message": "最大长度6个字符", "trigger": "blur" } { "trigger": "blur" }
], ],
"stfcod": [ "sftcod": [
{ "required": true, "message": "必输项", "type": "string", "trigger": "blur" }, { "required": true, "message": "必输项", "type": "string", "trigger": "blur" },
{ "max": 4, "message": "最大长度4个字符", "trigger": "blur" } { "trigger": "blur" }
], ],
"rol": [ "rol": [
{ "required": true, "message": "必输项", "type": "string", "trigger": "blur" }, { "required": true, "message": "必输项", "type": "string", "trigger": "blur" },
{ "max": 3, "message": "最大长度3个字符", "trigger": "blur" } { "trigger": "blur" }
], ],
"incflg": [ "incflg": [
{ "required": true, "message": "必输项", "type": "string", "trigger": "blur" }, { "required": true, "message": "必输项", "type": "string", "trigger": "blur" },
...@@ -77,7 +77,7 @@ export const Pattern = { ...@@ -77,7 +77,7 @@ export const Pattern = {
], ],
"grpcod": [ "grpcod": [
{ "required": true, "message": "必输项", "type": "string", "trigger": "blur" }, { "required": true, "message": "必输项", "type": "string", "trigger": "blur" },
{ "max": 6, "message": "最大长度6个字符", "trigger": "blur" } { "trigger": "blur" }
], ],
"ver": [ "ver": [
{ "required": true, "message": "必输项", "type": "string", "trigger": "blur" }, { "required": true, "message": "必输项", "type": "string", "trigger": "blur" },
...@@ -93,7 +93,7 @@ export const Pattern = { ...@@ -93,7 +93,7 @@ export const Pattern = {
], ],
"dtacod": [ "dtacod": [
{ "required": true, "message": "必输项", "type": "string", "trigger": "blur" }, { "required": true, "message": "必输项", "type": "string", "trigger": "blur" },
{ "max": 8, "message": "最大长度40个字符", "trigger": "blur" } { "trigger": "blur" }
], ],
"etgextkey": [ "etgextkey": [
{ "required": true, "message": "必输项", "type": "string", "trigger": "blur" }, { "required": true, "message": "必输项", "type": "string", "trigger": "blur" },
......
...@@ -2,110 +2,127 @@ ...@@ -2,110 +2,127 @@
<div class="eibs-tab"> <div class="eibs-tab">
<c-col :span="12" class="col-left"> <c-col :span="12" class="col-left">
<c-col :span="24"> <c-col :span="24">
<el-form-item label="Fee Code" prop="cod"> <el-form-item label="费用代码" prop="cod">
<c-select <c-select
style="width: 100%" style="width: 100%"
v-model="model.cod" v-model="model.cod"
placeholder="请选择Fee Code" placeholder="请选择费用代码"
:code="getCodesByKey('fepfeecod')" :code="getCodesByKey('feecod3')"
> >
</c-select> </c-select>
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="24"> <c-col :span="24">
<el-form-item label="Relevant Amount" prop="reltir"> <el-form-item label="相关金额类型" prop="reltir">
<c-select <c-select
style="width: 100%" style="width: 100%"
v-model="model.reltir" v-model="model.reltir"
placeholder="请选择Relevant Amount" placeholder="请选择相关金额类型"
:code="getCodesByKey('calcbs')" :code="getCodesByKey('calcbs')"
> >
</c-select> </c-select>
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="24"> <c-col :span="24">
<el-form-item label="SWIFT Code" prop="sftcod"> <el-form-item label="SWIFT报文描述" prop="sftcod">
<c-select <c-select
style="width: 100%" style="width: 100%"
v-model="model.sftcod" v-model="model.sftcod"
placeholder="请选择SWIFT Code" placeholder="请选择SWIFT报文类型"
:code="getCodesByKey('swtcod')" :code="getCodesByKey('swtcod')"
> >
</c-select> </c-select>
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="24"> <c-col :span="24">
<el-form-item label="Fee Code for DTA Messages" prop="dtacod"> <el-form-item label="DTA报文中的费用代码" prop="dtacod">
<c-select <c-select
style="width: 100%" style="width: 100%"
v-model="model.dtacod" v-model="model.dtacod"
placeholder="请选择Fee Code for DTA Messages" placeholder="请选择DTA报文中的费用代码"
:code="getCodesByKey('dtacod')" :code="getCodesByKey('dtacod')"
> >
</c-select> </c-select>
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="24"> <c-col :span="24">
<el-form-item label="Booking Type" prop="staflg"> <el-form-item label="统计标志" prop="staflg">
<c-select <c-select
style="width: 100%" style="width: 100%"
v-model="model.staflg" v-model="model.staflg"
placeholder="请选择Booking Type" placeholder="请选择统计标志"
:code="getCodesByKey('staflgFee')" :code="getCodesByKey('staflgFee')"
> >
</c-select> </c-select>
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="24"> <c-col :span="24">
<c-checkbox v-model="model.incflg" >Income</c-checkbox> <el-form-item label="是否收入" prop="incflgFee">
<c-select style="width: 100%"
v-model="model.incflg"
:code="getCodesByKey('incflgFee')"
>
</c-select>
</el-form-item>
</c-col> </c-col>
<c-col :span="24"> <c-col :span="24">
<el-form-item label="Fee Payer(Deafult) " prop="rol"> <el-form-item label="支付此费用的默认角色" prop="rol">
<c-select <c-select
style="width: 100%" style="width: 100%"
v-model="model.rol" v-model="model.rol"
placeholder="请选择Fee Payer(Deafult)" placeholder="请选择支付此费用的角色"
:code="getCodesByKey('rol')" :code="getCodesByKey('rol')"
> >
</c-select> </c-select>
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="24"> <c-col :span="24">
<el-form-item label="Account" prop="acc"> <el-form-item label="账号" prop="acc">
<c-input v-model="model.acc" placeholder="请输入Account"> </c-input> <c-input v-model="model.acc" placeholder="请输入账号"> </c-input>
</el-form-item> </el-form-item>
</c-col> </c-col>
</c-col> </c-col>
<c-col :span="12" class="col-right"> <c-col :span="12" class="col-right">
<c-col :span="24"> <c-col :span="24">
<c-checkbox v-model="model.dscmodflg">Modification of Description Allowed in Settlement</c-checkbox> <el-form-item label="费用描述是否允许修改" prop="dscmodflg">
</c-col> <c-select style="width: 100%"
v-model="model.dscmodflg"
:code="getCodesByKey('dscmodflg')"
>
</c-select>
</el-form-item>
</c-col>
<c-col :span="24"> <c-col :span="24">
<el-form-item label="accruing Account" prop="accacr"> <el-form-item label="循环收费账号" prop="accacr">
<c-input v-model="model.accacr" placeholder="请输入accruing Account"> <c-input v-model="model.accacr" placeholder="请输入循环收费账号">
</c-input> </c-input>
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="24"> <c-col :span="24">
<el-form-item label="Usable in" prop="reltrn"> <el-form-item label="有关交易及业务部门" prop="reltrn">
<c-input v-model="model.reltrn" maxlength="40" placeholder="请输入Relevant Transaction and Business Sector"></c-input> <c-input v-model="model.reltrn" maxlength="40" placeholder="请输入有关交易及业务部门"></c-input>
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="24"> <c-col :span="24">
<el-form-item label="Begin Date" prop="begdat"> <el-form-item label="开始日期" prop="begdat">
<c-date-picker type="date" v-model="model.begdat" style="width:100%" placeholder="请选择Begin Date"></c-date-picker> <c-date-picker type="date" v-model="model.begdat" style="width:100%" placeholder="请选择开始日期"></c-date-picker>
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="24"> <c-col :span="24">
<el-form-item label="End Date" prop="enddat"> <el-form-item label="结束日期" prop="enddat">
<c-date-picker type="date" v-model="model.enddat" style="width:100%" placeholder="请选择End Date"></c-date-picker> <c-date-picker type="date" v-model="model.enddat" style="width:100%" placeholder="请选择结束日期"></c-date-picker>
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="24"> <c-col :span="24">
<el-form-item label="Group Code" prop="grpcod"> <el-form-item label="费用分组" prop="grpcod">
<c-select v-model="model.grpcod" style="width:100%" placeholder="请选择Group Code"> <c-select
v-model="model.grpcod"
style="width:100%"
placeholder="请选择费用的组"
:code="getCodesByKey('grpcod')"
>
</c-select> </c-select>
</el-form-item> </el-form-item>
</c-col> </c-col>
...@@ -120,8 +137,8 @@ ...@@ -120,8 +137,8 @@
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="24"> <c-col :span="24">
<el-form-item label="Tax Account" prop="taxacc"> <el-form-item label="传真账号" prop="taxacc">
<c-input v-model="model.taxacc" maxlength="34" placeholder="请输入Tax Account"></c-input> <c-input v-model="model.taxacc" maxlength="34" placeholder="请输入传真账号"></c-input>
</el-form-item> </el-form-item>
</c-col> </c-col>
</c-col> </c-col>
......
...@@ -3,10 +3,10 @@ ...@@ -3,10 +3,10 @@
<c-col :span="12" class="col-left"> <c-col :span="12" class="col-left">
<c-col :span="24"> <c-col :span="24">
<el-form-item label="FeeCode" prop="cod"> <el-form-item label="费用代码" prop="cod">
<c-input <c-input
v-model="model.cod" v-model="model.cod"
placeholder="请输入FeeCode" placeholder="请输入费用代码"
style="width: 100%" style="width: 100%"
> >
</c-input> </c-input>
...@@ -17,10 +17,10 @@ ...@@ -17,10 +17,10 @@
<c-col :span="12" class="col-right"> <c-col :span="12" class="col-right">
<c-col :span="24"> <c-col :span="24">
<el-form-item label="Description" prop="nam"> <el-form-item label="名称" prop="nam">
<c-input <c-input
v-model="model.nam" v-model="model.nam"
placeholder="请输入Description" placeholder="请输入名称"
style="width: 100%" style="width: 100%"
> >
</c-input> </c-input>
...@@ -111,14 +111,14 @@ export default { ...@@ -111,14 +111,14 @@ export default {
return { return {
feeData: [], feeData: [],
feeColumns: [ feeColumns: [
{ label: 'Fee Code', prop: 'cod', width: '120' }, { label: '费用代码', prop: 'cod', width: '120' },
{ label: 'Description', prop: 'descrp', width: '120' }, { label: '名称', prop: 'descrp', width: '120' },
{ label: 'Relevant Amount', prop: 'reltir', width: '150' }, { label: '相关金额类型', prop: 'reltir', width: '150' },
{ label: 'SWIFT COD', prop: 'sftcod', width: '150' }, { label: 'SWIFT报文描述', prop: 'sftcod', width: '150' },
{ label: 'DTA COD', prop: 'dtacod', width: '150' }, { label: 'DTA报文中的费用代码', prop: 'dtacod', width: '170' },
{ label: 'Booking Type', prop: 'staflg', width: '150' }, { label: '统计标志', prop: 'staflg', width: '120' },
{ label: 'Fee Payer(Deafult)', prop: 'rol', width: '170' }, { label: '支付此费用的默认角色', prop: 'rol', width: '170' },
{ label: 'Account', prop: 'acc', width: '120' } { label: '账号', prop: 'acc', width: '120' }
], ],
}; };
}, },
...@@ -146,11 +146,19 @@ export default { ...@@ -146,11 +146,19 @@ export default {
map.set(objectArr[i].value,objectArr[i].label); map.set(objectArr[i].value,objectArr[i].label);
} }
var feeList = []; var feeList = [];
for(var fee of map){ if(!this.model.cod&&this.model.nam){
console.log(fee[0]) for(var fee of map){
if(fee[1].includes(this.model.nam)){
feeList.push(fee[0])
}
}
}
if(this.model.cod&&this.model.nam){
for(var fee of map){
if(fee[0].includes(this.model.cod)&&fee[1].includes(this.model.nam)){ if(fee[0].includes(this.model.cod)&&fee[1].includes(this.model.nam)){
feeList.push(fee[0]) feeList.push(fee[0])
} }
}
} }
this.model.feelist = feeList; this.model.feelist = feeList;
console.log(this.model) console.log(this.model)
...@@ -161,25 +169,6 @@ export default { ...@@ -161,25 +169,6 @@ export default {
* total: 69 * total: 69
* totalPage: 0 * totalPage: 0
*/ */
// const objectArr = codes['fepfeecod'];
// const feeCodeArr = new Array();
// for (let i = 0; i < objectArr.length; i++) {
// let descrp = objectArr[i].label;
// if(descrp.includes(this.model.nam)){
// feeCodeArr.push(objectArr[i].value);
// }
// }
// const feecod = feeCodeArr;
// const list = res.list;
// const list2 = [];
// for (let i = 0; i < list.length; i++) {
// for (let j = 0; j < feecod.length; j++) {
// if(cod.includes(feecod[j])){
// debugger
// list2.push(list[i]);
// }
// }
// }
const list = res.list; const list = res.list;
this.feeData = list; this.feeData = list;
for(let i =0;i<list.length;i++){ for(let i =0;i<list.length;i++){
...@@ -188,6 +177,7 @@ export default { ...@@ -188,6 +177,7 @@ export default {
this.model.pageNum = res.pageNumber this.model.pageNum = res.pageNumber
this.model.pageSize = res.pageSize this.model.pageSize = res.pageSize
this.model.total = res.total this.model.total = res.total
this.model.feelist=[];
}) })
}, },
queryFunc(pageNumber, pageSize) { queryFunc(pageNumber, pageSize) {
......
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
import Infsea from "./Infsea"; import Infsea from "./Infsea";
export default { export default {
name: "StaticsInffec", name: "StaticsInffee",
components: { components: {
"m-infsea": Infsea, "m-infsea": Infsea,
}, },
...@@ -38,10 +38,8 @@ export default { ...@@ -38,10 +38,8 @@ export default {
return { return {
tabVal: "infsea", tabVal: "infsea",
model: { model: {
codfee:"", cod:"",
feepri:"!", nam:"",
objtyp:"",
// paging
pageNum: 1, pageNum: 1,
pageSize: 5, pageSize: 5,
total: 0 total: 0
......
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