Skip to content

V
vue-gjjs
Commit 3e4d0379 by liuxin
Options

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

parents a2f299f0 8b71e437
Showing with 114 additions and 142 deletions
src/model/Brtcan/Check.js
......@@ -4,20 +4,15 @@ import Utils from "~/utils"
* Brtcan Check规则
*/
let checkObj = {
"liaall.misamt" :null,
"liaall.limmod.limpts.oth.pts.extkey" :null,
"liaall.limmod.ownref" :null,
"liaall.limmod.ecifno" :null,
"liaall.limmod.othp.ptsget.sdamod.dadsnd" :null,
"liaall.limmod.limpts.oth.pts.nam" :null,
"setmod.dspflg" :null,
"brtp0.recget.sdamod.dadsnd" :null,
"liaall.limmod.limpts.wrk.pts.nam" :null,
"brtp0.lidget.sdamod.dadsnd" :null,
"liaall.limmod.limpts.wrk.pts.extkey" :null,
"mtabut.coninf.conexedat" :null,
"liaall.limmod.limpts.nonrevflg1" :null,
"liaall.limmod.wrkp.ptsget.sdamod.dadsnd" :null,
"setmod.docamt" :null,
}
......
src/model/Brtcan/Default.js
......@@ -7,30 +7,29 @@ import Utils from "~/utils/index"
export default {
"liaall.limmod.limpts.oth.pts.extkey" :Utils.defaultFunction,
"brdgrp.prb.pts.nam" :Utils.defaultFunction,
"liaall.limmod.limpts.oth.pts.nam" :Utils.defaultFunction,
"liaall.limmod.limpts.nonrevflg2" :Utils.defaultFunction,
"liaall.limmod.limpts.nonrevflg1" :Utils.defaultFunction,
"liaall.limmod.comamt" :Utils.defaultFunction,
"liaall.limmod.ccvamt" :Utils.defaultFunction,
"liaall.limmod.limpts.wrk.pts.extkey" :Utils.defaultFunction,
"liaall.misamt" :Utils.defaultFunction,
"brdgrp.rec.ownref" :Utils.defaultFunction,
"mtabut.coninf.oitset.oit.inftxt" :Utils.defaultFunction,
"liaall.limmod.limpts.wrk.pts.nam" :Utils.defaultFunction,
"setmod.doccur" :Utils.defaultFunction,
"setmod.dspflg" :Utils.defaultFunction,
"setmod.docamt" :Utils.defaultFunction,
"trnmod.trndoc.condocstm" :Utils.defaultFunction,
"trnmod.trndoc.shwinc" :Utils.defaultFunction,
"trnmod.trndoc.shwout" :Utils.defaultFunction,
"mtabut.coninf.usr.extkey" :Utils.defaultFunction,
"mtabut.coninf.oitset.oit.inflev" :Utils.defaultFunction,
"brdgrp.apl.pts.nam" :Utils.defaultFunction,
"liaall.limmod.limpts.wrk.pts.extkey" :Utils.defaultFunction,
"liaall.limmod.limpts.nonrevflg2" :Utils.defaultFunction,
"liaall.limmod.limpts.nonrevflg1" :Utils.defaultFunction,
"brdgrp.ben.pts.nam" :Utils.defaultFunction,
"liaall.limmod.comamt" :Utils.defaultFunction,
"liaall.limmod.ccvamt" :Utils.defaultFunction,
"liaall.limmod.limpts.wrk.pts.nam" :Utils.defaultFunction,
"brdgrp.apl.pts.nam" :Utils.defaultFunction,
"mtabut.coninf.oitset.oit.inftxt" :Utils.defaultFunction,
"mtabut.coninf.oitset.oit.inflev" :Utils.defaultFunction,
"mtabut.coninf.usr.extkey" :Utils.defaultFunction,
"liaall.limmod.limpts.oth.pts.nam" :Utils.defaultFunction,
"brdgrp.prb.pts.nam" :Utils.defaultFunction,
"mtabut.coninf.oitinf.oit.inftxt" :Utils.defaultFunction,
"mtabut.coninf.oitinf.oit.inflev" :Utils.defaultFunction,
"lidgrp.rec.ownref" :Utils.defaultFunction,
"mtabut.coninf.conexedat" :Utils.defaultFunction,
"brdgrp.rec.ownref" :Utils.defaultFunction,
"lidgrp.rec.ownref" :Utils.defaultFunction,
}
//你可以添加自动default处理
src/model/Brtcan/Event.js
......@@ -2,31 +2,7 @@ import Api from "~/service/Api"
import Utils from "~/utils"
export default {
async onLiaallButmisamt(){
let rtnmsg = await this.executeRule("liaall.butmisamt")
if(rtnmsg.respCode == SUCCESS)
{
//TODO 处理数据逻辑
}
else
{
this.$notify.error({title: '错误',message: '服务请求失败！'});
}
},
async onLiaallButmissig(){
let rtnmsg = await this.executeRule("liaall.butmissig")
if(rtnmsg.respCode == SUCCESS)
{
//TODO 处理数据逻辑
}
else
{
this.$notify.error({title: '错误',message: '服务请求失败！'});
}
},
async onSetmodDet(){
async onSetmodDet(){
let rtnmsg = await this.executeRule("setmod.det")
if(rtnmsg.respCode == SUCCESS)
{
......
src/model/Brtcan/Pattern.js
......@@ -19,7 +19,7 @@ export default {
{max: 3,message:"长度不能超过3"}
],
"lidgrp.cbs.opn1.amt":[
{type: "number", required: false, message: "必输项"},
{required: true, message: "必输项"},
{max: 18,message:"整数位不能超过14位"},
{pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
],
......@@ -41,7 +41,7 @@ export default {
],
"brdgrp.cbs.max.amt":[
{type: "number", required: false, message: "必输项"},
{required: true, message: "必输项"},
{max: 18,message:"整数位不能超过14位"},
{pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
],
......@@ -54,7 +54,7 @@ export default {
{max: 3,message:"长度不能超过3"}
],
"brdgrp.cbs.opn1.amt":[
{type: "number", required: false, message: "必输项"},
{required: true, message: "必输项"},
{max: 18,message:"整数位不能超过14位"},
{pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
],
......@@ -96,36 +96,6 @@ export default {
],
"liaall.outamt":[
{type: "number", required: false, message: "必输项"},
{max: 18,message:"整数位不能超过14位"},
{pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
],
"liaall.outpct":[
{type: "string", required: false, message: "必输项"},
{max: 6,message:"长度不能超过6"}
],
"liaall.concur":[
{type: "string", required: false, message: "必输项"},
{max: 3,message:"长度不能超过3"}
],
"liaall.misamt":[
{type: "number", required: false, message: "必输项"},
{max: 18,message:"整数位不能超过14位"},
{pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
],
"liaall.exttotoldamt":[
{type: "number", required: false, message: "必输项"},
{max: 18,message:"整数位不能超过14位"},
{pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
],
"liaall.exttotamt":[
{type: "number", required: false, message: "必输项"},
{max: 18,message:"整数位不能超过14位"},
{pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
],
"setmod.ref":[
{type: "string", required: false, message: "必输项"},
{max: 16,message:"长度不能超过16"}
......@@ -243,7 +213,7 @@ export default {
],
"liaall.limmod.comamt":[
{type: "number", required: false, message: "必输项"},
{required: true, message: "必输项"},
{max: 18,message:"整数位不能超过14位"},
{pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
],
......@@ -256,7 +226,7 @@ export default {
{max: 40,message:"长度不能超过40"}
],
"liaall.limmod.ccvamt":[
{type: "number", required: false, message: "必输项"},
{required: true, message: "必输项"},
{max: 18,message:"整数位不能超过14位"},
{pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
],
......
src/model/Brtcan/index.js
import Api from "~/service/Api"
import Pts from "../Common/Pts"
import Setmod from "../Public/Setmod"
export default class Brtcan{
constructor () {
this.data = {
......@@ -66,52 +68,6 @@ export default class Brtcan{
},
sndmsg:"", // Send Message .sndmsg
rebkpflg:"", // Booking Procedure .rebkpflg
liaall:{
misamt:"", // Amount not yet assigned .liaall.misamt
concur:"", // External Booking Amount .liaall.concur
outpct:"", // Sight Amount Percentage .liaall.outpct
outamt:"", // Sight Amount .liaall.outamt
exttotoldamt:"", // Old Amount booked externally .liaall.exttotoldamt
exttotamt:"", // Total booking amount external assinged .liaall.exttotamt
limmod:{
limpts:{
wrklab:"", // Label .liaall.limmod.limpts.wrklab
othlab:"", // Label .liaall.limmod.limpts.othlab
othlabss:"", // Label .liaall.limmod.limpts.othlabss
wrk:{
pts:new Pts().data,
},
oth:{
pts:new Pts().data,
},
lsh:"", // 合同流�'号 .liaall.limmod.limpts.lsh
nonrevflg1:"", // Flag to Mark Non-revolving Limits .liaall.limmod.limpts.nonrevflg1
pfcod1:"", // 合同流�'号 .liaall.limmod.limpts.pfcod1
nonrevflg2:"", // Flag to Mark Non-revolving Limits .liaall.limmod.limpts.nonrevflg2
pfcod2:"", // 合同流�'号 .liaall.limmod.limpts.pfcod2
},
wrkp:{
ptsget:{
sdamod:{
dadsnd:"", // Drag Drop Sender .liaall.limmod.wrkp.ptsget.sdamod.dadsnd
seainf:"", // .liaall.limmod.wrkp.ptsget.sdamod.seainf
},
},
},
othp:{
ptsget:{
sdamod:{
dadsnd:"", // Drag Drop Sender .liaall.limmod.othp.ptsget.sdamod.dadsnd
seainf:"", // .liaall.limmod.othp.ptsget.sdamod.seainf
},
},
},
ownref:"", // 国结业务编号 .liaall.limmod.ownref
comamt:"", // 业务余额 .liaall.limmod.comamt
ccvamt:"", // 保证金余额 .liaall.limmod.ccvamt
ecifno:"", // ECIFNO .liaall.limmod.ecifno
},
},
setmod:new Setmod().data,
mtabut:{
coninf:{
......@@ -153,6 +109,46 @@ export default class Brtcan{
filrecv:"", // File Receiver .trnmod.trndoc.filrecv
},
},
liaall:{
limmod:{
limpts:{
wrklab:"", // Label .liaall.limmod.limpts.wrklab
othlab:"", // Label .liaall.limmod.limpts.othlab
othlabss:"", // Label .liaall.limmod.limpts.othlabss
wrk:{
pts:new Pts().data,
},
oth:{
pts:new Pts().data,
},
lsh:"", // 合同流�'号 .liaall.limmod.limpts.lsh
nonrevflg1:"", // Flag to Mark Non-revolving Limits .liaall.limmod.limpts.nonrevflg1
pfcod1:"", // 合同流�'号 .liaall.limmod.limpts.pfcod1
nonrevflg2:"", // Flag to Mark Non-revolving Limits .liaall.limmod.limpts.nonrevflg2
pfcod2:"", // 合同流�'号 .liaall.limmod.limpts.pfcod2
},
wrkp:{
ptsget:{
sdamod:{
dadsnd:"", // Drag Drop Sender .liaall.limmod.wrkp.ptsget.sdamod.dadsnd
seainf:"", // .liaall.limmod.wrkp.ptsget.sdamod.seainf
},
},
},
othp:{
ptsget:{
sdamod:{
dadsnd:"", // Drag Drop Sender .liaall.limmod.othp.ptsget.sdamod.dadsnd
seainf:"", // .liaall.limmod.othp.ptsget.sdamod.seainf
},
},
},
ownref:"", // 国结业务编号 .liaall.limmod.ownref
comamt:"", // 业务余额 .liaall.limmod.comamt
ccvamt:"", // 保证金余额 .liaall.limmod.ccvamt
ecifno:"", // ECIFNO .liaall.limmod.ecifno
},
},
pageId: "" // ctx的key
}
}
......
src/views/Business/Brtcan/index.vue
<template>
<div class="eContainer">
<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="150px" label-position="left" size="small" :validate-on-rule-change="false">
<c-tabs v-model="tabVal" ref="elment" type="card" @tab-click="tabClick">
......@@ -9,9 +13,9 @@
</el-tab-pane>
<!--PD000027 -->
<el-tab-pane label="Liability" name="engp">
<!-- <el-tab-pane label="Liability" name="engp">
<m-engp :model="model" :codes="codes"/>
</el-tab-pane>
</el-tab-pane> -->
<!--PD000000 -->
<el-tab-pane label="Settlement" name="setpan">
......@@ -46,24 +50,24 @@ import Api from "~/service/Api"
import CodeTable from "~/config/CodeTable"
import Brtcan from "~/model/Brtcan"
import commonProcess from "~/mixin/commonProcess"
import commonFuncs from "~/mixin/commonFuncs"
import Check from "~/model/Brtcan/Check"
import Default from "~/model/Brtcan/Default"
import Pattern from "~/model/Brtcan/Pattern"
import Canp from "./Canp"
import Engp from "./Engp"
// import Setpan from "./Setpan"
import Coninfp from "./Coninfp"
import Docpan from "./Docpan"
import Doctre from "./Doctre"
import Limitbody from "./Limitbody"
// import Engp from "./Engp"
import Setpan from "../../Public/Setpan"
import Coninfp from "../../Public/Coninfp"
import Docpan from "../../Public/Docpan"
import Doctre from "../../Public/Doctre"
import Limitbody from "../../Public/Limitbody"
export default {
name: 'Brtcan',
components:{
"m-canp" : Canp,
"m-engp" : Engp,
// "m-engp" : Engp,
"m-setpan" : Setpan,
"m-coninfp" : Coninfp,
"m-docpan" : Docpan,
......@@ -76,7 +80,7 @@ export default {
root: this
}
},
mixins: [commonProcess], // 里面包含了Default、Check等的公共处理
mixins: [commonProcess, commonFuncs], // 里面包含了Default、Check等的公共处理
data(){
return {
tabVal: "canp",
......@@ -91,19 +95,45 @@ export default {
}
},
methods:{
tabClick(){
async handleSave() {
let result = await this.save();
if (result.respCode == SUCCESS && Object.keys(result.fieldErrors).length == 0) {
this.$notify({
title: "成功",
message: "保存成功",
type: "success",
});
this.$store.dispatch("TagsView/delView", this.$route)
this.$router.go(-1)
} else if(result.fieldErrors && Object.keys(result.fieldErrors).length > 0 ){
const tab = this.showBackendErrors(result.fieldErrors)
if (tab) {
// tab切换之后，需出发tab-click的事件
this.tabClick(tab);
}
this.$notify({
title: "错误",
message: "检核失败！",
type: "error",
});
} else{
this.$notify({
title: "失败",
message: "保存失败",
type: "error",
});
}
}
},
created:async function(){
console.log("进入brtcan交易");
console.log("$el",this.$el)
let rtnmsg = await this.init({})
if(rtnmsg.respCode == SUCCESS)
{
//TODO 处理数据逻辑
this.updateModel(rtnmsg.data)
}
else
{
......
src/views/Business/Detame/index.vue
......@@ -115,6 +115,7 @@ import Detame from "~/model/Detame"
import commonProcess from "~/mixin/commonProcess";
import commonFuncs from "~/mixin/commonFuncs";
import Check from "~/model/Detopn/Check";
import Detame from "~/model/Detame";
import Default from "~/model/Detopn/Default";
import Pattern from "~/model/Detopn/Pattern";
import Ovwp from "./Ovwp";
......@@ -132,7 +133,7 @@ import Docpan from "~/views/Public/Docpan";
import Limitbody from "~/views/Public/Limitbody";
export default {
name: "Detopn",
name: "Detame",
components: {
"m-ovwp": Ovwp,
"m-detp": Detp,
......
src/views/Business/Fctcan/index.vue
......@@ -76,6 +76,8 @@ export default {
message: "保存成功",
type: "success",
});
this.$store.dispatch("TagsView/delView", this.$route)
this.$router.go(-1)
} else if(result.fieldErrors && Object.keys(result.fieldErrors).length > 0 ){
const tab = this.showBackendErrors(result.fieldErrors)
if (tab) {
......
src/views/Business/Fctopn/index.vue
......@@ -78,6 +78,8 @@ export default {
message: "保存成功",
type: "success",
});
this.$store.dispatch("TagsView/delView", this.$route)
this.$router.go(-1)
} else if(result.fieldErrors && Object.keys(result.fieldErrors).length > 0 ){
const tab = this.showBackendErrors(result.fieldErrors)
if (tab) {
......
src/views/Business/Inflid/index.vue
......@@ -23,6 +23,7 @@ import Infsea from "./Infsea"
export default {
name: 'Inflid',
components:{
"m-infsea" : Infsea,
......@@ -35,7 +36,7 @@ export default {
mixins: [commonProcess], // 里面包含了Default、Check等的公共处理
data(){
return {
tabVal: "",
tabVal: "infsea",
trnName: "inflid",
model: new Inflid().data,
checkRules: Check,
......@@ -55,7 +56,7 @@ export default {
if(rtnmsg.respCode == SUCCESS)
{
//TODO 处理数据逻辑
this.updateModel(rtnmsg.data)
}
else
{
......
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