Skip to content

V
vue-gjjs
Commit 7c74efbe by huxi
Options

Merge branch 'settle-test-20230110' of http://114.115.138.98:8900/fukai/vue-gjjs… 

Merge branch 'settle-test-20230110' of http://114.115.138.98:8900/fukai/vue-gjjs into settle-test-20230110
parents 5f60931d 15f45533
Showing with 187 additions and 127 deletions
src/business/brtdck/event/buildCommons.js
......@@ -19,42 +19,45 @@ export default {
},
buildCommonData (model, trnName) {
let ptsptaList = [];
if (model.gidgrp.apl.pts.extkey) {
ptsptaList.push(this.buildPtspta(model.gidgrp.apl));
if (model.lidgrp.apl.pts.extkey) {
ptsptaList.push(this.buildPtspta(model.lidgrp.apl));
}
if (model.gidgrp.adv.pts.extkey) {
ptsptaList.push(this.buildPtspta(model.gidgrp.adv));
if (model.lidgrp.adv.pts.extkey) {
ptsptaList.push(this.buildPtspta(model.lidgrp.adv));
}
if (model.gidgrp.ben.pts.extkey) {
ptsptaList.push(this.buildPtspta(model.gidgrp.ben));
if (model.lidgrp.ben.pts.extkey) {
ptsptaList.push(this.buildPtspta(model.lidgrp.ben));
}
let dataObj = {
rec: {
objtyp: 'GID',
ownref: model.gidgrp.rec.ownref,
opndat: model.gidgrp.rec.opndat,
expdat: model.gidgrp.rec.expdat,
branchInr: model.gidgrp.rec.branchInr,
hndtyp: model.gidgrp.rec.hndtyp,
gartyp: model.gidgrp.rec.gartyp,
fingua: model.gidgrp.rec.fingua,
segtyp: model.gidgrp.ghd.segtyp,
fromflg: model.gidgrp.rec.fromflg,
othersno: model.gidgrp.rec.othersno,
sndto: model.gidgrp.rec.sndto,
swiftflg: model.gitp.swiftflg,
giduil: model.gidgrp.rec.giduil,
purpos: model.gidgrp.rec.purpos,
revflg: model.gidgrp.rec.revflg,
cnfsta: model.gidgrp.rec.cnfsta,
ownref: model.lidgrp.rec.ownref,
opndat: model.lidgrp.rec.opndat,
expdat: model.lidgrp.rec.expdat,
branchInr: model.lidgrp.rec.branchInr,
hndtyp: model.lidgrp.rec.hndtyp,
gartyp: model.lidgrp.rec.gartyp,
fingua: model.lidgrp.rec.fingua,
// segtyp: model.lidgrp.ghd.segtyp,
fromflg: model.lidgrp.rec.fromflg,
othersno: model.lidgrp.rec.othersno,
sndto: model.lidgrp.rec.sndto,
// swiftflg: model.gitp.swiftflg,
giduil: model.lidgrp.rec.giduil,
purpos: model.lidgrp.rec.purpos,
revflg: model.lidgrp.rec.revflg,
cnfsta: model.lidgrp.rec.cnfsta,
},
cbsMap: {
MAX: model.gidgrp.cbs.max,
OPN1: model.gidgrp.cbs.opn1,
MAC: model.gidgrp.cbs.mac,
MAC2: model.gidgrp.cbs.mac2,
OPC2: model.gidgrp.cbs.opc2,
CNF: model.gidgrp.cbs.cnf,
MAX: model.lidgrp.cbs.max,
OLDMAX: model.lidgrp.cbs.oldmax,
MAX2: model.lidgrp.cbs.max2,
NOM1: model.lidgrp.cbs.nom1,
OPN1: model.lidgrp.cbs.opn1,
MAC: model.lidgrp.cbs.mac,
MAC2: model.lidgrp.cbs.mac2,
OPC2: model.lidgrp.cbs.opc2,
CNF: model.lidgrp.cbs.cnf,
},
ptsList: ptsptaList,
transName: trnName,
......@@ -118,8 +121,8 @@ export default {
...this.buildCommonData(model, trnName),
rec: {
objtyp: 'GID',
objinr: model.gidgrp.rec.objinr,
ownref: model.gidgrp.rec.ownref,
objinr: model.lidgrp.rec.objinr,
ownref: model.lidgrp.rec.ownref,
},
};
return params
......@@ -129,9 +132,9 @@ export default {
...this.buildCommonData(model, trnName),
rec: {
objtyp: 'GID',
objinr: model.gidgrp.rec.objinr,
ownref: model.gidgrp.rec.ownref,
swiftflg: model.gitp.swiftflg,
objinr: model.lidgrp.rec.objinr,
ownref: model.lidgrp.rec.ownref,
// swiftflg: model.gitp.swiftflg,
},
};
return params
......
src/business/brtdck/event/index.js
......@@ -28,7 +28,16 @@ export default {
...params,
transName: this.trnName,
userId: window.sessionStorage.userId || 'ZL',
brtInr:'00000029',
lidgrp:{
rec:{
inr:"00000026",
}
},
brdgrp:{
rec:{
inr:"00000059",
}
}
});
if (!res.data) {
return
......
src/business/brteus/event/index.js
......@@ -28,7 +28,13 @@ export default {
...params,
transName: this.trnName,
userId: window.sessionStorage.userId || 'ZL',
brdgrp:{
rec:{
inr: "00000289",
}
}
});
// debugger
if (!res.data) {
return
}
......
src/business/brteus/views/index.vue
......@@ -158,7 +158,10 @@ export default {
}
},
methods: {},
created: async function () {}
mounted () {
this.init()
this.queryHndtypCodeTableList(this.trnName)
},
}
</script>
......
src/business/brtlat/event/buildCommons.js
......@@ -28,29 +28,13 @@ export default {
let dataObj = {
rec: {
objtyp: 'LID',
// ownref: model.brdgrp.rec.ownref,
// expdat: model.lidgrp.rec.expdat,
// branchInr: model.brdgrp.rec.branchInr,
// hndtyp: model.brdgrp.rec.hndtyp,
// gartyp: model.brdgrp.rec.gartyp,
// fingua: model.brdgrp.rec.fingua,
// segtyp: model.brdgrp.ghd.segtyp,
// fromflg: model.brdgrp.rec.fromflg,
// othersno: model.brdgrp.rec.othersno,
// sndto: model.brdgrp.rec.sndto,
// swiftflg: model.gitp.swiftflg,
// giduil: model.brdgrp.rec.giduil,
// purpos: model.brdgrp.rec.purpos,
// revflg: model.brdgrp.rec.revflg,
// cnfsta: model.brdgrp.rec.cnfsta,
// },
// cbsMap: {
// MAX: model.brdgrp.cbs.max,
// OPN1: model.brdgrp.cbs.opn1,
// MAC: model.brdgrp.cbs.mac,
// MAC2: model.brdgrp.cbs.mac2,
// OPC2: model.brdgrp.cbs.opc2,
// CNF: model.brdgrp.cbs.cnf,
ownref: model.brdgrp.rec.ownref,
expdat: model.lidgrp.rec.expdat,
},
cbsMap: {
MAX: model.brdgrp.cbs.max,
OPN1: model.brdgrp.cbs.opn1,
},
ptsList: ptsptaList,
transName: trnName,
......@@ -71,8 +55,6 @@ export default {
let params = {
...this.buildCommonData(model, trnName),
setfeg: model.setmod.setfeg,
liaall: model.liaall,
liaccv: model.liaccv,
};
return params
},
......
src/business/brtlat/event/index.js
......@@ -31,16 +31,16 @@ export default {
userId: window.sessionStorage.userId || 'ZL',
lidInr:'00000036',
brdInr:'00000028'
});
console.log("测试")
});
if (!res.data) {
return
};
if (res.respCode === SUCCESS) {
this.copyValueFromVoData(this.model, res.data)
this.copyValueFromVoData(this.model.setmod.setfeg, res.data.setfeg)
this.copyValueFromVoData(this.model.setmod.setfog, res.data.setfog)
this.copyValueFromVoData(this.model.setmod.setglg, res.data.setglg)
}
this.copyValueFromVoData(this.model, res.data)
this.copyValueFromVoData(this.model.setmod.setfeg, res.data.setfeg)
this.copyValueFromVoData(this.model.setmod.setfog, res.data.setfog)
this.copyValueFromVoData(this.model.setmod.setglg, res.data.setglg)
},
// 兼容处理在前端model中定义了字段，后端返回的数据中不存在字段的问题
copyValueFromVoData (model, data) {
......@@ -69,7 +69,7 @@ export default {
let engpRequest = buildFn.buildEngp(this.model, this.trnName);
this.processLiaall(engpRequest);
break;
case 'setpan':
case 'setmod':
let setfegRequest = buildFn.buildSetfeg(this.model, this.trnName);
// 此处利用回调是为了等setfeg的接口调用完成后才去获取setglg参数，由于setglg参数依赖于setfeg函数的返回值
this.processSetpan(setfegRequest, () => {
......
src/business/brtlat/model/check.js
......@@ -16,17 +16,12 @@ export default {
{max: 3,message:"长度不能超过3"}
],
"lidgrp.rec.expdat":[
{type: "date", required: false, message: "输入正确的日期"}
{ required: false, message: "输入正确的日期"}
],
"lidgrp.cbs.opn1.cur":[
{type: "string", required: false, message: "必输项"},
{max: 3,message:"长度不能超过3"}
],
"lidgrp.cbs.opn1.amt":[
{type: "string", required: false, message: "必输项"},
{max: 18,message:"整数位不能超过14位"},
{pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
],
"brtp.recget.sdamod.dadsnd":[
{type: "string", required: false, message: "必输项"},
{max: 16,message:"长度不能超过16"}
......@@ -67,10 +62,10 @@ export default {
{max: 40,message:"长度不能超过40"}
],
"brdgrp.rec.rcvdat":[
{type: "date", required: false, message: "输入正确的日期"}
{ required: false, message: "输入正确的日期"}
],
"brdgrp.rec.advdat":[
{type: "date", required: false, message: "输入正确的日期"}
{ required: false, message: "输入正确的日期"}
],
"brdgrp.ben.pts.ref":[
{type: "string", required: false, message: "必输项"},
......@@ -78,19 +73,17 @@ export default {
],
"brdgrp.rec.matdat":[
{type: "date", required: false, message: "输入正确的日期"}
{ required: false, message: "输入正确的日期"}
],
"brdgrp.rec.stadat":[
{type: "date", required: false, message: "输入正确的日期"}
{ required: false, message: "输入正确的日期"}
],
"brdgrp.ben.pts.nam":[
{type: "string", required: false, message: "必输项"},
{max: 40,message:"长度不能超过40"}
],
"brdgrp.rec.tenmaxday":[
{type: "number", required: false, message: "必输项"},
],
"brdgrp.prb.pts.ref":[
{type: "string", required: false, message: "必输项"},
{max: 16,message:"长度不能超过16"}
......@@ -114,10 +107,7 @@ export default {
{max: 18,message:"整数位不能超过14位"},
{pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
],
"brdgrp.blk.aplins":[
{type: "string", required: true, message: "必输项"},
{max: 40,message:"长度不能超过40"}
],
"trnmod.docimm.ascin":[
{type: "string", required: false, message: "必输项"},
{max: 1,message:"长度不能超过1"}
......
src/business/brtlat/model/index.js
......@@ -3,6 +3,14 @@ import Pub from '~/components/business/commonModel/index.js';
export default class Brtlat{
constructor () {
this.data = {
// gidgrp:{
// rec:{
// branchinr
// }
// },
// gitp:{
// },
brtapll1blk:"", // XMLPanel brtapll1的内置block .brtapll1blk
brdgrp:{
shp:{
......
src/business/brtlat/views/index.vue
<template>
<div class="eContainer">
<c-page>
<el-form
:model="model"
:rules="rules"
......@@ -33,16 +32,18 @@
<m-limitbody :model="model" :codes="codes" />
</c-content>
</el-tab-pane>
<el-tab-pane label="表外记账" name="engp">
<c-content>
<!-- 表外记账 -->
<m-engp :model="model" :codes="codes" />
</c-content>
</el-tab-pane>
<!--PD000027 -->
<el-tab-pane label="费用/账务" name="setmod">
<c-content>
<m-setmod
:model="model"
:codes="codes"
@changeSetmodModel="changeSetmodModel"
/>
</c-content>
</el-tab-pane>
<c-content>
<m-setmod :model="model" :codes="codes" />
</c-content>
</el-tab-pane>
<!--PD000000 -->
......@@ -73,7 +74,6 @@
:handleStash="handleStash"
>
</c-function-btn>
</c-page>
</div>
</template>
<script>
......@@ -81,7 +81,7 @@ import CodeTable from "~/config/CodeTable";
import Brtlat from "../model";
import event from '../event';
import Addbcb from "./Addbcb";
import commonFuncs from "~/mixin/commonFuncs";
import operationFunc from "~/mixin/operationFunc";
import Check from "../model/check";
import Brtapll1 from "./Brtapll1";
import Prtswtr from "./Prtswtr";
......@@ -97,7 +97,8 @@ import Setmod from "~/components/business/setmod/views";
import Docpan from "~/components/business/docpan/views";
import Doctre from "~/components/business/doctre/views";
import Limitbody from "~/components/business/limitbody/views";
import Total from "./Total"
import Total from "./Total";
import Engp from "~/components/business/engp/views";
export default {
name: "Brtlat",
......@@ -117,20 +118,22 @@ export default {
"m-cmnsetl1": Cmnsetl1,
"m-syswrndisplay": Syswrndisplay,
"m-limitbody": Limitbody,
"m-total": Total
"m-total": Total,
"m-engp": Engp,
},
provide() {
return {
root: this,
};
},
mixins: [event, commonFuncs], // 里面包含了Default、Check等的公共处理
mixins: [event, operationFunc], // 里面包含了Default、Check等的公共处理
data() {
return {
tabVal: "total",
trnName: "brtlat",
model: new Brtlat().data,
rules: Check,
activeNames: ["engp"],
codes: {
...CodeTable,
},
......
src/business/gitopn/model/index.js
......@@ -58,7 +58,7 @@ export default class Gitopn {
},
gidgrp: {
rec: {
branchinr: '00000047',
branchinr: '',
ownref: '', // Reference .gidgrp.rec.ownref
purposin: '', // Incoming Purpose .gidgrp.rec.purposin
purpos: '', // Outgoing Purpose .gidgrp.rec.purpos
......
src/business/infbrd/event/index.js
......@@ -77,9 +77,11 @@ export default {
async details(row) {
const params = {
//根据xx字段 查询详情表的数据
inr:row.inr,
userId: window.sessionStorage.userId || 'ZL',
ownref: row.ownref,
};
const res = await Api.post('/service/infbrd/getDetailByOwnref', params);
const res = await Api.post('/service/infbrd/getDetail', params);
if (res.respCode === SUCCESS) {
this.trnData.data = res.data;
}
......
src/business/infbrd/model/index.js
......@@ -12,8 +12,8 @@ export default class Infbrd {
seadocflg: '',
infcon: {
chksubcon: '',
opndatfrom: '',
opndatto: '',
opndatfrom: new Date(),
opndatto: new Date(),
seaownref: '',
seashgref: '',
seaamtfr: '',
......
src/business/infbrd/views/Infsea.vue
......@@ -96,6 +96,7 @@
></c-input>
</el-form-item>
</c-col>
<c-col :span="8">
<el-form-item
style="width: 100%"
......@@ -138,6 +139,7 @@
></c-input>
</el-form-item>
</c-col>
<c-col :span="8">
<el-form-item label="当事人角色" style="width: 100%">
<c-select
......@@ -170,6 +172,7 @@
></c-input>
</el-form-item>
</c-col>
<c-col :span="8">
<el-form-item
style="width: 100%"
......@@ -219,6 +222,7 @@
</c-select>
</el-form-item>
</c-col>
<c-col :span="8">
<el-form-item
style="width: 100%"
......@@ -491,10 +495,6 @@ export default {
label: "货物类型",
prop: "stagod",
},
// {
// label: '操作',
// prop: 'ownref'
// },
],
data: [],
},
......@@ -506,6 +506,52 @@ export default {
initdialog: false,
handlerDataList: [],
btnRouteMap: [
{
label: '寄单',
route: '/business-new/brtsnd'
},
{
label: '改单/二次到单',
route: '/business-new/brtdck'
},
{
label: '拒付/不符点处理',
route: '/business-new/brtdcr'
},
{
label:'接收不符点',
route:'/business-new/brtacp'
},
{
label:'承兑',
route:'/business-new/brtudp'
},
{
label:'展期',
route:'/business-new/brteus'
},
{
label:'付汇',
route:'/business-new/brtset'
},
{
label:'提货担保修改',
route:'/business-new/brtame'
},
{
label:'提货担保注销',
route:'/business-new/brtcsg'
},
{
label:'单据偿还垫款',
route:'/business-new/brtlat'
},
{
label:'单据注销',
route:'/business-new/brtcan'
},
],
currentHandleRow: {},
};
},
......
src/business/inflid/views/Infsea.vue
......@@ -220,8 +220,8 @@
</div>
</c-col>
</div>
<!-- 点击处理弹框 -->
<el-dialog
<!-- 点击处理弹框 -->
<el-dialog
:visible.sync="initdialog"
title="交易列表"
append-to-body
......@@ -261,42 +261,50 @@ export default {
columns: [
{
label: '保函编号',
prop: 'ownref'
prop: 'seaownref'
},
{
label: '客户经理',
prop: 'ownusr'
},
{
label: '分行名称',
prop: 'bchname'
label: '币种',
prop: 'seacur'
},
{
label: '处理类型',
prop: 'hndtyp',
label: '金额',
prop: 'maxamt',
},
{
label: '电子渠道类型',
prop: 'fromflg'
label: '余额',
prop: 'opnamt'
},
{
label: '其他编号',
prop: 'othersno'
label: '开立日期',
prop: 'opndat'
},
{
label: '保函品种',
prop: 'othersno',
label: '申请人编号',
prop: 'aplextkey',
},
{
label: '开立日期',
prop: 'opndat'
label: '申请人名称',
prop: 'aplnam'
},
{
label: '通知银行BIC编码',
prop: 'seapty'
},
{
label: '保函效期',
prop: 'expdat'
label: '受益人名称',
prop: 'benefi'
},
{
label: '远离期限',
prop: 'tenmaxday'
},
],
data: [],
......
src/model/Litopn/Check.js
......@@ -48,7 +48,7 @@ let checkObj = {
"lidgrp.rmb.pts.extkey" :null,
"lidgrp.rec.rptref" :null,
"lidgrp.adv.pts.extkey" :null,
"trnmod.trndia.diarec.dat" :null,
// "trnmod.trndia.diarec.dat" :null,
"lidgrp.adv.adrelc" :null,
"lidgrp.ben.pts.extkey" :null,
"lidgrp.cbs.max2.amt" :null,
......@@ -98,11 +98,11 @@ let checkObj = {
"lidgrp.rec.ownref" :null,
"lidgrp.a2b.adrelc" :null,
"litp.advp.ptsget.sdamod.dadsnd" :null,
"trnmod.trndia.diarec.nam" :null,
// "trnmod.trndia.diarec.nam" :null,
"lidgrp.avb.namelc" :null,
"cnybop.cnylib.sbanktrano" :null,
"lidgrp.blk.feetxt" :null,
"trnmod.trndia.diarec.cod" :null,
// "trnmod.trndia.diarec.cod" :null,
"litp.recget.sdamod.dadsnd" :null,
"lidgrp.ben.adrelc" :null,
"cnybop.cnylib.sforbankswiftbic" :null,
......
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