Commit 9b2e28a9 by panziyi

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 d025f542 121932ee
......@@ -5,6 +5,10 @@ import Pub from "../Public"
export default class Botame{
constructor () {
this.data = {
botcoll2blk:"",
botcoll1blk:"",
botdrrl1blk:"",
bodgrp:{
rec:{
ownref:"", // Reference .bodgrp.rec.ownref
......
......@@ -127,7 +127,7 @@ import Engp from "~/views/Public/Engp"
export default {
name: "botame",
name: "Botame",
components:{
"m-amep" : Amep,
"m-ovwp" : Ovwp,
......
......@@ -95,6 +95,7 @@ import Engp from "~/views/Public/Engp";
import Glepan from "~/views/Public/Glepan";
export default {
name: "Botcan",
components: {
"m-canp": Canp,
"m-setpan": Setpan,
......
......@@ -128,7 +128,7 @@
export default {
name: "botdav",
name: "Botdav",
components: {
"m-ovwp": Ovwp,
"m-inst": Inst,
......
......@@ -172,7 +172,9 @@
<c-col :span="24">
<el-form-item label="" prop="bopmod.dbdp.baspp.acp">
<c-checkbox style=" margin: 0px 0 10px 150px;" disabled v-model="model.bopmod.dbdp.baspp.acp">确认</c-checkbox>
</el-form-item>
</c-col>
......@@ -281,6 +283,15 @@ export default {
},
},
},
// watch:{
// "model.lendoc.actflg":function(){
// if(this.model.bopmod.szflg=='2' && this.model.lendoc.actflg=='X'){
// this.model.bopmod.dbdp.baspp.acp="X"
// }else{
// this.model.bopmod.dbdp.baspp.acp=""
// }
// }
// },
methods:{},
created:function(){
......
......@@ -458,11 +458,11 @@ export default {
async change1(){
if(this.model.bodgrp.cbs.opn1.amt<=this.model.setmod.docamt){
this.flag1=false;
this.model.mtabut.clsflg = "O";
// this.model.mtabut.clsflg = "C";
}
else if(this.model.bodgrp.cbs.opn1.amt>this.model.setmod.docamt){
this.flag1=true;
this.model.mtabut.clsflg = "C";
// this.model.mtabut.clsflg = "O";
}},
// async change() {
// if (this.model.bodgrp.rec.focflg === "X") {
......
......@@ -211,7 +211,7 @@ const BusRouter = [
{ path: 'cltdav', component: Cltdav, name: 'Cltdav', meta: { title: '打包托收开立' } },
{ path: 'clttra', component: Clttra, name: 'Clttra', meta: { title: '打包托收催收' } },
{ path: 'cltset', component: Cltset, name: 'Cltset', meta: { title: '打包托收解包' } },
{ path: 'infccd', component: Infccd, name: 'Infccd', meta: { title: '光票托收查询1' } },
{ path: 'infccd', component: Infccd, name: 'Infccd', meta: { title: '光票托收查询' } },
{ path: 'infcld', component: Infcld, name: 'Infcld', meta: { title: '光票托收查询2' } },
{ path: 'ccttra', component: Ccttra, name: 'Ccttra', meta: { title: '光票托收催收' } },
{ path: 'cctdav', component: Cctdav, name: 'Cctdav', meta: { title: '光票托收开立' } },
......
......@@ -138,6 +138,7 @@
v-model="model.ccdgrp.rec.purflg"
style="width: 100%"
placeholder="请选择Payment Disposition "
:disabled="model.ccdgrp.rec.modset == '1'"
:code="codes.purflg"
>
</c-select>
......@@ -205,7 +206,7 @@
<c-input
v-model="model.cctp.usr.extkey"
maxlength="8"
placeholder="请输入User ID"
placeholder="请输入resp.usr"
disabled
></c-input>
</el-form-item>
......@@ -326,7 +327,7 @@
v-model="model.ccdgrp.col.pts.ref"
maxlength="16"
placeholder="请输入Coll. Bank参考号"
disabled
:disabled="model.ccdgrp.rec.modset == '2'"
></c-input>
</el-form-item>
</c-col>
......@@ -338,7 +339,10 @@
v-model="model.ccdgrp.col.pts.extkey"
maxlength="16"
placeholder="请输入Coll. Bank"
disabled
@keyup.enter.native="
showGridPromptDialog('ccdgrp.col.pts.extkey')
"
:disabled="model.ccdgrp.rec.modset == '2'"
></c-input>
<template slot="footer">
<c-button
......@@ -366,7 +370,7 @@
maxlength="150"
show-word-limit
placeholder="请输入名称地址"
disabled
:disabled="model.ccdgrp.rec.modset == '2'"
></c-input>
</el-form-item>
</c-col>
......
......@@ -265,7 +265,7 @@
size="medium"
type="primary"
@click="toCctdav"
>光票托收</c-button
>光票托收</c-button
>
</c-col>
<c-col :span="24">
......
......@@ -161,6 +161,7 @@
</c-col>
<!-- Maximum Amount 信用证最大金额-->
<c-col :span="24">
<c-col :span="12">
<el-form-item label="Maximum Amount" prop="ledgrp.cbs.max.cur">
<c-select
......@@ -183,7 +184,9 @@
></c-input>
</el-form-item>
</c-col>
</c-col>
<c-col :span="24">
<!-- Issued on开证日期 Date Pre-advised 预通知日期-->
<c-col :span="12">
<el-form-item label="Issued on" prop="ledgrp.rec.opndat">
......@@ -198,7 +201,9 @@
</c-date-picker>
</el-form-item>
</c-col>
</c-col>
<c-col :span="24">
<!-- Shipment Date 装运日期 -->
<c-col :span="12">
<el-form-item label="Shipment Date" prop="ledgrp.rec.shpdat">
......@@ -212,7 +217,9 @@
</c-date-picker>
</el-form-item>
</c-col>
</c-col>
<c-col :span="24">
<!--Expiring on 到期日 -->
<c-col :span="12">
<el-form-item label="Expiring on" prop="ledgrp.rec.expdat">
......@@ -227,6 +234,7 @@
</el-form-item>
</c-col>
<c-col :span="12"></c-col>
</c-col>
<!-- in (Place)/counters of有效地点 -->
<c-col :span="24">
......
<template>
<div class="eibs-tab">
<c-row>
<!-- ============================顶部-第一行================================ -->
<c-row>
<c-col :span="24">
......@@ -125,7 +126,8 @@
</el-form-item>
</c-col>
<c-col :span="5">
<c-checkbox v-model="model.ledgrp.rec.revflg"
<c-checkbox
v-model="model.ledgrp.rec.revflg"
style="margin-left: 10px"
disabled
>Revolving L/C</c-checkbox
......@@ -133,7 +135,7 @@
</c-col>
</c-col>
<c-row>
<c-col :span="24">
<!-- Available with指定银行 -->
<c-col :span="19">
<el-form-item label="Available with" prop="ledgrp.avbnam">
......@@ -145,7 +147,7 @@
></c-input>
</el-form-item>
</c-col>
</c-row>
</c-col>
<c-col :span="24">
<c-col :span="19">
......@@ -161,7 +163,8 @@
</el-form-item>
</c-col>
<c-col :span="5">
<c-checkbox v-model="model.ledgrp.rec.redclsflg"
<c-checkbox
v-model="model.ledgrp.rec.redclsflg"
style="margin-left: 10px"
disabled
>Red/Green Clause</c-checkbox
......@@ -234,7 +237,6 @@
</c-select>
</el-form-item>
</c-col>
</c-col>
<!-- ========================上半部分的右边======================= -->
<c-col :span="11" :offset="1">
......@@ -303,8 +305,7 @@
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="" prop="">
</el-form-item>
<el-form-item label="" prop=""> </el-form-item>
</c-col>
</c-col>
</c-row>
......@@ -352,11 +353,7 @@
</c-col>
<c-col :span="11" :offset="1">
<!-- Name -->
<el-form-item
label="Name"
text-align="middle"
prop="bedgrp.rec.nam"
>
<el-form-item label="Name" text-align="middle" prop="bedgrp.rec.nam">
<c-input
v-model="model.bedgrp.rec.nam"
maxlength="40"
......@@ -369,7 +366,7 @@
</c-row>
<!-- ========================下半部分的上半部分(左边,右边是空白的)======================= -->
<c-row>
<c-row>
<c-col :span="24">
<c-col :span="12">
<c-col :span="24">
......@@ -422,7 +419,10 @@
</c-col>
<!-- Discrep. advised on -->
<c-col :span="12">
<el-form-item label="Discrep. advised on" prop="bedgrp.rec.disdat">
<el-form-item
label="Discrep. advised on"
prop="bedgrp.rec.disdat"
>
<c-date-picker
type="date"
v-model="model.bedgrp.rec.disdat"
......@@ -435,7 +435,7 @@
</c-col>
</c-col>
</c-col>
</c-row>
</c-row>
<!-- ========================下半部分的下半边的左边=Presented by-====================== -->
<c-row>
<c-col :span="12">
......@@ -446,9 +446,7 @@
style="width: 100%"
placeholder="请选择Presented by"
:code="codes.docprbrol0"
@change="eventFunction(
'bedgrp.rec.docprbrol'
)"
@change="eventFunction('bedgrp.rec.docprbrol')"
>
</c-select>
</el-form-item>
......@@ -474,7 +472,7 @@
}"
@onSeainf="onSeainf"
@onAplpDet="onPrbpDet"
:disabled1="model.bedgrp.rec.docprbrol=='BEN'? true: false"
:disabled1="model.bedgrp.rec.docprbrol == 'BEN' ? true : false"
>
</c-ptap1>
</c-col>
......@@ -488,9 +486,7 @@
style="width: 100%"
placeholder="请选择Payer"
:code="codes.payrol"
@change="eventFunction(
'bedgrp.rec.payrol'
)"
@change="eventFunction('bedgrp.rec.payrol')"
>
</c-select>
</el-form-item>
......@@ -524,7 +520,6 @@
</c-col>
</c-row>
<!-- <c-col :span="12">
<el-form-item label="Drag Drop Sender" prop="betp.ledget.sdamod.dadsnd">
<c-input
......@@ -1078,6 +1073,7 @@
></c-input>
</el-form-item>
</c-col> -->
</c-row>
</div>
</template>
<script>
......@@ -1097,7 +1093,7 @@ export default {
},
methods: {
...Event,
onSeainf(){},
onSeainf() {},
},
computed: {
docprbrolFlag: {
......
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