Skip to content

V
vue-gjjs
Commit ca827d4a by wangna
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 def7b18d f26d9f7c
Showing with 76 additions and 40 deletions
src/model/Letame/Pattern.js
......@@ -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":[
......
src/views/Business/Bdteus/Brteus.vue
......@@ -301,7 +301,7 @@
</c-col>
<c-col :span="24">
<el-form-item label="说明" label-width="135px" prop="strinf">
<el-form-item label="说明" prop="strinf">
<c-input v-model="model.strinf"
type="textarea"
:autosize="{minRows:12,maxRows:12}"
......
src/views/Business/Bdtset/Fktj.vue
......@@ -67,7 +67,7 @@
<c-col :span="24">
<c-col :span="13">
<el-form-item label="付款类型" prop="bddgrp.rec.paytyp">
<c-select v-model="model.bddgrp.rec.paytyp" style="width:100%" placeholder="请选择付款类型">
<c-select v-model="model.bddgrp.rec.paytyp" style="width:100%" placeholder="请选择付款类型" :code="codes.paytyp">
</c-select>
</el-form-item>
</c-col>
......@@ -76,7 +76,7 @@
<c-col :span="24">
<c-col :span="13">
<el-form-item label="清算方式" prop="bddgrp.rec.clrmtd">
<c-select v-model="model.bddgrp.rec.clrmtd" style="width:100%" placeholder="请选择清算方式">
<c-select v-model="model.bddgrp.rec.clrmtd" style="width:100%" placeholder="请选择清算方式" :code="codes.clrtyp">
</c-select>
</el-form-item>
</c-col>
......
src/views/Business/Bdtset/Utlp.vue
......@@ -285,7 +285,7 @@
<c-checkbox v-model="crefinflg" :disabled="model.bddgrp.rec.frepayflg === 'X' || model.paypsb ==='X'">融资</c-checkbox>
</c-col>
<c-col :span="5">
<c-checkbox v-model="clsflg">闭卷</c-checkbox>
<c-checkbox v-model="clsflg" @change="clsflgDefault">闭卷</c-checkbox>
</c-col>
<c-col :span="5">
<c-checkbox v-model="paypsb" :disabled="model.bddgrp.rec.frepayflg === 'X' || model.trtcre.crefinflg ==='X'">垫款</c-checkbox>
......@@ -300,14 +300,10 @@
</c-col>
<c-col :span="24">
<el-form-item label="交单行编号" prop="bddgrp.prb.pts.ref">
<c-input
v-model="model.bddgrp.prb.pts.ref"
maxlength="16"
style="width: 100%"
placeholder="请输入交单行编号"
@keyup.enter.native="ptsRefEvent"
></c-input>
<el-form-item label="交单行" prop="bddgrp.rec.docprbrol">
<c-select v-model="model.bddgrp.rec.docprbrol" style="width: 100%" placeholder="请选择Presented by"
:code="codes.docprbrol1" @change="docprbrolChange">
</c-select>
</el-form-item>
</c-col>
......@@ -682,6 +678,14 @@ export default {
}
});
},
clsflgDefault(){
this.executeDefault("mtabut.clsflg").then((res) => {
if ((res.respCode == SUCCESS)) {
Utils.copyValueFromVO(this.model, res.data);
}
});
},
},
created: function () {
},
......
src/views/Business/Brtset/Cfactlp.vue
......@@ -71,7 +71,7 @@
<c-col :span="24">
<el-form-item label="中资企业境外担保项下境内贷款额度币种" prop="cfatrt.cda.cfeogudcurr">
<c-select v-model="model.cfatrt.cda.cfeogudcurr" style="width:100%" placeholder="请选择中资企业境外担保项下境内贷款额度币种 :disabled=this.flag">
<c-select v-model="model.cfatrt.cda.cfeogudcurr" style="width:100%" placeholder="请选择中资企业境外担保项下境内贷款额度币种" :disabled=this.flag>
</c-select>
</el-form-item>
</c-col>
......
src/views/Business/Brtset/Utlp.vue
......@@ -375,7 +375,7 @@
</c-col>
<c-col :span="11">
<el-form-item label="" prop="setmod.redamt" label-width="5px">
<c-input v-model="model.setmod.redamt" placeholder="请输入Reduction Amt."></c-input>
<c-input v-model="model.setmod.redamt" placeholder="请输入Reduction Amt." :disabled="model.brdgrp.rec.frepayflg !=''?true:false"></c-input>
</el-form-item>
</c-col>
</c-col>
......
src/views/Business/Getcan/index.vue
......@@ -21,7 +21,7 @@
<m-canp :model="model" :codes="codes"/>
</el-tab-pane>
<el-tab-pane label="Mt769" name="Mt769p" v-if="model.gidgrp.rec.purcan=='RR'">
<el-tab-pane label="Mt769" name="Mt769p" v-if="model.gidgrp.rec.purcan=='RR'">
<m-mt769p :model="model" :codes="codes"/>
</el-tab-pane>
<!--PD000027 -->
......@@ -83,7 +83,7 @@ import Doctre from "~/views/Public/Doctre"
import Docpan from "~/views/Public/Docpan"
import Setpan from "~/views/Public/Setpan"
import Coninfp from "~/views/Public/Coninfp"
import Mt769p from "./Mt769p"
//import Mt769p from "./Mt769p"
export default {
......@@ -96,7 +96,7 @@ export default {
"m-docpan" : Docpan,
"m-doctre" : Doctre,
"m-limitbody" : Limitbody,
"m-mt769p" : Mt769p,
//"m-mt769p" : Mt769p,
},
provide() {
return {
......
src/views/Business/Letamc/index.vue
......@@ -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">
......
src/views/Business/Letcan/index.vue
......@@ -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,
......
src/views/Business/Letnot/index.vue
......@@ -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,
......
src/views/Business/Letopn/index.vue
......@@ -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
......
src/views/Public/Docpan.vue
......@@ -280,33 +280,36 @@
</c-select>
</el-form-item>
<el-form-item
label-width="30px"
v-if="title != 'elcs.101.001.01'"
>
<el-input
style="width: 250px"
label-width="150px"
v-if="title == 'elcs.101.001.01'"
>
<c-fullbox>
<c-input
v-model="dialog.rcv.pts.extkey"
/>
<c-button size="small" type="primary" icon="el-icon-search"
<template slot="footer">
<c-button size="small" type="primary" icon="el-icon-search"
></c-button
>
<c-button size="small" type="primary">
详情
</c-button>
</template>
</c-fullbox>
</el-form-item>
<el-form-item v-else label="BIC">
<el-form-item v-else label="BIC" label-width="150px">
<el-input v-model="dialog.rcv.pts.extkey" />
</el-form-item>
<el-form-item
v-if="title == 'elcs.101.001.01'"
label="行联行号"
v-if="title == 'elcs.101.001.01'||(title != 'elcs.101.001.01'&&dialog.rcv.pts.bankno!='')"
label="联行行号" label-width="150px"
>
<el-input v-model="dialog.rcv.pts.bankno" />
</el-form-item>
<el-form-item label-width="30px">
<el-input
:value="
title != 'elcs.101.001.01'
title == 'elcs.101.001.01'
? dialog.rcv.namelc
: dialog.rcv.pts.jigomc
"
......@@ -317,7 +320,7 @@
<br />
<el-input
:value="
title != 'elcs.101.001.01'
title == 'elcs.101.001.01'
? dialog.rcv.adrelc
: dialog.rcv.pts.dizzhii
"
......@@ -468,6 +471,7 @@ export default {
rcv: {
pts: {},
ptyinftxt: {},
},
},
centerDialogVisible: false,
......
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