Skip to content

V
vue-gjjs
Commit 8882a0bd by liaoxing
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 6c2fb9bf 295726a8
Showing with 113 additions and 61 deletions
src/business/brtdck/event/index.js
......@@ -74,7 +74,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/event/buildCommons.js
......@@ -27,9 +27,12 @@ export default {
}
let dataObj = {
rec: {
objtyp: 'LID',
objtyp: 'BRD',
objinr: model.brdgrp.rec.inr,
ownref: model.brdgrp.rec.ownref,
expdat: model.lidgrp.rec.expdat,
doccur: model.setmod.doccur,
docamt: model.setmod.docamt,
},
cbsMap: {
......
src/business/brtlat/event/index.js
......@@ -51,6 +51,13 @@ export default {
this.copyValueFromVoData(this.model.setmod.setfog, res.data.setfog)
this.copyValueFromVoData(this.model.setmod.setglg, res.data.setglg)
}
let setfegRequest = buildFn.buildSetfeg(this.model, this.trnName);
// 此处利用回调是为了等setfeg的接口调用完成后才去获取setglg参数，由于setglg参数依赖于setfeg函数的返回值
this.processSetpan(setfegRequest, () => {
return buildFn.buildSetglg(this.model, this.trnName);
});
},
// 兼容处理在前端model中定义了字段，后端返回的数据中不存在字段的问题
copyValueFromVoData (model, data) {
......
src/business/brtlat/model/index.js
......@@ -43,7 +43,7 @@ export default class Brtlat{
},
opn1:{
cur:"", // 单据余额 .brdgrp.cbs.opn1.cur
amt:"", // Balance .brdgrp.cbs.opn1.amt
amt:"0.0", // Balance .brdgrp.cbs.opn1.amt
},
},
apl:{
......
src/business/brtlat/views/Utlp.vue
<template>
<div class="eibs">
<c-row >
<c-row>
<c-col :span="24">
<!---------------------------左边--------------------------->
<c-col :span="12" class="col-left">
<c-col :span="24">
<el-form-item label="信用证编号" prop="lidgrp.rec.ownref">
<c-input v-model="model.lidgrp.rec.ownref" maxlength="16" placeholder="请输入信用证编号" disabled></c-input>
<c-input v-model="model.lidgrp.rec.ownref" maxlength="16" placeholder="请输入信用证编号"
disabled></c-input>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="单据参考号" prop="brdgrp.rec.ownref">
<c-input v-model="model.brdgrp.rec.ownref" maxlength="16" placeholder="请输入单据参考号" disabled></c-input>
<c-input v-model="model.brdgrp.rec.ownref" maxlength="16" placeholder="请输入单据参考号"
disabled></c-input>
</el-form-item>
</c-col>
<c-col :span="24">
<c-col :span="13">
<el-form-item label="单据金额" prop="brdgrp.cbs.max.cur">
<c-select v-model="model.brdgrp.cbs.max.cur" style="width:100%" placeholder="请选择单据金额" disabled :code="codes.cur">
<c-select v-model="model.brdgrp.cbs.max.cur" style="width:100%" placeholder="请选择单据金额" disabled
:code="codes.cur">
</c-select>
</el-form-item>
</c-col>
......@@ -33,7 +36,8 @@
<c-col :span="24">
<c-col :span="13">
<el-form-item label="单据余额" prop="brdgrp.cbs.opn1.cur">
<c-input v-model="model.brdgrp.cbs.opn1.cur" maxlength="3" placeholder="请输入单据余额" disabled :code="codes.cur"></c-input>
<c-input v-model="model.brdgrp.cbs.opn1.cur" maxlength="3" placeholder="请输入单据余额" disabled
:code="codes.cur"></c-input>
</el-form-item>
</c-col>
......@@ -47,12 +51,14 @@
<c-col :span="24">
<c-col :span="12">
<el-form-item label="到单日期" prop="brdgrp.rec.rcvdat">
<c-date-picker type="date" v-model="model.brdgrp.rec.rcvdat" style="width:100%" placeholder="请选择到单日期" disabled></c-date-picker>
<c-date-picker type="date" v-model="model.brdgrp.rec.rcvdat" style="width:100%"
placeholder="请选择到单日期" disabled></c-date-picker>
</el-form-item>
</c-col>
<c-col :span="12">
<el-form-item label="通知到单日期" prop="brdgrp.rec.advdat">
<c-date-picker type="date" v-model="model.brdgrp.rec.advdat" style="width:100%" placeholder="请选择通知到单日期" disabled></c-date-picker>
<c-date-picker type="date" v-model="model.brdgrp.rec.advdat" style="width:100%"
placeholder="请选择通知到单日期" disabled></c-date-picker>
</el-form-item>
</c-col>
</c-col>
......@@ -60,19 +66,22 @@
<c-col :span="24">
<c-col :span="12">
<el-form-item label="远期单据到期日" prop="brdgrp.rec.matdat">
<c-date-picker type="date" v-model="model.brdgrp.rec.matdat" style="width:100%" placeholder="请选择远期单据到期日" disabled></c-date-picker>
<c-date-picker type="date" v-model="model.brdgrp.rec.matdat" style="width:100%"
placeholder="请选择远期单据到期日" disabled></c-date-picker>
</el-form-item>
</c-col>
<c-col :span="12">
<el-form-item label="开始日期" prop="brdgrp.rec.stadat">
<c-date-picker type="date" v-model="model.brdgrp.rec.stadat" style="width:100%" placeholder="请选择开始日期" disabled></c-date-picker>
<c-date-picker type="date" v-model="model.brdgrp.rec.stadat" style="width:100%"
placeholder="请选择开始日期" disabled></c-date-picker>
</el-form-item>
</c-col>
</c-col>
<c-col :span="24">
<c-col :span="12">
<el-form-item label="单据类型" prop="brdgrp.rec.docflg">
<c-select v-model="model.brdgrp.rec.docflg" style="width:100%" placeholder="请选择单据类型" :code="codes.docflg" disabled>
<c-select v-model="model.brdgrp.rec.docflg" style="width:100%" placeholder="请选择单据类型"
:code="codes.docflg" disabled>
</c-select>
</el-form-item>
</c-col>
......@@ -84,14 +93,16 @@
</c-col>
<c-col :span="24">
<el-form-item label="单据状态" prop="brdgrp.rec.docsta">
<c-select v-model="model.brdgrp.rec.docsta" style="width:100%" placeholder="请选择单据状态" :code="codes.docsta1" disabled>
<c-select v-model="model.brdgrp.rec.docsta" style="width:100%" placeholder="请选择单据状态"
:code="codes.docsta1" disabled>
</c-select>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="提交单据" prop="brdgrp.blk.prsdoc">
<c-input type="textarea" v-model="model.brdgrp.blk.prsdoc" maxlength="65" show-word-limit placeholder="请输入" :rows="5" disabled></c-input>
<c-input type="textarea" v-model="model.brdgrp.blk.prsdoc" maxlength="65" show-word-limit
placeholder="请输入" :rows="5" disabled></c-input>
</el-form-item>
</c-col>
......@@ -101,7 +112,8 @@
<c-col :span="12" class="col-right">
<c-col :span="24">
<el-form-item label="到期日" prop="lidgrp.rec.expdat">
<c-date-picker type="date" v-model="model.lidgrp.rec.expdat" style="width:100%" placeholder="请选择到期日" disabled></c-date-picker>
<c-date-picker type="date" v-model="model.lidgrp.rec.expdat" style="width:100%" placeholder="请选择到期日"
disabled></c-date-picker>
</el-form-item>
</c-col>
<c-col :span="24">
......@@ -118,13 +130,15 @@
</c-col>
<c-col :span="24">
<el-form-item label="单据简略信息" prop="brdgrp.rec.nam">
<c-input v-model="model.brdgrp.rec.nam" maxlength="40" placeholder="请输入单据简略信息" disabled></c-input>
<c-input v-model="model.brdgrp.rec.nam" maxlength="40" placeholder="请输入单据简略信息"
disabled></c-input>
</el-form-item>
</c-col>
<c-col :span="24">
<c-col :span="13">
<el-form-item label="申请人" prop="brdgrp.apl.pts.ref">
<c-input v-model="model.brdgrp.apl.pts.ref" maxlength="16" placeholder="请输入申请人" disabled></c-input>
<c-input v-model="model.brdgrp.apl.pts.ref" maxlength="16" placeholder="请输入申请人"
disabled></c-input>
</el-form-item>
</c-col>
<c-col :span="11">
......@@ -137,7 +151,8 @@
<c-col :span="24">
<c-col :span="13">
<el-form-item label="受益人" prop="brdgrp.ben.pts.ref">
<c-input v-model="model.brdgrp.ben.pts.ref" maxlength="16" placeholder="请输入受益人" disabled></c-input>
<c-input v-model="model.brdgrp.ben.pts.ref" maxlength="16" placeholder="请输入受益人"
disabled></c-input>
</el-form-item>
</c-col>
<c-col :span="11">
......@@ -150,7 +165,8 @@
<c-col :span="24">
<c-col :span="13">
<el-form-item label="交单行" prop="brdgrp.prb.pts.ref">
<c-input v-model="model.brdgrp.prb.pts.ref" maxlength="16" placeholder="请输入交单行" disabled></c-input>
<c-input v-model="model.brdgrp.prb.pts.ref" maxlength="16" placeholder="请输入交单行"
disabled></c-input>
</el-form-item>
</c-col>
<c-col :span="11">
......@@ -172,7 +188,8 @@
<c-col :span="24">
<c-col :span="13">
<el-form-item label="减少后的结算金额" prop="setmod.doccur">
<c-input v-model="model.setmod.doccur" maxlength="3" placeholder="请输入减少后的结算金额" disabled></c-input>
<c-input v-model="model.setmod.doccur" maxlength="3" placeholder="请输入减少后的结算金额"
disabled></c-input>
</el-form-item>
</c-col>
<c-col :span="11">
......@@ -183,7 +200,8 @@
</c-col>
<c-col :span="24">
<el-form-item label="收到申请人指示" prop="brdgrp.blk.aplins">
<c-input type="textarea" v-model="model.brdgrp.blk.aplins" maxlength="40" show-word-limit placeholder="请输入指示内容" :rows="5"></c-input>
<c-input type="textarea" v-model="model.brdgrp.blk.aplins" maxlength="40" show-word-limit
placeholder="请输入指示内容" :rows="5"></c-input>
</el-form-item>
</c-col>
</c-col>
......@@ -213,7 +231,7 @@
</el-form-item>
</c-col>
<c-col :span="12">
<span v-text="model.brtp.matp.mattxtlab" data-path=".brtp.matp.mattxtlab" > </span>
<span v-text="model.brtp.matp.mattxtlab" data-path=".brtp.matp.mattxtlab"> </span>
</c-col>
......@@ -224,17 +242,21 @@
</template>
<script>
import event from "../event"
export default {
inject: ['root'],
props:["model","codes"],
props: ["model", "codes"],
mixins: [event],
data(){
return {
}
data() {
return {}
},
created:function(){
created: function () {
},
computed: {
setmoddoccur() {
this.model.setmod.doccur = this.brdgrp.cbs.max.cur
return this.model.setmod.doccur
}
}
}
</script>
......
src/business/brtset/model/index.js
......@@ -425,10 +425,10 @@ export default class Bctset {
},
lidgrp: {
rec: {
inr:"00000014",
inr:"",
expdat: '',
ownref: '',
branchinr:"00000014",
branchinr:"",
},
cbs: {
opn1: {
......
src/business/brtset/views/Utlp.vue
......@@ -270,7 +270,7 @@
<c-col :span="13">
<el-form-item label="单据金额部分" prop="brdgrp.cbs.opn2.cur">
<c-select
v-model="model.brdgrp.cbs.opn2.cur"
v-model="opn2cur"
style="width: 100%"
placeholder="请选择币种"
:code="codes.cur"
......@@ -293,7 +293,7 @@
<c-col :span="13">
<el-form-item label="附加金额部分" prop="brdgrp.cbs.opn2.cur">
<c-select
v-model="model.brdgrp.cbs.opn2.cur"
v-model="opn2cur"
style="width: 100%"
placeholder="请选择币种"
:code="codes.cur"
......@@ -745,6 +745,12 @@ export default {
},
},
},
computed:{
opn2cur(){
this.model.brdgrp.cbs.opn2.cur = this.model.brdgrp.cbs.max.cur
return this.model.brdgrp.cbs.opn2.cur
}
}
};
</script>
<style>
......
src/business/brtudp/event/buildCommons.js
......@@ -45,7 +45,7 @@ export default {
ownref: model.brdgrp.rec.ownref,
opndat: model.brdgrp.rec.opndat,
expdat: model.brdgrp.rec.expdat,
branchInr: model.brdgrp.rec.branchInr,
branchInr: model.brdgrp.rec.branchinr,
hndtyp: model.brdgrp.rec.hndtyp,
gartyp: model.brdgrp.rec.gartyp,
fingua: model.brdgrp.rec.fingua,
......@@ -59,10 +59,17 @@ export default {
cnfsta: model.brdgrp.rec.cnfsta,
sftmt: model.sftmt,
docprbrol: model.brdgrp.rec.docprbrol,
docamt: model.setmod.docamt,
doccur: model.setmod.doccur,
expdat: model.brdgrp.rec.expdat,
matdat: model.brdgrp.rec.matdat,
acpnowflg: model.brdgrp.rec.acpnowflg,
docflg: model.brdgrp.rec.docflg,
},
cbsMap: {
MAX: model.brdgrp.cbs.max,
OPN1: model.brdgrp.cbs.opn1,
OPN2: model.brdgrp.cbs.opn2,
MAC: model.brdgrp.cbs.mac,
MAC2: model.brdgrp.cbs.mac2,
OPC2: model.brdgrp.cbs.opc2,
......
src/business/brtudp/event/index.js
......@@ -105,7 +105,7 @@ export default {
// 业务信息=》基本信息=》保函编号-----获取保函编号
async queryOwnref() {
let params = {
ptainr: this.model.gidgrp.apl.pts.ptainr,
ptainr: this.model.brdgrp.apl.pts.ptainr,
businessType: 'LG',
tbl: 'LG',
};
......@@ -113,7 +113,7 @@ export default {
let res = await Api.post('/service/brtudp/getOwnRef', params);
if (res.respCode == SUCCESS) {
loading.close();
this.model.gidgrp.rec.ownref = res.data;
this.model.brdgrp.rec.ownref = res.data;
}
},
// 获取brtudp弹框表格数据
......
src/business/brtudp/model/index.js
......@@ -24,19 +24,19 @@ export default class Brtudp {
relstoadr: ''
},
prb: {
pts:new Pts().data
pts: new Pts().data
},
acb: {
pts:new Pts().data
pts: new Pts().data
},
rmb: {
pts:new Pts().data
pts: new Pts().data
},
beb: {
pts:new Pts().data
pts: new Pts().data
},
shp: {
pts:new Pts().data
pts: new Pts().data
},
rec: {
tenmaxday: '',
......@@ -70,6 +70,7 @@ export default class Brtudp {
advdat: '',
stadat: '',
dscinsflg: '',
acpnowflg:'X',
branchinr:'',
inr:''
},
......@@ -96,7 +97,7 @@ export default class Brtudp {
brtp: {
connum: '',
oth: {
pts:new Pts().data
pts: new Pts().data
},
},
aamset: {
......
src/business/brtudp/views/index.vue
......@@ -45,6 +45,13 @@
</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>
......
src/business/infbed/model/index.js
......@@ -14,8 +14,8 @@ export default class Infbed{
},
infcon: {
chksubcon: '',
opndatfrom: '',
opndatto: '',
opndatfrom: new Date(),
opndatto: new Date(),
seaownref: '',
forflg: '',
invnum: '',
......
src/business/infbed/views/Infsea.vue
......@@ -51,8 +51,9 @@
<c-date-picker
type="date"
v-model="model.infcon.opndatto"
placeholder="请选择截止日期"
style="width: 100%"
placeholder="请选择截至日期"
value-format="yyyy-MM-dd"
></c-date-picker>
</c-col>
</el-form-item>
......
src/business/litdav/event/buildCommons.js
......@@ -31,10 +31,11 @@ export default {
let dataObj = {
rec: {
objtyp: 'BRD',
ownref: model.lidgrp.rec.ownref,
opndat: model.lidgrp.rec.opndat,
expdat: model.lidgrp.rec.expdat,
branchInr: model.lidgrp.rec.branchInr,
objinr: model.brdgrp.rec.inr,
ownref: model.brdgrp.rec.ownref,
opndat: model.brdgrp.rec.opndat,
expdat: model.brdgrp.rec.expdat,
branchInr: model.brdgrp.rec.branchinr,
hndtyp: model.lidgrp.rec.hndtyp,
gartyp: model.lidgrp.rec.gartyp,
fingua: model.lidgrp.rec.fingua,
......@@ -50,17 +51,14 @@ export default {
advtyp: model.brdgrp.rec.advtyp,
},
cbsMap: {
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,
// 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,
MAX: model.brdgrp.cbs.max,
MAX2: model.brdgrp.cbs.max2,
OPN2: model.brdgrp.cbs.opn1,
},
ptsList: ptsptaList,
transName: trnName,
......
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