Skip to content

V
vue-gjjs
Commit 7e3e90ea by Wuyuqiu
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 c0e55e12 b59a9834
Showing with 271 additions and 213 deletions
debug.log
[0908/094200.007:ERROR:exit_code_watcher_win.cc(87)] Failed to wait for process exit or stop event
[0908/141403.897:ERROR:exit_code_watcher_win.cc(87)] Failed to wait for process exit or stop event
[0909/090947.311:ERROR:exit_code_watcher_win.cc(87)] Failed to wait for process exit or stop event
[1011/090658.486:ERROR:exit_code_watcher_win.cc(87)] Failed to wait for process exit or stop event
src/config/CodeTable/index.js
......@@ -7187,6 +7187,11 @@ const CodeTable = {
{label:"HK HONG KONG",value:"HK"},
{label:"GB Great Britain",value:"GB"},
],
ctytxt2:[
{label:"People's Republic of China",value:"CN"},
{label:"HONG KONG",value:"HK"},
{label:"Great Britain",value:"GB"},
],
trndoc_advdoc: [
{ label: "经核验，证实电相符/印鉴相符。", value: "" },
{ label: "信用证真实性待核实。", value: "2" },
......
src/model/Litame/Pattern.js
......@@ -63,6 +63,7 @@ export default {
{type: "string", required: false, message: "必输项"},
{max: 18,message:"整数位不能超过15位"},
{pattern: /(^\d+$)|(^\.\d{1,2}$)|(^\d+\.\d{1,2}$)/, message: "小数位不能超过2位" }
],
"trnmod.swiadd.newamt":[
......
src/model/Litopn/Pattern.js
......@@ -219,8 +219,9 @@ export default {
{max: 35,message:"长度不能超过35"}
],
"lidgrp.rec.prepers18":[
{ required: false, },
{type: "number", required: false, message: "请输入数字"},
{type: "number",max: 999,message:"不能超过999"},
{pattern: /^-?[1-9][0-9]{0,2}$/, message: "应在-999至999之间" }
],
"litp.avbp.ptsget.sdamod.dadsnd":[
......@@ -320,8 +321,10 @@ export default {
{max: 65,message:"长度不能超过65"}
],
"lidgrp.rec.tenmaxday":[
{ required: true, },
{type: "number", required: false, message: "请输入数字"},
{type: "number",max: 999,message:"不能超过999"},
{pattern: /(^-?[1-9][0-9]{0,2}$)|0/, message: "-999至999之间" }
// ^-?[1-9]\d*$　　 //匹配整数
],
"lidgrp.rec.porloa":[
{type: "string", required: false, message: "必输项"},
......
src/views/Business/Bttdck/Dscinsp.vue
......@@ -16,9 +16,9 @@
size="small"
type="primary"
icon="el-icon-search"
@click="showGridPromptDialog('brtp.docdis.buttxmsel', null, null,{TXT:'brdgrp.blk.docdis'}, {TXT: false},'doxpDialog')">
@click="showGridPromptDialog('bttp.docdis.buttxmsel', null, null,{TXT:'btdgrp.blk.docdis'}, {TXT: false},'doxpDialog')">
...
</c-button>
</c-button>
</c-col>
</el-row>
<el-row>
......@@ -32,7 +32,7 @@
size="small"
type="primary"
icon="el-icon-search"
@click="showGridPromptDialog('brtp.intdis.buttxmsel', null, null,{TXT:'brdgrp.blk.intdis'}, {TXT: false},'doxpDialog')">
@click="showGridPromptDialog('bttp.intdis.buttxmsel', null, null,{TXT:'btdgrp.blk.intdis'}, {TXT: false},'doxpDialog')">
...
</c-button>
</c-col>
......@@ -48,7 +48,7 @@
size="small"
type="primary"
icon="el-icon-search"
@click="showGridPromptDialog('brtp.comcon.buttxmsel', null, null,{TXT:'brdgrp.blk.comcon'}, {TXT: false},'doxpDialog')">
@click="showGridPromptDialog('bttp.comcon.buttxmsel', null, null,{TXT:'btdgrp.blk.comcon'}, {TXT: false},'doxpDialog')">
...
</c-button>
</c-col>
......@@ -65,7 +65,7 @@
size="small"
type="primary"
icon="el-icon-search"
@click="showGridPromptDialog('brtp.setins.buttxmsel', null, null,{TXT:'brdgrp.blk.setinsbt'}, {TXT: false},'doxpDialog')">
@click="showGridPromptDialog('bttp.setins.buttxmsel', null, null,{TXT:'btdgrp.blk.setinsbt'}, {TXT: false},'doxpDialog')">
...
</c-button>
</c-col>
......@@ -74,6 +74,7 @@
<c-col :span="24">
<c-docpre
:model="model"
rol="docgrdmbe1"
:argadr="{
path: 'btdgrp.blk.prsdocbe1',
grp: 'bttp',
......@@ -87,6 +88,7 @@
<c-col :span="24">
<c-docpre
:model="model"
rol="docgrdmbe2"
:argadr="{
path: 'btdgrp.blk.prsdocbe2',
grp: 'bttp',
......
src/views/Business/Getamc/index.vue
......@@ -27,7 +27,9 @@
<c-tabs v-model="tabVal" ref="elment" type="card" @tab-click="myTabClick">
<!--PD000017 -->
<el-tab-pane label="保兑" name="conp">
<c-content>
<m-conp :model="model" :codes="codes" />
</c-content>
</el-tab-pane>
<el-tab-pane label="概要" name="ovwp">
......
src/views/Business/Getame/Ovwp.vue
......@@ -197,7 +197,6 @@
<c-col :span="24">
<el-form-item label="保函种类" prop="gidgrp.rec.gartyp">
<c-select
disabled
v-model="model.gidgrp.rec.gartyp"
style="width: 100%"
placeholder="请选择保函种类"
......@@ -343,7 +342,7 @@
<c-col :span="24">
<el-form-item label="保函文本格式" prop="gidgrp.rec.gtxinr">
<c-select
disabled
v-model="model.gidgrp.rec.gtxinr"
style="width: 100%"
placeholder="请选择保函文本格式"
......
src/views/Business/Getame/Ptyp.vue
......@@ -63,6 +63,7 @@
<c-input
v-model="model.gidgrp.con.pts.ref"
maxlength="16"
disabled
placeholder="请输入申请人参考号"
></c-input>
</el-form-item>
......@@ -77,6 +78,7 @@
<c-input
v-model="model.gidgrp.con.pts.extkey"
maxlength="16"
disabled
placeholder="请输入"
@keyup.enter.native="
showGridPromptDialog(`gidgrp.con.pts.extkey`)
......@@ -113,6 +115,7 @@
<c-input
type="textarea"
rows="4"
disabled
v-model="model.gidgrp.con.pts.adrblk"
maxlength="140"
show-word-limit
......@@ -130,6 +133,7 @@
<c-input
v-model="model.gidgrp.con.pts.ref"
maxlength="16"
disabled
placeholder="请输入保兑行参考号"
></c-input>
</el-form-item>
......@@ -208,6 +212,7 @@
<c-input
v-model="model.gidgrp.ben.pts.extkey"
maxlength="16"
:disabled="model.gidgrp.ben.pts.adrblk!=''"
placeholder="请输入"
@keyup.enter.native="
showGridPromptDialog(`gidgrp.ben.pts.extkey`)
......
src/views/Business/Getame/index.vue
......@@ -49,7 +49,7 @@
</el-tab-pane>
<!--gitp PD000727 Presentation/ Delivery -->
<el-tab-pane
v-if="model.gitp.swiftflg == 'Y'"
v-if="false"
label="演示/交付"
name="preperp"
>
......
src/views/Business/Gitopn/Detp.vue
......@@ -194,7 +194,7 @@
<c-col :span="24">
<c-col :span="12">
<el-form-item label=""合同币种和金额" " prop="gidgrp.rec.orccur">
<el-form-item label="合同币种和金额" prop="gidgrp.rec.orccur">
<c-select
disabled
v-model="model.gidgrp.rec.orccur"
......@@ -299,12 +299,14 @@
label="仲裁法律"
prop="gidgrp.rec.jurlaw"
>
<c-input
<c-select
disabled
v-model="model.gidgrp.rec.jurlaw"
maxlength="35"
:code="codes.ctytxt2"
style="width: 100%"
placeholder="请输入仲裁法律"
></c-input>
></c-select>
</el-form-item>
</c-col>
<c-col :span="24">
......@@ -658,6 +660,19 @@ export default {
return {};
},
methods: { ...Event },
watch:{
"model.gidgrp.rec.jurlaws20": function(){
if(this.model.gidgrp.rec.jurlaws20=="GB"){
this.model.gidgrp.rec.jurlaw="GB"
}else if(this.model.gidgrp.rec.jurlaws20=="CN"){
this.model.gidgrp.rec.jurlaw="CN"
}else if(this.model.gidgrp.rec.jurlaws20=="HK"){
this.model.gidgrp.rec.jurlaw="HK"
}else if(this.model.gidgrp.rec.jurlaws20==""){
this.model.gidgrp.rec.jurlaw=""
}
}
},
created: function () {},
};
</script>
......
src/views/Business/Gitopn/Ovwp.vue
......@@ -1981,6 +1981,11 @@ export default {
this.model.gidgrp.rec.liaflg = "X";
}
},
"model.gidgrp.rec.gartyp": function() {
if(this.model.gidgrp.rec.gartyp=='1'){
this.model.gidgrp.rec.gtxinr="<NILTXT>"
}
}
},
methods: {
...Event,
......
src/views/Business/Gitopn/Ptyp.vue
......@@ -386,13 +386,13 @@
(model.gidgrp.rec.purposin == 'ISSU' ||
model.gidgrp.rec.purposin == '')
"
label=""账户/对象"参考号"
label="账户/对象参考号"
prop="gidgrp.ctr.pts.ref"
>
<c-input
v-model="model.gidgrp.ctr.pts.ref"
maxlength="16"
placeholder="请输入"账户/对象"参考号"
placeholder="请输入账户/对象参考号"
></c-input>
</el-form-item>
</c-col>
......@@ -403,7 +403,7 @@
(model.gidgrp.rec.purposin == 'ISSU' ||
model.gidgrp.rec.purposin == '')
"
label=""账户/对象""
label="账户/对象"
prop="gidgrp.ctr.pts.extkey"
>
<c-fullbox>
......
src/views/Business/Gitpop/Detp.vue
......@@ -300,12 +300,14 @@
<c-col :span="24">
<el-form-item label="仲裁法律" prop="gidgrp.rec.jurlaw">
<c-input
<c-select
disabled
v-model="model.gidgrp.rec.jurlaw"
maxlength="35"
:code="codes.ctytxt2"
placeholder="请输入仲裁法律"
></c-input>
style="width:100%"
></c-select>
</el-form-item>
</c-col>
<c-col :span="24">
......@@ -508,6 +510,19 @@ export default {
};
},
methods: { ...Event },
watch:{
"model.gidgrp.rec.jurlaws20": function(){
if(this.model.gidgrp.rec.jurlaws20=="GB"){
this.model.gidgrp.rec.jurlaw="GB"
}else if(this.model.gidgrp.rec.jurlaws20=="CN"){
this.model.gidgrp.rec.jurlaw="CN"
}else if(this.model.gidgrp.rec.jurlaws20=="HK"){
this.model.gidgrp.rec.jurlaw="HK"
}else if(this.model.gidgrp.rec.jurlaws20==""){
this.model.gidgrp.rec.jurlaw=""
}
}
},
created: function () {},
};
</script>
......
src/views/Business/Gitpop/Ovwp.vue
......@@ -1554,7 +1554,7 @@ export default {
}
},
},
created: function () {},
created: function () {},
watch: {
"model.gidgrp.rec.expflg": function () {
if (
......@@ -1564,8 +1564,13 @@ export default {
this.model.gidgrp.rec.liaflg = "X";
}
},
declareParams() {},
},
declareParams() {},
"model.gidgrp.rec.gartyp": function() {
if(this.model.gidgrp.rec.gartyp=='1'){
this.model.gidgrp.rec.gtxinr="<NILTXT>"
}
}
},
};
</script>
<style>
......
src/views/Business/Gitpop/Preperp.vue
......@@ -126,7 +126,7 @@
placeholder="请选择费用承担人"
>
<el-option
v-for="item in codes.chato"
v-for="item in codes.gitopn_chato"
:key="item.value"
:label="item.label"
:value="item.value"
......
src/views/Business/Litame/Amep.vue
......@@ -156,10 +156,10 @@
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="寄单期限(原)" prop="oldlidgrp.blk.preper">
<el-form-item label="寄单期限(原)" prop="oldlidgrp.rec.prepertxts18">
<c-input
type="textarea"
v-model="model.oldlidgrp.blk.preper"
v-model="model.oldlidgrp.rec.prepertxts18"
maxlength="35"
show-word-limit
placeholder="请输入寄单期限"
......
src/views/Business/Litame/index.vue
......@@ -36,8 +36,8 @@
<!--PD000021 -->
<el-tab-pane label="叙述内容" name="narp">
<c-content>
<m-narp :model="model" :codes="codes" />
</c-content>
<m-narp :model="model" :codes="codes" />
</c-content>
</el-tab-pane>
<!--PD000077 -->
......@@ -64,29 +64,29 @@
<!--PD000027 -->
<el-tab-pane label="表外记账" name="engp">
<c-content>
<m-engp :model="model" :codes="codes" />
</c-content>
<m-engp :model="model" :codes="codes" />
</c-content>
</el-tab-pane>
<!--PD000001 -->
<el-tab-pane label="保证金" name="ccvpan">
<c-content>
<m-ccvpan :model="model" :codes="codes" />
</c-content>
<m-ccvpan :model="model" :codes="codes" />
</c-content>
</el-tab-pane>
<!--PD000000 -->
<el-tab-pane label="结算" name="setpan">
<c-content>
<m-setpan :model="model" :codes="codes" />
</c-content>
<m-setpan :model="model" :codes="codes" />
</c-content>
</el-tab-pane>
<!--PD000001 -->
<el-tab-pane label="会计分录" name="glepan">
<c-content>
<m-glepan :model="model" :codes="codes" />
</c-content>
<m-glepan :model="model" :codes="codes" />
</c-content>
</el-tab-pane>
<!--PD000328 -->
......
src/views/Business/Litdav/Davp.vue
<template>
<div class="eibs-tab">
<!-- =====================左========================== -->
<el-col :span="11">
<el-col :span="12" class="col-left">
<c-col :span="24">
<el-form-item label="信用证编号" prop="lidgrp.rec.ownref">
<c-fullbox>
......@@ -16,7 +16,6 @@
style="margin: 0 10px 0 10px; padding: 0 12px"
size="small"
type="primary"
@click=""
>
<span style="font-family: '宋体'; font-weight: bold">i</span>
</c-button>
......@@ -112,7 +111,6 @@
style="margin: 0 10px 0 10px; padding: 0 12px"
size="small"
type="primary"
@click=""
>
<span style="font-family: '宋体'; font-weight: bold">i</span>
</c-button>
......@@ -145,7 +143,7 @@
</c-col>
</el-col>
<!-- ========================右======================= -->
<el-col :span="11" :offset="1">
<el-col :span="12" class="col-right">
<c-col :span="24" >
<el-form-item label="简略信息" prop="lidgrp.rec.nam">
<c-input
......@@ -160,10 +158,9 @@
<el-form-item label="申请人参考号" prop="brdgrp.apl.pts.ref">
<c-input
disabled
v-model="model.brdgrp.apl.pts.ref" maxlength="16" placeholder="请输入申请人" :disabled="true"></c-input>
v-model="model.brdgrp.apl.pts.ref" maxlength="16" placeholder="请输入申请人"></c-input>
</el-form-item>
</c-col>
</c-col>
</c-col>
<c-col :span="24">
<el-form-item label="申请人名称" prop="brdgrp.apl.pts.nam">
<c-input :disabled="true" v-model="model.brdgrp.apl.pts.nam" maxlength="40" placeholder="请输入名称"></c-input>
......@@ -225,7 +222,6 @@
style="margin: 0 10px 0 10px; padding: 0 12px"
size="small"
type="primary"
@click=""
>
<span style="font-family: '宋体'; font-weight: bold">i</span>
</c-button>
......@@ -233,7 +229,6 @@
style="margin: 0 0"
size="small"
type="primary"
@click=""
>
获取
</c-button>
......
src/views/Business/Litdla/Amep.vue
......@@ -121,8 +121,8 @@
</c-col>
<c-col :span="24">
<el-form-item label="寄单期限(原)" prop="oldlidgrp.blk.preper">
<c-input disabled type="textarea" v-model="model.oldlidgrp.blk.preper" maxlength="35" show-word-limit placeholder="请输入寄单期限" ></c-input>
<el-form-item label="寄单期限(原)" prop="oldlidgrp.rec.prepertxts18">
<c-input disabled type="textarea" v-model="model.oldlidgrp.rec.prepertxts18" maxlength="35" show-word-limit placeholder="请输入寄单期限" ></c-input>
</el-form-item>
</c-col>
......
src/views/Business/Litdla/Ptyp.vue
......@@ -167,12 +167,14 @@
type="textarea" v-model="model.lidgrp.a2b.pts.adrblk" maxlength="180" show-word-limit placeholder="请输入地址信息" ></c-input>
</el-form-item>
</c-col>
<c-col :span="24">
<c-col :span="24" v-if="this.model.lidgrp.rec.avbwth!='O'">
<el-form-item label="可用银行参考号" prop="lidgrp.avb.pts.ref">
<c-input disabled v-model="model.lidgrp.avb.pts.ref" maxlength="16" placeholder="请输入编号 for Address Optional"></c-input>
</el-form-item>
</c-col>
<c-col :span="24">
<c-col :span="24" v-if="this.model.lidgrp.rec.avbwth!='O'">
<el-form-item label="地址编码" prop="lidgrp.avb.pts.extkey">
<c-fullbox>
<c-input disabled v-model="model.lidgrp.avb.pts.extkey" maxlength="16" placeholder="请输入地址编码"></c-input>
......@@ -200,7 +202,8 @@
</c-fullbox>
</el-form-item>
</c-col>
<c-col :span="24">
<c-col :span="24" v-if="this.model.lidgrp.rec.avbwth!='O'">
<el-form-item label="地址信息" prop="lidgrp.avb.pts.adrblk">
<c-input
:rows="4"
......
src/views/Business/Litopn/Detp.vue
......@@ -347,7 +347,7 @@
<c-col :span="24">
<el-form-item label="提交期限（天）" prop="lidgrp.rec.prepers18">
<c-input
v-model="model.lidgrp.rec.prepers18"
v-model.number="model.lidgrp.rec.prepers18"
style="width: 100%"
placeholder="请输入天数"
></c-input>
......@@ -449,7 +449,7 @@
>
<c-input
:disabled="!!(this.model.lidgrp.rec.avbby == 'P')"
v-model="model.lidgrp.rec.tenmaxday"
v-model.number="model.lidgrp.rec.tenmaxday"
placeholder="请输入天数"
></c-input>
</el-form-item>
......
src/views/Public/Coninfp.vue
<!-- 附言公共页面 -->
<template>
<div class="eibs-tab">
<c-row>
<c-col :span="24">
<c-col :span="15">
<el-form-item
style="height: 200px"
label="一般提示"
label-width="70px"
prop="mtabut.coninf.oitinf.oit.inftxt"
>
<c-input-xml
......@@ -24,7 +24,6 @@
<c-col :span="7" :offset="1">
<el-form-item
label="提示类型"
label-width="70px"
prop="mtabut.coninf.oitinf.oit.inflev"
>
<c-select
......@@ -43,7 +42,6 @@
<el-form-item
label="付款提示"
style="height: 200px"
label-width="70px"
prop="mtabut.coninf.oitset.oit.inftxt"
>
<c-input-xml
......@@ -61,7 +59,6 @@
<c-col :span="7" :offset="1">
<el-form-item
label="提示类型"
label-width="70px"
prop="mtabut.coninf.oitset.oit.inflev"
>
<c-select
......@@ -77,12 +74,11 @@
</c-col>
<c-col :span="24">
<c-col :span="15">
<el-form-item label="执行日期" label-width="70px" prop="mtabut.coninf.conexedat">
<el-form-item label="执行日期" prop="mtabut.coninf.conexedat">
<c-date-picker
type="date"
v-model="model.mtabut.coninf.conexedat"
style="width: 60%,margin-left:70px"
placeholder="请选择执行日期"
></c-date-picker>
</el-form-item>
......@@ -90,14 +86,11 @@
<c-col :span="7" :offset="1">
<el-form-item
label="指定复核人"
label-width="80px"
style="display:inline-block"
prop="mtabut.coninf.usr.extkey"
>
<c-input
v-model="model.mtabut.coninf.usr.extkey"
maxlength="8"
disabled="disabled"
placeholder="请输入用户编码"
......@@ -106,6 +99,7 @@
</c-col>
</c-col>
</c-row>
</div>
</template>
<script>
// 附言页签,勿改
......
src/views/Public/Doctre.vue
<template>
<div class="eibs-tab">
<c-col :span="24" style="height: 24px">
<c-col :span="24" style="height: 24px;margin-bottom: 20px;">
<el-form-item label="发出面函/报文" class="messageLabel"></el-form-item>
</c-col>
<c-col :span="24" style="height: 0px">
......@@ -31,7 +31,7 @@
</c-istream-table-docpan>
</c-col>
<c-col :span="24" style="height: 24px;margin-top: 20px;">
<c-col :span="24" style="height: 24px;margin-top: 20px;;margin-bottom: 20px;">
<el-form-item label="前置面函/报文" class="messageLabel"></el-form-item>
</c-col>
<c-col :span="24" style="height: 0px">
......
src/views/Public/Engp.vue
......@@ -75,6 +75,7 @@
label-width="0"
:prop="'liaall.liaallg.' + scope.$index + '.acc'"
>
{{scope.row.acc}}
<!-- <c-input
v-model="scope.row.acc"
style="width: 100%"
......
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