Commit ac9b2a0f by Wuyuqiu

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 566002e3 4a73f7e0
...@@ -183,7 +183,6 @@ export default { ...@@ -183,7 +183,6 @@ export default {
codes:{ codes:{
...CodeTable ...CodeTable
} }
}; };
}, },
mounted() { mounted() {
...@@ -238,7 +237,7 @@ export default { ...@@ -238,7 +237,7 @@ export default {
const o = obj[k]; const o = obj[k];
const tableColumn = o.map((item) => item.prop).join("\n"); const tableColumn = o.map((item) => item.prop).join("\n");
let colInfo = { let colInfo = {
prop: tableColumn, prop: tableColumn + '_' + k,
label: tableColumn, label: tableColumn,
width: o[0].width, width: o[0].width,
// width: "auto", // width: "auto",
...@@ -330,14 +329,13 @@ export default { ...@@ -330,14 +329,13 @@ export default {
code(item,scope){ code(item,scope){
let value = scope.row[item.prop] let value = scope.row[item.prop]
let code = item.code let code = item.code
if(!value || !code){ if(typeof code == 'string'){
return "" code = this.codes[code]
} }
let args=this.codes[code]; if(!value || !code){
if (!args) {
return "" return ""
} }
let em = args.find(item=>item.value.trim() == value.trim()) let em = code.find(item=>item.value.trim() == value.trim())
if(!em){ if(!em){
return value return value
} }
......
...@@ -106,7 +106,7 @@ const CodeTable = { ...@@ -106,7 +106,7 @@ const CodeTable = {
{ label: "系统外还款", value: "1" }, { label: "系统外还款", value: "1" },
{ label: "正常还款", value: "0" }, { label: "正常还款", value: "0" },
], ],
acttyp0: [ acttyp: [
{ label: "境外", value: "(JW)" }, { label: "境外", value: "(JW)" },
{ label: "境内非居民", value: "(JN)" }, { label: "境内非居民", value: "(JN)" },
], ],
...@@ -3257,6 +3257,10 @@ const CodeTable = { ...@@ -3257,6 +3257,10 @@ const CodeTable = {
{ label: "非融资类", value: "2" }, { label: "非融资类", value: "2" },
{ label: "非分离式", value: "0" }, { label: "非分离式", value: "0" },
], ],
fenlishi2: [
{ label: "融资类", value: "1" },
{ label: "非融资类", value: "2" },
],
fepdsp: [ fepdsp: [
{ label: "Stored in pool", value: "P" }, { label: "Stored in pool", value: "P" },
{ label: "Advised", value: "A" }, { label: "Advised", value: "A" },
...@@ -6761,12 +6765,14 @@ const CodeTable = { ...@@ -6761,12 +6765,14 @@ const CodeTable = {
{ label: "blank text", value: "" }, { label: "blank text", value: "" },
], ],
gtxinr1: [ gtxinr1: [
{ label: "Performance Guaratee2", value: "00000008" }, { label: "LMTEST01", value: "00000215" },
{ label: "Refund Guarantee", value: "00000006" }, { label: "blank text", value: "" },
{ label: "Advance/Down Payment Guarantee", value: "00000203" }, ],
{ label: "performance Gua for Project contracting", value: "00000202" }, gtxinr2: [
{ label: "LMTEST02", value: "00000216" }, { label: "LMTEST02", value: "00000216" },
{ lable: "LMTEST01", value: "00000215" }, { label: "blank text", value: "<NILTXT>" },
],
gtxinr3: [
{ label: "blank text", value: "" }, { label: "blank text", value: "" },
], ],
docstabot: [ docstabot: [
...@@ -6912,6 +6918,16 @@ const CodeTable = { ...@@ -6912,6 +6918,16 @@ const CodeTable = {
hndtyp7: [ hndtyp7: [
{ label: "Advise with confirmation", value: "FI" }, { label: "Advise with confirmation", value: "FI" },
], ],
hndtyp8: [
{ label: "Transfer", value: "OT" },
{ label: "Direct (we issue)", value: "OL" },
{ label: "Indirect (please issue)", value: "OC" },
],
demand:[
{label:"Multiple & partial demands not permitted",value:"NMPT"},
{label:"Multiple demands not permitted",value:"NMLT"},
{label:"Partial demands not permitted",value:"NPRT"},
],
legfrmc1: [ legfrmc1: [
{ label: "Demand Guarantee", value: "DGAR" }, { label: "Demand Guarantee", value: "DGAR" },
{ label: "Standby Letter of Credit", value: "STBY" }, { label: "Standby Letter of Credit", value: "STBY" },
...@@ -6936,21 +6952,76 @@ const CodeTable = { ...@@ -6936,21 +6952,76 @@ const CodeTable = {
{ label: "ISSU Issuance of undertaking", value: "ISSU" }, { label: "ISSU Issuance of undertaking", value: "ISSU" },
{ label: "ISCO Issuance of counter-undertaking", value: "ISCO" }, { label: "ISCO Issuance of counter-undertaking", value: "ISCO" },
], ],
gtxinr2: [
{ label: "LMTEST02", value: "00000216" }, ctytxt1:[
{ label: "blank text", value: "<NILTXT>" }, {label:"CN People's Republic of China",value:"CN"},
], {label:"HK HONG KONG",value:"HK"},
gtxinr3: [ {label:"GB Great Britain",value:"GB"},
{ label: "blank text", value: "" },
],
ctytxt1: [
{ label: "CN People's Republic of China", value: "CN" },
{ label: "HK HONG KONG", value: "HK" },
{ label: "GB Great Britain", value: "GB" },
], ],
trndoc_advdoc: [ trndoc_advdoc: [
{ label: "经核验,证实电相符/印鉴相符。", value: "" }, { label: "经核验,证实电相符/印鉴相符。", value: "" },
{ label: "信用证真实性待核实。", value: "2" }, { label: "信用证真实性待核实。", value: "2" },
], ],
swiftflg:[
{label:"是",value:"Y"},
{label:"否",value:"N"},
],
purposamein:[
{label:"ISCA Issuance of amendment to counter-undert.",value:"ISCA" },
{label:"ADVA Advice of amendment to issued undertaking",value:"ADVA" },
{label:"ACNA Advice and confirmation of amendment",value:"ACNA" },
{label:"ISUA Issuance of amendment to issued undertaking",value:"ISUA" },
{label:"ICCA Issuance of amendmt to issued counter-counter",value:"ICCA" },
],
purposame:[
{label:"ISCA Issuance of amendment to counter-undert.",value:"ISCA" },
{label:"ADVA Advice of amendment to issued undertaking",value:"ADVA" },
{label:"ACNA Advice and confirmation of amendment",value:"ACNA" },
{label:"ISUA Issuance of amendment to issued undertaking",value:"ISUA" },
{label:"ICCA Issuance of amendmt to issued counter-counter",value:"ICCA" },
],
ramrol:[
{label:"Applicant",value:"APL"},
{label:"Beneficiary",value:"BEN"},
],
redrea:[
{label:"Beneficiary",value:"BUFI"},
{label:"Others",value:"OTHR" },
{label:"Other",value:"NOAC"},
{label:"Fulfilled conditions for reduce",value:"REFU" },
{label:"Warranty period expired",value:"WOEX" },
],
exptyp:[
{label:"Expiry condition",value:"COND"},
{label:"Specified date of expiry",value:"FIXD"},
{label:"No specified date of expiry",value:"OPEN"},
],
liatypc:[
{label:"Expiry condition",value:"COND"},
{label:"Specified date of expiry",value:"FIXD"},
{label:"No specified date of expiry",value:"OPEN"},
],
delori1:[
{ label: "By collection", value: "COLL" },
{ label: "By courier (i. e. Fedex, DHL, UPS)", value: "COUR" },
{ label: "By mail", value: "MAIL" },
{ label: "By messenger - hand-deliver", value: "MESS" },
{ label: "Other method", value: "OTHR" },
{ label: "By registered mail or airmail", value: "REGM" },
],
delto:[
{label:"Specified address",value:"OTHR"},
],
deltoc:[
{label:"Specified address",value:"OTHR"},
{label:"Beneficiary",value:"BENE"},
],
gartypc:[
{label:"APAY",value:"APAY Advance Payment"},
{label:"PAYM",value:"PAYM Payment"},
{label:"PERF",value:"PERF Performance"},
{label:"TEND",value:"TEND Tender or Bid"},
{label:"WARR",value:"WARR Warrantyimaintenance"},
],
} }
export default CodeTable; export default CodeTable;
...@@ -98,6 +98,7 @@ export default class Botdav{ ...@@ -98,6 +98,7 @@ export default class Botdav{
}, },
botp:{ botp:{
ptsaddp:{ ptsaddp:{
ptsaddg: [],
}, },
recget:{ recget:{
sdamod:{ sdamod:{
......
...@@ -129,7 +129,7 @@ export default { ...@@ -129,7 +129,7 @@ export default {
], ],
"brdgrp.prb.pts.adrblk":[ "brdgrp.prb.pts.adrblk":[
{type: "string", required: true, message: "必输项"}, {type: "string", required: true, message: "必输项"},
{max: 200,message:"长度不能超过200"} {max: 300,message:"长度不能超过300"}
], ],
"brdgrp.prb.dbfadrblkcn":[ "brdgrp.prb.dbfadrblkcn":[
{type: "string", required: true, message: "必输项"}, {type: "string", required: true, message: "必输项"},
......
...@@ -233,7 +233,9 @@ export default class Utils { ...@@ -233,7 +233,9 @@ export default class Utils {
} }
static generateUUID() { static generateUUID() {
console.log(111);
var d = new Date().getTime(); var d = new Date().getTime();
console.log(2222);
if (window.performance && typeof window.performance.now === "function") { if (window.performance && typeof window.performance.now === "function") {
d += performance.now(); //use high-precision timer if available d += performance.now(); //use high-precision timer if available
} }
......
...@@ -26,7 +26,9 @@ ...@@ -26,7 +26,9 @@
</c-col> </c-col>
<c-col :span="4"> <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-button>
</c-col> </c-col>
...@@ -46,7 +48,9 @@ ...@@ -46,7 +48,9 @@
<c-col :span="4"> <c-col :span="4">
<c-button size="small" type="primary" icon="el-icon-search" @click="onDftinsButtxmsel"> <c-button
disabled
size="small" type="primary" icon="el-icon-search" @click="onDftinsButtxmsel">
</c-button> </c-button>
</c-col> </c-col>
...@@ -76,7 +80,9 @@ ...@@ -76,7 +80,9 @@
</c-col> </c-col>
<c-col :span="4"> <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-button>
</c-col> </c-col>
......
<template> <template>
<c-row> <c-row>
<c-col :span="11"> <c-col :span="11">
<c-ptap <c-ptap :model="model" :argadr="{
:model="model"
:argadr="{
title: 'Drawer', title: 'Drawer',
grp: 'bodgrp', grp: 'bodgrp',
rol: 'drr', rol: 'drr',
}" }" :disabled="true" @onSeainf="onSeainf">
:disabled="true" </c-ptap>
@onSeainf="onSeainf"
<c-ptap :model="model" :argadr="{
>
</c-ptap>
<c-ptap
:model="model"
:argadr="{
title: 'Drawee', title: 'Drawee',
grp: 'bodgrp', grp: 'bodgrp',
rol: 'dre', rol: 'dre',
}" }" :disabled="true" @onSeainf="onSeainf">
:disabled="true" </c-ptap>
@onSeainf="onSeainf" </c-col>
<c-col :span="11" :offset="1">
> <c-ptap :model="model" :argadr="{
</c-ptap>
</c-col>
<c-col :span="11" :offset="1">
<c-ptap
:model="model"
:argadr="{
title: 'Collecting Bank', title: 'Collecting Bank',
grp: 'bodgrp', grp: 'bodgrp',
rol: 'col', rol: 'col',
}" }" :disabled="true" @onSeainf="onSeainf">
:disabled="true" </c-ptap>
@onSeainf="onSeainf" </c-col>
> <c-col :span="24">
</c-ptap> <c-table max-height="300px" style="text-align: center;" stripe :list="this.model.botp.ptsaddp.ptsaddg || []"
</c-col> :paginationShow="false" :border="true">
<el-table-column label="角色" width="auto" prop="rol">
<c-col :span="24"> <template slot-scope="scope">
<c-edit-table :model="model" v-bind="ptsaddg"> <c-select v-model="scope.row.rol" :code="codes.ptyp2">
<el-table-column label="操作" text-align="center"> </c-select>
<template slot-scope="scope"> </template>
<el-button
size="mini" </el-table-column>
@click="handleEdit(scope.$index, scope.row)" <el-table-column label="机构实体" width="auto" prop="ptyextkey">
type="primary" <template slot-scope="scope">
>详情</el-button <c-input v-model="scope.row.ptyextkey" maxlength="12">
> </c-input>
</template> </template>
</el-table-column> </el-table-column>
</c-edit-table> <el-table-column label="名称" width="auto" prop="nam">
</c-col> <template slot-scope="scope">
</c-row> <c-input v-model="scope.row.nam" maxlength="12">
</c-input>
</template>
</el-table-column>
<el-table-column label="参考地址" width="auto" prop="ref">
<template slot-scope="scope">
<c-input v-model="scope.row.ref" maxlength="12">
</c-input>
</template>
</el-table-column>
<el-table-column label="Document" prop="docnam" width="auto">
<template slot="header" slot-scope="scope">
<c-row>
<c-col :span="12">
<span style="line-height: 36px;">操作</span>
</c-col>
<c-col :span="12">
<div style="float: right;">
<span class="add_del_button add_button" @click="addTableValue">+</span>
<span class="add_del_button" @click="deleteTable">-</span>
</div>
</c-col>
</c-row>
</template>
<template slot-scope="scope">
<el-button size="mini" @click="handleEdit(scope.$index, scope.row)" type="primary">详情
</el-button>
</template>
</el-table-column>
</c-table>
</c-col>
</c-row>
</template> </template>
<script> <script>
import Api from "~/service/Api" import Api from "~/service/Api"
import commonProcess from "~/mixin/commonProcess"; import commonProcess from "~/mixin/commonProcess";
import CodeTable from "~/config/CodeTable" import CodeTable from "~/config/CodeTable"
import Utils from "~/utils"; import Utils from "~/utils";
import Ptap from "~/views/Public/Ptap"; import Ptap from "~/views/Public/Ptap";
export default { export default {
components: { "c-ptap": Ptap }, components: { "c-ptap": Ptap },
inject: ['root'], inject: ['root'],
props:["model","codes"], props: ["model", "codes"],
mixins: [commonProcess], mixins: [commonProcess],
data(){ data() {
return { return {
ptsaddg: { }
columns: [ },
{ methods: {
title: "角色", ...Event,
width: "120px", addTableValue(index) {
dataIndex: "rol", var newTableValue = Object.assign({}, this.newValue);
show: "select", const serial = Utils.generateUUID();
code:"codes.ptyp2" newTableValue.serialNum = serial;
}, this.model.botp.ptsaddp.ptsaddg.splice(index - 1, 0, newTableValue);
{ },
title: "机构实体", deleteTable(index) {
width: "180px", this.model.botp.ptsaddp.ptsaddg.splice(index, 1);
dataIndex: "ptyextkey",
show: "input",
},
{
title: "名称",
width: "300px",
dataIndex: "nam",
},
{
title: "参考地址",
width: "300px",
dataIndex: "ref",
},
],
urls: "botp.ptsaddp.ptsaddg",
}, },
},
created: function () {
} }
},
methods:{...Event},
created:function(){
} }
}
</script> </script>
<style> <style>
</style> </style>
\ No newline at end of file
...@@ -49,19 +49,53 @@ ...@@ -49,19 +49,53 @@
</c-col> </c-col>
<c-col :span="24"> <c-col :span="24">
<c-edit-table :model="model" v-bind="ptsaddg" :disabledAll="true" :isAdd="false"> <c-table max-height="300px" style="text-align: center;" stripe :list="this.model.botp.ptsaddp.ptsaddg || []"
<el-table-column label="操作" text-align="center"> :paginationShow="false" :border="true">
<template slot-scope="scope"> <el-table-column label="角色" width="auto" prop="rol">
<el-button <template slot-scope="scope">
<c-select v-model="scope.row.rol" :code="codes.ptyp2">
size="mini" </c-select>
@click="handleEdit(scope.$index, scope.row)" </template>
type="primary"
>详情</el-button </el-table-column>
> <el-table-column label="机构实体" width="auto" prop="ptyextkey">
</template> <template slot-scope="scope">
</el-table-column> <c-input v-model="scope.row.ptyextkey" maxlength="12">
</c-edit-table> </c-input>
</template>
</el-table-column>
<el-table-column label="名称" width="auto" prop="nam">
<template slot-scope="scope">
<c-input v-model="scope.row.nam" maxlength="12">
</c-input>
</template>
</el-table-column>
<el-table-column label="参考地址" width="auto" prop="ref">
<template slot-scope="scope">
<c-input v-model="scope.row.ref" maxlength="12">
</c-input>
</template>
</el-table-column>
<el-table-column label="Document" prop="docnam" width="auto">
<template slot="header" slot-scope="scope">
<c-row>
<c-col :span="12">
<span style="line-height: 36px;">操作</span>
</c-col>
<c-col :span="12">
<div style="float: right;">
<span class="add_del_button add_button" @click="addTableValue">+</span>
<span class="add_del_button" @click="deleteTable">-</span>
</div>
</c-col>
</c-row>
</template>
<template slot-scope="scope">
<el-button size="mini" @click="handleEdit(scope.$index, scope.row)" type="primary">详情
</el-button>
</template>
</el-table-column>
</c-table>
</c-col> </c-col>
</c-row> </c-row>
</template> </template>
...@@ -80,36 +114,20 @@ export default { ...@@ -80,36 +114,20 @@ export default {
mixins: [commonProcess], mixins: [commonProcess],
data(){ data(){
return { return {
ptsaddg: {
columns: [
{
title: "角色",
width: "120px",
dataIndex: "rol",
show: "select",
},
{
title: "机构实体",
width: "180px",
dataIndex: "ptyextkey",
show: "input",
},
{
title: "名称",
width: "300px",
dataIndex: "nam",
},
{
title: "参考地址",
width: "300px",
dataIndex: "ref",
},
],
urls: "botp.ptsaddp.ptsaddg",
},
} }
}, },
methods:{...Event}, methods: {
...Event,
addTableValue(index) {
var newTableValue = Object.assign({}, this.newValue);
const serial = Utils.generateUUID();
newTableValue.serialNum = serial;
this.model.botp.ptsaddp.ptsaddg.splice(index - 1, 0, newTableValue);
},
deleteTable(index) {
this.model.botp.ptsaddp.ptsaddg.splice(index, 1);
},
},
created:function(){ created:function(){
onsole.log(this.root); onsole.log(this.root);
} }
......
<template> <template>
<c-row> <c-row>
<c-col :span="11"> <c-col :span="11">
<c-ptap <c-ptap :model="model" :argadr="{
:model="model"
:argadr="{
title: 'Drawer', title: 'Drawer',
grp: 'bodgrp', grp: 'bodgrp',
rol: 'drr', rol: 'drr',
}" }" :disabledRef="false" :disabledExtkey="true" :disabled="true" @onSeainf="onSeainf" @onAplpDet="onBenpDet">
:disabledRef="false" </c-ptap>
:disabledExtkey="true"
:disabled="true" <c-ptap :model="model" :argadr="{
@onSeainf="onSeainf"
@onAplpDet="onBenpDet"
>
</c-ptap>
<c-ptap
:model="model"
:argadr="{
title: 'Drawee', title: 'Drawee',
grp: 'bodgrp', grp: 'bodgrp',
rol: 'dre', rol: 'dre',
}" }" :disabledRef="true" :disabledExtkey="true" :disabled="true" @onSeainf="onSeainf" @onAplpDet="onBenpDet">
:disabledRef="true" </c-ptap>
:disabledExtkey="true" </c-col>
:disabled="true" <c-col :span="11" :offset="1">
@onSeainf="onSeainf" <c-ptap :model="model" :argadr="{
@onAplpDet="onBenpDet"
>
</c-ptap>
</c-col>
<c-col :span="11" :offset="1">
<c-ptap
:model="model"
:argadr="{
title: 'Collecting Bank', title: 'Collecting Bank',
grp: 'bodgrp', grp: 'bodgrp',
rol: 'col', rol: 'col',
}" }" :disabledRef="true" :disabledExtkey="true" :disabled="true" @onSeainf="onSeainf" @onAplpDet="onBenpDet">
:disabledRef="true" </c-ptap>
:disabledExtkey="true" </c-col>
:disabled="true"
@onSeainf="onSeainf" <c-col :span="24">
@onAplpDet="onBenpDet" <c-table max-height="300px" style="text-align: center;" stripe :list="this.model.botp.ptsaddp.ptsaddg || []"
> :paginationShow="false" :border="true">
</c-ptap> <el-table-column label="角色" width="auto" prop="rol">
</c-col> <template slot-scope="scope">
<c-select v-model="scope.row.rol" :code="codes.ptyp2">
<c-col :span="24"> </c-select>
<c-edit-table :model="model" v-bind="ptsaddg" > </template>
<el-table-column label="操作" text-align="center">
<template slot-scope="scope"> </el-table-column>
<el-button <el-table-column label="机构实体" width="auto" prop="ptyextkey">
<template slot-scope="scope">
size="mini" <c-input v-model="scope.row.ptyextkey" maxlength="12">
@click="handleEdit(scope.$index, scope.row)" </c-input>
type="primary" </template>
>详情</el-button </el-table-column>
> <el-table-column label="名称" width="auto" prop="nam">
</template> <template slot-scope="scope">
</el-table-column> <c-input v-model="scope.row.nam" maxlength="12">
</c-edit-table> </c-input>
</c-col> </template>
</c-row> </el-table-column>
<el-table-column label="参考地址" width="auto" prop="ref">
<template slot-scope="scope">
<c-input v-model="scope.row.ref" maxlength="12">
</c-input>
</template>
</el-table-column>
<el-table-column label="Document" prop="docnam" width="auto">
<template slot="header" slot-scope="scope">
<c-row>
<c-col :span="12">
<span style="line-height: 36px;">操作</span>
</c-col>
<c-col :span="12">
<div style="float: right;">
<span class="add_del_button add_button" @click="addTableValue">+</span>
<span class="add_del_button" @click="deleteTable">-</span>
</div>
</c-col>
</c-row>
</template>
<template slot-scope="scope">
<el-button size="mini" @click="handleEdit(scope.$index, scope.row)" type="primary">详情
</el-button>
</template>
</el-table-column>
</c-table>
</c-col>
<!-- <c-col :span="24">
<c-edit-table :model="model" v-bind="ptsaddg">
<el-table-column label="操作" text-align="center">
<template slot-scope="scope">
<el-button size="mini" @click="handleEdit(scope.$index, scope.row)" type="primary">详情
</el-button>
</template>
</el-table-column>
</c-edit-table>
</c-col> -->
</c-row>
</template> </template>
<script> <script>
import Api from "~/service/Api" import Api from "~/service/Api"
import commonProcess from "~/mixin/commonProcess"; import commonProcess from "~/mixin/commonProcess";
import CodeTable from "~/config/CodeTable" import CodeTable from "~/config/CodeTable"
import Event from "~/model/Botdcr/Event" import Event from "~/model/Botdcr/Event"
import Utils from "~/utils"; import Utils from "~/utils";
import Ptap from "~/views/Public/Ptap"; import Ptap from "~/views/Public/Ptap";
export default { export default {
components: { "c-ptap": Ptap }, components: { "c-ptap": Ptap },
inject: ['root'], inject: ['root'],
props:["model","codes"], props: ["model", "codes"],
mixins: [commonProcess], mixins: [commonProcess],
data(){ data() {
return { return {
ptsaddg: { // ptsaddg: {
columns: [ // columns: [
{ // {
title: "角色", // title: "角色",
width: "120px", // width: "120px",
dataIndex: "rol", // dataIndex: "rol",
show: "select", // show: "select",
code: [ // code: [
{ label: "1st Third Party", value: "TP1" }, // { label: "1st Third Party", value: "TP1" },
{ label: "2nd Third Party", value: "TP2" }, // { label: "2nd Third Party", value: "TP2" },
] // ]
}, // },
{ // {
title: "机构实体", // title: "机构实体",
width: "180px", // width: "180px",
dataIndex: "ptyextkey", // dataIndex: "ptyextkey",
show: "input", // show: "input",
}, // },
{ // {
title: "名称", // title: "名称",
width: "300px", // width: "300px",
dataIndex: "nam", // dataIndex: "nam",
}, // },
{ // {
title: "参考地址", // title: "参考地址",
width: "300px", // width: "300px",
dataIndex: "ref", // dataIndex: "ref",
// },
// ],
// urls: "botp.ptsaddp.ptsaddg",
// },
newValue: {
rol:"",
ptyextkey:"",
nam:"",
ref:"",
}, },
], }
urls: "botp.ptsaddp.ptsaddg", },
methods: {
...Event,
addTableValue(index) {
var newTableValue = Object.assign({}, this.newValue);
const serial = Utils.generateUUID();
newTableValue.serialNum = serial;
this.model.botp.ptsaddp.ptsaddg.splice(index - 1, 0, newTableValue);
}, },
deleteTable(index) {
this.model.botp.ptsaddp.ptsaddg.splice(index, 1);
},
},
created: function () {
onsole.log(this.root);
} }
},
methods:{...Event},
created:function(){
onsole.log(this.root);
} }
}
</script> </script>
<style> <style>
</style> </style>
\ No newline at end of file
...@@ -80,6 +80,7 @@ ...@@ -80,6 +80,7 @@
v-model="model.cpdgrp.orc.pts.ref" v-model="model.cpdgrp.orc.pts.ref"
maxlength="16" maxlength="16"
placeholder="" placeholder=""
disabled
></c-input> ></c-input>
</el-form-item> </el-form-item>
</c-col> </c-col>
...@@ -90,6 +91,7 @@ ...@@ -90,6 +91,7 @@
v-model="model.cpdgrp.rec.orcact" v-model="model.cpdgrp.rec.orcact"
maxlength="35" maxlength="35"
placeholder="汇款人账号" placeholder="汇款人账号"
disabled
></c-input> ></c-input>
</el-form-item> </el-form-item>
</c-col> </c-col>
...@@ -210,10 +212,10 @@ ...@@ -210,10 +212,10 @@
> >
<el-option <el-option
v-for="item in codes.cur" v-for="item in codes.currencycode"
:key="item.value" :key="item.value"
:label="item.label" :label="item.value+item.label"
:value="item.value" :value="item.value"
></el-option> ></el-option>
</c-select> </c-select>
</el-form-item> </el-form-item>
...@@ -256,10 +258,10 @@ ...@@ -256,10 +258,10 @@
> >
<el-option <el-option
v-for="item in codes.cur" v-for="item in codes.currencycode"
:key="item.value" :key="item.value"
:label="item.label" :label="item.value+item.label"
:value="item.value" :value="item.value"
></el-option> ></el-option>
</c-select> </c-select>
</el-form-item> </el-form-item>
......
...@@ -86,10 +86,10 @@ ...@@ -86,10 +86,10 @@
@change="commonExecuteRule('cpdgrp.cbs.nom1.cur')" @change="commonExecuteRule('cpdgrp.cbs.nom1.cur')"
> >
<el-option <el-option
v-for="item in codes.cur" v-for="item in codes.currencycode"
:key="item.value" :key="item.value"
:label="item.label" :label="item.value+item.label"
:value="item.value" :value="item.value"
></el-option> ></el-option>
</c-select> </c-select>
</c-form-item> </c-form-item>
...@@ -142,13 +142,12 @@ ...@@ -142,13 +142,12 @@
@keyup.enter.native="showGridPromptDialog('cptp.draweecountcode')" @keyup.enter.native="showGridPromptDialog('cptp.draweecountcode')"
></c-input> ></c-input>
<template slot="footer"> <template slot="footer">
<c-button <c-button
size="small"                 size="small"
type="primary"                 type="primary"
@click="onCptpSelbut"                 icon="el-icon-search"
icon="el-icon-search"                 @click="showGridPromptDialog('cptp.selbut', null, null,{TXT: 'cptp.draweecountcode'}, {TXT: false},'doxpDialog')"
style="margin-left:10px;padding: 0 10px;">               > </c-button>
</c-button>
</template> </template>
</c-fullbox> </c-fullbox>
</el-form-item> </el-form-item>
...@@ -338,10 +337,10 @@ ...@@ -338,10 +337,10 @@
placeholder="请选择国外费用币种" placeholder="请选择国外费用币种"
> >
<el-option <el-option
v-for="item in codes.cur" v-for="item in codes.currencycode"
:key="item.value" :key="item.value"
:label="item.label" :label="item.value+item.label"
:value="item.value" :value="item.value"
> >
</el-option> </el-option>
</c-select> </c-select>
......
...@@ -68,6 +68,14 @@ ...@@ -68,6 +68,14 @@
</c-tabs> </c-tabs>
</el-form> </el-form>
</div> </div>
<c-grid-ety-prompt-dialog
        ref="doxpDialog"
        :isPty="false"
        :promptData="promptData"
        @select-ety="selectMsg"
      >
      </c-grid-ety-prompt-dialog>
<c-grid-ety-prompt-dialog ref="etyDialog" :promptData="promptData" v-on:select-ety="selectEty"></c-grid-ety-prompt-dialog> <c-grid-ety-prompt-dialog ref="etyDialog" :promptData="promptData" v-on:select-ety="selectEty"></c-grid-ety-prompt-dialog>
</c-page> </c-page>
</template> </template>
......
...@@ -28,34 +28,34 @@ ...@@ -28,34 +28,34 @@
" "
></c-input> ></c-input>
</el-form-item> </el-form-item>
<!-- </c-col> <template slot="footer">
<c-col :span="6" style="text-align: right"> <!-- <c-button
<el-form-item label="" label-width="15px"> --> style="margin:0 10px 0 10px;padding: 0 12px;"
<!-- <c-col :span="12"> --> size="small"
<template slot="footer"> type="primary"
<c-button icon="el-icon-search"
style="margin:0 10px 0 10px;padding: 0 12px;" >
size="small" </c-button> -->
type="primary" <c-button
icon="el-icon-search"                 size="small"
>                 type="primary"
</c-button>                 icon="el-icon-search"
<!-- </c-col> -->                 @click="showGridPromptDialog('ptsget.sdamod.seainf', null, null,{TXT: 'cpdgrp.ori.pts.extkey'}, {TXT: false},'doxpDialog')"
<!-- <c-col :span="12"> -->               >
<c-button             </c-button>
style="margin:0 0"
size="small"
type="primary" <c-button
@click="onSndpDet" style="margin:0 0"
disabled size="small"
> type="primary"
详情 @click="onSndpDet"
</c-button> disabled
</template> >
<!-- </c-col> --> 详情
<!-- </el-form-item> --> </c-button>
</c-fullbox> </template>
<!-- </c-col> --> </c-fullbox>
</c-col> </c-col>
<c-col :span="24"> <c-col :span="24">
...@@ -151,7 +151,7 @@ ...@@ -151,7 +151,7 @@
></c-input> ></c-input>
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="24"> <c-col :span="24" v-show="false">
<el-form-item label="收款人名称" prop="pyenam"> <el-form-item label="收款人名称" prop="pyenam">
<c-input <c-input
v-model="model.pyenam" v-model="model.pyenam"
...@@ -161,7 +161,7 @@ ...@@ -161,7 +161,7 @@
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="24"> <c-col :span="24" v-show="false">
<el-form-item label="清算费用锁定服务" prop="cptp.qsfysd"> <el-form-item label="清算费用锁定服务" prop="cptp.qsfysd">
<c-select <c-select
v-model="model.cptp.qsfysd" v-model="model.cptp.qsfysd"
...@@ -256,12 +256,11 @@ ...@@ -256,12 +256,11 @@
v-model="model.cpdgrp.rec.curf33b" v-model="model.cpdgrp.rec.curf33b"
style="width: 100%" style="width: 100%"
placeholder="" placeholder=""
:disabled="model.cpdgrp.orc.pts.extkey && model.cpdgrp.pye.pts.extkey"
> >
<el-option <el-option
v-for="item in codes.cur" v-for="item in codes.currencycode"
:key="item.value" :key="item.value"
:label="item.label" :label="item.value+item.label"
:value="item.value" :value="item.value"
></el-option> ></el-option>
</c-select> </c-select>
...@@ -273,10 +272,11 @@ ...@@ -273,10 +272,11 @@
label-width="8px" label-width="8px"
prop="cpdgrp.rec.amtf33b" prop="cpdgrp.rec.amtf33b"
> >
<!-- :disabled="model.cpdgrp.orc.pts.extkey != '' && model.cpdgrp.pye.pts.extkey != ''" -->
<c-input <c-input
v-model="model.cpdgrp.rec.amtf33b" v-model="model.cpdgrp.rec.amtf33b"
placeholder="请输入原始金额" placeholder="请输入原始金额"
:disabled="model.cpdgrp.orc.pts.extkey != '' && model.cpdgrp.pye.pts.extkey != ''"
></c-input> ></c-input>
</el-form-item> </el-form-item>
</c-col> </c-col>
...@@ -287,7 +287,6 @@ ...@@ -287,7 +287,6 @@
<c-input <c-input
v-model="model.cpdgrp.rec.f36" v-model="model.cpdgrp.rec.f36"
placeholder="" placeholder=""
:disabled="model.cpdgrp.orc.pts.extkey != '' && model.cpdgrp.pye.pts.extkey != ''"
></c-input> ></c-input>
</el-form-item> </el-form-item>
</c-col> </c-col>
...@@ -302,13 +301,13 @@ ...@@ -302,13 +301,13 @@
v-model="model.cpdgrp.rec.cur71f" v-model="model.cpdgrp.rec.cur71f"
placeholder="" placeholder=""
style="width: 100%" style="width: 100%"
:disabled="model.cpdgrp.orc.pts.extkey != '' && model.cpdgrp.pye.pts.extkey != ''"
> >
<el-option <el-option
v-for="item in codes.cur" v-for="item in codes.currencycode"
:key="item.value" :key="item.value"
:label="item.label" :label="item.value+item.label"
:value="item.value" :value="item.value"
></el-option> ></el-option>
</c-select> </c-select>
</el-form-item> </el-form-item>
...@@ -322,7 +321,6 @@ ...@@ -322,7 +321,6 @@
<c-input <c-input
v-model="model.cpdgrp.rec.amt71f" v-model="model.cpdgrp.rec.amt71f"
placeholder="请输入发报行扣费金额" placeholder="请输入发报行扣费金额"
:disabled="model.cpdgrp.orc.pts.extkey != '' && model.cpdgrp.pye.pts.extkey != ''"
></c-input> ></c-input>
</el-form-item> </el-form-item>
</c-col> </c-col>
......
...@@ -118,9 +118,9 @@ ...@@ -118,9 +118,9 @@
@change="onNom1CurChange" @change="onNom1CurChange"
> >
<el-option <el-option
v-for="item in codes.cur" v-for="item in codes.currencycode"
:key="item.value" :key="item.value"
:label="item.label" :label="item.value+item.label"
:value="item.value" :value="item.value"
></el-option> ></el-option>
</c-select> </c-select>
...@@ -206,7 +206,7 @@ ...@@ -206,7 +206,7 @@
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
style="width: 100%" style="width: 100%"
placeholder="" placeholder=""
:disabled="!model.cpdgrp.rec.ischktyp || model.cpdgrp.rec.ischktyp == 'N'" :disabled=this.flag1
></c-date-picker> ></c-date-picker>
</el-form-item> </el-form-item>
</c-col> </c-col>
...@@ -348,33 +348,35 @@ ...@@ -348,33 +348,35 @@
<c-col :span="24"> <c-col :span="24">
<c-fullbox> <c-fullbox>
<el-form-item <c-col :span="20">
label="收款人常驻国家/地区代码" <c-col :span="21">
prop="cptp.payeecountcode" <el-form-item
> label="收款人常驻国家/地区代码"
<c-input prop="cptp.payeecountcode">
v-model="model.cptp.payeecountcode" <c-input
maxlength="3" v-model="model.cptp.payeecountcode"
placeholder="请输入收款人常驻国家/地区代码" maxlength="3"
@keyup.enter.native=" placeholder="请输入收款人常驻国家/地区代码"
showGridPromptDialog('cptp.payeecountcode') @keyup.enter.native="
" showGridPromptDialog('cptp.payeecountcode')
style="width: 100%" "
></c-input> style="width: 100%"
</el-form-item> ></c-input>
</el-form-item>
</c-col>
<c-col :span="3">
<c-button
                size="small"
                type="primary"
                icon="el-icon-search"
                @click="showGridPromptDialog('cptp.selbut1', null, null,{TXT: 'cptp.payeecountcode'}, {TXT: false},'doxpDialog')"
              > </c-button>
</c-col>
</c-col>
<template slot="footer"> <c-col :span="4" style="float: right">
<c-button <c-checkbox v-model="model.cpdgrp.rec.tsnflg" label-width="150px" >同名划转</c-checkbox>
size="small" </c-col>
type="primary"
icon="el-icon-search"
@click="onCptpGetinf"
>
</c-button>
<c-checkbox v-model="model.cpdgrp.rec.tsnflg"
>同名划转</c-checkbox
>
</template>
</c-fullbox> </c-fullbox>
</c-col> </c-col>
...@@ -466,7 +468,7 @@ export default { ...@@ -466,7 +468,7 @@ export default {
{ value: "O", label: "Other" }, { value: "O", label: "Other" },
{ value: "S", label: "CIPS系统" }, { value: "S", label: "CIPS系统" },
], ],
flag1:false,
}; };
}, },
methods: { methods: {
...@@ -474,6 +476,20 @@ export default { ...@@ -474,6 +476,20 @@ export default {
onCptpGetref() {}, onCptpGetref() {},
onCptpGetmod() {}, onCptpGetmod() {},
}, },
watch:{
"model.cpdgrp.rec.ischktyp":{
immediate:true,
handler(val ,oldVal){
if(this.model.cpdgrp.rec.ischktyp == 'N'){
this.flag1=true;
this.model.cpdgrp.rec.paydat="";
}
else{
this.flag1=false;
}
}
},
},
created: function () {}, created: function () {},
computed: { computed: {
flag() { flag() {
......
...@@ -96,7 +96,14 @@ ...@@ -96,7 +96,14 @@
</c-tabs> </c-tabs>
</el-form> </el-form>
</div> </div>
<c-grid-ety-prompt-dialog
        ref="doxpDialog"
        :isPty="false"
        :promptData="promptData"
        @select-ety="selectMsg"
      >
      </c-grid-ety-prompt-dialog>
<c-grid-ety-prompt-dialog ref="etyDialog" :promptData="promptData" v-on:select-ety="selectEty"></c-grid-ety-prompt-dialog> <c-grid-ety-prompt-dialog ref="etyDialog" :promptData="promptData" v-on:select-ety="selectEty"></c-grid-ety-prompt-dialog>
</c-page> </c-page>
</template> </template>
......
...@@ -22,8 +22,10 @@ ...@@ -22,8 +22,10 @@
<m-opnp :model="model" :codes="codes"/> <m-opnp :model="model" :codes="codes"/>
</el-tab-pane> </el-tab-pane>
<!--gitamep PD002031 Amendment --> <!--gitamep PD002031 Amendment -->
<el-tab-pane :label="$t('gitamep.PD002031')" name="ameps20"> <el-tab-pane label="Amendment" name="ameps20">
<m-ameps20 :model="model" :codes="codes"/> <c-content>
<m-ameps20 :model="model" :codes="codes"/>
</c-content>
</el-tab-pane> </el-tab-pane>
<!--gitamep PD002100 Amendment Dates --> <!--gitamep PD002100 Amendment Dates -->
<!-- <el-tab-pane :label="$t('gitamep.PD002100')" name="amedat20"> <!-- <el-tab-pane :label="$t('gitamep.PD002100')" name="amedat20">
......
...@@ -224,7 +224,7 @@ ...@@ -224,7 +224,7 @@
placeholder="请选择Handling Type" placeholder="请选择Handling Type"
> >
<el-option <el-option
v-for="item in codes.hndtyp" v-for="item in codes.hndtyp8"
:key="item.value" :key="item.value"
:label="item.label" :label="item.label"
:value="item.value" :value="item.value"
...@@ -422,7 +422,7 @@ ...@@ -422,7 +422,7 @@
placeholder="请选择Type of Undertaking" placeholder="请选择Type of Undertaking"
> >
<el-option <el-option
v-for="item in codes.typgar" v-for="item in codes.seagtyp"
:key="item.value" :key="item.value"
:label="item.label" :label="item.label"
:value="item.value" :value="item.value"
...@@ -519,7 +519,7 @@ ...@@ -519,7 +519,7 @@
placeholder="请选择Language of Undertak." placeholder="请选择Language of Undertak."
> >
<el-option <el-option
v-for="item in codes.uiltxt" v-for="item in codes.uiltxt1"
:key="item.value" :key="item.value"
:label="item.label" :label="item.label"
:value="item.value" :value="item.value"
...@@ -552,7 +552,7 @@ ...@@ -552,7 +552,7 @@
placeholder="请选择Language of Undertak." placeholder="请选择Language of Undertak."
> >
<el-option <el-option
v-for="item in codes.uiltxt" v-for="item in codes.uiltxt2"
:key="item.value" :key="item.value"
:label="item.label" :label="item.label"
:value="item.value" :value="item.value"
...@@ -1849,6 +1849,11 @@ export default { ...@@ -1849,6 +1849,11 @@ export default {
}, },
}, },
watch:{ watch:{
"model.gidgrp.rec.expflg":function () {
if(this.model.gidgrp.rec.expflg=='X'&&this.model.gidgrp.rec.hndtyp=='OC'){
this.model.gidgrp.rec.liaflg='X';
}
},
}, },
methods:{ methods:{
...Event, ...Event,
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
<c-fullbox> <c-fullbox>
<c-select :disabled="model.gidgrp.rec.purpos=='ICCO'||model.gidgrp.rec.purpos=='ISCO'" v-model="model.gidgrp.rec.delori" style="width:100%" placeholder="请选择Delivery of Undertak."> <c-select :disabled="model.gidgrp.rec.purpos=='ICCO'||model.gidgrp.rec.purpos=='ISCO'" v-model="model.gidgrp.rec.delori" style="width:100%" placeholder="请选择Delivery of Undertak.">
<el-option <el-option
v-for="item in codes.delori" v-for="item in codes.delori1"
:key="item.value" :key="item.value"
:label="item.label" :label="item.label"
:value="item.value" :value="item.value"
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
</el-option> </el-option>
</c-select> </c-select>
<template slot="footer"> <template slot="footer">
<c-input :disabled="model.gidgrp.rec.delori!='COUR'||model.gidgrp.rec.delori!='OTHR'" v-model="model.gidgrp.rec.deloritxt" maxlength="35" placeholder="请输入Delivery of Undertak."></c-input> <c-input :disabled="model.gidgrp.rec.delori!='COUR'&&model.gidgrp.rec.delori!='OTHR'" v-model="model.gidgrp.rec.deloritxt" maxlength="35" placeholder="请输入Delivery of Undertak."></c-input>
</template> </template>
</c-fullbox> </c-fullbox>
</el-form-item> </el-form-item>
...@@ -53,7 +53,7 @@ ...@@ -53,7 +53,7 @@
<c-col :span="24"> <c-col :span="24">
<el-form-item label="Delivery to Address" prop="gidgrp.blk.deltoadr"> <el-form-item label="Delivery to Address" prop="gidgrp.blk.deltoadr">
<c-input disabled type="textarea" v-model="model.gidgrp.blk.deltoadr" maxlength="35" show-word-limit placeholder="请输入Delivery to Address" ></c-input> <c-input :disabled="model.gidgrp.rec.delto==''" type="textarea" v-model="model.gidgrp.blk.deltoadr" maxlength="35" show-word-limit placeholder="请输入Delivery to Address" ></c-input>
</el-form-item> </el-form-item>
</c-col> </c-col>
......
...@@ -188,7 +188,7 @@ ...@@ -188,7 +188,7 @@
<el-form-item v-show="model.gitp.swiftflg=='Y'" label="Outgoing Purpose" prop="gidgrp.rec.purpos"> <el-form-item v-show="model.gitp.swiftflg=='Y'" label="Outgoing Purpose" prop="gidgrp.rec.purpos">
<c-select v-model="model.gidgrp.rec.purpos" style="width:100%" placeholder="请选择Outgoing Purpose"> <c-select v-model="model.gidgrp.rec.purpos" style="width:100%" placeholder="请选择Outgoing Purpose">
<el-option <el-option
v-for="item in codes.purpos" v-for="item in codes.purpos1"
:key="item.value" :key="item.value"
:label="item.label" :label="item.label"
:value="item.value" :value="item.value"
...@@ -230,7 +230,7 @@ ...@@ -230,7 +230,7 @@
placeholder="请选择Type of Undertaking" placeholder="请选择Type of Undertaking"
> >
<el-option <el-option
v-for="item in codes.typgar" v-for="item in codes.seagtyp"
:key="item.value" :key="item.value"
:label="item.label" :label="item.label"
:value="item.value" :value="item.value"
...@@ -378,7 +378,7 @@ ...@@ -378,7 +378,7 @@
placeholder="请选择是否分离式保函" placeholder="请选择是否分离式保函"
> >
<el-option <el-option
v-for="item in codes.fenlishi" v-for="item in codes.fenlishi2"
:key="item.value" :key="item.value"
:label="item.label" :label="item.label"
:value="item.value" :value="item.value"
...@@ -610,7 +610,7 @@ ...@@ -610,7 +610,7 @@
></c-date-picker> ></c-date-picker>
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="7" v-show="model.gitp.swiftflg!='Y'" class="centerLable"> <c-col :span="7" v-if="model.gitp.swiftflg!='Y'" class="centerLable">
<c-checkbox v-model="model.gidgrp.rec.expflg" <c-checkbox v-model="model.gidgrp.rec.expflg"
>Unlimited Guarantee</c-checkbox >Unlimited Guarantee</c-checkbox
> >
......
...@@ -6,9 +6,9 @@ ...@@ -6,9 +6,9 @@
<c-col :span="24"> <c-col :span="24">
<el-form-item label="Delivery of Undertak." prop="gidgrp.rec.delori"> <el-form-item label="Delivery of Undertak." prop="gidgrp.rec.delori">
<c-fullbox> <c-fullbox>
<c-select :disabled="model.gidgrp.rec.purpos!='ISSU'" v-model="model.gidgrp.rec.delori" style="width:100%" placeholder="请选择Delivery of Undertak."> <c-select :disabled="model.gidgrp.rec.purpos=='ICCO'||model.gidgrp.rec.purpos=='ISCO'" v-model="model.gidgrp.rec.delori" style="width:100%" placeholder="请选择Delivery of Undertak.">
<el-option <el-option
v-for="item in codes.delori" v-for="item in codes.delori1"
:key="item.value" :key="item.value"
:label="item.label" :label="item.label"
:value="item.value" :value="item.value"
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
</el-option> </el-option>
</c-select> </c-select>
<template slot="footer"> <template slot="footer">
<c-input disabled v-model="model.gidgrp.rec.deloritxt" maxlength="35" placeholder="请输入Delivery of Undertak."></c-input> <c-input :disabled="model.gidgrp.rec.delori!='COUR'&&model.gidgrp.rec.delori!='OTHR'" v-model="model.gidgrp.rec.deloritxt" maxlength="35" placeholder="请输入Delivery of Undertak."></c-input>
</template> </template>
</c-fullbox> </c-fullbox>
</el-form-item> </el-form-item>
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
<c-col :span="24"> <c-col :span="24">
<el-form-item label="Undertaking Send to" prop="gidgrp.rec.sndto"> <el-form-item label="Undertaking Send to" prop="gidgrp.rec.sndto">
<c-select :disabled="model.gidgrp.rec.purpos!='ISSU'" v-model="model.gidgrp.rec.sndto" style="width:100%" placeholder="请选择Undertaking Send to"> <c-select :disabled="model.gidgrp.rec.purpos=='ICCO'||model.gidgrp.rec.purpos=='ISCO'" v-model="model.gidgrp.rec.sndto" style="width:100%" placeholder="请选择Undertaking Send to">
<el-option <el-option
v-for="item in codes.rolall" v-for="item in codes.rolall"
:key="item.value" :key="item.value"
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
<c-col :span="24"> <c-col :span="24">
<el-form-item label="Deliv. To/Collection By" prop="gidgrp.rec.delto"> <el-form-item label="Deliv. To/Collection By" prop="gidgrp.rec.delto">
<c-select :disabled="model.gidgrp.rec.purpos!='ISSU'" v-model="model.gidgrp.rec.delto" style="width:100%" placeholder="请选择Deliv. To/Collection By"> <c-select :disabled="model.gidgrp.rec.purpos=='ICCO'||model.gidgrp.rec.purpos=='ISCO'" v-model="model.gidgrp.rec.delto" style="width:100%" placeholder="请选择Deliv. To/Collection By">
<el-option <el-option
v-for="item in codes.delto" v-for="item in codes.delto"
:key="item.value" :key="item.value"
...@@ -52,7 +52,7 @@ ...@@ -52,7 +52,7 @@
<c-col :span="24"> <c-col :span="24">
<el-form-item label="Delivery to Address" prop="gidgrp.blk.deltoadr"> <el-form-item label="Delivery to Address" prop="gidgrp.blk.deltoadr">
<c-input disabled type="textarea" v-model="model.gidgrp.blk.deltoadr" maxlength="35" show-word-limit placeholder="请输入Delivery to Address" ></c-input> <c-input :disabled="model.gidgrp.rec.delto==''" type="textarea" v-model="model.gidgrp.blk.deltoadr" maxlength="35" show-word-limit placeholder="请输入Delivery to Address" ></c-input>
</el-form-item> </el-form-item>
</c-col> </c-col>
...@@ -108,7 +108,7 @@ ...@@ -108,7 +108,7 @@
<c-col :span="13"> <c-col :span="13">
<c-col :span="20"> <c-col :span="20">
<el-form-item label="Presentation Instr." prop="gidgrp.blk.preper"> <el-form-item label="Presentation Instr." prop="gidgrp.blk.preper">
<c-input :disabled="model.gitp.prepermodflg!='X'" type="textarea" :rows="5" v-model="model.gidgrp.blk.preper" maxlength="65" show-word-limit placeholder="请输入Presentation Instr." ></c-input> <c-input :disabled="model.gitp.prepermodflg == ''" type="textarea" :rows="5" v-model="model.gidgrp.blk.preper" maxlength="65" show-word-limit placeholder="请输入Presentation Instr." ></c-input>
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="4"> <c-col :span="4">
......
...@@ -137,6 +137,7 @@ ...@@ -137,6 +137,7 @@
placeholder="请选择Currency" placeholder="请选择Currency"
:code="codes.currencycode" :code="codes.currencycode"
> >
</c-select> </c-select>
</el-form-item> </el-form-item>
</c-col> </c-col>
...@@ -325,7 +326,7 @@ export default { ...@@ -325,7 +326,7 @@ export default {
width: 100, width: 100,
pattern: "code", pattern: "code",
label: "状态", label: "状态",
code: "relstaEN", code: this.codes.relstaEN,
}, },
'5 5 "币种" 80', '5 5 "币种" 80',
'6 6 "金额" 110', '6 6 "金额" 110',
...@@ -336,7 +337,7 @@ export default { ...@@ -336,7 +337,7 @@ export default {
'1 1 "Reference" 140', '1 1 "Reference" 140',
'2 2 "Resp. User" 100', '2 2 "Resp. User" 100',
//'3 3 "Goods Code" 100 1 0 1 GODCOD', //'3 3 "Goods Code" 100 1 0 1 GODCOD',
{ index: 3, position: 3, width: 100, pattern: "code", label: "Goods Code" ,"code":"godcod"}, { index: 3, position: 3, width: 100, pattern: "code", label: "Goods Code" ,"code":this.codes.godcod},
'7 4 "Party Number1" 133', '7 4 "Party Number1" 133',
'8 5 "Applicant" 160', '8 5 "Applicant" 160',
'9 6 "Applicant CN" 133', '9 6 "Applicant CN" 133',
...@@ -386,6 +387,9 @@ export default { ...@@ -386,6 +387,9 @@ export default {
this.trnData.data = rtnmsg.data.infcon_trnstm.rows; this.trnData.data = rtnmsg.data.infcon_trnstm.rows;
} }
}, },
async closeTrn(refId) {
this.$refs[refId].doClose();
},
}, },
created: function () {}, created: function () {},
}; };
......
...@@ -401,7 +401,8 @@ ...@@ -401,7 +401,8 @@
</el-table-column> </el-table-column>
</c-istream-table> </c-istream-table>
</c-col> </c-col>
<!-- <m-busbtn ref="childs" :ownref="ownref" @onChoose="onChoose"></m-busbtn> -->
<m-busbtn ref="childs" :ownref="ownref" trnCode="cptsel" :model="cptselModel" ownrefPath="cpdgrp" @onChoose="onChoose" >11</m-busbtn>
</div> </div>
</template> </template>
...@@ -411,6 +412,7 @@ import commonProcess from "~/mixin/commonProcess"; ...@@ -411,6 +412,7 @@ import commonProcess from "~/mixin/commonProcess";
import CodeTable from "~/config/CodeTable"; import CodeTable from "~/config/CodeTable";
import Event from "~/model/Infcpd/Event"; import Event from "~/model/Infcpd/Event";
import BusNavbar from "~/views/Public/BusNavbar"; import BusNavbar from "~/views/Public/BusNavbar";
import CptselModel from "~/model/Cptsel"
export default { export default {
...@@ -427,6 +429,7 @@ export default { ...@@ -427,6 +429,7 @@ export default {
{ label: "Payee", value: "PYE" }, { label: "Payee", value: "PYE" },
{ label: "Reimb. Bank Transfer", value: "RMT" }, { label: "Reimb. Bank Transfer", value: "RMT" },
], ],
cptselModel: new CptselModel().data,
searchToggle: true, searchToggle: true,
ownref: "", ownref: "",
dialogTableVisible: false, dialogTableVisible: false,
...@@ -443,7 +446,7 @@ export default { ...@@ -443,7 +446,7 @@ export default {
width: 100, width: 100,
pattern: "code", pattern: "code",
label: "状态", label: "状态",
code: this.codes.relstaEN, code: "relstaEN",
}, },
'5 5 "币种" 80', '5 5 "币种" 80',
'6 6 "金额" 100', '6 6 "金额" 100',
...@@ -541,7 +544,6 @@ export default { ...@@ -541,7 +544,6 @@ export default {
closeTrn(refId){ closeTrn(refId){
this.$refs[refId].doClose(); this.$refs[refId].doClose();
}, },
handleReset() {},
toCptopn(){ toCptopn(){
this.$router.history.push("/business/cptopn") this.$router.history.push("/business/cptopn")
}, },
......
...@@ -309,15 +309,15 @@ ...@@ -309,15 +309,15 @@
<!-- <el-row> --> <!-- <el-row> -->
<c-col :span="24"> <c-col :span="24">
<c-istream-table :list="stmData.data" :columns="stmData.columns"> <c-istream-table :list="stmData.data" :columns="stmData.columns" :showButtonFlg="true">
<el-table-column fixed="right" prop="op" label="操作" width="140px"> <el-table-column fixed="right" prop="op" label="操作" width="140px">
<template slot="header"> <template slot="header">
<c-col :span="11" style="text-align: left" <c-col :span="11" style="text-align: left"
><span>操作</span></c-col ><span>操作</span></c-col
> >
<c-col :span="12" style="text-align: right" <!-- <c-col :span="12" style="text-align: right"
><c-button icon="el-icon-s-tools"></c-button ><c-button icon="el-icon-s-tools"></c-button
></c-col> ></c-col> -->
</template> </template>
<template slot-scope="scope"> <template slot-scope="scope">
<el-popover <el-popover
...@@ -611,7 +611,7 @@ export default { ...@@ -611,7 +611,7 @@ export default {
// '3 3 "日期" 200', // '3 3 "日期" 200',
{index:3,position:3,width:110,pattern:'date',label:'日期'}, {index:3,position:3,width:110,pattern:'date',label:'日期'},
// '4 4 "状态" 50', // '4 4 "状态" 50',
{index:4,position:4,width:100,pattern:'code',label:'状态',code:this.codes.relstaEN}, {index:4,position:4,width:100,pattern:'code',label:'状态',code:"relstaEN"},
'5 5 "币种" 80', '5 5 "币种" 80',
'6 6 "金额" 110', '6 6 "金额" 110',
], ],
......
...@@ -206,6 +206,7 @@ ...@@ -206,6 +206,7 @@
v-model="model.infcon.seacur" v-model="model.infcon.seacur"
style="width: 100%" style="width: 100%"
placeholder="请选择Currency" placeholder="请选择Currency"
:code="codes.cur"
> >
<el-option <el-option
v-for="item in codes.seacur" v-for="item in codes.seacur"
...@@ -454,7 +455,7 @@ import Event from "~/model/Inflid/Event"; ...@@ -454,7 +455,7 @@ import Event from "~/model/Inflid/Event";
import Litsel from "~/model/Litsel" import Litsel from "~/model/Litsel"
import BusNavbar from "~/views/Public/BusNavbar"; import BusNavbar from "~/views/Public/BusNavbar";
export default { export default {
inject: ["root"], inject: ["root"],
...@@ -481,7 +482,7 @@ export default { ...@@ -481,7 +482,7 @@ export default {
width: 100, width: 100,
pattern: "code", pattern: "code",
label: "状态", label: "状态",
code: this.codes.relstaEN, code: "relstaEN",
}, },
'5 5 "币种" 80', '5 5 "币种" 80',
'6 6 "金额" 110', '6 6 "金额" 110',
...@@ -493,22 +494,26 @@ export default { ...@@ -493,22 +494,26 @@ export default {
'1 1 "Reference" 120', '1 1 "Reference" 120',
'2 2 "Resp. User" 100', '2 2 "Resp. User" 100',
'3 3 "Tenor day" 100 ', '3 3 "Tenor day" 100 ',
'4 4 "Goods Code" 100 ', // '4 4 "Goods Code" 100 ',
'5 13 "Opened" 500 4 7', { index: 4, position: 4, width: 100, pattern: "code", label: "Goods Code" ,"code":"godcod"},
'6 14 "Expired" 500 4 7', //'5 11 "Opened" 500 4 7',
'7 15 "Closed" 500 4 7', { index: 5, position: 11, width: 100, pattern: "date", label: "Opened"},
'8 17 "分行名称" 136', //'6 12 "Expired" 500 4 7',
{ index: 6, position: 12, width: 100, pattern: "date", label: "Expired"},
//'7 13 "Closed" 500 4 7',
{ index: 7, position: 13, width: 100, pattern: "date", label: "Closed"},
'8 19 "分行名称" 136',
'9 16 "PTA NO." 410', '9 16 "PTA NO." 410',
'10 5 "Party Number" 191', '10 5 "Party Number" 191',
'11 8 "Applicant" 191', '11 6 "Applicant" 191',
'12 9 "Applicant CN" 191', '12 7 "Applicant CN" 191',
'13 11 "Advising Bank BIC" 165', '13 10 "Advising Bank BIC" 165',
'14 10 "Party Number" 165', '14 8 "Party Number" 165',
'15 12 "Beneficiary" 165', '15 9 "Beneficiary" 165',
'16 6 "Cur" 80', '16 14 "Cur" 80',
'17 7 "L/C Amount" 110 2 8 1 16', '17 17 "L/C Amount" 110 2 8 1 16',
'18 18 "Cur" 410', '18 15 "Cur" 410',
'19 19 "Open Amount" 110 2 8 1 18', '19 18 "Open Amount" 110 2 8 1 18',
// '1 1 "Reference" 130 200', // '1 1 "Reference" 130 200',
// "2 2 \"经办柜员\" 90 80", // "2 2 \"经办柜员\" 90 80",
// "5 5 \"开立日期\" 180 300", // "5 5 \"开立日期\" 180 300",
......
...@@ -246,9 +246,9 @@ ...@@ -246,9 +246,9 @@
<c-col :span="12"> <c-col :span="12">
<el-form-item label="款项去向" prop="outlen.acttyp"> <el-form-item label="款项去向" prop="outlen.acttyp">
<c-select <c-select
disabled :disabled="this.flag1"
v-model="model.outlen.acttyp" v-model="model.outlen.acttyp"
:code="codes.acttyp1" :code="codes.acttyp"
></c-select> ></c-select>
</el-form-item> </el-form-item>
</c-col> </c-col>
...@@ -373,7 +373,7 @@ ...@@ -373,7 +373,7 @@
<el-form-item label="Address Block" prop="brdgrp.prb.pts.adrblk"> <el-form-item label="Address Block" prop="brdgrp.prb.pts.adrblk">
<c-input <c-input
:rows="4" :rows="4"
type="textarea" v-model="model.brdgrp.prb.pts.adrblk" maxlength="100" show-word-limit placeholder="请输入Address Block" ></c-input> type="textarea" v-model="model.brdgrp.prb.pts.adrblk" maxlength="300" show-word-limit placeholder="请输入Address Block" ></c-input>
</el-form-item> </el-form-item>
</c-col> </c-col>
...@@ -527,8 +527,20 @@ export default { ...@@ -527,8 +527,20 @@ export default {
mixins: [commonProcess], mixins: [commonProcess],
data(){ data(){
return { return {
flag1:true
}
},
watch:{
"model.outlen.szflg":{
immediate:true,
handler(val,oldval){
if(this.model.outlen.szflg == '1'){
this.flag1=false;
}else{
this.flag1=true;
}
} }
}
}, },
methods:{...Event}, methods:{...Event},
created:function(){ created:function(){
......
...@@ -182,6 +182,8 @@ export default { ...@@ -182,6 +182,8 @@ export default {
}, },
methods:{ methods:{
getType(idx) { getType(idx) {
console.log(this.codes);
for (let i = 0; i < this.codes.doceotCortyp.length; i++) { for (let i = 0; i < this.codes.doceotCortyp.length; i++) {
const c = this.codes.doceotCortyp[i]; const c = this.codes.doceotCortyp[i];
if (this.model.trnmod.trndoc.doceot[idx].cortyp === c.value) { if (this.model.trnmod.trndoc.doceot[idx].cortyp === c.value) {
......
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