Skip to content

V
vue-gjjs
Commit c89c481a by wangren
Options

bctdav、bctrad交易bug修正

parent ebd0441d
Showing with 401 additions and 38 deletions
src/config/CodeTable/index.js
......@@ -4466,11 +4466,12 @@ const CodeTable = {
],
modflg: [
{ label: "Rate changed", value: "x" },
{ label: "Amount changed", value: "a" },
{ label: "Unmodified", value: "r" },
{ label: "Unmodified/redefault", value: "r" },
{ label: "Code changed", value: "c" },
{ label: "Amount changed", value: "a" },
{ label: "Units changed", value: "u" },
{ label: "Date changed", value: "d" },
{ label: "Conditon changed", value: "d" },
{ label: "Conditon changed", value: "n" },
],
modfystat: [
{ label: "已拒绝", value: "RJCT" },
......
src/model/Bctdav/Pattern.js
......@@ -108,7 +108,7 @@ export default {
{max: 35,message:"长度不能超过35"}
],
"bcdgrp.rmi.pts.adrblk":[
{type: "string", required: true, message: "必输项"},
{type: "string", required: false, message: "必输项"},
{max: 120,message:"长度不能超过120"}
],
"bcdgrp.rmi.dbfadrblkcn":[
......@@ -153,8 +153,8 @@ export default {
{max: 35,message:"长度不能超过35"}
],
"bcdgrp.drr.pts.adrblk":[
{type: "string", required: true, message: "必输项"},
{max: 35,message:"长度不能超过35"}
{type: "string", required: false, message: "必输项"},
{max: 135,message:"长度不能超过135"}
],
"bcdgrp.drr.dbfadrblkcn":[
{type: "string", required: true, message: "必输项"},
......
src/model/Bctdav/index.js
......@@ -12,6 +12,9 @@ export default class Bctdav{
vouflg:"",
},
bcdgrp:{
co2:{
pts:new Pts().data,
},
srm:{
djutyp:"",
},
......
src/model/Bctrad/Pattern.js
......@@ -71,7 +71,7 @@ export default {
],
"bcdgrp.blk.colinssnm":[
{type: "string", required: true, message: "必输项"},
{max: 60,message:"长度不能超过60"}
{max: 260,message:"长度不能超过260"}
],
"bcdgrp.co2.pts.ref":[
......@@ -110,7 +110,7 @@ export default {
],
"bcdgrp.blk.colins":[
{type: "string", required: true, message: "必输项"},
{max: 65,message:"长度不能超过65"}
{max: 265,message:"长度不能超过265"}
],
......
src/views/Business/Bctdav/Detp.vue
......@@ -74,7 +74,7 @@
<c-col :span="14">
<c-col :span="4">
<el-form-item label="Good's Code">
<el-form-item label="Good's Code" style="margin-left:-12px">
</el-form-item>
</c-col>
<c-col :span="10">
......@@ -103,7 +103,7 @@
<c-col :span="24">
<c-select v-model="model.bcdgrp.rec.chato" style="width:100%" placeholder="请选择Our Charges to"
:code="codes.chato"
:code="codes.chadet"
>
</c-select>
</el-option>
......@@ -129,7 +129,7 @@
</el-form-item>
</c-col>
<c-col :span="4">
<el-form-item label="Bank Charges">
<el-form-item label="Bank Charges" style="margin-left:-42px">
</el-form-item>
</c-col>
</c-col>
......@@ -147,7 +147,7 @@
</el-form-item>
</c-col>
<c-col :span="4">
<el-form-item label="Bank Charges">
<el-form-item label="Bank Charges" style="margin-left:-18px">
</el-form-item>
</c-col>
......
src/views/Business/Bctdav/Ovwp.vue
......@@ -286,7 +286,7 @@
<c-input
v-model="model.bcdgrp.dre.pts.extkey"
maxlength="50"
maxlength="150"
placeholder="请输入External Key of Address"
@keyup.enter.native="showGridPromptDialog('bcdgrp.dre.pts.extkey')"
></c-input>
......@@ -320,7 +320,7 @@
type="textarea"
:rows="4"
v-model="model.bcdgrp.dre.pts.adrblk"
maxlength="50"
maxlength="150"
disabled
show-word-limit
placeholder="请输入Address Block"
......@@ -408,7 +408,7 @@
type="textarea"
:rows="4"
v-model="model.bcdgrp.rmi.pts.adrblk"
maxlength="50"
maxlength="150"
show-word-limit
placeholder="请输入Address Block"
......@@ -469,7 +469,7 @@
type="textarea"
:rows="4"
v-model="model.bcdgrp.drr.pts.adrblk"
maxlength="50"
maxlength="150"
show-word-limit
placeholder="请输入Address Block"
......
src/views/Business/Bctdav/Ptyp.vue 0 → 100644
<template>
<div class="eibs-tab">
<!-- ====================左边======================= -->
<c-col :span="11">
<c-col :span="24">
<el-form-item
label="Drawee Ref."
prop="bcdgrp.dre.pts.ref"
>
<c-input
v-model="model.bcdgrp.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="Extkey" prop="bcdgrp.dre.pts.extkey">
<c-fullbox>
<c-input
@keyup.enter.native="showGridPromptDialog('bcdgrp.dre.pts.extkey')"
v-model="model.bcdgrp.dre.pts.extkey"
maxlength="50"
placeholder="请输入External Key of Address"
></c-input>
<template slot="footer">
<c-button
style="margin:0 10px 0 10px;padding: 0 12px;"
size="small"
type="primary"
>
<span style="font-family:'宋体';font-weight:bold">i</span>
</c-button>
<c-button
style="margin:0 0"
size="small"
type="primary"
>
详情
</c-button>
</template>
</c-fullbox>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="Address Block" prop="bcdgrp.dre.pts.adrblk">
<c-input
type="textarea"
:rows="4"
v-model="model.bcdgrp.dre.pts.adrblk"
maxlength="150"
disabled
show-word-limit
placeholder="请输入Address Block"
></c-input>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item
label="2nd Collecting Bank Ref."
prop="bcdgrp.co2.pts.ref"
>
<c-input
v-model="model.bcdgrp.co2.pts.ref"
maxlength="16"
style="width: 100%"
placeholder=""
></c-input>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="Extkey" prop="bcdgrp.co2.pts.extkey">
<c-fullbox>
<c-input
@keyup.enter.native="showGridPromptDialog('bcdgrp.co2.pts.extkey')"
v-model="model.bcdgrp.co2.pts.extkey"
maxlength="50"
placeholder="请输入External Key of Address"
></c-input>
<template slot="footer">
<c-button
style="margin:0 10px 0 10px;padding: 0 12px;"
size="small"
type="primary"
>
<span style="font-family:'宋体';font-weight:bold">i</span>
</c-button>
<c-button
style="margin:0 0"
size="small"
type="primary"
>
详情
</c-button>
</template>
</c-fullbox>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="Address Block" prop="bcdgrp.co2.pts.adrblk">
<c-input
type="textarea"
:rows="4"
v-model="model.bcdgrp.co2.pts.adrblk"
maxlength="50"
show-word-limit
placeholder="请输入Address Block"
></c-input>
</el-form-item>
</c-col>
<!-- <c-col :span="24">
<c-ptap
:model="model"
:argadr="{
title: 'Drawee',
grp: 'bcdgrp',
rol: 'dre',
}"
:disabled="true"
:isAdrblk="false"
@onSeainf="onSeainf"
@onAplpDet="onDrepDet"
>
</c-ptap>
</c-col>
<c-col :span="24">
<c-ptap
:model="model"
:argadr="{
title: '2nd Collecting',
grp: 'bcdgrp',
rol: 'co2',
}"
:disabled="true"
:isAdrblk="false"
@onSeainf="onSeainf"
@onAplpDet="onCo2pDet"
>
</c-ptap>
</c-col> -->
</c-col>
<!-- ====================右边======================= -->
<c-col :span="11" :offset="1">
<c-col :span="24">
<el-form-item
label="Remitting Bank Ref."
prop="bcdgrp.rmi.pts.ref"
>
<c-input
v-model="model.bcdgrp.rmi.pts.ref"
maxlength="16"
style="width: 100%"
placeholder=""
></c-input>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="Extkey" prop="bcdgrp.rmi.pts.extkey">
<c-fullbox>
<c-input
v-model="model.bcdgrp.rmi.pts.extkey"
maxlength="50"
placeholder="请输入External Key of Address"
@keyup.enter.native="showGridPromptDialog('bcdgrp.rmi.pts.extkey')"
></c-input>
<template slot="footer">
<c-button
style="margin:0 10px 0 10px;padding: 0 12px;"
size="small"
type="primary"
>
<span style="font-family:'宋体';font-weight:bold">i</span>
</c-button>
<c-button
style="margin:0 0"
size="small"
type="primary"
>
详情
</c-button>
</template>
</c-fullbox>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="Address Block" prop="bcdgrp.rmi.pts.adrblk">
<c-input
type="textarea"
:rows="4"
v-model="model.bcdgrp.rmi.pts.adrblk"
maxlength="150"
show-word-limit
placeholder="请输入Address Block"
></c-input>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item
label="Drawer Ref."
prop="bcdgrp.drr.pts.ref"
>
<c-input
v-model="model.bcdgrp.drr.pts.ref"
maxlength="16"
style="width: 100%"
placeholder=""
></c-input>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="Extkey" prop="bcdgrp.drr.pts.extkey">
<c-fullbox>
<c-input
@keyup.enter.native="showGridPromptDialog('bcdgrp.drr.pts.extkey')"
v-model="model.bcdgrp.drr.pts.extkey"
maxlength="150"
placeholder="请输入External Key of Address"
></c-input>
<template slot="footer">
<c-button
style="margin:0 10px 0 10px;padding: 0 12px;"
size="small"
type="primary"
>
<span style="font-family:'宋体';font-weight:bold">i</span>
</c-button>
<c-button
style="margin:0 0"
size="small"
type="primary"
>
详情
</c-button>
</template>
</c-fullbox>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="Address Block" prop="bcdgrp.drr.pts.adrblk">
<c-input
type="textarea"
:rows="4"
v-model="model.bcdgrp.drr.pts.adrblk"
maxlength="50"
show-word-limit
placeholder="请输入Address Block"
></c-input>
</el-form-item>
</c-col>
<!-- <c-col :span="24">
<c-ptap
:model="model"
:argadr="{
title: 'Remitting Bank',
grp: 'bcdgrp',
rol: 'rmi',
}"
:disabled="true"
:isAdrblk="false"
@onSeainf="onSeainf"
@onAplpDet="onRmipDet"
>
</c-ptap>
</c-col>
<c-col :span="24">
<c-ptap
:model="model"
:argadr="{
title: 'Drawer',
grp: 'bcdgrp',
rol: 'drr',
}"
:disabled="true"
:isAdrblk="false"
@onSeainf="onSeainf"
@onAplpDet="onDrrpDet"
>
</c-ptap>
</c-col> -->
</c-col>
</div>
</template>
<script>
import Api from "~/service/Api"
import commonProcess from "~/mixin/commonProcess";
import CodeTable from "~/config/CodeTable"
import Event from "~/model/Bctset/Event"
import Ptap from "~/views/Public/Ptap";
export default {
components: { "c-ptap": Ptap },
inject: ['root'],
props:["model","codes"],
mixins: [commonProcess],
data(){
return {
}
},
methods:{...Event},
created:function(){
}
}
</script>
<style>
</style>
src/views/Business/Bctdav/Srmp.vue
......@@ -13,7 +13,7 @@
<c-col :span="24">
<el-form-item label="单据出具人" prop="bcdgrp.srm.djuusr">
<c-input
:disabled="!this.model.bcdgrp.srm.djutyp"
:disabled="(!this.model.bcdgrp.srm.djutyp || this.model.bcdgrp.srm.djutyp == 'D' )"
v-model="model.bcdgrp.srm.djuusr" maxlength="80" placeholder="请输入单据出具人"></c-input>
</el-form-item>
</c-col>
......@@ -21,7 +21,7 @@
<c-col :span="24">
<el-form-item label="单据出具日期" prop="bcdgrp.srm.djudat">
<c-date-picker
:disabled="!this.model.bcdgrp.srm.djutyp"
:disabled="(!this.model.bcdgrp.srm.djutyp || this.model.bcdgrp.srm.djutyp == 'D' )"
type="date" v-model="model.bcdgrp.srm.djudat" style="width:100%" placeholder="请选择单据出具日期"></c-date-picker>
</el-form-item>
</c-col>
......@@ -29,7 +29,7 @@
<c-col :span="24">
<el-form-item label="货权单据编号" prop="bcdgrp.srm.djuref">
<c-input
:disabled="!this.model.bcdgrp.srm.djutyp"
:disabled="(!this.model.bcdgrp.srm.djutyp || this.model.bcdgrp.srm.djutyp == 'D' )"
v-model="model.bcdgrp.srm.djuref" maxlength="40" placeholder="请输入货权单据编号"></c-input>
</el-form-item>
</c-col>
......
src/views/Business/Bctdav/index.vue
......@@ -30,15 +30,21 @@
<m-detp :model="model" :codes="codes" />
</el-tab-pane>
<el-tab-pane label="Parties" name="ptyp">
<c-content>
<m-ptyp :model="model" :codes="codes"/>
</c-content>
</el-tab-pane>
<el-tab-pane label="Settlement" name="setpan">
<c-content>
<m-setpan :model="model" :codes="codes" />
</c-content>
</el-tab-pane>
<!--Liability -->
<el-tab-pane label="Liability" name="engp">
<m-engp :model="model" :codes="codes" />
<el-tab-pane label="Completion" name="coninfp">
<m-coninfp :model="model" :codes="codes" />
</el-tab-pane>
<!--Messages -->
......@@ -52,9 +58,7 @@
</el-tab-pane>
<!--Completion -->
<el-tab-pane label="Completion" name="coninfp">
<m-coninfp :model="model" :codes="codes" />
</el-tab-pane>
<el-tab-pane label="跨境人民币申报" name="cnyp">
<m-cnyp :model="model" :codes="codes" />
......@@ -85,6 +89,7 @@ import Default from "~/model/Bctdav/Default";
import Pattern from "~/model/Bctdav/Pattern";
import Ovwp from "./Ovwp";
import Detp from "./Detp";
import Ptyp from "./Ptyp"
import Srmp from "./Srmp";
import Cnyp from "./Cnyp";
import Engp from "~/views/Public/Engp";
......@@ -98,6 +103,7 @@ export default {
components: {
"m-ovwp": Ovwp,
"m-detp": Detp,
'm-ptyp': Ptyp,
"m-setpan": Setpan,
"m-engp": Engp,
"m-docpan": Docpan,
......
src/views/Business/Bctrad/Bctret.vue
......@@ -71,7 +71,7 @@
<c-col :span="24">
<el-form-item label="Document Set Status" prop="bcdgrp.rec.docsta">
<c-select
:code="codes.docsta"
:code="codes.docstabot"
v-model="model.bcdgrp.rec.docsta" style="width:93%" placeholder="请输入Document Set Status"
disabled>
</c-select>
......@@ -94,9 +94,9 @@
<c-docpre
:model="model"
:argadr="{
path: 'bcdgrp.blk.docpre',
path: 'SEMFLG',
grp: 'bctp',
rol: 'blk',
code: 'docpre'
}"></c-docpre>
</c-col>
</c-col>
......
src/views/Business/Bctrad/Detp.vue
......@@ -5,12 +5,12 @@
<c-col :span="24">
<c-col :span="20">
<el-form-item label="Delivery of Documents Instructions" prop="bcdgrp.blk.colins">
<c-input disabled type="textarea" v-model="model.bcdgrp.blk.colins" maxlength="65" show-word-limit
<c-input disabled type="textarea" v-model="model.bcdgrp.blk.colins" maxlength="265" show-word-limit
placeholder="请输入Delivery of Documents Instructions"></c-input>
</el-form-item>
</c-col>
<c-col :span="4">
<c-button size="small" type="primary" icon="el-icon-search" @click="onColinsButtxmsel">
<c-button disabled size="small" type="primary" icon="el-icon-search" @click="onColinsButtxmsel">
</c-button>
</c-col>
</c-col>
......@@ -43,7 +43,7 @@
</el-form-item>
</c-col>
<c-col :span="4">
<c-button size="small" type="primary" icon="el-icon-search" @click="onOthins1Buttxmsel">
<c-button disabled size="small" type="primary" icon="el-icon-search" @click="onOthins1Buttxmsel">
</c-button>
</c-col>
<c-col :span="24">
......
src/views/Public/Setpan.vue
......@@ -361,14 +361,14 @@
<c-col :span="24">
&nbsp;
</c-col>
<c-col :span="12">
<!-- <c-col :span="12">
<el-form-item label="rollab">
<c-input v-model="dialog3.rollab" maxlength="3" placeholder="请输入rollab"></c-input>
</el-form-item>
</c-col>
</c-col> -->
<c-col :span="12">
<el-form-item label="role">
<c-col :span="24">
<el-form-item label="ROLLAB">
<c-select v-model="dialog3.rol" style="width:100%" placeholder="请输入role">
<el-option v-for="item in codes.rolall" :key="item.value" :label="item.label" :value="item.value">
</el-option>
......
src/views/Public/SetpanDialog.vue
......@@ -18,9 +18,10 @@
<c-col :span="16">
<el-form-item label="中文描述">
<c-input v-model="formData.feetxt" style="width: 350px" />
<c-input
<c-select
v-model="formData.modflg"
disabled
:code="codes.modflg"
style="width: 350px; margin-left: 100px"
/>
</el-form-item>
......@@ -256,14 +257,14 @@
<el-form-item label="from Perimod">
<c-input style="width: 200px" v-model="formData.wrkfec.perbegtr2" />
<c-input
disabled
style="width: 200px; margin-left: 50px"
v-model="formData.wrkfec.perrattr2"
/>
</el-form-item>
<el-form-item label="from Perimod">
<c-input
disabled
style="width: 200px"
v-model="formData.wrkfec.perbegtr3"
/>
......
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