Skip to content

V
vue-gjjs
Commit 5477032e by Eivi
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 2220a19b e3c9f283
Showing with 128 additions and 84 deletions
src/model/Botame/Pattern.js
......@@ -93,7 +93,7 @@ export default {
],
"bodgrp.cbs.max.amt":[
{type: "number", required: false, message: "必输项"},
{type: "string", required: false, message: "必输项"},
{max: 18,message:"整数位不能超过14位"},
{pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
],
......@@ -117,13 +117,13 @@ export default {
],
"bodgrp.cbs.opn1.amt":[
{type: "number", required: false, message: "必输项"},
{type: "string", required: false, message: "必输项"},
{max: 18,message:"整数位不能超过14位"},
{pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
],
"bodgrp.drr.pts.adrblk":[
{type: "string", required: true, message: "必输项"},
{max: 35,message:"长度不能超过35"}
//{max: 35,message:"长度不能超过35"}
],
"bodgrp.drr.dbfadrblkcn":[
{type: "string", required: true, message: "必输项"},
......@@ -174,15 +174,15 @@ export default {
],
"bodgrp.col.pts.adrblk":[
{type: "string", required: true, message: "必输项"},
{max: 35,message:"长度不能超过35"}
//{max: 35,message:"长度不能超过35"}
],
"bodgrp.col.dbfadrblkcn":[
{type: "string", required: true, message: "必输项"},
{max: 35,message:"长度不能超过35"}
],
"bodgrp.rec.matpercnt":[
{type: "string", required: false, message: "必输项"},
{max: 3,message:"长度不能超过3"}
//{type: "string", required: false, message: "必输项"},
//{max: 3,message:"长度不能超过3"}
],
"bodgrp.rec.paydocnum":[
{type: "string", required: false, message: "必输项"},
......@@ -231,7 +231,7 @@ export default {
],
"bodgrp.dre.pts.adrblk":[
{type: "string", required: true, message: "必输项"},
{max: 35,message:"长度不能超过35"}
//{max: 35,message:"长度不能超过35"}
],
"bodgrp.dre.dbfadrblkcn":[
{type: "string", required: true, message: "必输项"},
......@@ -293,7 +293,7 @@ export default {
],
"bodgrp.blk.setinsbo":[
{type: "string", required: true, message: "必输项"},
{max: 65,message:"长度不能超过65"}
//{max: 65,message:"长度不能超过65"}
],
"bodgrp.blk.agtaut":[
......
src/model/Botset/Pattern.js
......@@ -83,7 +83,7 @@ export default {
],
"bodgrp.drr.pts.adrblk":[
{type: "string", required: true, message: "必输项"},
{max: 35,message:"长度不能超过35"}
//{max: 35,message:"长度不能超过35"}
],
"bodgrp.drr.dbfadrblkcn":[
{type: "string", required: true, message: "必输项"},
......@@ -91,7 +91,7 @@ export default {
],
"bodgrp.col.pts.adrblk":[
{type: "string", required: true, message: "必输项"},
{max: 35,message:"长度不能超过35"}
//{max: 35,message:"长度不能超过35"}
],
"bodgrp.col.dbfadrblkcn":[
{type: "string", required: true, message: "必输项"},
......@@ -128,7 +128,7 @@ export default {
],
"bodgrp.dre.pts.adrblk":[
{type: "string", required: true, message: "必输项"},
{max: 35,message:"长度不能超过35"}
//{max: 35,message:"长度不能超过35"}
],
"bodgrp.dre.dbfadrblkcn":[
{type: "string", required: true, message: "必输项"},
......@@ -176,7 +176,7 @@ export default {
"setmod.docamt":[
{type: "number", required: false, message: "必输项"},
{type: "string", required: false, message: "必输项"},
{max: 18,message:"整数位不能超过14位"},
{pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
],
......@@ -371,7 +371,7 @@ export default {
{pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
],
"bodgrp.cbs.opn1.amt":[
{type: "number", required: false, message: "必输项"},
{type: "string", required: false, message: "必输项"},
{max: 18,message:"整数位不能超过14位"},
{pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
],
......@@ -414,7 +414,7 @@ export default {
],
"setmod.redamt":[
{type: "number", required: false, message: "必输项"},
{type: "string", required: false, message: "必输项"},
{max: 18,message:"整数位不能超过14位"},
{pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
],
......
src/model/Detame/index.js
......@@ -48,6 +48,7 @@ export default class Detopn{
},
dedgrp:{
rec:{
rejame:"",
ownref:"", // 编号 .dedgrp.rec.ownref
opndat:"", // 开立日期 .dedgrp.rec.opndat
shpdat:"", // Shipment Date .dedgrp.rec.shpdat
......
src/model/Getsel/index.js
......@@ -88,6 +88,7 @@ export default class Getsel{
clsflg:"", // which contracts to show .gcdget.clsflg
},
cfgfil:{
btnstm:[],
bitmap:"", // Bitmap for folder .cfgfil.bitmap
regside1:"", // Regside .cfgfil.regside1
regside2:"", // Regside .cfgfil.regside2
......
src/views/Business/Botame/Amep.vue
......@@ -24,7 +24,6 @@
size="small"
type="primary"
icon="el-icon-search"
@click="onSeainf"
></c-button>
</c-col>
......@@ -54,7 +53,7 @@
<el-form-item label="" >
</el-form-item>
</c-col>
<c-col :span="12" offset="4">
<c-col :span="12" :offset="4">
<el-form-item label="Amount" >
</el-form-item>
</c-col>
......@@ -171,27 +170,36 @@
<c-col :span="11">
<c-col :span="24">
<c-col :span="8">
<el-form-item label="Tenor Data" prop="trnmod.swiadd.newmatpercnt">
<c-input disabled v-model="model.trnmod.swiadd.newmatpercnt" placeholder="请输入New Tenor Data"></c-input>
<el-form-item label="Tenor Data" prop="oldbodgrp.rec.matpercnt">
<c-input disabled v-model="model.oldbodgrp.rec.matpercnt" placeholder="请输入New Tenor Data"></c-input>
</el-form-item>
</c-col>
<c-col :span="5">
<el-form-item label="" prop="trnmod.swiadd.newmatpertyp" label-width="5px">
<c-select disabled v-model="model.trnmod.swiadd.newmatpertyp" style="width: 100%" placeholder="请选择Days/Month or Year for Maturity Period"></c-select>
<el-form-item label="" prop="oldbodgrp.rec.matpertyp" label-width="5px">
<c-select disabled v-model="model.oldbodgrp.rec.matpertyp" style="width: 100%" placeholder="请选择Days/Month or Year for Maturity Period">
<el-option
v-for="item in codes.matper"
v-for="item in matpertyp"
:key="item.value"
:label="item.label"
:value="item.value"
>
</el-option>
</c-select>
</el-form-item>
</c-col>
<c-col :span="11">
<el-form-item label="" prop="trnmod.swiadd.newmatperbeg" label-width="5px">
<c-select disabled v-model="model.trnmod.swiadd.newmatperbeg" style="width:100%" placeholder="请选择Start of Maturity Period">
<el-form-item label="" prop="oldbodgrp.rec.matperbeg" label-width="5px">
<c-select disabled v-model="model.oldbodgrp.rec.matperbeg" style="width:100%" placeholder="请选择Start of Maturity Period">
<el-option
v-for="item in codes.matperbeg"
:key="item.value"
:label="item.label"
:value="item.value"
>
</el-option>
</c-select>
</el-form-item>
</c-col>
......@@ -203,16 +211,16 @@
<c-col :span="11">
<c-col :span="24">
<c-col :span="8">
<el-form-item label="New Tenor Data" prop="oldbodgrp.rec.matpercnt">
<c-input :disabled="model.bodgrp.rec.doctypcod === 'P'" v-model="model.oldbodgrp.rec.matpercnt" placeholder="请输入Tenor Data"></c-input>
<el-form-item label="New Tenor Data" prop="trnmod.swiadd.newmatpercnt">
<c-input :disabled="model.bodgrp.rec.doctypcod === 'P'" v-model="model.trnmod.swiadd.newmatpercnt" placeholder="请输入Tenor Data"></c-input>
</el-form-item>
</c-col>
<c-col :span="5">
<el-form-item label="" prop="oldbodgrp.rec.matper" label-width="5px">
<c-select :disabled="model.bodgrp.rec.doctypcod === 'P'" v-model="model.oldbodgrp.rec.matper" style="width: 100%" placeholder="请输入Days/Months or Years for Maturity Period">
<el-form-item label="" prop="trnmod.swiadd.newmatpertyp" label-width="5px">
<c-select :disabled="model.bodgrp.rec.doctypcod === 'P'" v-model="model.trnmod.swiadd.newmatpertyp" style="width: 100%" placeholder="请输入Days/Months or Years for Maturity Period">
<el-option
v-for="item in codes.matper"
v-for="item in matpertyp"
:key="item.value"
:label="item.label"
:value="item.value"
......@@ -223,8 +231,8 @@
</c-col>
<c-col :span="11">
<el-form-item label="" prop="oldbodgrp.rec.matperbeg" label-width="5px">
<c-select :disabled="model.bodgrp.rec.doctypcod === 'P'" v-model="model.oldbodgrp.rec.matperbeg" style="width:100%" placeholder="请选择Start of Maturity Period MATBEG">
<el-form-item label="" prop="trnmod.swiadd.newmatperbeg" label-width="5px">
<c-select :disabled="model.bodgrp.rec.doctypcod === 'P'" v-model="model.trnmod.swiadd.newmatperbeg" style="width:100%" placeholder="请选择Start of Maturity Period MATBEG">
<el-option
v-for="item in codes.matperbeg"
:key="item.value"
......@@ -275,18 +283,30 @@ export default {
mixins: [commonProcess],
data(){
return {
matpertyp: [
{ label: "Days", value: "D" },
],
}
},
watch:{
"model.bodgrp.rec.doctypcod":function(){
if(this.model.bodgrp.rec.doctypcod=='P'){
this.model.oldbodgrp.rec.matpercnt="";
this.model.oldbodgrp.rec.matper="";
this.model.oldbodgrp.rec.matperbeg="";
this.model.trnmod.swiadd.newmatpercnt="";
this.model.trnmod.swiadd.newmatpertyp="";
this.model.trnmod.swiadd.newmatperbeg="";
this.model.trnmod.swiadd.newmatdat="";
}
},
"model.trnmod.swiadd.newmatdat":function(){
if(this.model.trnmod.swiadd.newmatdat!=""||this.model.trnmod.swiadd.newmatpercnt!=""){
this.model.bodgrp.rec.matdat=this.model.trnmod.swiadd.newmatdat;
}
else{
this.model.bodgrp.rec.matdat=this.model.oldbodgrp.rec.matdat;
}
}
},
methods:{...Event},
created:function(){
......
src/views/Business/Botame/Ptyp.vue
......@@ -9,8 +9,6 @@
rol: 'drr',
}"
:disabled="true"
@onSeainf="onSeainf"
@onAplpDet="onBenpDet"
>
</c-ptap>
......@@ -22,8 +20,6 @@
rol: 'dre',
}"
:disabled="true"
@onSeainf="onSeainf"
@onAplpDet="onBenpDet"
>
</c-ptap>
</c-col>
......@@ -36,8 +32,6 @@
rol: 'col',
}"
:disabled="true"
@onSeainf="onSeainf"
@onAplpDet="onBenpDet"
>
</c-ptap>
</c-col>
......@@ -57,7 +51,7 @@
</c-edit-table>
</c-col>
</c-row>
</div>
</template>
<script>
import Api from "~/service/Api"
......@@ -105,7 +99,7 @@ export default {
},
methods:{...Event},
created:function(){
onsole.log(this.root);
console.log(this.root);
}
}
</script>
......
src/views/Business/Botame/index.vue
......@@ -157,7 +157,7 @@ export default {
if(rtnmsg.respCode == SUCCESS)
{
//TODO 处理数据逻辑
this.updateModel(rtnmsg.data)
}
else
{
......
src/views/Business/Botcan/index.vue
......@@ -131,7 +131,6 @@ export default {
if (rtnmsg.respCode == SUCCESS) {
//TODO 处理数据逻辑
//更新数据
Utils.copyValueFromVO(this.model, rtnmsg.data);
this.updateModel(rtnmsg.data)
if (this.isInDisplay) {
this.restoreDisplay();
......
src/views/Business/Botset/Cnyp.vue
......@@ -4,7 +4,7 @@
<c-col :span="24">
<el-form-item label="是否报送跨境人民币2101表" label-width="30%" prop="cnybop.cnyflg">
<c-select v-model="model.cnybop.cnyflg" style="width:100%" placeholder="请选择是否报送跨境人民币2101表"
:code="codes.cnyflg" :disabled="true">
:code="codes.cnyflg" >
</c-select>
</el-form-item>
</c-col>
......
src/views/Business/Botset/Ptyp.vue
......@@ -9,8 +9,6 @@
rol: 'drr',
}"
:disabled="true"
@onSeainf="onSeainf"
@onAplpDet="onBenpDet"
>
</c-ptap>
......@@ -22,8 +20,6 @@
rol: 'dre',
}"
:disabled="true"
@onSeainf="onSeainf"
@onAplpDet="onBenpDet"
>
</c-ptap>
</c-col>
......@@ -36,8 +32,6 @@
rol: 'col',
}"
:disabled="true"
@onSeainf="onSeainf"
@onAplpDet="onBenpDet"
>
</c-ptap>
</c-col>
......@@ -104,7 +98,7 @@ export default {
},
methods:{...Event},
created:function(){
onsole.log(this.root);
console.log(this.root);
}
}
</script>
......
src/views/Business/Botset/Setp.vue
......@@ -26,7 +26,6 @@
size="small"
type="primary"
icon="el-icon-search"
@click="onSeainf"
></c-button>
</c-col>
</c-col>
......@@ -254,13 +253,13 @@
<el-form-item
style="text-align: left"
label-width="5px"
prop="bodgrp.cbs.max.amt"
prop="setmod.redamt"
>
<c-input-currency :disabled="model.bodgrp.rec.focflg=='X'"
v-model="model.bodgrp.cbs.max.amt"
v-model="model.setmod.redamt"
style="text-align: left; width: 100%"
placeholder="请输入Reduction Amt"
@keyup.enter.native="defaultFunction('bodgrp.cbs.max.amt', model.bodgrp.cbs.max.amt)"
@keyup.enter.native="defaultFunction('setmod.redamt', model.setmod.redamt)"
></c-input-currency>
</el-form-item>
</c-col>
......@@ -292,13 +291,13 @@
<el-form-item
style="text-align: left"
label-width="5px"
prop="bodgrp.cbs.max.amt"
prop="setmod.docamt"
>
<c-input-currency
v-model="model.bodgrp.cbs.max.amt"
v-model="model.setmod.docamt"
style="text-align: left; width: 100%"
placeholder="请输入Settle Amt."
@keyup.enter.native="defaultFunction('bodgrp.cbs.max.amt', model.bodgrp.cbs.max.amt)"
@keyup.enter.native="defaultFunction('setmod.docamt', model.setmod.docamt)"
></c-input-currency>
</el-form-item>
</c-col>
......@@ -354,6 +353,29 @@ export default {
},
}
},
watch:{
"model.bodgrp.rec.docsta":function(){
if(this.model.bodgrp.rec.predat!=''){
this.model.bodgrp.rec.docsta=="A";
}
else if(this.model.bodgrp.rec.opndat!=''){
this.model.bodgrp.rec.docsta=="B";
}
else if(this.model.bodgrp.rec.focflg=='X'){
this.model.bodgrp.rec.docsta==="D";
}
else if(this.model.bodgrp.rec.clsdat!=''){
this.model.bodgrp.rec.docsta=="E";
}
},
"model.bodgrp.rec.focflg":function(){
if(this.model.bodgrp.rec.focflg=='X'){
this.model.setmod.redamt=this.model.setmod.docamt;
}else{
this.model.setmod.redamt=='';
}
}
},
computed: {
clsflgp: {
get() {
......
src/views/Business/Botset/Wg.vue
......@@ -22,7 +22,7 @@
<template slot="footer">
<el-form-item label="" prop="lendoc.actflg">
<c-checkbox
:disabled="model.bopmod.szflg==='3'"
:disabled="model.bopmod.szflg=='3' || model.bopmod.szflg==''"
v-model="model.lendoc.actflg"
style="margin-left: 10px"
>基础数据</c-checkbox
......@@ -38,7 +38,7 @@
v-model="model.bopmod.acttyp"
style="width: 100%"
placeholder="请选择款项来源"
:disabled="model.bopmod.szflg==='2' || model.bopmod.szflg==='3'"
:disabled="model.bopmod.szflg!='1'"
>
<el-option
v-for="item in acttyp"
......@@ -59,7 +59,7 @@
v-model="model.bopmod.ownextkey"
style="width: 100%"
placeholder="请选择地区机构号"
:disabled="model.bopmod.szflg==='3'"
:disabled="model.bopmod.szflg=='3' || model.bopmod.szflg==''"
>
</c-select>
</el-form-item>
......
src/views/Business/Botset/index.vue
......@@ -204,7 +204,7 @@ export default {
if(rtnmsg.respCode == SUCCESS)
{
//TODO 处理数据逻辑
this.updateModel(rtnmsg.data)
}
else
{
......
src/views/Business/Detame/Amep.vue
......@@ -129,6 +129,7 @@
<c-input
v-model="model.trnmod.swiadd.ameamt"
style="width: 100%"
@keyup.enter.native="showGridPromptDialog('trnmod.swiadd.ameamt')"
></c-input>
</el-form-item>
</c-col>
......@@ -423,11 +424,13 @@
v-model="model.trnmod.swiadd.orimsgtyp"
style="width: 100%"
placeholder="请选择原报文类型"
disabled
>
</c-select>
</el-form-item>
</c-col>
<c-col :span="24">
<!-- DETAME默认不展示 -->
<!-- <c-col :span="24">
<el-form-item
label="Request of Amendment send to"
prop="detamep.ramrol"
......@@ -439,19 +442,20 @@
>
</c-select>
</el-form-item>
</c-col>
</c-col> -->
<c-col :span="24">
<el-form-item
label=""
>
<c-col :span="12">
<!-- DETAME默认不展示 -->
<!-- <c-col :span="12">
<c-checkbox v-model="model.detamep.benconflg"
>Beneficiary's Confirmation Required</c-checkbox
>受益人加保兑</c-checkbox
>
</c-col>
</c-col> -->
<c-col :span="12">
<c-checkbox v-model="model.detamep.benaccflg"
>Amendment Accepted by Beneficiary</c-checkbox
>受益人接受修改</c-checkbox
>
</c-col>
</el-form-item>
......
src/views/Business/Detsel/Sel.vue
......@@ -16,7 +16,6 @@
<c-button
size="small"
type="primary"
@click="onSeainf"
icon="el-icon-search"
style="margin-right: 10px"
></c-button>
......
src/views/Business/Getsel/Sel.vue
......@@ -9,11 +9,7 @@
<c-col :span="12">
<el-form-item label="Reference" prop="gidgrp.rec.ownref">
<c-input v-model="model.gidgrp.rec.ownref" maxlength="16" placeholder="请输入Reference"
@keyup.enter.native="
showGridPromptDialog('gidgrp.rec.ownref')
"
></c-input>
<c-input v-model="model.gidgrp.rec.ownref" maxlength="16" placeholder="请输入Reference"></c-input>
</el-form-item>
</c-col>
......
src/views/Business/Getsel/index.vue
......@@ -35,7 +35,7 @@ export default {
mixins: [commonProcess], // 里面包含了Default、Check等的公共处理
data(){
return {
tabVal: "sel",
tabVal: "",
trnName: "getsel",
model: new Getsel().data,
checkRules: Check,
......
src/views/Business/Infgcd/Infsea.vue
......@@ -533,14 +533,14 @@ export default {
},
methods: {
...Event,
async getButtons(ownref) {
this.initdialog = true;
this.ownref = ownref;
console.log("ownref:" + ownref);
setTimeout(() => {
this.$refs.childs.$emit("childmethods")
}, 10)
},
// async getButtons(ownref) {
// this.initdialog = true;
// this.ownref = ownref;
// console.log("ownref:" + ownref);
// setTimeout(() => {
// this.$refs.childs.$emit("childmethods")
// }, 10)
// },
async onChoose(code) {
//跳转交易
this.$router.history.push("/business/" + code);
......
src/views/Business/Infgid/Infsea.vue
......@@ -513,9 +513,13 @@
</el-row>
<el-dialog :visible.sync="initdialog" :title="'交易列表'" append-to-body>
<div class="m-list-btns">
<div v-if="dialogFlag" class="m-list-btns">
<m-busbtn ref="childs" :ownref="ownref" trnCode="gitsel" ownrefPath="gidgrp" :model="gitselModel" tabIndex=1 @onChoose="onChoose">11</m-busbtn>
</div>
<div v-else >
<m-busbtn ref="childs" :ownref="ownref" trnCode="getsel" ownrefPath="gidgrp" :model="getselModel" tabIndex=1 @onChoose="onChoose">11</m-busbtn>
</div>
</el-dialog>
<!-- <c-col :span="12">
......@@ -700,6 +704,7 @@ import CodeTable from "~/config/CodeTable";
import Event from "~/model/Infgid/Event";
import GitselModel from "~/model/Gitsel";
import GetselModel from "~/model/Getsel";
import BusNavbar from "~/views/Public/BusNavbar";
export default {
......@@ -710,9 +715,11 @@ export default {
data() {
return {
gitselModel: new GitselModel().data,
getselModel: new GetselModel().data,
ownref: "",
initdialog: false,
dialogTableVisible: false,
dialogFlag: true,
trnData: {
columns: [
'0 1 "Trn ID" 100',
......@@ -760,6 +767,8 @@ export default {
async getButtons(ownref) {
this.initdialog = true;
this.ownref = ownref;
this.dialogFlag = ownref.startsWith("LG");
console.log("dialogFlag:" + this.dialogFlag);
console.log("ownref:" + ownref);
setTimeout(() => {
this.$refs.childs.$emit("childmethods")
......@@ -797,6 +806,11 @@ export default {
},
},
created: function () {},
watch:{
"model.gidgrp.rec.ownref":function(){
}
},
};
</script>
<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