Skip to content

V
vue-gjjs
Commit 1b57c982 by WF1020
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 ee223f04 6458be20
Showing with 85 additions and 81 deletions
src/business/brtdcr/event/buildCommons.js
...@@ -30,31 +30,31 @@ export default { ...@@ -30,31 +30,31 @@ export default {
} }
let dataObj = { let dataObj = {
rec: { rec: {
objtyp: 'GID', objtyp: 'LID',
ownref: model.gidgrp.rec.ownref, ownref: model.brdgrp.rec.ownref,
opndat: model.gidgrp.rec.opndat, opndat: model.brdgrp.rec.opndat,
expdat: model.gidgrp.rec.expdat, expdat: model.brdgrp.rec.expdat,
branchInr: model.gidgrp.rec.branchInr, branchInr: model.brdgrp.rec.branchInr,
hndtyp: model.gidgrp.rec.hndtyp, hndtyp: model.brdgrp.rec.hndtyp,
gartyp: model.gidgrp.rec.gartyp, gartyp: model.brdgrp.rec.gartyp,
fingua: model.gidgrp.rec.fingua, fingua: model.brdgrp.rec.fingua,
segtyp: model.gidgrp.ghd.segtyp, // segtyp: model.brdgrp.ghd.segtyp,
fromflg: model.gidgrp.rec.fromflg, fromflg: model.brdgrp.rec.fromflg,
othersno: model.gidgrp.rec.othersno, othersno: model.brdgrp.rec.othersno,
sndto: model.gidgrp.rec.sndto, sndto: model.brdgrp.rec.sndto,
swiftflg: model.gitp.swiftflg, // swiftflg: model.gitp.swiftflg,
giduil: model.gidgrp.rec.giduil, giduil: model.brdgrp.rec.giduil,
purpos: model.gidgrp.rec.purpos, purpos: model.brdgrp.rec.purpos,
revflg: model.gidgrp.rec.revflg, revflg: model.brdgrp.rec.revflg,
cnfsta: model.gidgrp.rec.cnfsta, cnfsta: model.brdgrp.rec.cnfsta,
}, },
cbsMap: { cbsMap: {
MAX: model.gidgrp.cbs.max, MAX: model.brdgrp.cbs.max,
OPN1: model.gidgrp.cbs.opn1, OPN1: model.brdgrp.cbs.opn1,
MAC: model.gidgrp.cbs.mac, MAC: model.brdgrp.cbs.mac,
MAC2: model.gidgrp.cbs.mac2, MAC2: model.brdgrp.cbs.mac2,
OPC2: model.gidgrp.cbs.opc2, OPC2: model.brdgrp.cbs.opc2,
CNF: model.gidgrp.cbs.cnf, CNF: model.brdgrp.cbs.cnf,
}, },
ptsList: ptsptaList, ptsList: ptsptaList,
transName: trnName, transName: trnName,
...@@ -67,7 +67,7 @@ export default { ...@@ -67,7 +67,7 @@ export default {
...this.buildCommonData(model, trnName), ...this.buildCommonData(model, trnName),
liaall: model.liaall, liaall: model.liaall,
liaccv: model.liaccv, liaccv: model.liaccv,
doceot: model.trnmod.trndoc.doceot, // doceot: model.trnmod.trndoc.doceot,
}; };
return params return params
}, },
...@@ -117,9 +117,9 @@ export default { ...@@ -117,9 +117,9 @@ export default {
let params = { let params = {
...this.buildCommonData(model, trnName), ...this.buildCommonData(model, trnName),
rec: { rec: {
objtyp: 'GID', objtyp: 'LID',
objinr: model.gidgrp.rec.objinr, objinr: model.brdgrp.rec.objinr,
ownref: model.gidgrp.rec.ownref, ownref: model.brdgrp.rec.ownref,
}, },
}; };
return params return params
...@@ -128,10 +128,10 @@ export default { ...@@ -128,10 +128,10 @@ export default {
let params = { let params = {
...this.buildCommonData(model, trnName), ...this.buildCommonData(model, trnName),
rec: { rec: {
objtyp: 'GID', objtyp: 'LID',
objinr: model.gidgrp.rec.objinr, objinr: model.brdgrp.rec.objinr,
ownref: model.gidgrp.rec.ownref, ownref: model.brdgrp.rec.ownref,
swiftflg: model.gitp.swiftflg, // swiftflg: model.gitp.swiftflg,
}, },
}; };
return params return params
......
src/business/brtdcr/event/index.js
...@@ -25,7 +25,6 @@ export default { ...@@ -25,7 +25,6 @@ export default {
spt: JSON.parse(localStorage.getItem('row_' + this.trnName)) spt: JSON.parse(localStorage.getItem('row_' + this.trnName))
} }
const res = await Api.post('/service/brtdcr/init', { const res = await Api.post('/service/brtdcr/init', {
...params,
transName: this.trnName, transName: this.trnName,
userId: window.sessionStorage.userId || 'ZL', userId: window.sessionStorage.userId || 'ZL',
lidinr: this.$route.query.inr lidinr: this.$route.query.inr
...@@ -65,7 +64,7 @@ export default { ...@@ -65,7 +64,7 @@ export default {
let engpRequest = buildFn.buildEngp(this.model, this.trnName); let engpRequest = buildFn.buildEngp(this.model, this.trnName);
this.processLiaall(engpRequest); this.processLiaall(engpRequest);
break; break;
case 'setpan': case 'setmod':
let setfegRequest = buildFn.buildSetfeg(this.model, this.trnName); let setfegRequest = buildFn.buildSetfeg(this.model, this.trnName);
// 此处利用回调是为了等setfeg的接口调用完成后才去获取setglg参数，由于setglg参数依赖于setfeg函数的返回值 // 此处利用回调是为了等setfeg的接口调用完成后才去获取setglg参数，由于setglg参数依赖于setfeg函数的返回值
this.processSetpan(setfegRequest, () => { this.processSetpan(setfegRequest, () => {
......
src/business/brtdcr/model/check.js
...@@ -186,11 +186,11 @@ export default { ...@@ -186,11 +186,11 @@ export default {
], ],
"liaall.outamt":[ // "liaall.outamt":[
{type: "string", required: false, message: "必输项"}, // {type: "string", required: false, message: "必输项"},
{max: 18,message:"整数位不能超过14位"}, // {max: 18,message:"整数位不能超过14位"},
{pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" } // {pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
], // ],
"liaall.outpct":[ "liaall.outpct":[
{type: "string", required: false, message: "必输项"}, {type: "string", required: false, message: "必输项"},
{max: 6,message:"长度不能超过6"} {max: 6,message:"长度不能超过6"}
...@@ -199,34 +199,34 @@ export default { ...@@ -199,34 +199,34 @@ export default {
{type: "string", required: false, message: "必输项"}, {type: "string", required: false, message: "必输项"},
{max: 3,message:"长度不能超过3"} {max: 3,message:"长度不能超过3"}
], ],
"liaall.misamt":[ // "liaall.misamt":[
{type: "string", required: false, message: "必输项"}, // {type: "string", required: false, message: "必输项"},
{max: 18,message:"整数位不能超过14位"}, // {max: 18,message:"整数位不能超过14位"},
{pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" } // {pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
], // ],
"liaall.exttotoldamt":[ // "liaall.exttotoldamt":[
{type: "string", required: false, message: "必输项"}, // {type: "string", required: false, message: "必输项"},
{max: 18,message:"整数位不能超过14位"}, // {max: 18,message:"整数位不能超过14位"},
{pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" } // {pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
], // ],
"liaall.exttotamt":[ // "liaall.exttotamt":[
{type: "string", required: false, message: "必输项"}, // {type: "string", required: false, message: "必输项"},
{max: 18,message:"整数位不能超过14位"}, // {max: 18,message:"整数位不能超过14位"},
{pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" } // {pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
], // ],
"setmod.ref":[ "setmod.ref":[
{type: "string", required: false, message: "必输项"}, {type: "string", required: false, message: "必输项"},
{max: 16,message:"长度不能超过16"} {max: 16,message:"长度不能超过16"}
], ],
"setmod.docamt":[ // "setmod.docamt":[
{type: "string", required: false, message: "必输项"}, // {type: "string", required: false, message: "必输项"},
{max: 18,message:"整数位不能超过14位"}, // {max: 18,message:"整数位不能超过14位"},
{pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" } // {pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
], // ],
...@@ -332,11 +332,11 @@ export default { ...@@ -332,11 +332,11 @@ export default {
{max: 3,message:"长度不能超过3"} {max: 3,message:"长度不能超过3"}
], ],
"liaall.limmod.comamt":[ // "liaall.limmod.comamt":[
{type: "string", required: false, message: "必输项"}, // {type: "string", required: false, message: "必输项"},
{max: 18,message:"整数位不能超过14位"}, // {max: 18,message:"整数位不能超过14位"},
{pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" } // {pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
], // ],
"liaall.limmod.limpts.wrk.pts.nam":[ "liaall.limmod.limpts.wrk.pts.nam":[
{type: "string", required: false, message: "必输项"}, {type: "string", required: false, message: "必输项"},
{max: 40,message:"长度不能超过40"} {max: 40,message:"长度不能超过40"}
...@@ -345,11 +345,11 @@ export default { ...@@ -345,11 +345,11 @@ export default {
{type: "string", required: false, message: "必输项"}, {type: "string", required: false, message: "必输项"},
{max: 40,message:"长度不能超过40"} {max: 40,message:"长度不能超过40"}
], ],
"liaall.limmod.ccvamt":[ // "liaall.limmod.ccvamt":[
{type: "string", required: false, message: "必输项"}, // {type: "string", required: false, message: "必输项"},
{max: 18,message:"整数位不能超过14位"}, // {max: 18,message:"整数位不能超过14位"},
{pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" } // {pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
], // ],
...@@ -365,11 +365,11 @@ export default { ...@@ -365,11 +365,11 @@ export default {
], ],
"brdgrp.cbs.max2.amt":[ // "brdgrp.cbs.max2.amt":[
{required: false, message: "必输项"}, // {required: false, message: "必输项"},
{max: 18,message:"整数位不能超过14位"}, // {max: 18,message:"整数位不能超过14位"},
{pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" } // {pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
], // ],
"brdgrp.blk.chaded":[ "brdgrp.blk.chaded":[
//{type: "string", required: false, message: "必输项"}, //{type: "string", required: false, message: "必输项"},
{max: 210,message:"长度不能超过210"} {max: 210,message:"长度不能超过210"}
...@@ -382,11 +382,11 @@ export default { ...@@ -382,11 +382,11 @@ export default {
{type: "string", required: false, message: "必输项"}, {type: "string", required: false, message: "必输项"},
{max: 3,message:"长度不能超过3"} {max: 3,message:"长度不能超过3"}
], ],
"brdgrp.rec.totamt":[ // "brdgrp.rec.totamt":[
{type: "string", required: false, message: "必输项"}, // {type: "string", required: false, message: "必输项"},
{max: 18,message:"整数位不能超过14位"}, // {max: 18,message:"整数位不能超过14位"},
{pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" } // {pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
], // ],
"brtp.acbp.ptsget.sdamod.dadsnd":[ "brtp.acbp.ptsget.sdamod.dadsnd":[
{type: "string", required: false, message: "必输项"}, {type: "string", required: false, message: "必输项"},
{max: 16,message:"长度不能超过16"} {max: 16,message:"长度不能超过16"}
......
src/business/brtdcr/model/index.js
...@@ -78,6 +78,7 @@ export default class Brtdcr { ...@@ -78,6 +78,7 @@ export default class Brtdcr {
pts: new Pts().data, pts: new Pts().data,
}, },
rec: { rec: {
inr:"",
totcur: '', totcur: '',
advtyp: '', advtyp: '',
ownref: '', ownref: '',
...@@ -134,8 +135,10 @@ export default class Brtdcr { ...@@ -134,8 +135,10 @@ export default class Brtdcr {
advrefflg: '', advrefflg: '',
lidgrp: { lidgrp: {
rec: { rec: {
inr:'',
expdat: '', expdat: '',
ownref: '' ownref: '',
branchinr: "00000047",
}, },
cbs: { cbs: {
opn1: { opn1: {
......
src/business/brtdcr/views/index.vue
...@@ -75,8 +75,10 @@ ...@@ -75,8 +75,10 @@
<c-grid-ety-prompt-dialog ref="doxpDialog" :isPty="false" :promptData="promptData"> <c-grid-ety-prompt-dialog ref="doxpDialog" :isPty="false" :promptData="promptData">
</c-grid-ety-prompt-dialog> </c-grid-ety-prompt-dialog>
<c-function-btn :handleSubmit="handleSubmit" :handleCheck="handleCheck" :handleStash="handleStash"> <c-function-btn
:handleSubmit="handleSubmit"
:handleCheck="handleCheck"
:handleStash="handleStash">
</c-function-btn> </c-function-btn>
</div> </div>
......
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