Commit 0b9627c4 by wangbinfei

modify

parent fbeda824
...@@ -5,16 +5,11 @@ import Utils from "~/utils" ...@@ -5,16 +5,11 @@ import Utils from "~/utils"
*/ */
let checkObj = { let checkObj = {
"cldgrp.rec.valdat" :null, "cldgrp.rec.valdat" :null,
"cldgrp.blk.setins" :null,
"cur" :null, "cur" :null,
"cltp.colp.ptsget.sdamod.dadsnd" :null,
"setmod.dspflg" :null,
"cldgrp.rec.credat" :null, "cldgrp.rec.credat" :null,
"cldgrp.col.pts.nam" :null, "cldgrp.col.pts.nam" :null,
"cldgrp.col.pts.extkey" :null, "cldgrp.col.pts.extkey" :null,
"cldgrp.rec.ownref" :null, "cldgrp.rec.ownref" :null,
"mtabut.coninf.conexedat" :null,
"setmod.docamt" :null,
"amount" :null, "amount" :null,
"cldgrp.rec.colflg" :null, "cldgrp.rec.colflg" :null,
} }
......
...@@ -6,26 +6,13 @@ import Api from "~/service/Api"; ...@@ -6,26 +6,13 @@ import Api from "~/service/Api";
import Utils from "~/utils/index" import Utils from "~/utils/index"
export default { export default {
"modflg" :Utils.defaultFunction,
"cldgrp.col.pts.extkey" :Utils.defaultFunction, "cldgrp.col.pts.extkey" :Utils.defaultFunction,
"cur" :Utils.defaultFunction, "cur" :Utils.defaultFunction,
"cldgrp.rec.colflg" :Utils.defaultFunction, "cldgrp.rec.colflg" :Utils.defaultFunction,
"cldgrp.rec.ownref" :Utils.defaultFunction, "cldgrp.rec.ownref" :Utils.defaultFunction,
"rowcntr" :Utils.defaultFunction, "rowcntr" :Utils.defaultFunction,
"setmod.doccur" :Utils.defaultFunction,
"setmod.dspflg" :Utils.defaultFunction,
"setmod.docamt" :Utils.defaultFunction,
"trnmod.trndoc.condocstm" :Utils.defaultFunction,
"trnmod.trndoc.shwinc" :Utils.defaultFunction,
"trnmod.trndoc.shwout" :Utils.defaultFunction,
"cldgrp.col.pts.nam" :Utils.defaultFunction, "cldgrp.col.pts.nam" :Utils.defaultFunction,
"mtabut.coninf.usr.extkey" :Utils.defaultFunction,
"cldgrp.rec.count" :Utils.defaultFunction, "cldgrp.rec.count" :Utils.defaultFunction,
"amount" :Utils.defaultFunction, "amount" :Utils.defaultFunction,
"mtabut.coninf.oitset.oit.inftxt" :Utils.defaultFunction,
"mtabut.coninf.oitset.oit.inflev" :Utils.defaultFunction,
"mtabut.coninf.oitinf.oit.inftxt" :Utils.defaultFunction,
"mtabut.coninf.oitinf.oit.inflev" :Utils.defaultFunction,
"mtabut.coninf.conexedat" :Utils.defaultFunction,
} }
//你可以添加自动default处理 //你可以添加自动default处理
...@@ -38,101 +38,5 @@ export default { ...@@ -38,101 +38,5 @@ export default {
this.$notify.error({title: '错误',message: '服务请求失败!'}); this.$notify.error({title: '错误',message: '服务请求失败!'});
} }
}, },
async onTrndocButshw(){
let rtnmsg = await this.executeRule("trndoc.butshw")
if(rtnmsg.respCode == SUCCESS)
{
//TODO 处理数据逻辑
}
else
{
this.$notify.error({title: '错误',message: '服务请求失败!'});
}
},
async onTrndocButadd(){
let rtnmsg = await this.executeRule("trndoc.butadd")
if(rtnmsg.respCode == SUCCESS)
{
//TODO 处理数据逻辑
}
else
{
this.$notify.error({title: '错误',message: '服务请求失败!'});
}
},
async onTrndocButnew(){
let rtnmsg = await this.executeRule("trndoc.butnew")
if(rtnmsg.respCode == SUCCESS)
{
//TODO 处理数据逻辑
}
else
{
this.$notify.error({title: '错误',message: '服务请求失败!'});
}
},
async onTrndocButattto(){
let rtnmsg = await this.executeRule("trndoc.butattto")
if(rtnmsg.respCode == SUCCESS)
{
//TODO 处理数据逻辑
}
else
{
this.$notify.error({title: '错误',message: '服务请求失败!'});
}
},
async onTrndocButdel(){
let rtnmsg = await this.executeRule("trndoc.butdel")
if(rtnmsg.respCode == SUCCESS)
{
//TODO 处理数据逻辑
}
else
{
this.$notify.error({title: '错误',message: '服务请求失败!'});
}
},
async onTrndocButatt(){
let rtnmsg = await this.executeRule("trndoc.butatt")
if(rtnmsg.respCode == SUCCESS)
{
//TODO 处理数据逻辑
}
else
{
this.$notify.error({title: '错误',message: '服务请求失败!'});
}
},
async onSetmodDet(){
let rtnmsg = await this.executeRule("setmod.det")
if(rtnmsg.respCode == SUCCESS)
{
//TODO 处理数据逻辑
}
else
{
this.$notify.error({title: '错误',message: '服务请求失败!'});
}
},
async onSetinsButtxmsel(){
let rtnmsg = await this.executeRule("setins.buttxmsel")
if(rtnmsg.respCode == SUCCESS)
{
//TODO 处理数据逻辑
}
else
{
this.$notify.error({title: '错误',message: '服务请求失败!'});
}
},
} }
\ No newline at end of file
...@@ -13,10 +13,10 @@ export default { ...@@ -13,10 +13,10 @@ export default {
{max: 1,message:"长度不能超过1"} {max: 1,message:"长度不能超过1"}
], ],
"cldgrp.rec.valdat":[ "cldgrp.rec.valdat":[
{type: "date", required: true, message: "必输项"} {type: "date", required: false, message: "输入正确的日期"}
], ],
"cldgrp.rec.credat":[ "cldgrp.rec.credat":[
{type: "date", required: true, message: "必输项"} {type: "date", required: false, message: "输入正确的日期"}
], ],
"rowcntr":[ "rowcntr":[
{type: "string", required: false, message: "必输项"}, {type: "string", required: false, message: "必输项"},
...@@ -64,94 +64,4 @@ export default { ...@@ -64,94 +64,4 @@ export default {
{type: "string", required: false, message: "必输项"}, {type: "string", required: false, message: "必输项"},
{max: 16,message:"长度不能超过16"} {max: 16,message:"长度不能超过16"}
], ],
"trnmod.trndoc.advnam":[
{type: "string", required: false, message: "必输项"},
{max: 50,message:"长度不能超过50"}
],
"trnmod.trndoc.amdapl":[
{type: "string", required: true, message: "必输项"},
{max: 50,message:"长度不能超过50"}
],
"trnmod.trndoc.advdoc":[
{type: "string", required: false, message: "必输项"},
{max: 1,message:"长度不能超过1"}
],
"trnmod.trndoc.filrecv":[
{type: "string", required: false, message: "必输项"},
{max: 16,message:"长度不能超过16"}
],
"trnmod.trndoc.doctrestm":[
{type: "string", required: false, message: "必输项"},
{max: 1,message:"长度不能超过1"}
],
"trnmod.trndoc.condocstm":[
{type: "string", required: false, message: "必输项"},
{max: 1,message:"长度不能超过1"}
],
"trnmod.trndoc.rcvatt.seainf":[
{type: "string", required: false, message: "必输项"},
{max: 3,message:"长度不能超过3"}
],
"mtabut.coninf.oitinf.oit.inftxt":[
{type: "string", required: true, message: "必输项"},
{max: 60,message:"长度不能超过60"}
],
"mtabut.coninf.oitset.oit.inftxt":[
{type: "string", required: true, message: "必输项"},
{max: 60,message:"长度不能超过60"}
],
"mtabut.coninf.conexedat":[
{type: "date", required: false, message: "输入正确的日期"}
],
"mtabut.coninf.usr.extkey":[
{type: "string", required: false, message: "必输项"},
{max: 8,message:"长度不能超过8"}
],
"setmod.ref":[
{type: "string", required: false, message: "必输项"},
{max: 16,message:"长度不能超过16"}
],
"setmod.docamt":[
{type: "number", required: false, message: "必输项"},
{max: 18,message:"整数位不能超过14位"},
{pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
],
"setmod.zmqacc":[
{type: "string", required: false, message: "必输项"},
{max: 20,message:"长度不能超过20"}
],
"cldgrp.rec.acno":[
{type: "string", required: false, message: "必输项"},
{max: 20,message:"长度不能超过20"}
],
"cldgrp.blk.setins":[
{type: "string", required: true, message: "必输项"},
{max: 65,message:"长度不能超过65"}
],
} }
\ No newline at end of file
import Api from "~/service/Api" import Api from "~/service/Api"
import Pts from "../Common/Pts" import Pts from "../Common/Pts"
import Pub from "../Public"
export default class Cltdav{ export default class Cltdav{
constructor () { constructor () {
this.data = { this.data = {
liaall: new Pub().data.Liaall,
cldgrp:{ cldgrp:{
rec:{ rec:{
ownref:"", // Batch No. .cldgrp.rec.ownref ownref:"", // Batch No. .cldgrp.rec.ownref
...@@ -15,15 +14,10 @@ export default class Cltdav{ ...@@ -15,15 +14,10 @@ export default class Cltdav{
count:"", // ITEM COUNT .cldgrp.rec.count count:"", // ITEM COUNT .cldgrp.rec.count
colref:"", // COLL BANK REF .cldgrp.rec.colref colref:"", // COLL BANK REF .cldgrp.rec.colref
nam:"", // Name of CC contract .cldgrp.rec.nam nam:"", // Name of CC contract .cldgrp.rec.nam
creact:"", // Credit to Account .cldgrp.rec.creact
acno:"", // A/C NO. .cldgrp.rec.acno
}, },
col:{ col:{
pts:new Pts().data, pts:new Pts().data,
}, },
blk:{
setins:"", // Settlement Instructions .cldgrp.blk.setins
},
}, },
rowcntr:"", // Total Row Count .rowcntr rowcntr:"", // Total Row Count .rowcntr
cur:"", // currency .cur cur:"", // currency .cur
...@@ -41,71 +35,6 @@ export default class Cltdav{ ...@@ -41,71 +35,6 @@ export default class Cltdav{
}, },
}, },
colmet:"", // Collection Method .colmet colmet:"", // Collection Method .colmet
trnmod:{
trndoc:{
advlabel:"", // ADVLABEL .trnmod.trndoc.advlabel
amdnam:"", // AMDNAM .trnmod.trndoc.amdnam
advdoc:"", // 国内证通知书 .trnmod.trndoc.advdoc
advnam:"", // 国内证落款 .trnmod.trndoc.advnam
amdapl:"", // 修改申请人名称 .trnmod.trndoc.amdapl
doclbl:"", // Lable for CONDOCSTM .trnmod.trndoc.doclbl
doctrestm:"", // Document tree .trnmod.trndoc.doctrestm
shwinc:"", // Show Incoming Messages .trnmod.trndoc.shwinc
shwout:"", // Show Outgoing Messages .trnmod.trndoc.shwout
condocstm:"", // Connected Documents .trnmod.trndoc.condocstm
rcvatt:{
seainf:"", // .trnmod.trndoc.rcvatt.seainf
},
filrecv:"", // File Receiver .trnmod.trndoc.filrecv
},
},
mtabut:{
coninf:{
oitinf:{
labinftxt:"", // Label for INFTXT .mtabut.coninf.oitinf.labinftxt
oit:{
inftxt:"", // Infotext .mtabut.coninf.oitinf.oit.inftxt
inflev:"", // Infotext Level .mtabut.coninf.oitinf.oit.inflev
},
},
oitset:{
labinftxt:"", // Label for INFTXT .mtabut.coninf.oitset.labinftxt
oit:{
inftxt:"", // Infotext .mtabut.coninf.oitset.oit.inftxt
inflev:"", // Infotext Level .mtabut.coninf.oitset.oit.inflev
},
},
conexedat:"", // 执行日期 .mtabut.coninf.conexedat
usr:{
extkey:"", // User ID .mtabut.coninf.usr.extkey
},
},
},
setmod:{
docamttyplab:"", // settled amount description as label .setmod.docamttyplab
retmsg:"", // Label showing Retry overflow condition .setmod.retmsg
ref:"", // our reference .setmod.ref
doccur:"", // document currency .setmod.doccur
docamt:"", // document amount .setmod.docamt
dspflg:"", // Type of settlement .setmod.dspflg
xreflg:"", // Recalculate Rates .setmod.xreflg
setglg:{
labdspflg:"", // Label for Type of Settlement .setmod.setglg.labdspflg
},
zmqacclab:"", // 主�'�号LABEL .setmod.zmqacclab
zmqacc:"", // 自�'�区主�'�号 .setmod.zmqacc
setfog:{
setfol:[]
},
setfeg:{
setfel:[]
},
glemod:{
gleshwstm: {}
},
},
modflg:"", // MODIFY .modflg
pageId: "" // ctx的key pageId: "" // ctx的key
} }
} }
......
...@@ -87,6 +87,9 @@ import Ccttra from "./Ccttra" ...@@ -87,6 +87,9 @@ import Ccttra from "./Ccttra"
import Cctdcr from "./Cctdcr" import Cctdcr from "./Cctdcr"
//import Cltdav from "./Cltdav"
import Cctset from "./Cctset"
//import Clttra from "./Clttra"
/** /**
* 带有name的才会被添加进顶部的标签页里 * 带有name的才会被添加进顶部的标签页里
*/ */
...@@ -171,6 +174,7 @@ const BusRouter = [ ...@@ -171,6 +174,7 @@ const BusRouter = [
{ path: 'cltdav', component: Cltdav, name: 'Cltdav', meta: { title: '打包托收开立' } }, { path: 'cltdav', component: Cltdav, name: 'Cltdav', meta: { title: '打包托收开立' } },
{ path: 'cltset', component: Cltset, name: 'Cltset', meta: { title: '打包托收解包' } }, { path: 'cltset', component: Cltset, name: 'Cltset', meta: { title: '打包托收解包' } },
{ path: 'clttra', component: Clttra, name: 'Clttra', meta: { title: '打包托收催收' } }, { path: 'clttra', component: Clttra, name: 'Clttra', meta: { title: '打包托收催收' } },
<<<<<<< Updated upstream
{ path: 'bdtcan', component: Bdtcan, name: 'Bdtcan', meta: { title: '买方信用证单据注销' } }, { path: 'bdtcan', component: Bdtcan, name: 'Bdtcan', meta: { title: '买方信用证单据注销' } },
{ path: 'ditdla', component: Ditdla, name: 'Ditdla', meta: { title: '买方信用证减额接受' } }, { path: 'ditdla', component: Ditdla, name: 'Ditdla', meta: { title: '买方信用证减额接受' } },
...@@ -180,6 +184,10 @@ const BusRouter = [ ...@@ -180,6 +184,10 @@ const BusRouter = [
{ path: 'bttdck', component: Bttdck, name: 'Bttdck', meta: { title: '转让信用证单据第一受益人换单' } }, { path: 'bttdck', component: Bttdck, name: 'Bttdck', meta: { title: '转让信用证单据第一受益人换单' } },
{ path: 'ccttra', component: Ccttra, name: 'Ccttra', meta: { title: '光票托收催收' } }, { path: 'ccttra', component: Ccttra, name: 'Ccttra', meta: { title: '光票托收催收' } },
{ path: 'cctdcr', component: Cctdcr, name: 'Cctdcr', meta: { title: '光票托收退票' } }, { path: 'cctdcr', component: Cctdcr, name: 'Cctdcr', meta: { title: '光票托收退票' } },
=======
//{ path: 'cctdav', component: Cctdav, name: 'Cctdav', meta: { title: '光票托收开立' } },
{ path: 'cctset', component: Cctset, name: 'Cctset', meta: { title: '光票托收收汇' } },
>>>>>>> Stashed changes
] ]
export default BusRouter export default BusRouter
\ No newline at end of file
<template> <template>
<c-page title="打包托收开立"> <div class="eContainer">
<div class="eContainer"> <el-form :model="model" :rules="rules" ref="modelForm" label-width="150px" label-position="right" size="small" :validate-on-rule-change="false">
<!-- <c-bus-button :$pntvm="this"></c-bus-button> --> <c-tabs v-model="tabVal" ref="elment" type="card" @tab-click="tabClick">
<c-function-btn :handleSubmit="handleSubmit" :handleCheck="handleCheck" :handleStash="handleStash">
<el-button size="small">备忘录</el-button> <!--PD000002 -->
<el-button size="small">影像信息</el-button> <el-tab-pane label="PD000002" name="sel">
<el-button size="small">保存模板</el-button> <m-sel :model="model" :codes="codes"/>
<el-button size="small">使用模板</el-button> </el-tab-pane>
<el-button size="small">制裁信息</el-button> </c-tabs>
<el-button size="small">拆分报文</el-button> </el-form>
<el-button size="small">提示</el-button> </div>
</c-function-btn>
<el-form :model="model" :rules="rules" ref="modelForm" label-width="150px" label-position="left"
size="small" :validate-on-rule-change="false">
<c-tabs v-model="tabVal" ref="elment" type="card" @tab-click="tabClick">
<!--PD000002 -->
<el-tab-pane label="内容" name="sel">
<m-sel :model="model" :codes="codes" />
</el-tab-pane>
<!--PD000057 -->
<el-tab-pane label="关联账号" name="account">
<m-account :model="model" :codes="codes" />
</el-tab-pane>
<!--PD000000 -->
<el-tab-pane label="费用及账务" name="setpan">
<c-content>
<m-setpan :model="model" :codes="codes" />
</c-content>
</el-tab-pane>
<!--PD000027 -->
<el-tab-pane label="表外信息" name="engp">
<m-engp :model="model" :codes="codes" />
</el-tab-pane>
<!--PD000001 -->
<el-tab-pane label="分录信息" name="glepan">
<m-glepan :model="model" :codes="codes" />
</el-tab-pane>
<el-tab-pane label="保证金" name="ccvpan">
<m-ccvpan :model="model" :codes="codes" />
</el-tab-pane>
<!--PD000529 -->
<el-tab-pane label="面函及报文" name="docpan">
<m-docpan :model="model" :codes="codes" />
</el-tab-pane>
<!--PD000546 -->
<el-tab-pane label="交易附件" name="doctre">
<m-doctre :model="model" :codes="codes" />
</el-tab-pane>
<!--PD000000 -->
<el-tab-pane label="附言" name="coninfp">
<m-coninfp :model="model" :codes="codes" />
</el-tab-pane>
</c-tabs>
</el-form>
</div>
</c-page>
</template> </template>
<script> <script>
import Api from "~/service/Api"; import Api from "~/service/Api"
import Utils from "~/utils/index"; import CodeTable from "~/config/CodeTable"
import Cltdav from "~/model/Cltdav"
import CodeTable from "~/config/CodeTable"; import CommonProcess from "~/mixin/CommonProcess"
import Cltdav from "~/model/Cltdav"; import Check from "~/model/Cltdav/Check"
import CommonProcess from "~/mixin/CommonProcess"; import Default from "~/model/Cltdav/Default"
import CommonFuncs from "~/mixin/CommonFuncs"; import Pattern from "~/model/Cltdav/Pattern"
import Check from "~/model/Cltdav/Check"; import Sel from "./Sel"
import Default from "~/model/Cltdav/Default";
import Pattern from "~/model/Cltdav/Pattern";
import Sel from "./Sel";
import Account from "./Account";
import Setpan from "~/views/Public/Setpan";
import Docpan from "~/views/Public/Docpan";
import Engp from "~/views/Public/Engp";
import Glepan from "~/views/Public/Glepan";
import Ccvpan from "~/views/Public/Ccvpan";
import Coninfp from "~/views/Public/Coninfp";
import Doctre from "./Doctre";
export default {
name: "Cltdav",
components: {
"m-sel": Sel,
"m-account": Account,
"m-setpan": Setpan,
"m-engp": Engp,
"m-glepan": Glepan,
"m-docpan": Docpan,
"m-doctre": Doctre,
"m-coninfp": Coninfp,
"m-ccvpan": Ccvpan,
},
provide() { export default {
return { name: "Cltdav",
root: this components:{
} "m-sel" : Sel,
}, },
mixins: [CommonProcess], // 里面包含了Default、Check等的公共处理 provide() {
data() { return {
return { root: this
tabVal: "", }
trnName: "cltdav", },
model: new Cltdav().data, mixins: [CommonProcess], // 里面包含了Default、Check等的公共处理
checkRules: Check, data(){
defaultRules: Default, return {
pattern: Pattern, tabVal: "",
rules: null, trnName: "cltdav",
codes: {...CodeTable}, model: new Cltdav().data,
} checkRules: Check,
}, defaultRules: Default,
methods: { pattern: Pattern,
tabClick() { rules: null,
} codes: {
}, },
created: async function () { }
console.log("进入cltdav交易"); },
let rtnmsg = await this.init({}) methods:{
if (rtnmsg.respCode == SUCCESS) { tabClick(){
//TODO 处理数据逻辑 }
},
created:async function(){
console.log("进入cltdav交易");
let rtnmsg = await this.init({})
if(rtnmsg.respCode == SUCCESS)
{
//TODO 处理数据逻辑
} }
else { else
this.$notify.error({ title: '错误', message: '服务请求失败!' }); {
} this.$notify.error({title: '错误',message: '服务请求失败!'});
} }
} }
}
</script> </script>
<style> <style>
</style> </style>
\ No newline at end of file
...@@ -105,11 +105,22 @@ export default { ...@@ -105,11 +105,22 @@ export default {
{ inifrm: "lttopn", ininam: "转让证开立", pntmiu: "8" }, { inifrm: "lttopn", ininam: "转让证开立", pntmiu: "8" },
{ inifrm: "lttame", ininam: "转让证修改", pntmiu: "8" }, { inifrm: "lttame", ininam: "转让证修改", pntmiu: "8" },
{ inifrm: "lttcan", ininam: "转让证注销", pntmiu: "8" }, { inifrm: "lttcan", ininam: "转让证注销", pntmiu: "8" },
<<<<<<< Updated upstream
{ inifrm: "lttdav", ininam: "转让信用证单据第一受益人换单", pntmiu: "8" }, { inifrm: "lttdav", ininam: "转让信用证单据第一受益人换单", pntmiu: "8" },
{ inifrm: "bttdck", ininam: "转让信用证通知到单", pntmiu: "8" }, { inifrm: "bttdck", ininam: "转让信用证通知到单", pntmiu: "8" },
{ inifrm: "9",ininam: "光票托收", pntmiu: "" }, { inifrm: "9",ininam: "光票托收", pntmiu: "" },
{ inifrm: "ccttra", ininam: "光票托收催收", pntmiu: "9" }, { inifrm: "ccttra", ininam: "光票托收催收", pntmiu: "9" },
{ inifrm: "cctdcr", ininam: "光票托收退票", pntmiu: "9" }, { inifrm: "cctdcr", ininam: "光票托收退票", pntmiu: "9" },
=======
{ inifrm: "9", ininam: "打包托收", pntmiu: "" },
{ inifrm: "cltdav", ininam: "打包托收开立", pntmiu: "9" },
{ inifrm: "clttra", ininam: "打包托收催收", pntmiu: "9" },
{ inifrm: "cltset", ininam: "打包托收解包", pntmiu: "9" },
{ inifrm: "10", ininam: "光票托收", pntmiu: "" },
//{ inifrm: "cltdav", ininam: "光票托收开立", pntmiu: "10" },
//{ inifrm: "clttra", ininam: "光票托收", pntmiu: "10" },
{ inifrm: "cctset", ininam: "光票托收收汇", pntmiu: "10" },
>>>>>>> Stashed changes
], ],
menus: [], menus: [],
}; };
......
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