Skip to content

V
vue-gjjs
Commit da2d1dfc by huangxin
Options

botset,bordav,botame优化

parent f9bd5570
Showing with 285 additions and 135 deletions
src/model/Botset/Pattern.js
......@@ -140,7 +140,7 @@ export default {
],
"liaall.outamt":[
{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位" }
],
......@@ -153,19 +153,19 @@ export default {
{max: 3,message:"长度不能超过3"}
],
"liaall.misamt":[
{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位" }
],
"liaall.exttotoldamt":[
{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位" }
],
"liaall.exttotamt":[
{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位" }
],
......@@ -480,29 +480,29 @@ export default {
],
"bopmod.dbdgrp.bas.lcyamt":[
{type: "number", required: false, message: "必输项"} ],
{type: "string", required: false, message: "必输项"} ],
"bopmod.dbdgrp.bas.lcyacc":[
{type: "string", required: false, message: "必输项"},
{max: 32,message:"长度不能超过32"}
],
"bopmod.dbdgrp.bas.fcyamt":[
{type: "number", required: false, message: "必输项"} ],
{type: "string", required: false, message: "必输项"} ],
"bopmod.dbdgrp.bas.fcyacc":[
{type: "string", required: false, message: "必输项"},
{max: 32,message:"长度不能超过32"}
],
"bopmod.dbdgrp.bas.othamt":[
{type: "number", required: false, message: "必输项"} ],
{type: "string", required: false, message: "必输项"} ],
"bopmod.dbdgrp.bas.othacc":[
{type: "string", required: false, message: "必输项"},
{max: 32,message:"长度不能超过32"}
],
"bopmod.dbdgrp.bas.txamt":[
{type: "number", required: false, message: "必输项"} ],
{type: "string", required: false, message: "必输项"} ],
"bopmod.dbdgrp.bas.inchargeamt":[
{type: "number", required: false, message: "必输项"} ],
{type: "string", required: false, message: "必输项"} ],
"bopmod.dbagrp.bas.rptno":[
{type: "string", required: false, message: "必输项"},
......@@ -558,32 +558,32 @@ export default {
],
"bopmod.dbagrp.bas.lcyamt":[
{type: "number", required: false, message: "必输项"} ],
{type: "string", required: false, message: "必输项"} ],
"bopmod.dbagrp.bas.lcyacc":[
{type: "string", required: false, message: "必输项"},
{max: 32,message:"长度不能超过32"}
],
"bopmod.dbagrp.bas.fcyamt":[
{type: "number", required: false, message: "必输项"} ],
{type: "string", required: false, message: "必输项"} ],
"bopmod.dbagrp.bas.fcyacc":[
{type: "string", required: false, message: "必输项"},
{max: 32,message:"长度不能超过32"}
],
"bopmod.dbagrp.bas.othamt":[
{type: "number", required: false, message: "必输项"} ],
{type: "string", required: false, message: "必输项"} ],
"bopmod.dbagrp.bas.othacc":[
{type: "string", required: false, message: "必输项"},
{max: 32,message:"长度不能超过32"}
],
"bopmod.dbagrp.bas.txamt":[
{type: "number", required: false, message: "必输项"} ],
{type: "string", required: false, message: "必输项"} ],
"bopmod.dbagrp.bas.inchargeamt":[
{type: "number", required: false, message: "必输项"} ],
{type: "string", required: false, message: "必输项"} ],
"bopmod.dbagrp.bas.outchargeamt":[
{type: "number", required: false, message: "必输项"} ],
{type: "string", required: false, message: "必输项"} ],
"cnybop.cnyinc.spk":[
{type: "string", required: false, message: "必输项"},
......
src/views/Business/Botame/Ovwp.vue
......@@ -309,6 +309,8 @@
rol: 'drr',
}"
:disabled="true"
:disabledRef="true"
:disabledExtkey="true"
>
</c-ptap>
<c-ptap
......@@ -318,7 +320,7 @@
grp: 'bodgrp',
rol: 'col',
}"
:disabled="true"
:disabled="this.flag2"
>
</c-ptap>
......@@ -329,70 +331,11 @@
grp: 'bodgrp',
rol: 'dre',
}"
:disabled="true"
:disabled="this.flag3"
>
</c-ptap>
<!-- <c-col :span="24">
<el-form-item
label="Drawee参考号"
prop="bodgrp.dre.pts.ref"
>
<c-input
v-model="model.bodgrp.dre.pts.ref"
maxlength="16"
style="width: 100%"
placeholder="请输入Application Ref"
></c-input>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="Drawee" prop="bodgrp.dre.pts.extkey">
<c-fullbox>
<c-input
v-model="model.bodgrp.dre.pts.extkey"
maxlength="50"
placeholder="请输入External Key of Address"
@keyup.enter.native="showGridPromptDialog('bodgrp.dre.pts.extkey')"
></c-input>
<template slot="footer">
<c-button
style="margin:0 10px 0 10px;padding: 0 12px;"
size="small"
type="primary"
icon="el-icon-search"
>
</c-button>
<c-button
style="margin:0 0"
size="small"
type="primary"
@click="onAplpDet"
>
详情
</c-button>
</template>
</c-fullbox>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="地址名称" prop="bodgrp.dre.pts.adrblk">
<c-input
type="textarea"
:rows="4"
v-model="model.bodgrp.dre.pts.adrblk"
maxlength="50"
disabled
show-word-limit
placeholder="请输入Address Block"
></c-input>
</el-form-item>
</c-col> -->
<c-col :span="24">
<el-form-item
......@@ -452,13 +395,36 @@ export default {
mixins: [commonProcess],
data() {
return {
flag2:false,
flag3:false,
invtyp: [{ label: "type1", value: "1" }],
}
},
watch:{
"model.bodgrp.col.pts.extkey" :{
immediate:true,
handler(val ,oldVal){
if(this.model.bodgrp.col.pts.extkey!=''){
this.flag2=true;
}else{
this.flag2=false;
}
}
},
"model.bodgrp.dre.pts.extkey" :{
immediate:true,
handler(val ,oldVal){
if(this.model.bodgrp.dre.pts.extkey!=''){
this.flag3=true;
}else{
this.flag3=false;
}
}
},
},
methods: {
...Event,
......
src/views/Business/Botdav/Ovwp.vue
......@@ -152,51 +152,7 @@
</el-form-item>
</c-col>
<!-- 无法显示数据，改用另一种方式 -->
<!-- <c-col :span="24">
<c-table
:list="model.botp.docgrdm.docgrd || []"
>
<el-table-column label="1st" width="camil1"></el-table-column>
<el-table-column label="2st" width="camil2"></el-table-column>
<el-table-column label="Document" width="docnam"></el-table-column>
</c-table>
</c-col> -->
<!-- <c-col :span="24" style="height: 24px; margin-top: -10px">
<el-form-item :label="model.botp.docgrdm.docdsclab" class="messageLabel">
<c-button style="float: right" @click="addTableValue" type="primary">新增单据</c-button>
</el-form-item>
</c-col>
<c-col :span="24" style="margin-bottom: 30px;">
<c-table height="200px" style="text-align: center" :list="this.model.botp.docgrdm.docgrd || []"
:paginationShow="false" :border="true">
<el-table-column label="1st" width="auto">
<template slot-scope="scope">
<c-input v-model="scope.row.cmail1" @change="docpre" maxlength="12"></c-input>
</template>
</el-table-column>
<el-table-column label="2nd" width="auto">
<template slot-scope="scope">
<c-input v-model="scope.row.cmail2" maxlength="12" @change="docpre"></c-input>
</template>
</el-table-column>
<el-table-column label="Document" prop="docnam" width="auto">
<template slot-scope="scope">
<c-select style="width: 100%" placeholder="请选择" v-model="scope.row.docnam" @change="docpre">
<el-option v-for="item in codeTable" :key="item.value" :label="item.label" :value="item.value">
</el-option>
</c-select>
</template>
</el-table-column>
<el-table-column label="操作" width="170px" fixed="right">
<template slot-scope="scope">
<c-button @click="deleteTable(scope.$index)" type="primary">删除</c-button>
</template>
</el-table-column>
</c-table>
</c-col> -->
<c-docpre :model="model" :argadr="{
path: 'SEMFLG',
......@@ -207,23 +163,210 @@
</c-col>
<!-- ====================右边======================= -->
<c-col :span="11" :offset="1">
<!-- <c-col :span="24">
<el-form-item
label="Drawer参考号"
prop="bodgrp.drr.pts.ref"
>
<c-input
v-model="model.bodgrp.drr.pts.ref"
maxlength="16"
style="width: 100%"
placeholder="请输入Application Ref"
></c-input>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="Drawer" prop="bodgrp.drr.pts.extkey">
<c-fullbox>
<c-input
v-model="model.bodgrp.drr.pts.extkey"
maxlength="50"
placeholder="请输入External Key of Address"
@keyup.enter.native="showGridPromptDialog('bodgrp.drr.pts.extkey')"
></c-input>
<template slot="footer">
<c-button
style="margin:0 10px 0 10px;padding: 0 12px;"
size="small"
type="primary"
icon="el-icon-search"
>
</c-button>
<c-button
style="margin:0 0"
size="small"
type="primary"
@click="onAplpDet"
>
详情
</c-button>
</template>
</c-fullbox>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="地址名称" prop="bodgrp.drr.pts.adrblk">
<c-input
type="textarea"
:rows="4"
v-model="model.bodgrp.drr.pts.adrblk"
maxlength="50"
:disabled="this.flag1"
show-word-limit
placeholder="请输入Address Block"
></c-input>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item
label="Collecting Bank参考号"
prop="bodgrp.col.pts.ref"
>
<c-input
v-model="model.bodgrp.col.pts.ref"
maxlength="16"
style="width: 100%"
placeholder="请输入Application Ref"
></c-input>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="Collecting Bank" prop="bodgrp.col.pts.extkey">
<c-fullbox>
<c-input
v-model="model.bodgrp.col.pts.extkey"
maxlength="50"
placeholder="请输入External Key of Address"
@keyup.enter.native="showGridPromptDialog('bodgrp.col.pts.extkey')"
></c-input>
<template slot="footer">
<c-button
style="margin:0 10px 0 10px;padding: 0 12px;"
size="small"
type="primary"
icon="el-icon-search"
>
</c-button>
<c-button
style="margin:0 0"
size="small"
type="primary"
@click="onAplpDet"
>
详情
</c-button>
</template>
</c-fullbox>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="地址名称" prop="bodgrp.col.pts.adrblk">
<c-input
type="textarea"
:rows="4"
v-model="model.bodgrp.col.pts.adrblk"
maxlength="50"
:disabled="this.flag2"
show-word-limit
placeholder="请输入Address Block"
></c-input>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item
label="Drawee参考号"
prop="bodgrp.dre.pts.ref"
>
<c-input
v-model="model.bodgrp.dre.pts.ref"
maxlength="16"
style="width: 100%"
placeholder="请输入Application Ref"
></c-input>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="Drawee" prop="bodgrp.dre.pts.extkey">
<c-fullbox>
<c-input
v-model="model.bodgrp.dre.pts.extkey"
maxlength="50"
placeholder="请输入External Key of Address"
@keyup.enter.native="showGridPromptDialog('bodgrp.dre.pts.extkey')"
></c-input>
<template slot="footer">
<c-button
style="margin:0 10px 0 10px;padding: 0 12px;"
size="small"
type="primary"
icon="el-icon-search"
>
</c-button>
<c-button
style="margin:0 0"
size="small"
type="primary"
@click="onAplpDet"
>
详情
</c-button>
</template>
</c-fullbox>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="地址名称" prop="bodgrp.dre.pts.adrblk">
<c-input
type="textarea"
:rows="4"
v-model="model.bodgrp.dre.pts.adrblk"
maxlength="50"
:disabled="this.flag3"
show-word-limit
placeholder="请输入Address Block"
></c-input>
</el-form-item>
</c-col> -->
<c-ptap :model="model" :argadr="{
title: 'Drawer',
grp: 'bodgrp',
rol: 'drr',
}" :isAdrblk="true" :disabled="false">
}" :isAdrblk="true" :disabled="this.flag1">
</c-ptap>
<c-ptap :model="model" :argadr="{
title: 'Collecting Bank',
grp: 'bodgrp',
rol: 'col',
}" :disabled="false">
}" :disabled="this.flag2">
</c-ptap>
<c-ptap :model="model" :argadr="{
title: 'Drawee',
grp: 'bodgrp',
rol: 'dre',
}" :disabled="false">
}" :disabled="this.flag3">
</c-ptap>
<c-col :span="24">
<el-form-item label="Country or region Code" prop="bodgrp.rec.stacty">
......@@ -259,6 +402,9 @@
mixins: [commonProcess],
data() {
return {
flag1:false,
flag2:false,
flag3:false,
codeTable2: [
{ label: "金(含金饰品)", value: "001" },
{ label: "银(含银饰品)", value: "002" },
......@@ -323,6 +469,39 @@
],
};
},
watch:{
"model.bodgrp.drr.pts.extkey" :{
immediate:true,
handler(val ,oldVal){
if(this.model.bodgrp.drr.pts.extkey!=''){
this.flag1=true;
}else{
this.flag1=false;
}
}
},
"model.bodgrp.col.pts.extkey" :{
immediate:true,
handler(val ,oldVal){
if(this.model.bodgrp.col.pts.extkey!=''){
this.flag2=true;
}else{
this.flag2=false;
}
}
},
"model.bodgrp.dre.pts.extkey" :{
immediate:true,
handler(val ,oldVal){
if(this.model.bodgrp.dre.pts.extkey!=''){
this.flag3=true;
}else{
this.flag3=false;
}
}
},
},
methods: {
...Event,
changeCur(){
......
src/views/Business/Botset/Basp3.vue
......@@ -49,7 +49,7 @@
<c-col :span="24">
<el-form-item label="收款人类型" prop="bopmod.dbagrp.bas.custype">
<c-select disabled v-model="model.bopmod.dbagrp.bas.custype" style="width:100%" placeholder="请选择类型">
<c-select disabled v-model="model.bopmod.dbagrp.bas.custype" style="width:100%" placeholder="请选择类型" @change="selectOrCheckboxRule('bopmod.dbagrp.bas.custype')">
<el-option
v-for="item in codes.custype"
:key="item.value"
......@@ -81,26 +81,26 @@
<c-col :span="24">
<el-form-item label="结汇金额" prop="bopmod.dbagrp.bas.lcyamt">
<c-input v-model="model.bopmod.dbagrp.bas.lcyamt" placeholder="请输入结汇金额"></c-input>
<c-input-currency v-model="model.bopmod.dbagrp.bas.lcyamt" placeholder="请输入结汇金额" @keyup.enter.native="defaultFunction('bopmod.dbagrp.bas.lcyamt', model.bopmod.dbagrp.bas.lcyamt)"></c-input-currency>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="现汇金额" prop="bopmod.dbagrp.bas.fcyamt">
<c-input v-model="model.bopmod.dbagrp.bas.fcyamt" placeholder="请输入现汇金额"></c-input>
<c-input-currency v-model="model.bopmod.dbagrp.bas.fcyamt" placeholder="请输入现汇金额" @keyup.enter.native="defaultFunction('bopmod.dbagrp.bas.fcyamt', model.bopmod.dbagrp.bas.fcyamt)"></c-input-currency>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="其它金额" prop="bopmod.dbagrp.bas.othamt">
<c-input v-model="model.bopmod.dbagrp.bas.othamt" placeholder="请输入其它金额"></c-input>
<c-input-currency v-model="model.bopmod.dbagrp.bas.othamt" placeholder="请输入其它金额" @keyup.enter.native="defaultFunction('bopmod.dbagrp.bas.othamt', model.bopmod.dbagrp.bas.othamt)"></c-input-currency>
</el-form-item>
</c-col>
<c-col>
<c-col :span="10">
<el-form-item label="收入款币种及金额" prop="bopmod.dbagrp.bas.txccy">
<c-select disabled v-model="model.bopmod.dbagrp.bas.txccy" style="width:100%" placeholder="请选择收入款币种及金额">
<c-select disabled v-model="model.bopmod.dbagrp.bas.txccy" style="width:100%" placeholder="请选择收入款币种及金额" >
<el-option
v-for="item in codes.curtxt1"
:key="item.value"
......@@ -114,7 +114,7 @@
<c-col :span="14">
<el-form-item label="" prop="bopmod.dbagrp.bas.txamt" label-width="5px">
<c-input disabled v-model="model.bopmod.dbagrp.bas.txamt" placeholder="请输入收入款币种及金额"></c-input>
<c-input-currency disabled v-model="model.bopmod.dbagrp.bas.txamt" placeholder="请输入收入款币种及金额" @keyup.enter.native="defaultFunction('bopmod.dbagrp.bas.txamt', model.bopmod.dbagrp.bas.txamt)"></c-input-currency>
</el-form-item>
</c-col>
</c-col>
......@@ -136,7 +136,7 @@
<c-col :span="14">
<el-form-item label="" prop="bopmod.dbagrp.bas.inchargeamt" label-width="5px">
<c-input disabled v-model="model.bopmod.dbagrp.bas.inchargeamt" placeholder="请输入国内银行扣费"></c-input>
<c-input-currency disabled v-model="model.bopmod.dbagrp.bas.inchargeamt" placeholder="请输入国内银行扣费" @keyup.enter.native="defaultFunction('bopmod.dbagrp.bas.inchargeamt', model.bopmod.dbagrp.bas.inchargeamt)"></c-input-currency>
</el-form-item>
</c-col>
</c-col>
......@@ -158,7 +158,7 @@
<c-col :span="14">
<el-form-item label="" prop="bopmod.dbagrp.bas.outchargeamt" label-width="5px">
<c-input disabled @change="change" v-model="model.bopmod.dbagrp.bas.outchargeamt" placeholder="请输入国外银行扣费"></c-input>
<c-input-currency disabled v-model="model.bopmod.dbagrp.bas.outchargeamt" placeholder="请输入国外银行扣费" @keyup.enter.native="defaultFunction('bopmod.dbagrp.bas.outchargeamt', model.bopmod.dbagrp.bas.outchargeamt)"></c-input-currency>
</el-form-item>
</c-col>
</c-col>
......
src/views/Business/Botset/Setp.vue
......@@ -334,7 +334,7 @@
</c-col>
<c-col :span="24">
<c-checkbox
:disabled="model.setmod.docamt < model.bodgrp.cbs.opn1.amt"
:disabled="this.flag1"
v-model="model.mtabut.clsflg"
>Close Contract</c-checkbox
>
......@@ -408,6 +408,7 @@ export default {
mixins: [commonProcess],
data() {
return {
flag1: true,
stmData: {
columns: [
'1 1 "Type" 250',
......@@ -467,8 +468,12 @@ export default {
methods: {
...Event,
async change1(){
if(this.model.bodgrp.cbs.opn1.amt==this.model.setmod.docamt){
if(this.model.bodgrp.cbs.opn1.amt<=this.model.setmod.docamt){
this.model.mtabut.clsflg = "X";
this.flag1=false;}
else if(this.model.bodgrp.cbs.opn1.amt>this.model.setmod.docamt){
this.model.mtabut.clsflg = "";
this.flag1=true;
}},
async change() {
if (this.model.bodgrp.rec.focflg === "X") {
......@@ -493,7 +498,7 @@ export default {
if (selection.length === 0) {
chkIds = [];
this.$nextTick(async () => {
this.model.setmod.docamt = "0.000";
this.model.setmod.docamt = "0.00";
})
this.model.liaall.tensetstm.rows = [];
} else {
......
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