Skip to content

V
vue-gjjs
Commit 24c2d259 by liyixun
Options

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 3a220aa3 3befceb5
Showing with 274 additions and 60 deletions
src/model/Botpay/Pattern.js
......@@ -50,7 +50,7 @@ export default {
],
"bodgrp.rec.matdat":[
{type: "date", required: false, message: "输入正确的日期"}
{type: "string", required: false, message: "输入正确的日期"}
],
"bodgrp.rec.matpercnt":[
{type: "string", required: false, message: "必输项"},
......@@ -67,10 +67,10 @@ export default {
{max: 40,message:"长度不能超过40"}
],
"bodgrp.rec.rcvdat":[
{type: "date", required: false, message: "输入正确的日期"}
{type: "string", required: false, message: "输入正确的日期"}
],
"bodgrp.rec.predat":[
{type: "date", required: false, message: "输入正确的日期"}
{type: "string", required: false, message: "输入正确的日期"}
],
"setmod.docamt":[
......@@ -283,7 +283,7 @@ export default {
],
"mtabut.coninf.conexedat":[
{type: "date", required: false, message: "输入正确的日期"}
{type: "string", required: false, message: "输入正确的日期"}
],
"mtabut.coninf.usr.extkey":[
{type: "string", required: false, message: "必输项"},
......
src/model/Cltdav/Event.js
......@@ -44,7 +44,7 @@ export default {
let rtnmsg = await this.executeRule("cltp.butgetref")
if (rtnmsg.respCode == SUCCESS) {
//TODO 处理数据逻辑
this.model.cldgrp.rec.ownref= rtnmsg.data.cldgrp_rec_ownref;
this.model.cldgrp.rec.ownref = rtnmsg.data.cldgrp_rec_ownref;
}
else {
this.$notify.error({ title: '错误', message: '服务请求失败！' });
......@@ -144,6 +144,7 @@ export default {
let rtnmsg = await this.executeRule("setins.buttxmsel")
if (rtnmsg.respCode == SUCCESS) {
//TODO 处理数据逻辑
this.showGridPromptDialog(cldgrp.blk.setins);
}
else {
......
src/model/Cltdav/Pattern.js
export default {
"cldgrp.rec.ownref":[
{type: "string", required: false, message: "必输项"},
{type: "string", required: true, message: "必输项"},
{max: 16,message:"长度不能超过16"}
],
......@@ -152,6 +152,6 @@ export default {
"cldgrp.blk.setins":[
{type: "string", required: true, message: "必输项"},
{max: 65,message:"长度不能超过65"}
{max: 300,message:"长度不能超过300"}
],
}
\ No newline at end of file
src/model/Cltset/Pattern.js
......@@ -36,7 +36,7 @@ export default {
{max: 40,message:"长度不能超过40"}
],
"cldgrp.rec.credat":[
{type: "date", required: false, message: "输入正确的日期"}
// {type: "date", required: false, message: "输入正确的日期"}
],
"cldgrp.rec.count":[
{type: "number", required: false, message: "必输项"},
......@@ -149,7 +149,7 @@ export default {
],
"mtabut.coninf.conexedat":[
{type: "date", required: false, message: "输入正确的日期"}
// {type: "date", required: false, message: "输入正确的日期"}
],
"mtabut.coninf.usr.extkey":[
{type: "string", required: false, message: "必输项"},
......
src/model/Clttra/Pattern.js
......@@ -36,7 +36,7 @@ export default {
{max: 40,message:"长度不能超过40"}
],
"cldgrp.rec.credat":[
{type: "date", required: false, message: "输入正确的日期"}
// {type: "date", required: false, message: "输入正确的日期"}
],
"cldgrp.rec.count":[
{type: "string", required: false, message: "必输项"},
......
src/views/Business/Bctset/Bctsus.vue
......@@ -246,7 +246,7 @@
</c-col>
<c-col :span="12">
<el-form-item label-width="0" prop="setmod.redamt">
<el-form-item label-width="0" >
<c-input
:disabled="model.bcdgrp.rec.focflg=='X'"
v-model="model.setmod.redamt"
......
src/views/Business/Botpay/Setp.vue
......@@ -259,33 +259,6 @@
</c-istream-table>
</c-col>
</c-col>
<!-- <c-col :span="24">
<div class="e-table-wrapper">
<el-table :data="model.bptbck.bptbckg" style="width: 100%">
<el-table-column prop="ownref" label="" sortable width="100">
</el-table-column>
<el-table-column prop="opncur" label="" sortable width="100">
</el-table-column>
<el-table-column prop="opnamt" label="" sortable width="100">
</el-table-column>
<el-table-column prop="bckamt" label="" sortable width="100">
</el-table-column>
<el-table-column prop="butcal" label="" sortable width="100">
</el-table-column>
</el-table> -->
<!-- <el-pagination
layout="prev, pager, next"
:total="pager.bptbck_bptbckg.total">
</el-pagination> -->
<!-- </div>
</c-col> -->
<!-- <c-col :span="12">
<el-form-item label="Tenor Stream" prop="liaall.tenstm">
<c-input v-model="model.liaall.tenstm" placeholder="请输入Tenor Stream"></c-input>
</el-form-item>
</c-col> -->
</div>
</template>
<script>
......
src/views/Business/Cltdav/Account.vue
......@@ -2,30 +2,32 @@
<div class="eibs-tab">
<c-col :span="11">
<el-form-item label="Credit to Account" prop="cldgrp.rec.creact">
<el-form-item label="Credit to Account" prop="cldgrp.rec.creact" style="width: 100%">
<c-select v-model="model.cldgrp.rec.creact" style="width: 100%" placeholder="请选择Credit to Account"
:code="codes.creact">
:code="codes.creact" :disabled="model.modflg === 'X'" id="toughH">
</c-select>
</el-form-item>
</c-col>
<c-col :span="11" :offset="1">
<el-form-item label="A/C NO." prop="cldgrp.rec.acno">
<c-input v-model="model.cldgrp.rec.acno" maxlength="20" placeholder="请输入A/C NO.">
<c-input v-model="model.cldgrp.rec.acno" maxlength="20" placeholder="请输入A/C NO."
:disabled="model.modflg === 'X'">
</c-input>
</el-form-item>
</c-col>
<c-col :span="11">
<el-form-item label="Settlement Instructions" prop="cldgrp.blk.setins">
<c-input type="textarea" v-model="model.cldgrp.blk.setins" maxlength="65" show-word-limit
placeholder="请输入Settlement Instructions"></c-input>
<c-input type="textarea" v-model="model.cldgrp.blk.setins" maxlength="300" show-word-limit rows="5"
placeholder="请输入Settlement Instructions" :disabled="model.modflg !== 'X'"></c-input>
</el-form-item>
</c-col>
<c-col :span="11" :offset="1">
<el-form-item label="">
<c-checkbox v-model="model.modflg" disabled>修改</c-checkbox>
<c-button size="small" type="primary" icon="el-icon-search" @click="onSetinsButtxmsel">
<c-checkbox v-model="model.modflg">修改</c-checkbox>
<c-button size="small" type="primary" icon="el-icon-search" :disabled="model.modflg !== 'X'"
@click="showGridPromptDialog('cltp.setins.buttxmsel', null, null,{TXT: 'cldgrp.blk.setins'}, {TXT: false},'doxpDialog')">
...
</c-button>
</el-form-item>
......@@ -58,9 +60,20 @@ export default {
methods: { ...Event },
created: function () {
},
watch: {
"model.modflg": {
async handler(newVal, oldVal) {
if (newVal !== 'X') {
this.model.cldgrp.blk.setins = '';
}
}
}
}
}
</script>
<style>
#toughH{
height: 24px !important;
}
</style>
src/views/Business/Cltdav/index.vue
......@@ -13,7 +13,7 @@
</c-function-btn>
<el-form :model="model" :rules="rules" ref="modelForm" label-width="150px" label-position="left"
size="small" :validate-on-rule-change="false">
<c-tabs v-model="tabVal" ref="elment" type="card" @tab-click="tabClick">
<c-tabs v-model="tabVal" ref="elment" type="card" @tab-click="myTabClick">
<!--PD000002 -->
<el-tab-pane label="内容" name="sel">
......@@ -22,17 +22,23 @@
<!--PD000529 -->
<el-tab-pane label="面函及报文" name="docpan">
<m-docpan :model="model" :codes="codes" />
<c-content>
<m-docpan :model="model" :codes="codes" />
</c-content>
</el-tab-pane>
<!--PD000546 -->
<el-tab-pane label="交易附件" name="doctre">
<m-doctre :model="model" :codes="codes" />
<c-content>
<m-doctre :model="model" :codes="codes" />
</c-content>
</el-tab-pane>
<!--PD000000 -->
<el-tab-pane label="附言" name="coninfp">
<m-coninfp :model="model" :codes="codes" />
<c-content>
<m-coninfp :model="model" :codes="codes" />
</c-content>
</el-tab-pane>
<el-tab-pane label="费用及账务" name="setpan">
......@@ -62,13 +68,15 @@
</el-form>
<c-grid-ety-prompt-dialog ref="etyDialog" :promptData="promptData" v-on:select-ety="selectEty">
</c-grid-ety-prompt-dialog>
<c-grid-ety-prompt-dialog ref="doxpDialog" :isPty="false" :promptData="promptData" @select-ety="selectMsg">
</c-grid-ety-prompt-dialog>
</div>
</c-page>
</template>
<script>
import Api from "~/service/Api";
import Utils from "~/utils/index";
import CodeTable from "~/config/CodeTable";
import Cltdav from "~/model/Cltdav";
import commonProcess from "~/mixin/commonProcess";
......@@ -76,6 +84,7 @@ import commonFuncs from "~/mixin/commonFuncs";
import Check from "~/model/Cltdav/Check";
import Default from "~/model/Cltdav/Default";
import Pattern from "~/model/Cltdav/Pattern";
import Sel from "./Sel";
import Account from "./Account";
......@@ -120,7 +129,8 @@ export default {
}
},
methods: {
tabClick() {
myTabClick(tab) {
this.tabClick(tab)
}
},
created: async function () {
......
src/views/Business/Cltset/index.vue
......@@ -125,6 +125,9 @@ export default {
if (rtnmsg.respCode == SUCCESS) {
this.updateModel(rtnmsg.data);
//TODO 处理数据逻辑
if (this.isInDisplay) {
this.restoreDisplay();
}
this.model.bptbck.bptbckg = rtnmsg.data.ccdbatg;
console.log(this.model.bptbck.bptbckg);
......
src/views/Business/Clttra/Sel.vue
......@@ -9,7 +9,7 @@
</c-col>
<c-col :span="11" :offset="1">
<el-form-item label="Type of Draft" prop="cldgrp.rec.chktyp">
<c-select v-model="model.cldgrp.rec.chktyp" style="width: 100%" placeholder="请输入Type of Draft">
<c-select v-model="model.cldgrp.rec.chktyp" style="width: 100%" placeholder="请输入Type of Draft" disabled>
<el-option v-for="item in codes.chktyp" :key="item.value" :label="item.label"
:value="item.value">
</el-option>
......@@ -36,7 +36,7 @@
<c-col :span="11" :offset="1">
<el-form-item label="Payemnt Disposition" prop="cldgrp.rec.colflg">
<c-select v-model="model.cldgrp.rec.colflg" style="width: 100%"
placeholder="请输入Payemnt Disposition">
placeholder="请输入Payemnt Disposition" disabled>
<el-option v-for="item in codes.colflg" :key="item.value" :label="item.label"
:value="item.value">
</el-option>
......
src/views/Business/Clttra/index.vue
......@@ -12,7 +12,7 @@
</c-function-btn>
<el-form :model="model" :rules="rules" ref="modelForm" label-width="150px" label-position="left"
size="small" :validate-on-rule-change="false">
<c-tabs v-model="tabVal" ref="elment" type="card" @tab-click="tabClick">
<c-tabs v-model="tabVal" ref="elment" type="card" @tab-click="myTabClick">
<!--PD000002 -->
<el-tab-pane label="内容" name="Sel">
......@@ -108,7 +108,8 @@ export default {
}
},
methods: {
tabClick() {
myTabClick(tab) {
this.tabClick(tab)
}
},
created: async function () {
......@@ -116,6 +117,9 @@ export default {
let rtnmsg = await this.init(this.$route.query)
if (rtnmsg.respCode == SUCCESS) {
//TODO 处理数据逻辑
if (this.isInDisplay) {
this.restoreDisplay();
}
this.updateModel(rtnmsg.data);
this.model.bptbck.bptbckg = rtnmsg.data.ccdbatg;
console.log(this.model.bptbck.bptbckg);
......
src/views/Business/Infcld/BusNavbar.vue 0 → 100644
<template>
<el-dialog
:visible.sync="initdialog"
:title="'交易列表'"
append-to-body
:before-close="beforeClose"
@opened="opened"
>
<div class="m-list-btns">
<div class="busnavbar">
<div class="busnavbar-items">
<c-button
style="margin-left: 7px"
size="medium"
type="primary"
class="medium_bcs"
v-for="(item, index) in navcode"
v-bind:key="index"
@click.native="onNarBtnClick(item.code, item.index)"
:title="item.title"
:disabled="item.isDis === 'N'"
>{{ item.label }}</c-button
>
</div>
</div>
</div>
</el-dialog>
</template>
<script>
import Api from "~/service/Api";
import commonProcess from "~/mixin/commonProcess";
import _ from "~/utils/Lodash"
export default {
props: {
ownref: {
required: true,
},
trnCode: {
required: true,
},
model: {
required: true,
},
ownrefPath: {
required: false,
default: "didgrp",
},
tabIndex: {
required: false,
default: 1,
},
amt: {
required: false,
default: 0,
}
},
components: {},
mixins: [commonProcess], // 里面包含了Default、Check等的公共处理
data() {
return {
initdialog: false,
navcode: [
// {code:"",label:"",isDis:"",title:""},
],
};
},
methods: {
//各入口按钮请求
async onNarBtnClick(code, i) {
this.model.cfgfil[`subtrn${i}`] = code;
let rtnmsg = await this.executeRule(`cfgfil.hotsub${i}`);
if (rtnmsg.respCode == SUCCESS) {
this.navcode = [];
this.$emit("onChoose", code.toLowerCase());
} else {
this.$notify.error({ title: "错误", message: "服务请求失败！" });
}
},
getIndex(module) {
for (let i = 1; i <= 12; i++) {
var temp = this.model.cfgfil[`subtxt${i}`];
if (module == temp) {
return i;
}
}
return 1;
},
opened() {
this.$emit("childmethods");
},
beforeClose() {
this.navcode = [];
this.initdialog = false;
},
},
mounted() {
this.trnName = this.trnCode;
this.$nextTick(function () {
this.$on("childmethods", async function () {
this.model.cldgrp.cbs.opn1.amt = this.amt;
let res = await this.executeRule(`cfgfil.hotreg${this.tabIndex}`);
if (res.respCode == SUCCESS) {
this.updateModel(res.data);
} else {
this.$notify.error({
title: "错误",
message: "服务请求失败！",
});
}
this.navcode = [];
//请求按钮数据
let rulePath
if (this.ownrefPath.endsWith(".ownref")) {
_.set(this.model, this.ownrefPath, this.ownref);
rulePath = this.ownrefPath
} else {
this.model[this.ownrefPath].rec.ownref = this.ownref;
rulePath = this.ownrefPath + ".rec.ownref"
}
let rtnmsg = await this.executeRule(rulePath); //didgrp_rec_ownref
if (rtnmsg.respCode == SUCCESS) {
//重置数组
this.navcode = [];
this.updateModel(rtnmsg.data);
//this.model.cfgfil.btnstm = rtnmsg.data.cfgfil_btnstm.rows
//给inr赋值,后面弹窗里面的按钮请求会用到
//this.model.didgrp.rec.inr = rtnmsg.data.didgrp_rec_inr
const length = this.model.cfgfil.btnstm.rows.length;
let btnStr = this.model.cfgfil.btnstm.rows;
for (let i = 0; i < length; i++) {
let arr = btnStr[i].split("\t");
var index = this.getIndex(arr[1]);
let newList = {
code: arr[0],
label: arr[1],
isDis: arr[2],
title: arr[3],
index: index,
};
this.navcode.push(newList);
}
} else {
this.navcode = [];
this.$notify.error({ title: "错误", message: "服务请求失败！" });
}
});
});
},
};
</script>
<style>
</style>
\ No newline at end of file
src/views/Business/Infcld/Infsea.vue
......@@ -165,14 +165,14 @@
slot="reference">详情</c-button>
</el-popover>
<c-button style="margin-left: 0" size="small" type="primary"
@click="getButtons(scope.row['Reference'])">处理
@click="getButtons(scope.row['Reference'],scope.row['Open Amount'])">处理
</c-button>
</template>
</el-table-column>
</c-istream-table>
</c-col>
<m-busbtn ref="childs" :ownref="ownref" :model="CltselModel" ownrefPath="cldgrp" trnCode="cltsel"
<m-busbtn ref="childs" :ownref="ownref" :amt="amt" :model="CltselModel" ownrefPath="cldgrp" trnCode="cltsel"
@onChoose="onChoose">11</m-busbtn>
......@@ -187,7 +187,7 @@ import CodeTable from "~/config/CodeTable"
import Event from "~/model/Infcld/Event"
import CltselModel from "~/model/Cltsel"
import BusNavbar from "~/views/Public/BusNavbar";
import BusNavbar from "./BusNavbar";
export default {
inject: ['root'],
......@@ -196,6 +196,7 @@ export default {
components: { "m-busbtn": BusNavbar },
data() {
return {
amt: '',
CltselModel: new CltselModel().data,
ownref: "",
initdialog: false,
......@@ -240,10 +241,13 @@ export default {
},
methods: {
...Event,
async getButtons(ownref) {
async getButtons(ownref,amt) {
this.$refs.childs.initdialog = true
this.executeDefault('executeNotify');
this.ownref = ownref
this.amt = amt;
console.log("ownref:" + ownref);
console.log(amt);
},
async onChoose(code) {
//跳转交易
......
src/views/Review/Business/ReviewCltset.vue 0 → 100644
<template>
<ReviewWrapper>
<Cltset></Cltset>
</ReviewWrapper>
</template>
<script>
import Cltset from "~/views/Business/Cltset";
import { ReviewWrapper } from "~/components/gj-common.min.js";
export default {
name: "ReviewCltset",
components: { ReviewWrapper, Cltset },
created() {},
mounted() {},
};
</script>
<style></style>
\ No newline at end of file
src/views/Review/Business/ReviewClttra.vue 0 → 100644
<template>
<ReviewWrapper>
<Clttra></Clttra>
</ReviewWrapper>
</template>
<script>
import Clttra from "~/views/Business/Clttra";
import { ReviewWrapper } from "~/components/gj-common.min.js";
export default {
name: "ReviewClttra",
components: { ReviewWrapper, Clttra },
created() {},
mounted() {},
};
</script>
<style></style>
\ No newline at end of file
src/views/Review/ReviewRouter.js
......@@ -90,6 +90,8 @@ import ReviewBetamc from "./Business/ReviewBetamc.vue";
import ReviewCptcan from "./Business/ReviewCptcan.vue";
import ReviewCptrep from "./Business/ReviewCptrep.vue";
import ReviewCltdav from "./Business/ReviewCltdav.vue";
import ReviewCltset from "./Business/ReviewCltset.vue";
import ReviewClttra from "./Business/ReviewClttra.vue";
import ReviewTrtopn from "./Business/ReviewTrtopn.vue";
import ReviewTrtame from "./Business/ReviewTrtame.vue";
......@@ -214,7 +216,13 @@ const ReviewRouter = [
{ path: "ccttra", component: ReviewCcttra, name: "ReviewCcttra", meta: { title: "复核-Ccttra" } },
{ path: "lttopn", component: ReviewLttopn, name: "ReviewLttopn", meta: { title: "复核-Lttopn" } },
{ path: "cltdav", component: ReviewCltdav, name: "ReviewCltdav", meta: { title: "复核-Cltdav" } },
<<<<<<< HEAD
{ path: "cltset", component: ReviewCltset, name: "ReviewCltset", meta: { title: "复核-Cltset" } },
{ path: "clttra", component: ReviewClttra, name: "ReviewClttra", meta: { title: "复核-Clttra" } },
=======
{ path: "lttdck", component: ReviewLttdck, name: "ReviewLttdck", meta: { title: "复核-Lttdck" } },
>>>>>>> 5ff75dabab23176ad31fe79802bc0bbfbb424721
{ path: "Cptati", component: ReviewCptati, name: "ReviewCptati", meta: { title: "复核-Cptati" } },
{ path: "Cptato", component: ReviewCptato, name: "ReviewCptato", meta: { title: "复核-Cptato" } },
{ path: "Cptcan", component: ReviewCptcan, name: "ReviewCptcan", meta: { title: "复核-Cptcan" } },
......
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