Skip to content

V
vue-gjjs
Commit 65f6396e by liuxin
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 70a97806 cb8bd0f8
Showing with 272 additions and 10 deletions
src/mixin/commonProcess.js
......@@ -91,7 +91,8 @@ export default {
const field = fields[i];
if (field.prop === prop) {
// select、checkbox使用change触发
if (field.$children[1].$children[0].$el.className.startsWith("el-select") || field.$children[1].$children[0].$el.className.startsWith("el-checkbox")) {
const ele = field.$children[1] ? field.$children[1].$children[0] : field.$children[0].$children[0]
if (ele.$el.className.startsWith("el-select") || ele.$el.className.startsWith("el-checkbox")) {
return "change";
}
return "blur";
......
src/model/Gitame/Check.js
......@@ -45,6 +45,7 @@ let checkObj = {
"gidgrp.rec.vrfdat" :null,
"gidgrp.rec.purpos" :null,
"gidgrp.gidcxm.cxmflg" :null,
"gitamep.amenumjmg" :null,
"addbcb.pwtyp9" :null,
"gidgrp.rec.autrnwflg" :null,
"gidgrp.ctc.namelc" :null,
......@@ -89,6 +90,7 @@ let checkObj = {
"gidgrp.ctr.adrelc" :null,
"gidgrp.cnr.adrelc" :null,
"gidgrp.con.namelc" :null,
"trnmod.swiadd.addamtcov" :null,
"gidgrp.rec.jurlawc" :null,
"gidgrp.ben.namelc" :null,
"addbcb.litameadv" :null,
......
src/model/Gitame/Default.js
......@@ -21,6 +21,7 @@ export default {
"gidgrp.rec.purposin" :Utils.defaultFunction,
"trnmod.swiadd.newexpdat" :Utils.defaultFunction,
"trnmod.swiadd.ameamt" :Utils.defaultFunction,
"trnmod.swiadd.newexpflg" :Utils.defaultFunction,
"gidgrp.rec.liatypc" :Utils.defaultFunction,
"gidgrp.blk.preper" :Utils.defaultFunction,
"gidgrp.blk.atxpreper" :Utils.defaultFunction,
......@@ -87,6 +88,7 @@ export default {
"gidgrp.ben.pts.extkey" :Utils.defaultFunction,
"trnmod.swiadd.liatypc" :Utils.defaultFunction,
"trnmod.swiadd.newliadat" :Utils.defaultFunction,
"trnmod.swiadd.newliaflg" :Utils.defaultFunction,
"gidgrp.rec.orcratc" :Utils.defaultFunction,
"gidgrp.cbs.mac.cur" :Utils.defaultFunction,
"gidgrp.rec.orcamtc" :Utils.defaultFunction,
......@@ -109,6 +111,7 @@ export default {
"gidgrp.atb.dbfadrblkcn" :Utils.defaultFunction,
"gidgrp.atb.pts.adrblk" :Utils.defaultFunction,
"trnmod.swiadd.addamtcovs20" :Utils.defaultFunction,
"trnmod.swiadd.addamtcov" :Utils.defaultFunction,
"gidgrp.cbs.mac2.amt" :Utils.defaultFunction,
"gitp.usr.extkey" :Utils.defaultFunction,
"gitamep.oldmaccur" :Utils.defaultFunction,
......@@ -157,6 +160,7 @@ export default {
"gidgrp.blk.atxpreperc" :Utils.defaultFunction,
"gidgrp.rec.gartypc" :Utils.defaultFunction,
"gidgrp.rec.legfrmc" :Utils.defaultFunction,
"gidgrp.cbs.max2.cur" :Utils.defaultFunction,
"gitp.aamp.aammod.addamtflg" :Utils.defaultFunction,
"trnmod.swiadd.ameblk" :Utils.defaultFunction,
"trnmod.swiadd.addamtcovc" :Utils.defaultFunction,
......@@ -225,6 +229,7 @@ export default {
"gidgrp.rec.delto" :Utils.defaultFunction,
"trnmod.swiadd.ameamtc" :Utils.defaultFunction,
"gitamep.oldmacamt" :Utils.defaultFunction,
"gitamep.plateflg" :Utils.defaultFunction,
"gidgrp.rec.orddat" :Utils.defaultFunction,
}
//你可以添加自动default处理
src/model/Gitame/Pattern.js
......@@ -1087,4 +1087,60 @@ export default {
{type: "string", required: true, message: "必输项"},
{max: 65,message:"长度不能超过65"}
],
"gitamep.recget.sdamod.dadsnd":[
{type: "string", required: false, message: "必输项"},
{max: 16,message:"长度不能超过16"}
],
"gidgrp.rec.nam":[
{type: "string", required: false, message: "必输项"},
{max: 40,message:"长度不能超过40"}
],
"gitamep.orddat":[
{type: "date", required: false, message: "输入正确的日期"}
],
"gitamep.amenbr":[
{type: "string", required: false, message: "必输项"},
{max: 3,message:"长度不能超过3"}
],
"gitamep.expnottxt":[
{type: "string", required: false, message: "必输项"},
{max: 11,message:"长度不能超过11"}
],
"gitamep.limnottxt":[
{type: "string", required: false, message: "必输项"},
{max: 11,message:"长度不能超过11"}
],
"gitamep.amenumjmg":[
{type: "string", required: false, message: "必输项"},
{max: 2,message:"长度不能超过2"}
],
"gitamep.expnewtxt":[
{type: "string", required: false, message: "必输项"},
{max: 11,message:"长度不能超过11"}
],
"gitamep.limnewtxt":[
{type: "string", required: false, message: "必输项"},
{max: 11,message:"长度不能超过11"}
],
"gidgrp.rec.vrfdat":[
{type: "date", required: false, message: "输入正确的日期"}
],
"trnmod.swiadd.addamtcov":[
{type: "string", required: true, message: "必输项"},
{max: 35,message:"长度不能超过35"}
],
"gidgrp.cbs.max2.cur":[
{type: "string", required: false, message: "必输项"},
{max: 3,message:"长度不能超过3"}
],
"gitamep.mstitle":[
{type: "string", required: true, message: "必输项"},
{max: 30,message:"长度不能超过30"}
],
}
\ No newline at end of file
src/model/Gitame/index.js
......@@ -278,6 +278,9 @@ export default class Gitame{
cur:"", // Open Add. Amount .gidgrp.cbs.opc2.cur
amt:"", // Balance .gidgrp.cbs.opc2.amt
},
max2:{
cur:"", // Currency .gidgrp.cbs.max2.cur
},
},
blk:{
gartyptxtin:"", // Specification of Type of Undertaking - Counter Undertaking .gidgrp.blk.gartyptxtin
......@@ -398,6 +401,7 @@ export default class Gitame{
recget:{
sdamod:{
seainf:"", // Reference .gitamep.recget.sdamod.seainf
dadsnd:"", // Drag Drop Sender .gitamep.recget.sdamod.dadsnd
},
},
ametxtflg:"", // Amendment :77C: modified .gitamep.ametxtflg
......@@ -419,6 +423,17 @@ export default class Gitame{
},
oldmaccur:"", // Old Local Undertaking .gitamep.oldmaccur
oldmacamt:"", // Old Local Undertaking .gitamep.oldmacamt
orddat:"", // Order From .gitamep.orddat
amenbr:"", // Actual Amendment No .gitamep.amenbr
expnottxt:"", // text 'unlimited' / old expiry .gitamep.expnottxt
limnottxt:"", // text 'unlimited' .gitamep.limnottxt
expnewtxt:"", // text 'unlimited' / new expiry .gitamep.expnewtxt
limnewtxt:"", // text 'unlimited' / new liability .gitamep.limnewtxt
cre767flg:"", // Create Amendment Message .gitamep.cre767flg
amemsg:"", // 银关保函操作 .gitamep.amemsg
plateflg:"", // plateflg .gitamep.plateflg
mstitle:"", // 面函标题 .gitamep.mstitle
amenumjmg:"", // 变�'次数 .gitamep.amenumjmg
},
trnmod:{
swiadd:{
......@@ -455,6 +470,9 @@ export default class Gitame{
addcurc:"", // Additional Currency Seq. C .trnmod.swiadd.addcurc
addamtc:"", // Additional Amount Seq. C .trnmod.swiadd.addamtc
addamtcovc:"", // Add. Amount Covered .trnmod.swiadd.addamtcovc
newexpflg:"", // Unlimited Validity .trnmod.swiadd.newexpflg
newliaflg:"", // Unlimited Liability .trnmod.swiadd.newliaflg
addamtcov:"", // Amounts Covered .trnmod.swiadd.addamtcov
},
},
oldgidgrp:{
......@@ -466,7 +484,7 @@ export default class Gitame{
},
rec:{
exptyp:"", // Old Expiry Type .oldgidgrp.rec.exptyp
expdat:"", // Old Expiry Date .oldgidgrp.rec.expdat
expdat:"", // Valid until .oldgidgrp.rec.expdat
liatypc:"", // Old Liability Type .oldgidgrp.rec.liatypc
liadat:"", // Liability until .oldgidgrp.rec.liadat
},
......
src/views/Business/Botdav/Inst.vue
......@@ -9,7 +9,12 @@
placeholder="请输入Collection Instructions" :disabled="model.bodgrp.blk.colinsflg !='X'">
</c-input>
<template slot="footer">
<c-button size="small" type="primary">
<c-button
size="small"
type="primary"
@click="showGridPromptDialog('botp.colins.buttxmsel',null,null,{TXT:'bodgrp.blk.colins'},{TXT:false},'doxpDialog')"
:disabled="model.bodgrp.blk.colinsflg !='X'"
>
...
</c-button>
</template>
......
src/views/Business/Botdav/Instrecp.vue
......@@ -25,7 +25,7 @@
</c-col>
<c-col :span="6">
<c-button size="small" type="primary"
@click="showGridPromptDialog('botp.proins.buttxmsel',null,null,{TXT:'bodgrp.blk.setinsbo'},{TXT:false},'doxpDialog')">
@click="showGridPromptDialog('botp.setins.buttxmsel',null,null,{TXT:'bodgrp.blk.setinsbo'},{TXT:false},'doxpDialog')">
...
</c-button>
</c-col>
......
src/views/Business/Botdav/Ptyp.vue
......@@ -29,7 +29,7 @@
:paginationShow="false" :border="true">
<el-table-column label="角色" width="auto" prop="rol">
<template slot-scope="scope">
<c-select v-model="scope.row.rol" :code="codes.ptyp2">
<c-select v-model="scope.row.rol" :code="ptyp2">
</c-select>
</template>
......@@ -73,12 +73,14 @@
</el-table-column>
</c-table>
</c-col>
</c-row>
</template>
<script>
import Api from "~/service/Api"
import commonProcess from "~/mixin/commonProcess";
import CodeTable from "~/config/CodeTable"
import Event from "~/model/Botdcr/Event"
import Utils from "~/utils";
import Ptap from "~/views/Public/Ptap";
......@@ -89,6 +91,24 @@
mixins: [commonProcess],
data() {
return {
newValue: {
rol: "",
ptyextkey: "",
nam: "",
ref: "",
},
ptyp2: [
{ label: "TPO Third Party", value: "TPO" },
{ label: "TP1 Third Party .", value: "TP1" },
{ label: "TP2 Third Party", value: "TP2" },
{ label: "TP3 Third Party", value: "TP3" },
{ label: "TP4 Third Party", value: "TP4" },
{ label: "TP5 Third Party", value: "TP5" },
{ label: "TP6 Third Party", value: "TP6" },
{ label: "TP7 Third Party", value: "TP7" },
{ label: "TP8 Third Party", value: "TP8" },
],
}
},
methods: {
......
src/views/Business/Botdcr/Ptyp.vue
......@@ -114,6 +114,12 @@ export default {
mixins: [commonProcess],
data(){
return {
newValue: {
rol:"",
ptyextkey:"",
nam:"",
ref:"",
},
}
},
methods: {
......
src/views/Business/Gitame/Amedat20.vue
......@@ -11,8 +11,8 @@
<!-- SF002110 : Old Expiry Date -->
<c-col :span="12">
<el-form-item :label="$t('gitamep.SF002110')" prop="oldgidgrp.rec.expdat">
<c-date-picker type="date" v-model="model.oldgidgrp.rec.expdat" style="width:100%" :placeholder="$t('other.please_enter')+$t('gitamep.SF002110')"></c-date-picker>
<el-form-item label="Old Expiry Date" prop="oldgidgrp.rec.expdat">
<c-date-picker type="date" v-model="model.oldgidgrp.rec.expdat" style="width:100%" placeholder="请选择Old Expiry Date"></c-date-picker>
</el-form-item>
</c-col>
<!-- SF002109 : Old Expiry Condition -->
......@@ -34,7 +34,7 @@
<c-col :span="12">
<el-form-item label="Liability until" prop="oldgidgrp.rec.liadat">
<c-date-picker type="date" v-model="model.oldgidgrp.rec.liadat" style="width:100%" :placeholder="$t('other.please_enter')+'Liability until'"></c-date-picker>
<c-date-picker type="date" v-model="model.oldgidgrp.rec.liadat" style="width:100%" placeholder="请选择Liability until"></c-date-picker>
</el-form-item>
</c-col>
<!-- SF002153 : Old Liability Condition -->
......@@ -78,7 +78,7 @@
<c-col :span="12">
<el-form-item label="New Liability Date" prop="trnmod.swiadd.newliadat">
<c-date-picker type="date" v-model="model.trnmod.swiadd.newliadat" style="width:100%" :placeholder="$t('other.please_enter')+'New Liability Date'"></c-date-picker>
<c-date-picker type="date" v-model="model.trnmod.swiadd.newliadat" style="width:100%" placeholder="请输入New Liability Date"></c-date-picker>
</el-form-item>
</c-col>
<!-- SF002157 : New Liability Condition -->
......
src/views/Business/Gitame/Amep.vue 0 → 100644
<template>
<div class="eibs-tab">
<c-col :span="12">
<c-form-item label="Drag Drop Sender" prop="gitamep.recget.sdamod.dadsnd">
<c-input v-model="model.gitamep.recget.sdamod.dadsnd" placeholder="$t('other.please_enter')+'Drag Drop Sender'"></c-input>
</c-form-item>
</c-col>
<!-- S0000027 : Reference -->
<!-- S0000028 : Name -->
<c-col :span="12">
<c-form-item label="Name" prop="gidgrp.rec.nam">
<c-input v-model="model.gidgrp.rec.nam" maxlength="40" placeholder="请输入name"></c-input>
</c-form-item>
</c-col>
<!-- S0000029 : Amendment Date -->
<!-- S0000039 : Order from -->
<c-col :span="12">
<el-form-item label="Order From" prop="gitamep.orddat">
<c-date-picker type="date" v-model="model.gitamep.orddat" style="width:100%" placeholder="请选择Order From"></c-date-picker>
</el-form-item>
</c-col>
<!-- SF000064 : Amend. No Receiv. -->
<!-- S0000038 : Actual Amendment No -->
<c-col :span="12">
<c-form-item label="Actual Amendment No" prop="gitamep.amenbr">
<c-input v-model="model.gitamep.amenbr" placeholder="请输入Actual Amendment No"></c-input>
</c-form-item>
</c-col>
<c-col :span="12">
<span v-text="model.gitamep.amemsg" data-path=".gitamep.amemsg" > </span>
</c-col>
<!-- S0000034 : Old Validity -->
<!-- S0000037 : Old Liability -->
<!-- SG002033 : 变更次数 -->
<!-- S0000030 : Old Guarantee Amt. -->
<c-col :span="12">
<c-form-item label="text 'unlimited' / old expiry" prop="gitamep.expnottxt">
<c-input v-model="model.gitamep.expnottxt" maxlength="11" placeholder="$t('other.please_enter')+'text '+'unlimited'+' / old expiry'"></c-input>
</c-form-item>
</c-col>
<c-col :span="12">
<c-form-item label="text 'unlimited'" prop="gitamep.limnottxt">
<c-input v-model="model.gitamep.limnottxt" maxlength="11" placeholder="$t('other.please_enter')+'text '+'unlimited'"></c-input>
</c-form-item>
</c-col>
<c-col :span="12">
<c-form-item label="变更次数" prop="gitamep.amenumjmg">
<c-input v-model="model.gitamep.amenumjmg" maxlength="2" placeholder="请输入变更次数"></c-input>
</c-form-item>
</c-col>
<!-- S0000032 : Amended -->
<!-- S0000035 : New Validity -->
<!-- S0000036 : New Liability -->
<!-- SG002034 : 核销日期 -->
<!-- S0000031 : Guarantee Amount -->
<c-col :span="12">
<c-form-item label="text 'unlimited' / new expiry" prop="gitamep.expnewtxt">
<c-input v-model="model.gitamep.expnewtxt" maxlength="11" placeholder="$t('other.please_enter')+'text '+'unlimited'+' / new expiry'"></c-input>
</c-form-item>
</c-col>
<c-col :span="12">
<c-form-item label="text 'unlimited' / new liability" prop="gitamep.limnewtxt">
<c-input v-model="model.gitamep.limnewtxt" maxlength="11" placeholder="$t('other.please_enter')+'text '+'unlimited'+' / new liability'"></c-input>
</c-form-item>
</c-col>
<c-col :span="12">
<el-form-item label="核销日期" prop="gidgrp.rec.vrfdat">
<c-date-picker type="date" v-model="model.gidgrp.rec.vrfdat" style="width:100%" placeholder="请选择核销日期"></c-date-picker>
</el-form-item>
</c-col>
<!-- S0000062 : Amounts Covered -->
<c-col :span="12">
<c-form-item label="Amounts Covered" prop="trnmod.swiadd.addamtcov">
<c-input type="textarea" v-model="model.trnmod.swiadd.addamtcov" maxlength="35" show-word-limit placeholder="请输入Amounts Covered" ></c-input>
</c-form-item>
</c-col>
<c-col :span="12">
<c-checkbox v-model="model.trnmod.swiadd.newexpflg">{{$t('gitamep.CF000052')}}</c-checkbox>
</c-col>
<c-col :span="12">
<c-checkbox v-model="model.trnmod.swiadd.newliaflg">{{$t('gitamep.CF000053')}}</c-checkbox>
</c-col>
<c-col :span="12">
<c-checkbox v-model="model.gitp.aamp.aammod.addamtflg">{{$t('gitamep.CF000063')}}</c-checkbox>
</c-col>
<c-col :span="12">
<c-form-item label="Currency" prop="gidgrp.cbs.max2.cur">
<c-input v-model="model.gidgrp.cbs.max2.cur" maxlength="3" placeholder="请输入Currency"></c-input>
</c-form-item>
</c-col>
<!-- S0000033 : Amendments -->
<c-col :span="12">
<c-checkbox v-model="model.gitamep.cre767flg">{{$t('gitamep.CF000061')}}</c-checkbox>
</c-col>
<c-col :span="12">
<c-checkbox v-model="model.gitamep.plateflg">{{$t('gitamep.CG002029')}}</c-checkbox>
</c-col>
<!-- SG002032 : 面函标题 -->
<c-col :span="12">
<c-form-item label="面函标题" prop="gitamep.mstitle">
<c-input type="textarea" v-model="model.gitamep.mstitle" maxlength="30" show-word-limit placeholder="$t('other.please_enter')+'面函标题'" ></c-input>
</c-form-item>
</c-col>
</div>
</template>
<script>
import Api from "~/service/Api"
import commonProcess from "~/mixin/commonProcess";
import CodeTable from "~/config/CodeTable"
import Event from "~/model/Gitame/Event"
export default {
inject: ['root'],
props:["model","codes"],
mixins: [commonProcess],
data(){
return {
}
},
methods:{...Event},
created:function(){
}
}
</script>
<style>
</style>
src/views/Business/Gitopn/Ovwp.vue
......@@ -589,7 +589,7 @@
placeholder="请选择是否分离式保函"
>
<el-option
v-for="item in codes.fenlishi"
v-for="item in codes.fenlishi2"
:key="item.value"
:label="item.label"
:value="item.value"
......
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