Skip to content

V
vue-gjjs
Commit 0381938f by fukai
Options

合并冲突

parents 3db02e30 57d6fa69
Showing with 164 additions and 144 deletions
src/components/Content.vue
......@@ -6,7 +6,13 @@
<script>
export default {
props: ['height'],
props: {
height: {
type: Number,
require: false,
default: 220
}
},
data() {
return {
clientHeight: '',
......
src/model/Letopn/Check.js
......@@ -4,104 +4,104 @@ import Utils from "~/utils"
* Letopn Check规则
*/
let checkObj = {
"ledgrp.apb.pts.extkey" :null,
"liaall.misamt" :null,
"letp.rmbp.ptsget.sdamod.dadsnd" :null,
"ledgrp.rec.opndat" :null,
"ledgrp.adv.namelc" :null,
"ledgrp.blk.shpper" :null,
"ledgrp.rmb.pts.extkey" :null,
"letp.avbp.ptsget.sdamod.dadsnd" :null,
"ledgrp.a2b.pts.adrblk" :null,
"letp.conp.ptsget.sdamod.dadsnd" :null,
"ledgrp.iss.pts.adrblk" :null,
"letp.issp.ptsget.sdamod.dadsnd" :null,
"ledgrp.rec.revdat" :null,
"ledgrp.blk.spcrcb" :null,
"ledgrp.blk.preper" :null,
"ledgrp.adv.adrelc" :null,
"ledgrp.ben.adrelc" :null,
"ledgrp.avb.adrelc" :null,
"ledgrp.rec.tenmaxday" :null,
"ledgrp.blk.mixdet" :null,
"ledgrp.avb.pts.extkey" :null,
"ledgrp.adv.pts.extkey" :null,
"ledgrp.drw.adrelc" :null,
"ledgrp.ben.pts.extkey" :null,
"ledgrp.rmb.pts.adrblk" :null,
"ledgrp.blk.lcrgod" :null,
"setmod.dspflg" :null,
"ledgrp.a2b.adrelc" :null,
"ledgrp.avb.namelc" :null,
"ledgrp.avb.pts.adrblk" :null,
"ledgrp.apb.pts.adrblk" :null,
"letp.usr.extkey" :null,
"ledgrp.rec.nomspc" :null,
"ledgrp.a2b.namelc" :null,
"ledgrp.cbs.nom1.cur" :null,
"ledgrp.rec.revtyp" :null,
"ledgrp.rec.avbby" :null,
"ledgrp.rec.shpdat" :null,
"letp.a2bp.ptsget.sdamod.dadsnd" :null,
"ledgrp.rec.prepers18" :null,
"ledgrp.rec.nomtop" :null,
"ledgrp.iss.adrelc" :null,
"ledgrp.rec.nomton" :null,
"ledgrp.rec.avbwth" :null,
"ledgrp.apb.namelc" :null,
"letp.drwp.ptsget.sdamod.dadsnd" :null,
"ledgrp.rec.ownref" :null,
"ledgrp.rmb.namelc" :null,
"ledgrp.blk.feetxt" :null,
"ledgrp.apl.namelc" :null,
"ledgrp.blk.revcls" :null,
"ledgrp.cbs.max2.amt" :null,
"ledgrp.rec.stacty" :null,
"ledgrp.adv.pts.adrblk" :null,
"ledgrp.cbs.nom1.amt" :null,
"ledgrp.blk.lcrdoc" :null,
"ledgrp.blk.defdet" :null,
"letp.apbp.ptsget.sdamod.dadsnd" :null,
"ledgrp.rec.expdat" :null,
"ledgrp.blk.dftat" :null,
"letp.benp.ptsget.sdamod.dadsnd" :null,
"ledgrp.rec.lcrtyp" :null,
"ledgrp.blk.insbnk" :null,
"mtabut.coninf.conexedat" :null,
"ledgrp.rec.apprul" :null,
"ledgrp.apl.adrelc" :null,
"ledgrp.iss.pts.extkey" :null,
"ledgrp.blk.adlcnd" :null,
"ledgrp.iss.namelc" :null,
"ledgrp.rec.expplc" :null,
"letp.advp.ptsget.sdamod.dadsnd" :null,
"ledgrp.drw.pts.extkey" :null,
"ledgrp.a2b.pts.extkey" :null,
"ledgrp.iss.pts.ref" :null,
"ledgrp.ben.namelc" :null,
"ledgrp.apl.pts.adrblk" :null,
"letp.recget.sdamod.dadsnd" :null,
"ledgrp.rec.preadvdt" :null,
"ledgrp.ben.pts.adrblk" :null,
"ledgrp.blk.addamtcov" :null,
"setmod.docamt" :null,
"ledgrp.rec.cnfins" :null,
"ledgrp.apb.adrelc" :null,
"ledgrp.rmb.adrelc" :null,
"ledgrp.drw.namelc" :null,
"ledgrp.apl.pts.extkey" :null,
"letp.aplp.ptsget.sdamod.dadsnd" :null,
"ledgrp.con.pts.extkey" :null,
"ledgrp.rec.cnfdet" :null,
"ledgrp.drw.pts.adrblk" :null,
"ledgrp.rec.apprultxt" :null,
"ledgrp.blk.spcben" :null,
"ledgrp.apb.pts.extkey": null,
"liaall.misamt": null,
"letp.rmbp.ptsget.sdamod.dadsnd": null,
"ledgrp.rec.opndat": null,
"ledgrp.adv.namelc": null,
"ledgrp.blk.shpper": null,
"ledgrp.rmb.pts.extkey": null,
"letp.avbp.ptsget.sdamod.dadsnd": null,
"ledgrp.a2b.pts.adrblk": null,
"letp.conp.ptsget.sdamod.dadsnd": null,
"ledgrp.iss.pts.adrblk": null,
"letp.issp.ptsget.sdamod.dadsnd": null,
"ledgrp.rec.revdat": null,
"ledgrp.blk.spcrcb": null,
"ledgrp.blk.preper": null,
"ledgrp.adv.adrelc": null,
"ledgrp.ben.adrelc": null,
"ledgrp.avb.adrelc": null,
"ledgrp.rec.tenmaxday": null,
"ledgrp.blk.mixdet": null,
"ledgrp.avb.pts.extkey": null,
"ledgrp.adv.pts.extkey": null,
"ledgrp.drw.adrelc": null,
"ledgrp.ben.pts.extkey": null,
"ledgrp.rmb.pts.adrblk": null,
"ledgrp.blk.lcrgod": null,
"setmod.dspflg": null,
"ledgrp.a2b.adrelc": null,
"ledgrp.avb.namelc": null,
"ledgrp.avb.pts.adrblk": null,
"ledgrp.apb.pts.adrblk": null,
"letp.usr.extkey": null,
"ledgrp.rec.nomspc": null,
"ledgrp.a2b.namelc": null,
"ledgrp.cbs.nom1.cur": null,
"ledgrp.rec.revtyp": null,
"ledgrp.rec.avbby": null,
"ledgrp.rec.shpdat": null,
"letp.a2bp.ptsget.sdamod.dadsnd": null,
"ledgrp.rec.prepers18": null,
"ledgrp.rec.nomtop": null,
"ledgrp.iss.adrelc": null,
"ledgrp.rec.nomton": null,
"ledgrp.rec.avbwth": null,
"ledgrp.apb.namelc": null,
"letp.drwp.ptsget.sdamod.dadsnd": null,
"ledgrp.rec.ownref": null,
"ledgrp.rmb.namelc": null,
"ledgrp.blk.feetxt": null,
"ledgrp.apl.namelc": null,
"ledgrp.blk.revcls": null,
"ledgrp.cbs.max2.amt": null,
"ledgrp.rec.stacty": null,
"ledgrp.adv.pts.adrblk": null,
"ledgrp.cbs.nom1.amt": null,
"ledgrp.blk.lcrdoc": null,
"ledgrp.blk.defdet": null,
"letp.apbp.ptsget.sdamod.dadsnd": null,
"ledgrp.rec.expdat": null,
"ledgrp.blk.dftat": null,
"letp.benp.ptsget.sdamod.dadsnd": null,
"ledgrp.rec.lcrtyp": null,
"ledgrp.blk.insbnk": null,
"mtabut.coninf.conexedat": null,
"ledgrp.rec.apprul": null,
"ledgrp.apl.adrelc": null,
"ledgrp.iss.pts.extkey": null,
"ledgrp.blk.adlcnd": null,
"ledgrp.iss.namelc": null,
"ledgrp.rec.expplc": null,
"letp.advp.ptsget.sdamod.dadsnd": null,
"ledgrp.drw.pts.extkey": null,
"ledgrp.a2b.pts.extkey": null,
"ledgrp.iss.pts.ref": null,
"ledgrp.ben.namelc": null,
"ledgrp.apl.pts.adrblk": null,
"letp.recget.sdamod.dadsnd": null,
"ledgrp.rec.preadvdt": null,
"ledgrp.ben.pts.adrblk": null,
"ledgrp.blk.addamtcov": null,
"setmod.docamt": null,
"ledgrp.rec.cnfins": null,
"ledgrp.apb.adrelc": null,
"ledgrp.rmb.adrelc": null,
"ledgrp.drw.namelc": null,
"ledgrp.apl.pts.extkey": null,
"letp.aplp.ptsget.sdamod.dadsnd": null,
"ledgrp.con.pts.extkey": null,
"ledgrp.rec.cnfdet": null,
"ledgrp.drw.pts.adrblk": null,
"ledgrp.rec.apprultxt": null,
"ledgrp.blk.spcben": null,
}
for (const key in checkObj) {
if (Object.hasOwnProperty.call(checkObj, key)) {
checkObj[key] = checkObj[key] ? checkObj[key] : Utils.reflectCheck(key)
}
}
// for (const key in checkObj) {
// if (Object.hasOwnProperty.call(checkObj, key)) {
// checkObj[key] = checkObj[key] ? checkObj[key] : Utils.reflectCheck(key)
// }
// }
export default checkObj
src/model/Letopn/Event.js
......@@ -13,7 +13,7 @@ export default {
}
},
async onBenpDet() {
let rtnmsg = await this.executeRule("benp.det")
let rtnmsg = await this.executeRule("bdtp.benp.det")
if (rtnmsg.respCode == SUCCESS) {
//TODO 处理数据逻辑
......@@ -33,8 +33,8 @@ export default {
}
},
onSeainf() {
console.log('测试。。。。。。。')
onSeainf(data) {
console.log('测试。。。。。。。', data)
},
async onAplpDet() {
......
src/views/Business/Ditopn/index.vue
......@@ -14,7 +14,7 @@
<c-tabs :value="tabVal" ref="elment" type="card" @tab-click="tabClick">
<el-tab-pane label="内容" name="ovwp">
<!--PD000001 -->
<c-content :height="280">
<c-content>
<m-ovwp :model="model" :codes="codes" />
</c-content>
</el-tab-pane>
......@@ -33,9 +33,7 @@
-->
<el-tab-pane label="银行明细" name="detp1">
<!--PD000452 -->
<c-content :height="220">
<m-detp1 :model="model" :codes="codes" />
</c-content>
<m-detp1 :model="model" :codes="codes" />
</el-tab-pane>
<el-tab-pane label="明细" name="detp">
<!--PD000077 -->
......
src/views/Business/Letopn/index.vue
<template>
<c-page title="出口信用证通知">
<div class="eContainer">
<c-bus-button :$pntvm="this"></c-bus-button>
<el-form
:model="model"
:rules="rules"
......@@ -12,7 +13,9 @@
<c-tabs v-model="tabVal" ref="elment" type="card" @tab-click="tabClick">
<!--PD000017 -->
<el-tab-pane label="内容" name="ovwp">
<m-ovwp :model="model" :codes="codes" />
<c-content>
<m-ovwp :model="model" :codes="codes" />
</c-content>
</el-tab-pane>
<!--PD000001 -->
......@@ -94,7 +97,6 @@
<m-glepan :model="model" :codes="codes" />
</el-tab-pane>
</c-tabs>
<c-bus-button :$pntvm="this"></c-bus-button>
</el-form>
</div>
</c-page>
......
src/views/Public/Ptap.vue
<template>
<div class="eibs-tab">
<c-col :span="24">
<c-col v-if="!noRef" :span="24">
<el-form-item
:label="`${argadr.title}参考号`"
:prop="`${argadr.grp}.${argadr.rol}.pts.ref`"
......@@ -14,12 +14,15 @@
<c-col :span="18">
<el-form-item
label="Extkey"
:label="`${argadr.title}编号`"
:prop="`${argadr.grp}.${argadr.rol}.pts.extkey`"
>
<c-input
v-model="model[argadr.grp][argadr.rol].pts.extkey"
:placeholder="'请输入' + argadr.title + 'Extkey'"
@keyup.enter.native="
showGridPromptDialog(`${argadr.grp}.${argadr.rol}.pts.extkey`)
"
></c-input>
</el-form-item>
</c-col>
......@@ -38,47 +41,49 @@
</el-form-item>
</c-col>
<c-col v-if="isAdrblk" :span="24">
<el-form-item
label="名称地址"
:prop="`${argadr.grp}.${argadr.rol}.pts.adrblk`"
>
<c-input
type="textarea"
:rows="3"
v-model="model[argadr.grp][argadr.rol].pts.adrblk"
maxlength="35"
show-word-limit
placeholder="请输入名称地址"
></c-input>
</el-form-item>
</c-col>
<template v-else>
<c-col :span="24">
<template v-if="!onlySearch">
<c-col v-if="isAdrblk" :span="24">
<el-form-item
label="名称"
:prop="`${argadr.grp}.${argadr.rol}.pts.namelc`"
label="名称地址"
:prop="`${argadr.grp}.${argadr.rol}.pts.adrblk`"
>
<c-input
v-model="model[argadr.grp][argadr.rol].pts.namelc"
:placeholder="'请输入' + argadr.title + '名称'"
:disabled="disabled"
type="textarea"
:rows="3"
v-model="model[argadr.grp][argadr.rol].pts.adrblk"
maxlength="35"
show-word-limit
placeholder="请输入名称地址"
></c-input>
</el-form-item>
</c-col>
<template v-else>
<c-col :span="24">
<el-form-item
label="名称"
:prop="`${argadr.grp}.${argadr.rol}.pts.namelc`"
>
<c-input
v-model="model[argadr.grp][argadr.rol].pts.namelc"
:placeholder="'请输入' + argadr.title + '名称'"
:disabled="disabled"
></c-input>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item
label="地址"
:prop="`${argadr.grp}.${argadr.rol}.pts.adrelc`"
>
<c-input
v-model="model[argadr.grp][argadr.rol].pts.adrelc"
:placeholder="'请输入' + argadr.title + '地址'"
:disabled="disabled"
></c-input>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item
label="地址"
:prop="`${argadr.grp}.${argadr.rol}.pts.adrelc`"
>
<c-input
v-model="model[argadr.grp][argadr.rol].pts.adrelc"
:placeholder="'请输入' + argadr.title + '地址'"
:disabled="disabled"
></c-input>
</el-form-item>
</c-col>
</template>
</template>
</div>
</template>
......@@ -97,7 +102,6 @@ export default {
},
argadr: {
type: Object,
required: true,
default: function () {
return {
title: "", //角色名称
......@@ -117,6 +121,16 @@ export default {
type: Boolean,
default: true,
},
onlySearch: {
//是否只展示extkey
type: Boolean,
default: false,
},
noRef: {
//无需参考号
type: Boolean,
default: false,
},
},
data() {
return {
......
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