Commit 4f2f77a7 by wangren

litopn ,litdck交易bug修改

parent 48f848f6
...@@ -238,7 +238,7 @@ export default { ...@@ -238,7 +238,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",
...@@ -334,9 +334,6 @@ export default { ...@@ -334,9 +334,6 @@ export default {
return "" return ""
} }
let args=this.codes[code]; let args=this.codes[code];
if (!args) {
return ""
}
let em = args.find(item=>item.value.trim() == value.trim()) let em = args.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)" },
], ],
......
...@@ -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: "必输项"},
......
...@@ -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>
......
...@@ -221,7 +221,7 @@ ...@@ -221,7 +221,7 @@
<c-col :span="24"> <c-col :span="24">
<c-istream-table :list="stmData.data" <c-istream-table :list="stmData.data"
:columns="columns"> :columns="columns" :showButtonFlg="true">
<el-table-column fixed="right" prop="op" label="操作" width="150px"> <el-table-column fixed="right" prop="op" label="操作" width="150px">
<template slot-scope="scope"> <template slot-scope="scope">
<el-popover <el-popover
......
...@@ -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"
...@@ -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,7 +527,19 @@ export default { ...@@ -527,7 +527,19 @@ 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},
......
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