Commit a92181f0 by xiameng

litdla Tab整合优化,UI调整,inffee修改

parent 109ab914
......@@ -19,14 +19,12 @@ export default {
const selDst= "dspstm";
let params = {selIds,selDst};
this.model.infbut.selrow = idx + 1;
let rtnmsg = await this.executeRule("infbut.dsp", params)
let rtnmsg = await this.executeRule("infbut.dspstm", params)
if(rtnmsg.respCode == SUCCESS)
{
//TODO 处理数据逻辑
 this.stmData.data = rtnmsg.data.infbut_dspstm.rows;
console.log(selrow)
//console.log(selrow)
this.updateModel(rtnmsg.data);
this.root.tabVal="feep";
}
else
......
......@@ -7,10 +7,11 @@ export default class Inffee{
cod:"", // FEE .cod
infbut:{
dspstm:"", // display stream .infbut.dspstm
evtstm:"", // Stream for Events of Object .infbut.evtstm
// dsp:"",
selrow: 0,
// evtstm:"", // Stream for Events of Object .infbut.evtstm
vermod:{
difsrm:"", // displayable stream of differences .infbut.vermod.difsrm
selrow:0,
},
},
nam:"", // Feecode Description .nam
......
......@@ -94,27 +94,29 @@ import Api from "~/service/Api";
import commonProcess from "~/mixin/commonProcess";
import CodeTable from "~/config/CodeTable";
import Event from "~/model/Inffee/Event";
import commonFuncs from "~/mixin/commonFuncs"
export default {
inject: ['root'],
props:["model","codes"],
mixins: [commonProcess],
mixins: [commonProcess,commonFuncs],
data(){
return {
// initdialog: false,
// radio: 3,
searchToggle: false,
stmData: {
columns: [
"1 1 \"Fee Cod\" 100 ",
"0 2\"Description\" 150 FEETXT",
"2 3 \"Relevant Amount\" 150",
"1 1 \"Fee Cod\" 160 ",
{ index: 1, position: 2, width: 190, pattern: 'code', label: 'description',"code":"fepfeecod"},
// "1 2\"Description\" 160 ",
"2 3 \"Relevant Amount\" 160",
"3 4 \"SWIFT / DTA Code\" 180",
"4 5 \" Booking Type\" 150 ",
"5 6 \" Fee Payer (Default) \" 150",
"6 7 \"Account\" 150",
"4 5 \" Booking Type\" 160 ",
"5 6 \" Fee Payer (Default) \" 180",
"6 7 \"Account\" 180",
],
......@@ -140,6 +142,8 @@ export default {
chooseRowEvent(row) {
this.model.infbut.selrow = row.IDX + 1;
},
...Event},
......
......@@ -12,7 +12,7 @@
<c-tabs v-model="tabVal" ref="elment" type="card" @tab-click="tabClick">
<!--PD000027 -->
<el-tab-pane label="费用查询" name="infsea">
<m-infsea :model="model" :codes="codes" />
<m-infsea :model="model" :codes="codes" ref="infsea"/>
</el-tab-pane>
<!--PD000119 -->
<el-tab-pane label="费用详情" name="feep">
......@@ -21,12 +21,12 @@
</c-tabs>
</el-form>
<c-function-btn
<!-- <c-function-btn
:handleSubmit="handleSubmit"
:handleCheck="handleCheck"
:handleStash="handleStash"
>
</c-function-btn>
</c-function-btn> -->
</c-page>
</div>
</template>
......@@ -66,7 +66,6 @@ export default {
pattern: Pattern,
rules: null,
codes: { ...CodeTable
// bustxt:[],
},
};
......
<template>
<div class="eibs-tab">
<el-collapse v-model="activeNames" @change="handleChange">
<el-collapse-item title="修改接受" name="1">
<div class="eibs">
<el-col :span="11">
<c-col :span="24">
<el-form-item label="信用证编号" prop="lidgrp.rec.ownref">
......@@ -184,54 +182,7 @@
>
</c-istream-table>
</el-col>
</el-collapse-item>
<el-collapse-item title="修改信息" name="2">
<!-- 详情 -->
<m-amep :model="model" :codes="codes" />
</el-collapse-item>
<el-collapse-item title="概览信息" name="3">
<!-- 当事人 -->
<m-ovwp :model="model" :codes="codes" />
</el-collapse-item>
<el-collapse-item title="叙述内容" name="4">
<!-- 单据 -->
<m-narp :model="model" :codes="codes" :dtyp="'dorp'" :rec="'lid'" />
</el-collapse-item>
<el-collapse-item title="详细信息" name="5">
<!-- 附加条款 -->
<m-detp :model="model" :codes="codes" :dtyp="'adcp'" :rec="'lid'" />
</el-collapse-item>
<el-collapse-item title="当事人信息" name="6">
<!-- 详情 -->
<m-ptyp :model="model" :codes="codes" />
</el-collapse-item>
<el-collapse-item title="货物修改" name="7">
<!-- 当事人 -->
<m-dogpame :model="model" :codes="codes" />
</el-collapse-item>
<el-collapse-item title="单据修改" name="8">
<!-- 货物 -->
<m-dorpame :model="model" :codes="codes" :dtyp="'dogp'" :rec="'lid'" />
</el-collapse-item>
<el-collapse-item title="附件条款(修改)" name="9">
<!-- 单据 -->
<m-adcpame :model="model" :codes="codes" :dtyp="'dorp'" :rec="'lid'" />
</el-collapse-item>
<el-collapse-item title="银行指示(修改)" name="10">
<!-- 附加条款 -->
<m-inspame :model="model" :codes="codes" :dtyp="'adcp'" :rec="'lid'" />
</el-collapse-item>
<el-collapse-item title="货物" name="11">
<!-- 单据 -->
<m-dogp :model="model" :codes="codes" :dtyp="'dorp'" :rec="'lid'" />
</el-collapse-item>
<el-collapse-item title="单据" name="12">
<!-- 附加条款 -->
<m-dorp :model="model" :codes="codes" :dtyp="'adcp'" :rec="'lid'" />
</el-collapse-item>
</el-collapse>
</div>
</template>
<script>
......@@ -239,42 +190,16 @@ import Api from "~/service/Api"
import commonProcess from "~/mixin/commonProcess";
import CodeTable from "~/config/CodeTable"
import Event from "~/model/Litacp/Event"
import Amep from "./Amep"
import Ovwp from "./Ovwp"
import Narp from "./Narp"
import Detp from "./Detp"
import Ptyp from "./Ptyp"
import Dogpame from "./Dogpame"
import Dorpame from "./Dorpame"
import Adcpame from "./Adcpame"
import Inspame from "./Inspame"
import Dogp from "./Dogp"
import Dorp from "./Dorp"
export default {
components:{
"m-amep" : Amep,
"m-ovwp" : Ovwp,
"m-narp" : Narp,
"m-detp" : Detp,
"m-ptyp" : Ptyp,
"m-dogpame" : Dogpame,
"m-dorpame" : Dorpame,
"m-adcpame" : Adcpame,
"m-inspame" : Inspame,
"m-dogp" : Dogp,
"m-dorp" : Dorp,
},
inject: ['root'],
props:["model","codes"],
mixins: [commonProcess],
data(){
return {
activeNames: ["1"],
return {
trnData: {
columns: [
"0 1 \"\" 200",
......
<template>
<div class="eibs-tab">
<div class="eibs">
<el-col :span="11">
<c-col :span="24">
......@@ -14,7 +14,7 @@
<c-col :span="24">
<el-form-item label="添加/删除补充信息" prop="litamep.adlcndamep.usrblk">
<c-input
:rows="12"
:rows="13"
type="textarea" v-model="model.litamep.adlcndamep.usrblk" maxlength="65" show-word-limit placeholder="请输入添加/删除补充信息" ></c-input>
</el-form-item>
</c-col>
......@@ -30,29 +30,30 @@
</el-form-item>
</c-col>
<c-col :span="24">
<c-checkbox v-model="model.lidgrp.rec.redclsflg">红/绿条款</c-checkbox>
<c-checkbox v-model="model.lidgrp.rec.redclsflg" style="margin-left:0px;padding: 0 10px;" >红/绿条款选项</c-checkbox>
</c-col>
<c-col :span="24">
<c-checkbox v-model="model.lidgrp.rec.spcbenflg">受益人特殊付款条件</c-checkbox>
<c-checkbox v-model="model.lidgrp.rec.spcbenflg" style="margin-left:0px;padding: 0 10px;">受益人特殊付款条件</c-checkbox>
</c-col>
<c-col :span="24">
<c-checkbox v-model="model.lidgrp.rec.spcrcbflg">银行专用特殊付款条件</c-checkbox>
<c-checkbox v-model="model.lidgrp.rec.spcrcbflg" style="margin-left:0px;padding: 0 10px;">银行专用特殊付款条件</c-checkbox>
</c-col>
<c-col :span="12">
<c-checkbox v-model="model.litamep.adlcndamep.modflg">修改要替换的文本</c-checkbox>
<c-col :span="24">
<c-checkbox v-model="model.litamep.adlcndamep.modflg" style="margin-left:0px;padding: 0 10px;">修改要替换的文本</c-checkbox>
</c-col>
<c-col :span="12">
<c-checkbox v-model="model.litamep.adlcndamep.modmanflg">手动更新的修改字段</c-checkbox>
<c-col :span="24">
<c-checkbox v-model="model.litamep.adlcndamep.modmanflg" style="margin-left:0px;padding: 0 10px;">手动更新的修改字段</c-checkbox>
</c-col>
<c-col :span="24">
<c-button size="small" type="primary" style=" margin: 0px 0px 10px 0px;" @click="onAdlcndamepButdif">
<c-button
size="small" type="primary" style=" margin: 0px 0px 10px 545px;" @click="onAdlcndamepButdif">
显示差异
</c-button>
</c-col>
......@@ -60,7 +61,7 @@
<c-col :span="24">
<c-button
disabled
size="small" type="primary" style=" margin: 0px 0px 10px 0px;" @click="onAdlcndamepButadd">
size="small" type="primary" style=" margin: 0px 0px 10px 545px;" @click="onAdlcndamepButadd">
添加文本
</c-button>
</c-col>
......@@ -68,7 +69,7 @@
<c-col :span="24">
<c-button
disabled
size="small" type="primary" style=" margin: 0px 0px 10px 0px;" @click="onAdlcndamepButdel">
size="small" type="primary" style=" margin: 0px 0px 10px 545px;" @click="onAdlcndamepButdel">
删除文本
</c-button>
</c-col>
......
<template>
<div class="eibs-tab">
<div class="eibs">
<el-col :span="11">
<c-col :span="24">
<el-form-item label="信用证编号" prop="lidgrp.rec.ownref">
......
<template>
<div class="eibs-tab">
<div class="eibs">
<el-col :span="11">
<c-col :span="24">
<el-form-item label="可用银行" prop="lidgrp.rec.avbwth">
......@@ -19,12 +19,13 @@
<c-input disabled v-model="model.lidgrp.avb.pts.extkey" maxlength="16" placeholder="请输入内容"></c-input>
<template slot="footer">
<c-button
style="margin: 0 10px 0 10px; padding: 0 12px"
style="margin: 0 5px 0 10px; padding: 0 12px"
size="small"
type="primary"
@click=""
icon="el-icon-info"
>
<span style="font-family: '宋体'; font-weight: bold">i</span>
</c-button>
<c-button
style="margin: 0 0"
......@@ -76,12 +77,12 @@
<c-input disabled v-model="model.lidgrp.drw.pts.extkey" maxlength="16" placeholder="请输入地址编码"></c-input>
<template slot="footer">
<c-button
style="margin: 0 10px 0 10px; padding: 0 12px"
style="margin: 0 5px 0 10px; padding: 0 12px"
size="small"
type="primary"
@click=""
>
<span style="font-family: '宋体'; font-weight: bold">i</span>
icon="el-icon-info"
>
</c-button>
<c-button
style="margin: 0 0"
......
<template>
<div class="eibs-tab">
<div class="eibs">
<c-col :span="20">
<el-form-item label="货物描述" prop="lidgrp.blk.lcrgod">
......
<template>
<div class="eibs-tab">
<div class="eibs">
<el-col :span="11">
<c-col :span="24">
<el-form-item label="货物/服务描述" prop="lidgrp.blk.lcrgod">
......@@ -11,7 +11,7 @@
<c-col :span="24">
<el-form-item label="在当前修订中添加/删除文本" prop="litamep.lcrgodamep.usrblk">
<c-input
:rows="6"
:rows="9"
type="textarea" v-model="model.litamep.lcrgodamep.usrblk" maxlength="65" show-word-limit placeholder="请输入添加/删除补充信息" ></c-input>
</el-form-item>
</c-col>
......@@ -26,26 +26,31 @@
</el-form-item>
</c-col>
<c-col :span="24">
<c-checkbox v-model="model.litamep.lcrgodamep.modflg">修改要替换的文本</c-checkbox>
<c-checkbox v-model="model.litamep.lcrgodamep.modflg" style="margin-left:0px;padding: 0 10px;">修改要替换的文本</c-checkbox>
</c-col>
<c-col :span="24">
<c-checkbox v-model="model.litamep.lcrgodamep.modmanflg">手动更新的修改字段</c-checkbox>
<c-checkbox v-model="model.litamep.lcrgodamep.modmanflg" style="margin-left:0px;padding: 0 10px;">手动更新的修改字段</c-checkbox>
</c-col>
<c-col :span="24">
<c-button size="small" type="primary" @click="onLcrgodamepButdif">
<c-button
size="small" type="primary" style=" margin: 0px 0px 10px 545px;" @click="onAdlcndamepButdif">
显示差异
</c-button>
</c-col>
<c-col :span="24">
<c-button size="small" disabled type="primary" @click="onLcrgodamepButadd">
<c-button
disabled
size="small" type="primary" style=" margin: 0px 0px 10px 545px;" @click="onAdlcndamepButadd">
添加文本
</c-button>
</c-col>
<c-col :span="24">
<c-button size="small" disabled type="primary" icon="el-icon-delete" @click="onLcrgodamepButdel">
<c-button
disabled
size="small" type="primary" style=" margin: 0px 0px 10px 545px;" @click="onAdlcndamepButdel">
删除文本
</c-button>
</c-col>
......
<template>
<div class="eibs-tab">
<div class="eibs">
<c-col :span="20">
<el-form-item label="单据要求" prop="lidgrp.blk.lcrdoc">
......
<template>
<div class="eibs-tab">
<div class="eibs">
<el-col :span="11">
<c-col :span="24">
<el-form-item label="单据要求" prop="lidgrp.blk.lcrdoc">
......@@ -12,7 +12,7 @@
<c-col :span="24">
<el-form-item label="在当前修订中添加/删除文本" prop="litamep.lcrdocamep.usrblk">
<c-input
:rows="7"
:rows="9"
type="textarea" v-model="model.litamep.lcrdocamep.usrblk" maxlength="65" show-word-limit placeholder="请输入添加/删除补充信息" ></c-input>
</el-form-item>
</c-col>
......@@ -28,23 +28,24 @@
</el-form-item>
</c-col>
<c-col :span="24">
<c-checkbox v-model="model.litamep.lcrdocamep.modflg">修改要替换的文本</c-checkbox>
<c-checkbox v-model="model.litamep.lcrdocamep.modflg" style="margin-left:0px;padding: 0 10px;">修改要替换的文本</c-checkbox>
</c-col>
<c-col :span="24">
<c-checkbox v-model="model.litamep.lcrdocamep.modmanflg">手动更新的修改字段</c-checkbox>
<c-checkbox v-model="model.litamep.lcrdocamep.modmanflg" style="margin-left:0px;padding: 0 10px;">手动更新的修改字段</c-checkbox>
</c-col>
<c-col :span="24">
<c-button size="small" type="primary" @click="onLcrdocamepButdif">
<c-button
size="small" type="primary" style=" margin: 0px 0px 10px 545px;" @click="onAdlcndamepButdif">
显示差异
</c-button>
</c-col>
<c-col :span="24">
<c-button size="small"
<c-button
disabled
type="primary" @click="onLcrdocamepButadd">
size="small" type="primary" style=" margin: 0px 0px 10px 545px;" @click="onAdlcndamepButadd">
添加文本
</c-button>
</c-col>
......@@ -52,7 +53,7 @@
<c-col :span="24">
<c-button
disabled
size="small" type="primary" icon="el-icon-delete" @click="onLcrdocamepButdel">
size="small" type="primary" style=" margin: 0px 0px 10px 545px;" @click="onAdlcndamepButdel">
删除文本
</c-button>
</c-col>
......
<template>
<div class="eibs-tab">
<div class="eibs">
<c-col :span="20">
<el-form-item label="付款/承兑/议付银行指示" prop="lidgrp.blk.insbnk">
......
<template>
<div class="eibs-tab">
<div class="eibs">
<el-col :span="11">
<c-col :span="24">
<el-form-item label="叙事的历史概述" prop="oldlidgrp.blk.narhis">
......
<template>
<div class="eibs-tab">
<el-collapse v-model="activeNames" @change="handleChange">
<el-collapse-item title="概览信息" name="ovwp">
<el-col :span="11">
<c-col :span="24">
<el-form-item label="信用证编号" prop="lidgrp.rec.ownref">
......@@ -329,12 +331,7 @@
</c-button>
</c-col> -->
<!-- <c-col :span="12">
<el-form-item label="Drag Drop Sender" prop="litp.aplp.ptsget.sdamod.dadsnd">
<c-input v-model="model.litp.aplp.ptsget.sdamod.dadsnd" placeholder="请输入Drag Drop Sender"></c-input>
......@@ -391,11 +388,7 @@
</el-form-item>
</c-col> -->
<!-- <c-col :span="12">
<el-form-item label="Drag Drop Sender" prop="litp.advp.ptsget.sdamod.dadsnd">
......@@ -442,10 +435,7 @@
</c-col> -->
<!-- <c-col :span="12">
<el-form-item label="Drag Drop Sender" prop="litp.benp.ptsget.sdamod.dadsnd">
......@@ -510,7 +500,70 @@
<c-input v-model="model.lidgrp.rec.oppbnk" maxlength="12" placeholder="请输入对手行代码"></c-input>
</el-form-item>
</c-col> -->
</el-collapse-item>
<el-collapse-item title="修改接受" name="accp">
<!-- 详情 -->
<m-accp :model="model" :codes="codes" />
</el-collapse-item>
<el-collapse-item title="修改信息" name="amep">
<!-- 当事人 -->
<m-amep :model="model" :codes="codes" />
</el-collapse-item>
<el-collapse-item title="叙述内容" name="narp">
<!-- 单据 -->
<m-narp :model="model" :codes="codes" :dtyp="'dorp'" :rec="'lid'" />
</el-collapse-item>
<el-collapse-item title="详细信息" name="detp">
<!-- 附加条款 -->
<m-detp :model="model" :codes="codes" :dtyp="'adcp'" :rec="'lid'" />
</el-collapse-item>
<el-collapse-item title="当事人信息" name="ptyp">
<!-- 详情 -->
<m-ptyp :model="model" :codes="codes" />
</el-collapse-item>
<el-collapse-item title="货物修改" name="7">
<!-- 当事人 -->
<m-dogpame :model="model" :codes="codes" />
</el-collapse-item>
<el-collapse-item title="单据修改" name="8">
<!-- 货物 -->
<m-dorpame :model="model" :codes="codes" :dtyp="'dogp'" :rec="'lid'" />
</el-collapse-item>
<el-collapse-item title="附件条款(修改)" name="9">
<!-- 单据 -->
<m-adcpame :model="model" :codes="codes" :dtyp="'dorp'" :rec="'lid'" />
</el-collapse-item>
<el-collapse-item title="银行指示(修改)" name="10">
<!-- 附加条款 -->
<m-inspame :model="model" :codes="codes" :dtyp="'adcp'" :rec="'lid'" />
</el-collapse-item>
<el-collapse-item title="货物" name="11">
<!-- 单据 -->
<m-dogp :model="model" :codes="codes" :dtyp="'dorp'" :rec="'lid'" />
</el-collapse-item>
<el-collapse-item title="单据" name="12">
<!-- 附加条款 -->
<m-dorp :model="model" :codes="codes" :dtyp="'adcp'" :rec="'lid'" />
</el-collapse-item>
<el-collapse-item title="试算结果" name="shisuan">
<!-- 附加条款 -->
<m-shisuan :model="model" :codes="codes" />
</el-collapse-item>
</el-collapse>
......@@ -521,13 +574,43 @@ import Api from "~/service/Api"
import commonProcess from "~/mixin/commonProcess";
import CodeTable from "~/config/CodeTable"
import Event from "~/model/Litdla/Event"
import Amep from "./Amep"
import Accp from "./Accp"
import Narp from "./Narp"
import Detp from "./Detp"
import Ptyp from "./Ptyp"
import Dogpame from "./Dogpame"
import Dorpame from "./Dorpame"
import Adcpame from "./Adcpame"
import Inspame from "./Inspame"
import Dogp from "./Dogp"
import Dorp from "./Dorp"
import Shisuan from "./Shisuan"
export default {
components:{
"m-amep" : Amep,
"m-accp" : Accp,
"m-narp" : Narp,
"m-detp" : Detp,
"m-ptyp" : Ptyp,
"m-dogpame" : Dogpame,
"m-dorpame" : Dorpame,
"m-adcpame" : Adcpame,
"m-inspame" : Inspame,
"m-dogp" : Dogp,
"m-dorp" : Dorp,
"m-shisuan" : Shisuan,
},
inject: ['root'],
props:["model","codes"],
mixins: [commonProcess],
data(){
return {
activeNames: ["ovwp"],
}
},
......
<template>
<div class="eibs-tab">
<div class="eibs">
<el-col :span="11">
<c-col :span="24">
<el-form-item label="申请人账户行参考号" prop="lidgrp.ini.pts.ref">
......
<template>
<div class="eibs-tab">
<div class="eibs">
<c-col :span="24">
<div class="e-table-wrapper">
......
<template>
<div class="eibs-tab">
<div class="eibs">
<c-col :span="11">
<c-col :span="24">
<el-form-item label="Special Payment Conditions for Beneficiary" prop="lidgrp.blk.spcben">
......
<template>
<div class="eibs-tab">
<div class="eibs">
<c-col :span="18">
<el-form-item label="存在受益人的特殊付款条件" prop="lidgrp.blk.spcben">
......
<template>
<div class="eibs-tab">
<div class="eibs">
<c-col :span="18">
<el-form-item label="仅适用于指定银行的特殊付款条件" prop="lidgrp.blk.spcrcb">
......
<template>
<div class="eibs-tab">
<div class="eibs">
<c-col :span="11">
<c-col :span="24">
......
......@@ -13,9 +13,9 @@
>
<c-tabs v-model="tabVal" ref="elment" type="card" @tab-click="myTabClick">
<el-tab-pane label="业务信息" name="accp">
<el-tab-pane label="业务信息" name="ovwp">
<c-content>
<m-accp :model="model" :codes="codes"/>
<m-ovwp :model="model" :codes="codes"/>
</c-content>
</el-tab-pane>
......@@ -167,14 +167,14 @@
<m-sprpame :model="model" :codes="codes" />
</el-tab-pane>
<!--PD001139 -->
<!-- PD001139
<el-tab-pane label="试算结果" name="shisuan">
<m-shisuan :model="model" :codes="codes"/>
</el-tab-pane>
</el-tab-pane> -->
</c-tabs>
</el-form>
<c-grid-ety-prompt-dialog
<c-grid-ety-prompt-dialog
ref="etyDialog"
:promptData="promptData"
v-on:select-ety="selectEty"
......@@ -266,7 +266,7 @@ export default {
mixins: [commonProcess,commonFuncs], // 里面包含了Default、Check等的公共处理
data(){
return {
tabVal: "accp",
tabVal: "ovwp",
trnName: "litdla",
model: new Litdla().data,
checkRules: Check,
......@@ -275,7 +275,7 @@ export default {
rules: null,
codes: {... CodeTable
},
activeNames: ["engp","coninfp"],
activeNames: ["engp","coninfp",],
}
},
methods:{
......
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