Commit 44698b53 by panziyi

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 1d7dc119 e814f6aa
......@@ -228,5 +228,6 @@ export default {
"gidgrp.rec.delto" :Utils.defaultFunction,
"gidgrp.ghd.aplnam" :Utils.defaultFunction,
"gidgrp.rec.orddat" :Utils.defaultFunction,
"setmod.glemod.glepan" :Utils.defaultFunction,
}
//你可以添加自动default处理
......@@ -53,6 +53,9 @@ export default {
"cnybop.outflg" :Utils.defaultFunction,
"gcdgrp.rec.docprbrol" :Utils.defaultFunction,
"setmod.glemod.glepan" :Utils.defaultFunction,
"bopmod.dbdp.basp" :Utils.defaultFunction,
// "bopmod.dbdp.basp" :Utils.defaultFunction,
// "bopmod.dbap.basp" :Utils.defaultFunction,
"bopmod.dbdp.baspp.acp" :Utils.defaultFunction,
"bopmod.dbap.baspp.acp" :Utils.defaultFunction,
}
//你可以添加自动default处理
......@@ -248,5 +248,6 @@ export default {
"gidgrp.ghd.aplnam" :Utils.defaultFunction,
"gitamep.plateflg" :Utils.defaultFunction,
"gidgrp.rec.orddat" :Utils.defaultFunction,
"setmod.glemod.glepan" :Utils.defaultFunction,
}
//你可以添加自动default处理
......@@ -477,10 +477,10 @@ export default {
{type: "string", required: true, message: "必输项"},
{max: 780,message:"长度不能超过780"}
],
"gidgrp.blk.atxexptxt":[
{type: "string", required: true, message: "必输项"},
{max: 65,message:"长度不能超过65"}
],
// "gidgrp.blk.atxexptxt":[
// {type: "string", required: true, message: "必输项"},
// {max: 65,message:"长度不能超过65"}
// ],
"gidgrp.rec.inudat":[
......@@ -523,10 +523,10 @@ export default {
{type: "string", required: true, message: "必输项"},
{max: 780,message:"长度不能超过780"}
],
"gidgrp.blk.atxliatxtc":[
{type: "string", required: true, message: "必输项"},
{max: 65,message:"长度不能超过65"}
],
// "gidgrp.blk.atxliatxtc":[
// {type: "string", required: true, message: "必输项"},
// {max: 65,message:"长度不能超过65"}
// ],
"gidgrp.ben.adrelc":[
......
......@@ -164,5 +164,6 @@ export default {
"gidgrp.rec.orddat" :Utils.defaultFunction,
"gidgrp.blk.apprulc" :Utils.defaultFunction,
"gidgrp.rec.autrnwflg" :Utils.defaultFunction,
"setmod.glemod.glepan" :Utils.defaultFunction,
}
//你可以添加自动default处理
......@@ -98,6 +98,24 @@ export default {
this.$notify.error({ title: '错误', message: '服务请求失败!' });
}
},
async handleReset() {
this.model.infcon.seaownref = ""
this.model.infcon.opndatfrom = new Date();
this.model.infcon.opndatto = new Date();
this.isGuarantee = "";
this.model.infcon.nam = "";
this.model.infcon.pty.extkey = "";
this.model.infcon.seapty = "";
this.model.infcon.searef = "";
this.model.infcon.pty.nam = "";
this.model.infcon.searol = "";
this.model.infcon.usr.extkey = "";
this.model.infcon.seasta = "";
this.model.infcon.seacur = "";
this.model.infcon.seaamtfr = "";
this.model.infcon.seaamtto = "";
this.model.seagtyp = "";
},
}
\ No newline at end of file
......@@ -375,9 +375,9 @@ export default {
}
},
async handleReset(formName) {
this.$refs[formName].resetFields();
},
// async handleReset(formName) {
// this.$refs[formName].resetFields();
// },
async handleSearch() {
this.stmData.data = [];
......@@ -404,5 +404,34 @@ export default {
}
},
async handleReset() {
this.model.infcon.seaownref = ""
this.model.infcon.opndatfrom = new Date();
this.model.infcon.opndatto = new Date();
this.isGuarantee = "";
this.model.infcon.nam = "";
this.model.infcon.pty.extkey = "";
this.model.infcon.seapty = "";
this.model.infcon.searef = "";
this.model.infcon.pty.nam = "";
this.model.infcon.searol = "";
this.model.infcon.usr.extkey = "";
this.model.infcon.seasta = "";
this.model.infcon.seacur = "";
this.model.infcon.seaamtfr = "";
this.model.infcon.seaamtto = "";
this.model.seagtyp = "";
this.model.infcon.relflg = "";
this.model.infcon.hndtyp = "";
this.model.infcon.cxmflg = "";
this.model.seapurpos = "";
this.model.seahndtyp = "";
this.model.infcon.segtyp = "";
this.model.fromflg = "";
this.model.fenlishi = "";
this.model.cmtflg = "";
this.model.fingua = "";
},
}
\ No newline at end of file
......@@ -54,9 +54,9 @@ export default {
],
"trnmod.swiadd.ameamt":[
{type: "string", required: false, message: "必输项"},
{max: 18,message:"整数位不能超过14位"},
{pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
{required: false, message: "必输项"},
{type: "string", max: 18,message:"整数位不能超过14位"},
{pattern: /(^(\+|\-)|\d+$)|(^(\+|\-)|\.\d{1,3}$)|(^(\+|\-)|\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
],
"letamep.engamt":[
......
......@@ -29,7 +29,9 @@
</c-form-item>
</c-col>
<c-col :span="12">
<c-input disabled v-if="model.gitp.swiftflg=='N'" v-model="model.oldgidgrp.cbs.max.amt" placeholder="请输入Balance"></c-input>
<c-form-item v-if="model.gitp.swiftflg=='N'" label-width="5px" prop="oldgidgrp.cbs.max.amt">
<c-input disabled v-model="model.oldgidgrp.cbs.max.amt" placeholder="请输入Balance"></c-input>
</c-form-item>
</c-col>
</c-col>
......@@ -40,7 +42,9 @@
</c-form-item>
</c-col>
<c-col :span="12">
<c-input v-if="model.gitp.swiftflg=='N'" v-model="model.trnmod.swiadd.ameamt" placeholder="请输入Amended Amount"></c-input>
<c-form-item v-if="model.gitp.swiftflg=='N'" label-width="5px" prop="trnmod.swiadd.ameamt">
<c-input v-model="model.trnmod.swiadd.ameamt" placeholder="请输入Amended Amount" @blur="ameamtBlur"></c-input>
</c-form-item>
</c-col>
</c-col>
......@@ -51,7 +55,9 @@
</c-form-item>
</c-col>
<c-col :span="12">
<c-input v-if="model.gitp.swiftflg=='N'" v-model="model.trnmod.swiadd.newamt" placeholder="请输入New amount"></c-input>
<c-form-item v-if="model.gitp.swiftflg=='N'" label-width="5px" prop="trnmod.swiadd.newamt">
<c-input v-model="model.trnmod.swiadd.newamt" placeholder="请输入New amount" @blur="newamtBlur"></c-input>
</c-form-item>
</c-col>
</c-col>
......@@ -63,7 +69,9 @@
</c-col>
<c-col :span="12">
<c-input disabled v-if="model.gitp.swiftflg=='N'" v-model="model.trnmod.swiadd.addamt" placeholder="请输入Additional Amount"></c-input>
<c-form-item v-if="model.gitp.swiftflg=='N'" label-width="5px" prop="trnmod.swiadd.addamt">
<c-input disabled v-model="model.trnmod.swiadd.addamt" placeholder="请输入Additional Amount"></c-input>
</c-form-item>
</c-col>
</c-col>
......@@ -164,7 +172,9 @@
</c-form-item>
</c-col>
<c-col :span="12">
<c-input disabled v-if="model.gitp.swiftflg=='Y'" v-model="model.oldgidgrp.cbs.max.amt" placeholder="请输入Balance"></c-input>
<c-form-item v-if="model.gitp.swiftflg=='Y'" label-width="5px" prop="oldgidgrp.cbs.max.amt">
<c-input disabled v-model="model.oldgidgrp.cbs.max.amt" placeholder="请输入Balance"></c-input>
</c-form-item>
</c-col>
</c-col>
<c-col :span="24">
......@@ -174,7 +184,9 @@
</c-form-item>
</c-col>
<c-col :span="12">
<c-input v-if="model.gitp.swiftflg=='Y'" v-model="model.trnmod.swiadd.ameamt" placeholder="请输入Amended Amount"></c-input>
<c-form-item v-if="model.gitp.swiftflg=='Y'" label-width="5px" prop="trnmod.swiadd.ameamt">
<c-input v-model="model.trnmod.swiadd.ameamt" placeholder="请输入Amended Amount" @blur="ameamtBlur"></c-input>
</c-form-item>
</c-col>
</c-col>
<c-col :span="24">
......@@ -184,7 +196,9 @@
</c-form-item>
</c-col>
<c-col :span="12">
<c-input v-if="model.gitp.swiftflg=='Y'" v-model="model.trnmod.swiadd.newamt" placeholder="请输入New amount"></c-input>
<c-form-item v-if="model.gitp.swiftflg=='Y'" label-width="5px" prop="trnmod.swiadd.newamt">
<c-input v-model="model.trnmod.swiadd.newamt" placeholder="请输入New amount" @blur="newamtBlur"></c-input>
</c-form-item>
</c-col>
</c-col>
......@@ -359,7 +373,9 @@
</c-form-item>
</c-col>
<c-col :span="12">
<c-input v-if="model.gitp.swiftflg=='Y'" :disabled="model.trnmod.swiadd.addamtflg==''" v-model="model.trnmod.swiadd.addamt" placeholder="请输入Additional Amount"></c-input>
<c-form-item v-if="model.gitp.swiftflg=='Y'" label-width="5px" prop="trnmod.swiadd.addamt">
<c-input :disabled="model.trnmod.swiadd.addamtflg==''" v-model="model.trnmod.swiadd.addamt" placeholder="请输入Additional Amount"></c-input>
</c-form-item>
</c-col>
</c-col>
......@@ -634,7 +650,22 @@ export default {
if (rtnmsg.respCode == SUCCESS) {
Utils.copyValueFromVO(this.model, rtnmsg.data);
}
}
},
async newamtBlur(){
let rtnmsg = await this.executeRule("trnmod.swiadd.newamt")
if (rtnmsg.respCode == SUCCESS) {
Utils.copyValueFromVO(this.model, rtnmsg.data);
}
},
async ameamtBlur(){
let rtnmsg = await this.executeDefault("trnmod.swiadd.newamt")
if (rtnmsg.respCode == SUCCESS) {
Utils.copyValueFromVO(this.model, rtnmsg.data);
}
},
},
created:function(){
......
......@@ -64,11 +64,11 @@
<m-engp :model="model" :codes="codes"/>
</el-tab-pane>
<el-tab-pane label="Settlement" name="Settlement">
<el-tab-pane label="Settlement" name="setpan">
<m-setpan :model="model" :codes="codes"/>
</el-tab-pane>
<el-tab-pane label="Bookings" name="Booking">
<el-tab-pane v-if=this.flag label="Bookings" name="glepan">
<m-glepan :model="model" :codes="codes"/>
</el-tab-pane>
......@@ -213,6 +213,7 @@ export default {
codes: {
...CodeTable,
},
flag:false,
}
},
methods:{
......@@ -221,6 +222,18 @@ export default {
/**
* do it yourself
**/
const name = tab.name
let rulePath;
if(name==="setpan"){
this.flag=true;
}
if (!!rulePath) {
this.executeRule(rulePath).then(res => {
if (res.respCode == SUCCESS) {
this.updateModel(res.data)
}
})
}
}
},
created:async function(){
......
......@@ -18,7 +18,7 @@
</c-col>
<c-col :span="24">
<el-form-item label="地区机构号" prop="bopmod.dbagrp.bas.ownextkey">
<c-select disabled :code="codes.ownextkey" v-model="model.bopmod.dbagrp.bas.ownextkey" style="width:100%" placeholder="请选择地区机构号">
<c-select disabled :code="codes.ownextkey1" v-model="model.bopmod.dbagrp.bas.ownextkey" style="width:100%" placeholder="请选择地区机构号">
</c-select>
</el-form-item>
</c-col>
......@@ -141,6 +141,14 @@
<c-input disabled v-model="model.bopmod.dbagrp.bas.othacc" maxlength="32" placeholder="请输入银行卡号"></c-input>
</c-form-item>
</c-col>
<c-col :span="24">
<c-col :span="6" :offset="6">
<c-form-item label-width="5px" prop="bopmod.dbap.baspp.acp">
<c-checkbox disabled v-model="model.bopmod.dbap.baspp.acp">确认</c-checkbox>
</c-form-item>
</c-col>
</c-col>
</c-col>
</c-col>
</c-row>
......@@ -276,6 +284,13 @@
</c-form-item>
</c-col>
</c-col>
<c-col :span="24">
<c-col :span="6" :offset="6">
<c-form-item label-width="5px" prop="bopmod.dbdp.baspp.acp">
<c-checkbox disabled v-model="model.bopmod.dbdp.baspp.acp">确认</c-checkbox>
</c-form-item>
</c-col>
</c-col>
</c-col>
</c-col>
</c-row>
......
......@@ -184,17 +184,23 @@
</c-col>
<c-col :span=24>
<c-col :span="6" :offset="6">
<c-checkbox v-model="model.gcdgrp.rec.cannowflg">Payment under Cancelation of Guarantee</c-checkbox>
<c-form-item label-width="5px" prop="gcdgrp.rec.cannowflg">
<c-checkbox v-model="model.gcdgrp.rec.cannowflg">Payment under Cancelation of Guarantee</c-checkbox>
</c-form-item>
</c-col>
</c-col>
<c-col :span="24">
<c-col :span="6" :offset="6">
<c-checkbox v-model="model.mtabut.clsflg">Close Contract</c-checkbox>
<c-col :span="6" :offset="6" >
<c-form-item label-width="5px" prop="mtabut.clsflg">
<c-checkbox v-model="model.mtabut.clsflg">Close Contract</c-checkbox>
</c-form-item>
</c-col>
</c-col>
<c-col :span="24">
<c-col :span="6" :offset="6">
<c-checkbox v-model="model.gcdgrp.rec.frepayflg">free of payment</c-checkbox>
<c-form-item label-width="5px" prop="gcdgrp.rec.frepayflg">
<c-checkbox v-model="model.gcdgrp.rec.frepayflg">free of payment</c-checkbox>
</c-form-item>
</c-col>
</c-col>
</c-col>
......
......@@ -116,11 +116,11 @@ export default {
methods:{
...Event,
async slChange(){
// this.executeRule("bopmod.szflg").then((res) => {
// if ((res.respCode == SUCCESS)) {
// Utils.updateModel(this.model, res.data);
// }
// });
this.executeRule("bopmod.szflg").then((res) => {
if ((res.respCode == SUCCESS)) {
Utils.copyValueFromVO(this.model, res.data);
}
});
}
},
created:function(){
......
......@@ -71,7 +71,7 @@
<m-basp :model="model" :codes="codes"/>
</c-content>
</el-tab-pane>
<el-tab-pane v-if="model.bopmod.szflg=='2' && model.bopmod.basflg=='X'" label="境内收入申报单-基础信息" name="basp">
<el-tab-pane v-if="model.bopmod.szflg=='2' && model.bopmod.basflg=='X'" label="境内收入申报单-基础信息" name="basp1">
<c-content>
<m-basp :model="model" :codes="codes"/>
</c-content>
......@@ -96,6 +96,7 @@
<script>
import Api from "~/service/Api"
import CodeTable from "~/config/CodeTable"
import Utils from "~/utils";
import Getset from "~/model/Getset"
import commonProcess from "~/mixin/commonProcess"
import commonFuncs from "~/mixin/commonFuncs";
......@@ -166,8 +167,12 @@ export default {
**/
const name = tab.name
let rulePath;
let rulePath1;
if (name === "basp") {
rulePath = "bopmod.dbdp.basp";
rulePath = "bopmod.dbap.basp";
}
if(name === "basp1"){
rulePath = "bopmod.dbdp.basp";
}
if(name==="setpan"){
this.flag=true;
......
......@@ -373,7 +373,7 @@
</c-col>
<c-col :span="12">
<c-form-item v-if="model.gitp.swiftflg=='Y'" label-width="5px" prop="trnmod.swiadd.addamt">
<c-input :disabled="model.trnmod.swiadd.addamtflg==''" v-model="model.trnmod.swiadd.addamt" placeholder="请输入Additional Amount"></c-input>
<c-input :disabled="model.trnmod.swiadd.addamtflg==''" v-model="model.trnmod.swiadd.addamt" @blur="addamtBlur" placeholder="请输入Additional Amount"></c-input>
</c-form-item>
</c-col>
</c-col>
......@@ -658,7 +658,14 @@ export default {
if (rtnmsg.respCode == SUCCESS) {
Utils.copyValueFromVO(this.model, rtnmsg.data);
}
}
},
async addamtBlur(){
let rtnmsg = await this.executeDefault("trnmod.swiadd.addamtcovs20")
if (rtnmsg.respCode == SUCCESS) {
Utils.copyValueFromVO(this.model, rtnmsg.data);
}
},
},
created:function(){
......
......@@ -1254,12 +1254,12 @@
<c-col :span="24">
<c-col :span="20">
<el-form-item v-if="model.gitp.swiftflg=='Y'&&model.gitp.exptxtmodflg==''" label="Expiry Condition/ Evt." prop="gidgrp.blk.exptxt">
<c-form-item v-show="model.gitp.swiftflg=='Y'&&model.gitp.exptxtmodflg==''" label="Expiry Condition/ Evt." prop="gidgrp.blk.exptxt">
<c-input type="textarea" rows="4" :disabled="model.gitp.exptxtmodflg==''" v-model="model.gidgrp.blk.exptxt" maxlength="780" show-word-limit placeholder="请输入Expiry Condition/ Evt." ></c-input>
</el-form-item>
<el-form-item v-if="model.gitp.swiftflg=='Y'&&model.gitp.exptxtmodflg=='X'" label="Expiry Condition/ Evt." prop="gidgrp.blk.atxexptxt">
<c-input type="textarea" rows="4" :disabled="model.gitp.exptxtmodflg==''" v-model="model.gidgrp.blk.atxexptxt" maxlength="780" show-word-limit placeholder="请输入Expiry Condition/ Evt." ></c-input>
</el-form-item>
</c-form-item>
<c-form-item v-show="model.gitp.swiftflg=='Y'&&model.gitp.exptxtmodflg=='X'" label="Expiry Condition/ Evt." prop="gidgrp.blk.atxexptxt">
<c-input type="textarea" rows="4" :disabled="model.gitp.exptxtmodflg==''" v-model="model.gidgrp.blk.atxexptxt" maxlength="780" @blur="atxexpBlur" show-word-limit placeholder="请输入Expiry Condition/ Evt." ></c-input>
</c-form-item>
</c-col>
<c-col :span="4">
<c-checkbox v-if="model.gitp.swiftflg=='Y'" v-model="model.gitp.exptxtmodflg" :disabled="model.gidgrp.rec.exptyp=='FIXD'||model.gidgrp.rec.exptyp=='OPEN'||model.gidgrp.rec.exptyp==''" style="margin:0 0 0 10px">Modify Text</c-checkbox>
......@@ -1336,6 +1336,7 @@ import commonProcess from "~/mixin/commonProcess";
import CodeTable from "~/config/CodeTable"
import Event from "~/model/Gitopn/Event"
import Ptap from "~/views/Public/Ptap";
import Utils from "~/utils";
export default {
components: { "c-ptap": Ptap },
......@@ -1362,13 +1363,16 @@ export default {
...Event,
onSeainf(data) {
this.$emit("onSeainf",data);
},
},
valueChange() {
if (this.onlySearch) return;
// this.showGridPromptDialog(
// `${this.argadr.grp}.${this.argadr.rol}.pts.extkey`
// );
},
async atxexpBlur(){
let rtnmsg = await this.executeRule("gidgrp.blk.atxexptxt")
if (rtnmsg.respCode == SUCCESS) {
Utils.updateModel(this.model, rtnmsg.data);
}
},
},
created:function(){
......
<template>
<div class="eibs-tab">
<c-list-search
@form-reset="handleReset('paramsForm')"
@form-reset="handleReset"
@form-search="handleSearch"
>
<!-- 持续展示区 -->
......
......@@ -55,9 +55,9 @@
</el-tab-pane>
<!--PD000001 -->
<!-- <el-tab-pane label="Booking" name="glepan">
<el-tab-pane label="Booking" name="glepan">
<m-glepan :model="model" :codes="codes" />
</el-tab-pane> -->
</el-tab-pane>
<!--PD000000 -->
<el-tab-pane label="Completion" name="coninfp">
......
......@@ -45,6 +45,13 @@
</c-content>
</el-tab-pane>
<!--PD000027 表外-->
<el-tab-pane label="Liability" name="engp">
<c-content>
<m-engp :model="model" :codes="codes" />
</c-content>
</el-tab-pane>
<!--PD000000 Settlement账务-->
<el-tab-pane label="Settlement" name="setpan">
<c-content>
......@@ -52,6 +59,13 @@
</c-content>
</el-tab-pane>
<!--PD000001 分录信息-->
<el-tab-pane label="Bookings" name="glepan">
<c-content>
<m-glepan :model="model" :codes="codes" />
</c-content>
</el-tab-pane>
<!--PD000000 Completion附言-->
<el-tab-pane label="Completion" name="coninfp">
<c-content>
......@@ -116,7 +130,9 @@ import Canp from './Canp'
// import Docpan from './Docpan'
// import Doctre from './Doctre'
// import Limitbody from './Limitbody'
import Setpan from '~/views/Public/Setpan'
import Engp from "~/views/Public/Engp";
import Setpan from '~/views/Public/Setpan';
import Glepan from "~/views/Public/Glepan";
import Coninfp from '~/views/Public/Coninfp'
import Docpan from '~/views/Public/Docpan'
import Doctre from '~/views/Public/Doctre'
......@@ -126,7 +142,9 @@ export default {
name: "Letcan",
components: {
'm-canp': Canp,
'm-engp': Engp,
'm-setpan': Setpan,
'm-glepan': Glepan,
'm-coninfp': Coninfp,
'm-docpan': Docpan,
'm-doctre': Doctre,
......
......@@ -94,6 +94,12 @@
</c-content>
</el-tab-pane>
<el-tab-pane label="Booking" name="glepan">
<c-content>
<m-glepan :model="model" :codes="codes" />
</c-content>
</el-tab-pane>
<!--PD000000 -->
<el-tab-pane label="附言" name="coninfp">
<c-content>
......@@ -174,6 +180,7 @@ import Adcp from './Adcp'
import Coninfp from '~/views/Public/Coninfp'
import Setpan from '~/views/Public/Setpan'
import Glepan from '~/views/Public/Glepan'
import Docpan from '~/views/Public/Docpan'
import Doctre from '~/views/Public/Doctre'
......@@ -189,6 +196,7 @@ export default {
'm-adcp': Adcp,
// "m-notcha": Notcha,
'm-setpan': Setpan,
'm-glepan': Glepan,
'm-coninfp': Coninfp,
'm-docpan': Docpan,
'm-doctre': Doctre,
......
......@@ -108,6 +108,13 @@
</c-content>
</el-tab-pane>
<!--PD000001 -->
<el-tab-pane label="Booking" name="glepan">
<c-content>
<m-glepan :model="model" :codes="codes" />
</c-content>
</el-tab-pane>
<!--PD000000 -->
<el-tab-pane label="附言" name="coninfp">
<c-content>
......@@ -129,12 +136,7 @@
</c-content>
</el-tab-pane>
<!--PD000001 -->
<el-tab-pane label="分录信息" name="glepan">
<c-content>
<m-glepan :model="model" :codes="codes" />
</c-content>
</el-tab-pane>
<!--PD000394 -->
<el-tab-pane
......
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