Skip to content

V
vue-gjjs
Commit 806382a5 by 吴佳
Options

Merge branch 'master' of http://114.115.138.98:8900/fukai/vue-gjjs

parents 191a98d7 eefa9aff
Showing with 639 additions and 2 deletions
src/model/Ditopn/Pattern.js
...@@ -567,6 +567,10 @@ export default { ...@@ -567,6 +567,10 @@ export default {
{ type: "string", required: false, message: "必输项" }, { type: "string", required: false, message: "必输项" },
{ max: 16, message: "长度不能超过16" } { max: 16, message: "长度不能超过16" }
], ],
"liaall.limmod.limpts.nonrevflg1": [
{ type: "string", required: true, message: "必输项" },
{ max: 10, message: "长度不能超过10" }
],
"liaall.limmod.othp.ptsget.sdamod.seainf": [ "liaall.limmod.othp.ptsget.sdamod.seainf": [
{ type: "string", required: false, message: "必输项" }, { type: "string", required: false, message: "必输项" },
{ max: 3, message: "长度不能超过3" } { max: 3, message: "长度不能超过3" }
......
src/views/Business/Ditopn/Detp.vue
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
<c-col :span="24"> <c-col :span="24">
<el-form-item label="付款期限" prop="didgrp.rec.tenmaxday"> <el-form-item label="付款期限" prop="didgrp.rec.tenmaxday">
<c-input :disabled="model.didgrp.rec.avbby == 'P'" v-model.number="model.didgrp.rec.tenmaxday" placeholder="请输入" style="width:100%" maxlength="3"></c-input> <c-input :disabled="model.didgrp.rec.avbby == 'P'" v-model.number="model.didgrp.rec.tenmaxday" placeholder="请输入" style="width:100%" maxlength="3" @keyup.enter.native="defaultFunction('didgrp.rec.tenmaxday', model.didgrp.rec.tenmaxday)"></c-input>
</el-form-item> </el-form-item>
</c-col> </c-col>
......
src/views/Business/Ditopn/Ovwp.vue
...@@ -529,6 +529,7 @@ ...@@ -529,6 +529,7 @@
v-model="model.didgrp.apl.pts.extact" v-model="model.didgrp.apl.pts.extact"
style="width: 100%" style="width: 100%"
placeholder="请选择External Account" placeholder="请选择External Account"
:code="getValues('didgrp.apl.pts.extact')"
> >
</c-select> </c-select>
</el-form-item> </el-form-item>
......
src/views/Public/Setpan.vue
...@@ -420,7 +420,7 @@ ...@@ -420,7 +420,7 @@
<el-table-column label="Rate" prop="rat" width="120px"> <el-table-column label="Rate" prop="rat" width="120px">
</el-table-column> </el-table-column>
<el-table-column label="操作" width="135px" fixed="right"> <el-table-column label="操作" width="135px" fixed="right">
<template> <template slot-scope="scoped">
<el-button <el-button
style="margin-left:0" style="margin-left:0"
size="small" size="small"
...@@ -431,6 +431,7 @@ ...@@ -431,6 +431,7 @@
style="margin-left:0" style="margin-left:0"
size="small" size="small"
type="primary" type="primary"
@click="handleDetail(scoped.$index, scoped.row)"
>详情</el-button >详情</el-button
> >
</template> </template>
...@@ -464,6 +465,564 @@ ...@@ -464,6 +465,564 @@
> >
</span> </span>
</c-col> --> </c-col> -->
<template>
<el-dialog
ref="detpDialog"
:visible.sync="detpDialogVisible"
width="70%"
center
>
<el-form label-width="100px" :model="dialog3">
<c-row>
<c-col :span="24" style="height:24px">
<el-form-item label="基础信息" class="messageLabel">
</el-form-item>
</c-col>
<c-col :span="24" style="height: 0px;margin-top:-5px">
<el-divider></el-divider>
</c-col>
<c-col :span="24">
&nbsp;
</c-col>
<c-col :span="12">
<el-form-item label="rollab" >
<c-input v-model="dialog3.rollab" maxlength="3" placeholder="请输入rollab"></c-input>
</el-form-item>
</c-col>
<c-col :span="12">
<el-form-item label="role" >
<c-input v-model="dialog3.rol" maxlength="3" placeholder="请输入role"></c-input>
</el-form-item>
</c-col>
<!-- <c-col :span="12">
<c-checkbox v-model="dialog3.act3flg">第三方还款</c-checkbox>
</c-col>
<c-col :span="12">
<c-button size="small" type="primary" @click="onMtdbutButapy">
确定
</c-button>
</c-col>
<c-col :span="12">
<el-form-item label="Drag Drop Sender" prop="setgll.actp.ptsget.sdamod.dadsnd">
<c-input v-model="dialog3.actp.ptsget.sdamod.dadsnd" placeholder="请输入Drag Drop Sender"></c-input>
</el-form-item>
</c-col> -->
<c-col :span="12">
<el-form-item label="Disposition" prop="setgll.dsp" >
<c-select v-model="dialog3.dsp" style="width:100%" placeholder="请选择Disposition">
</c-select>
</el-form-item>
</c-col>
<c-col :span="12">
<el-form-item label="External" prop="setgll.setgrp.act.pts.extkey" >
<c-input v-model="dialog3.setgrp.act.pts.extkey" maxlength="16" placeholder="请输入External Key of Address"></c-input>
</el-form-item>
</c-col>
<c-col :span="12">
<el-form-item label="seainf" >
<c-col :span="18">
<c-input v-model="dialog3.actp.ptsget.sdamod.seainf" placeholder="请输入"></c-input>
</c-col>
<c-col :span="6" style="text-align: right">
<c-button size="small" type="primary" @click="onActpDet">
Details
</c-button>
</c-col>
</el-form-item>
</c-col>
<!-- <c-col :span="12">
<el-form-item label="核心业务代号" >
<c-input v-model="dialog3.acccode" maxlength="4" placeholder="请输入核心业务代号"></c-input>
</el-form-item>
</c-col>
<c-col :span="12">
<c-button size="small" type="primary" @click="onSetgllDetget">
Get
</c-button>
</c-col> -->
<c-col :span="12">
<el-form-item label="账号" >
<c-select v-model="dialog3.act" style="width:100%" placeholder="请选择账号">
</c-select>
</el-form-item>
</c-col>
<!-- <c-col :span="12">
<el-form-item label="Name of Party" >
<c-input v-model="dialog3.setgrp.act.pts.nam" maxlength="40" placeholder="请输入Name of Party"></c-input>
</el-form-item>
</c-col> -->
<c-col :span="24">
<c-col :span="12">
<el-form-item label="科目代码" >
<c-select v-model="dialog3.cur" style="width:100%" placeholder="请选择科目代码">
</c-select>
</el-form-item>
</c-col>
<c-col :span="12">
<el-form-item label="value date" >
<c-date-picker type="date" v-model="dialog3.valdat" style="width:100%" placeholder="请选择value date"></c-date-picker>
</el-form-item>
</c-col>
</c-col>
<!-- <c-col :span="12">
<el-form-item label="Search type" >
<c-select v-model="dialog3.actpriflg" style="width:100%" placeholder="请选择Search type">
</c-select>
</el-form-item>
</c-col> -->
<c-col :span="24">
<el-form-item label="原始金额">
<c-col :span="8">
<c-select v-model="dialog3.acttrmtyp" style="width:100%" placeholder="请选择原始金额">
</c-select>
</c-col>
<c-col :span="8">
<el-form-item label="" label-width="5%">
<c-input v-model="dialog3.fmtamt" placeholder="请输入原始金额"></c-input>
</el-form-item>
</c-col>
<c-col :span="8">
<el-form-item label="" label-width="5%">
<c-select v-model="dialog3.modflg" style="width:100%" placeholder="请选择Modified">
</c-select>
</el-form-item>
</c-col>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="实际金额">
<c-col :span="8">
<el-form-item label="" label-width="0">
<c-select v-model="dialog3.acccur" style="width:100%" placeholder="请选择Amount handled">
</c-select>
</el-form-item>
</c-col>
<c-col :span="8">
<el-form-item label="" label-width="5%">
<c-input v-model="dialog3.fmtaccamt" placeholder="请输入实际金额"></c-input>
</el-form-item>
</c-col>
<c-col :span="8">
<el-form-item label="" label-width="5%">
<c-input v-model="dialog3.debcdtflg" maxlength="1" placeholder="请输入Debit/Credit"></c-input>
</el-form-item>
</c-col>
</el-form-item>
</c-col>
<!-- ---------------------- -->
<c-col :span="23" style="height:24px">
<el-form-item label="Cross信息" class="messageLabel">
</el-form-item>
</c-col>
<c-col :span="23" style="height: 0px;margin-top:-5px">
<el-divider></el-divider>
</c-col>
<c-col :span="24">
&nbsp;
</c-col>
<c-col :span="24">
<el-form-item label="Cross Rate">
<c-col :span="6">
<c-col :span="24">
<el-form-item label="" label-width="20%">
<span>Rate Type</span>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="" label-width="20%">
<c-input v-model="rattyp"></c-input>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="" label-width="20%">
<c-input v-model="dcbrattyp"></c-input>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="" label-width="20%">
<c-input v-model="scbrattyp"></c-input>
</el-form-item>
</c-col>
</c-col>
<c-col :span="6">
<c-col :span="24">
<el-form-item label="" label-width="20%">
<span>Calculate Rate</span>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="" label-width="20%">
<c-input v-model="dialog3.rat" placeholder="请输入rate used"></c-input>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="" label-width="20%">
<c-input v-model="dialog3.dcbextrat" placeholder="请输入Selling Rate"></c-input>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="" label-width="20%">
<c-input v-model="dialog3.scbextrat" placeholder="请输入Buying Rate"></c-input>
</el-form-item>
</c-col>
</c-col>
<c-col :span="6">
<c-col :span="24">
<el-form-item label="" label-width="20%">
<span>From Date</span>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="" label-width="20%">
&nbsp;
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="" label-width="20%">
<c-input v-model="dialog3.xrtdatcur" placeholder="请输入xrtdatcur"></c-input>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="" label-width="20%">
<c-input v-model="dialog3.xrtdatacc" placeholder="请输入xrtdatacc"></c-input>
</el-form-item>
</c-col>
</c-col>
<c-col :span="6">
<c-col :span="24">
<el-form-item label="牌价时间">
<c-input v-model="dialog3.xrttim" placeholder="请输入牌价时间"></c-input>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="卖价" prop="setgll.midrat">
<c-input v-model="dialog3.selrat" placeholder="请输入卖价"></c-input>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="中间价" prop="setgll.midrat">
<c-input v-model="dialog3.midrat" placeholder="请输入中间价"></c-input>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="买价" prop="setgll.midrat">
<c-input v-model="dialog3.buyrat" placeholder="请输入买价"></c-input>
</el-form-item>
</c-col>
</c-col>
</el-form-item>
</c-col>
<!-- <div>
<c-col :span="12">
<el-form-item label="pre rate type" prop="setgll.selrattyp">
<c-select v-model="dialog3.selrattyp" style="width:100%" placeholder="请选择pre rate type">
</c-select>
</el-form-item>
</c-col>
<c-col :span="12">
<el-form-item label="Sel" prop="setgll.preselrat">
<c-input v-model="dialog3.preselrat" placeholder="请输入Sel"></c-input>
</el-form-item>
</c-col>
<c-col :span="12">
<span v-text="dialog3.selpct" data-path=".setgll.selpct" > </span>
</c-col>
<c-col :span="12">
<el-form-item label="Amount handled" prop="setgll.fmtacccpramt">
<c-input v-model="dialog3.fmtacccpramt" placeholder="请输入Amount handled"></c-input>
</el-form-item>
</c-col>
<c-col :span="12">
<el-form-item label="Pre rate type" prop="setgll.buyrattyp">
<c-select v-model="dialog3.buyrattyp" style="width:100%" placeholder="请选择Pre rate type">
</c-select>
</el-form-item>
</c-col>
<c-col :span="12">
<el-form-item label="Buy" prop="setgll.prebuyrat">
<c-input v-model="dialog3.prebuyrat" placeholder="请输入Buy"></c-input>
</el-form-item>
</c-col>
<c-col :span="12">
<span v-text="dialog3.buypct" data-path=".setgll.buypct" > </span>
</c-col>
<c-col :span="12">
<el-form-item label="From Date" prop="setgll.xrttim">
<c-input v-model="dialog3.xrttim" maxlength="20" placeholder="请输入From Date"></c-input>
</el-form-item>
</c-col>
<c-col :span="12">
<span v-text="dialog3.ratcurlab" data-path=".setgll.ratcurlab" > </span>
</c-col>
<c-col :span="12">
<el-form-item label="Codetable of supported rate types M-iddle, B-uying, S-elling, I-nput" prop="setgll.rattyp">
<c-select v-model="dialog3.rattyp" style="width:100%" placeholder="请选择Codetable of supported rate types M-iddle, B-uying, S-elling, I-nput">
</c-select>
</el-form-item>
</c-col>
<c-col :span="12">
<el-form-item label="rate used" prop="setgll.rat">
<c-input v-model="dialog3.rat" placeholder="请输入rate used"></c-input>
</el-form-item>
</c-col>
<c-col :span="12">
<el-form-item label="Selling Rate" prop="setgll.selrat">
<c-input v-model="dialog3.selrat" placeholder="请输入Selling Rate"></c-input>
</el-form-item>
</c-col>
<c-col :span="12">
<span v-text="dialog3.dcbratlab" data-path=".setgll.dcbratlab" > </span>
</c-col>
<c-col :span="12">
<el-form-item label="Document Cur to Base RATe TYPe" prop="setgll.dcbrattyp">
<c-select v-model="dialog3.dcbrattyp" style="width:100%" placeholder="请选择Document Cur to Base RATe TYPe">
</c-select>
</el-form-item>
</c-col>
<c-col :span="12">
<el-form-item label="Document Cur to Base EXTernal RATe" prop="setgll.dcbextrat">
<c-input v-model="dialog3.dcbextrat" placeholder="请输入Document Cur to Base EXTernal RATe"></c-input>
</el-form-item>
</c-col>
<c-col :span="12">
<el-form-item label="Begin-Date of XRT-Rate of CUR" prop="setgll.xrtdatcur">
<c-date-picker type="date" v-model="dialog3.xrtdatcur" style="width:100%" placeholder="请选择Begin-Date of XRT-Rate of CUR"></c-date-picker>
</el-form-item>
</c-col>
<c-col :span="12">
<el-form-item label="" prop="setgll.xrtgetdcb.sdamod.seainf">
<c-input v-model="dialog3.xrtgetdcb.sdamod.seainf" placeholder="请输入"></c-input>
</el-form-item>
</c-col>
<c-col :span="12">
<el-form-item label="Middle Rate" prop="setgll.midrat">
<c-input v-model="dialog3.midrat" placeholder="请输入Middle Rate"></c-input>
</el-form-item>
</c-col>
<c-col :span="12">
<span v-text="dialog3.scbratlab" data-path=".setgll.scbratlab" > </span>
</c-col>
<c-col :span="12">
<el-form-item label="Settle Cur to Base RATe TYPe" prop="setgll.scbrattyp">
<c-select v-model="dialog3.scbrattyp" style="width:100%" placeholder="请选择Settle Cur to Base RATe TYPe">
</c-select>
</el-form-item>
</c-col>
<c-col :span="12">
<el-form-item label="Settle Cur to Base EXTernal RATe" prop="setgll.scbextrat">
<c-input v-model="dialog3.scbextrat" placeholder="请输入Settle Cur to Base EXTernal RATe"></c-input>
</el-form-item>
</c-col>
<c-col :span="12">
<el-form-item label="Begin-Date of XRT-Rate of ACCCUR" prop="setgll.xrtdatacc">
<c-date-picker type="date" v-model="dialog3.xrtdatacc" style="width:100%" placeholder="请选择Begin-Date of XRT-Rate of ACCCUR"></c-date-picker>
</el-form-item>
</c-col>
<c-col :span="12">
<el-form-item label="" prop="setgll.xrtgetscb.sdamod.seainf">
<c-input v-model="dialog3.xrtgetscb.sdamod.seainf" placeholder="请输入"></c-input>
</el-form-item>
</c-col>
<c-col :span="12">
<el-form-item label="Buying Rate" prop="setgll.buyrat">
<c-input v-model="dialog3.buyrat" placeholder="请输入Buying Rate"></c-input>
</el-form-item>
</c-col>
</div> -->
<!-- ---------------------- -->
<c-col :span="23" style="height:24px">
<el-form-item label="交易信息" class="messageLabel">
</el-form-item>
</c-col>
<c-col :span="23" style="height: 0px;margin-top:-5px">
<el-divider></el-divider>
</c-col>
<c-col :span="24">
&nbsp;
</c-col>
<c-col :span="12">
<c-col :span="24">
<el-form-item label="交易主体" prop="setgll.trnman">
<c-select v-model="dialog3.trnman" style="width:100%" placeholder="请选择交易主体">
</c-select>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="TRADE OUT" prop="setgll.trdout">
<c-select v-model="dialog3.trdout" style="width:100%" placeholder="请选择TRADE OUT">
</c-select>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="TRADE IN" prop="setgll.trdint">
<c-select v-model="dialog3.trdint" style="width:100%" placeholder="请选择TRADE IN">
</c-select>
</el-form-item>
</c-col>
</c-col>
<c-col :span="12">
<c-col :span="24">
<el-form-item label="TXT" prop="setgll.txt">
<c-input type="textarea" v-model="dialog3.txt" maxlength="100" show-word-limit placeholder="请输入TXT" ></c-input>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="TXT1" prop="setgll.txt1">
<c-input type="textarea" v-model="dialog3.txt1" maxlength="100" show-word-limit placeholder="请输入TXT1" ></c-input>
</el-form-item>
</c-col>
</c-col>
<!-- <c-col :span="12">
<c-checkbox v-model="dialog3.modifyflg">Modify flg</c-checkbox>
</c-col> -->
<!-- ---------------------- -->
<c-col :span="23" style="height:24px">
<el-form-item label="交易详情" class="messageLabel">
</el-form-item>
</c-col>
<c-col :span="23" style="height: 0px;margin-top:-5px">
<el-divider></el-divider>
</c-col>
<c-col :span="24">
&nbsp;
</c-col>
<c-col :span="12">
<el-form-item label="交易性质" >
<c-col :span="20">
<c-input v-model="dialog3.trntyp" maxlength="6" placeholder="请输入交易性质"></c-input>
</c-col>
<c-col :span="4" style="text-align:right">
<c-button size="small" type="primary" icon="el-icon-search" @click="onSetgllCodsel">
</c-button>
</c-col>
</el-form-item>
</c-col>
<c-col :span="12">
<el-form-item label="国别代码" prop="setgll.ctycod">
<c-col :span="20">
<c-input v-model="dialog3.ctycod" maxlength="3" placeholder="请输入国别代码"></c-input>
</c-col>
<c-col :span="4" style="text-align:right">
<c-button size="small" type="primary" icon="el-icon-search" @click="onSetgllCtysel">
</c-button>
</c-col>
</el-form-item>
</c-col>
<!-- <c-col :span="12">
<el-form-item label="Which MT to beneficiary institution" prop="setgll.sftmt">
<c-select v-model="dialog3.sftmt" style="width:100%" placeholder="请选择Which MT to beneficiary institution">
</c-select>
</el-form-item>
</c-col>
<c-col :span="12">
<el-form-item label="Direct payment one message" prop="setgll.dirindflg">
<c-select v-model="dialog3.dirindflg" style="width:100%" placeholder="请选择Direct payment one message">
</c-select>
</el-form-item>
</c-col> -->
<c-col :span="12">
<el-form-item label="对方名称" prop="setgll.oppnam">
<c-input v-model="dialog3.oppnam" maxlength="100" placeholder="请输入对方名称"></c-input>
</el-form-item>
</c-col>
<c-col :span="12">
<el-form-item label="国内地区代码" prop="setgll.discod">
<c-input v-model="dialog3.discod" maxlength="6" placeholder="请输入国内地区代码"></c-input>
</el-form-item>
</c-col>
<c-col :span="12">
<el-form-item label="对方账号" prop="setgll.oppacc">
<c-input v-model="dialog3.oppacc" maxlength="35" placeholder="请输入对方账号"></c-input>
</el-form-item>
</c-col>
<c-col :span="12">
<el-form-item label="虚拟号账号" prop="setgll.xzhacc">
<c-input v-model="dialog3.xzhacc" maxlength="40" placeholder="请输入虚拟号账号"></c-input>
</el-form-item>
</c-col>
<!-- <c-col :span="12">
<c-button size="small" type="primary" @click="onMtdbutButcan">
取消
</c-button>
</c-col> -->
<c-col :span="12">
<el-form-item label="对方银行代码" prop="setgll.oppbnk">
<c-input v-model="dialog3.oppbnk" maxlength="14" placeholder="请输入对方银行代码"></c-input>
</el-form-item>
</c-col>
<c-col :span="12">
<el-form-item label="虚拟号名称" prop="setgll.xzhnam">
<c-input v-model="dialog3.xzhnam" maxlength="50" placeholder="请输入虚拟号名称"></c-input>
</el-form-item>
</c-col>
</c-row>
</el-form>
</el-dialog>
</template>
</c-row> </c-row>
</template> </template>
<script> <script>
...@@ -493,6 +1052,26 @@ export default { ...@@ -493,6 +1052,26 @@ export default {
feetxt:"", feetxt:"",
}, },
index: 0, index: 0,
detpDialogVisible : false,
rattyp:'',
dcbrattyp:'',
scbrattyp:'',
dialog3:{
setgrp:{
act:{
pts:{
}
}
},
actp:{
ptsget:{
sdamod:{
}
}
},
},
}; };
}, },
methods: { methods: {
...@@ -535,6 +1114,54 @@ export default { ...@@ -535,6 +1114,54 @@ export default {
that.dialog2 = row that.dialog2 = row
}) })
}, },
// 第三个表格
async handleDetail(index, row) {
const that = this;
const rule = "setmod.setglg.setgll("+(index+1)+").det";
let rtnmsg = await this.executeRule(rule)
if (rtnmsg.respCode == SUCCESS) {
that.$refs.detpDialog.visiable = true;
this.detpDialogVisible = true;
that.dialog3 = Object.assign({}, that.model.setmod.setglg.setgll[index]);
that.index = index;
that.rattyp = that.strCalCode(that.dialog3.rattyp, that.codes.ratetype);
that.dcbrattyp = that.strCalCode(that.dialog3.dcbrattyp, that.codes.ratetype);
that.scbrattyp = that.strCalCode(that.dialog3.scbrattyp, that.codes.ratetype);
}
},
strCalCode(str, code){
var result = '';
for(let i = 0; i < code.length; i++){
if(code[i].value === str){
result = code[i].label;
continue;
}
}
if(result === ''){
return str;
}else{
return result;
}
},
onMtdbutButapy(){
},
onActpDet(){
},
onSetgllCodsel(){
},
onMtdbutButcan(){
},
onSetgllCtysel(){
},
onSetgllDetget(){
}
}, },
created: function () {}, created: function () {},
}; };
...@@ -547,4 +1174,9 @@ export default { ...@@ -547,4 +1174,9 @@ export default {
text-align: left; text-align: left;
font-weight:bold; font-weight:bold;
} }
.messageLabel >>> .el-form-item__label{
text-align: left;
font-weight:bold;
font-size: 12px;
}
</style> </style>
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