Skip to content

V
vue-gjjs
Commit 0a8776e0 by xionglin
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 69dcffff aed69a6c
Showing with 157 additions and 88 deletions
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/index.js
......@@ -34,12 +34,13 @@ export default {
});
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) {
......
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
......@@ -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/business/litame/event/index.js
......@@ -28,6 +28,11 @@ export default {
...params,
transName: this.trnName,
userId: window.sessionStorage.userId || 'ZL',
lidgrp:{
rec:{
inr: "00006833",
}
}
});
if (!res.data) {
return
......@@ -64,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/litame/views/Amep.vue
......@@ -28,10 +28,10 @@
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="修改日期" prop="trnmod.swiadd.amedat">
<el-form-item label="修改日期" prop="swiadd.amedat">
<c-date-picker
type="date"
v-model="model.trnmod.swiadd.amedat"
v-model="model.swiadd.amedat"
style="width: 100%"
placeholder="请选择修改日期"
></c-date-picker>
......@@ -78,9 +78,9 @@
</el-form-item>
</c-col>
<c-col :span="12">
<el-form-item label="修改金额" prop="trnmod.swiadd.amecur">
<el-form-item label="修改金额" prop="swiadd.amecur">
<c-input
v-model="model.trnmod.swiadd.amecur"
v-model="model.swiadd.amecur"
style="width: 100%"
placeholder="请输入修改金额"
disabled
......@@ -90,17 +90,17 @@
</c-col>
<c-col :span="12">
<el-form-item label="" prop="trnmod.swiadd.ameamt">
<el-form-item label="" prop="swiadd.ameamt">
<c-input-currency-min
v-model="model.trnmod.swiadd.ameamt"
v-model="model.swiadd.ameamt"
placeholder="请输入增减金额."
></c-input-currency-min>
</el-form-item>
</c-col>
<c-col :span="12">
<el-form-item label="修改后金额" prop="trnmod.swiadd.newcur">
<el-form-item label="修改后金额" prop="swiadd.newcur">
<c-input
v-model="model.trnmod.swiadd.newcur"
v-model="model.swiadd.newcur"
style="width: 100%"
placeholder="请选择修改后金额"
disabled
......@@ -110,36 +110,36 @@
</c-col>
<c-col :span="12">
<el-form-item label="" prop="trnmod.swiadd.newamt">
<el-form-item label="" prop="swiadd.newamt">
<c-input-currency-min
v-model="model.trnmod.swiadd.newamt"
v-model="model.swiadd.newamt"
placeholder="请输入修改后金额"
></c-input-currency-min>
</el-form-item>
</c-col>
<c-col :span="12">
<el-form-item label="新的上浮比例" prop="trnmod.swiadd.newnomtop">
<el-form-item label="新的上浮比例" prop="swiadd.newnomtop">
<c-input
v-model.number="model.trnmod.swiadd.newnomtop"
v-model.number="model.swiadd.newnomtop"
placeholder="请输入新的上浮比例"
></c-input>
</el-form-item>
</c-col>
<c-col :span="12">
<el-form-item label="新的下浮比例" prop="trnmod.swiadd.newnomton">
<el-form-item label="新的下浮比例" prop="swiadd.newnomton">
<c-input
v-model.number="model.trnmod.swiadd.newnomton"
v-model.number="model.swiadd.newnomton"
placeholder="请输入新的下浮比例"
></c-input>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="限额表述" prop="trnmod.swiadd.nomspc">
<el-form-item label="限额表述" prop="swiadd.nomspc">
<c-select
disabled
:code="codes.nomspc"
v-model="model.trnmod.swiadd.nomspc"
v-model="model.swiadd.nomspc"
style="width: 100%"
placeholder="请选择限额表述"
>
......@@ -159,19 +159,19 @@
</el-form-item>
</c-col>
<c-col :span="12">
<el-form-item label="(新)生效日期" prop="trnmod.swiadd.newexpdat">
<el-form-item label="(新)生效日期" prop="swiadd.newexpdat">
<c-date-picker
type="date"
v-model="model.trnmod.swiadd.newexpdat"
v-model="model.swiadd.newexpdat"
style="width: 100%"
placeholder="请选择新生效日期"
></c-date-picker>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="信息目的" prop="trnmod.swiadd.purpos">
<el-form-item label="信息目的" prop="swiadd.purpos">
<c-select
v-model="model.trnmod.swiadd.purpos"
v-model="model.swiadd.purpos"
style="width: 100%"
placeholder="请选择信息目的"
:code="codes.purpos5"
......@@ -207,9 +207,9 @@
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="费用承担人修改" prop="trnmod.swiadd.trnchato">
<el-form-item label="费用承担人修改" prop="swiadd.trnchato">
<c-select
v-model="model.trnmod.swiadd.trnchato"
v-model="model.swiadd.trnchato"
style="width: 100%"
placeholder="请选择费用承担人修改"
:code="codes.trnchato1"
......@@ -218,14 +218,14 @@
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="收费详情" prop="trnmod.swiadd.trnfeetxt">
<el-form-item label="收费详情" prop="swiadd.trnfeetxt">
<c-input
type="textarea"
v-model="model.trnmod.swiadd.trnfeetxt"
v-model="model.swiadd.trnfeetxt"
maxlength="210"
show-word-limit
placeholder="请输入收费详情"
:disabled="model.trnmod.swiadd.trnchato != 'OTHR'"
:disabled="model.swiadd.trnchato != 'OTHR'"
></c-input>
</el-form-item>
</c-col>
......@@ -244,9 +244,9 @@
</el-form-item>
</c-col>
<c-col :span="12">
<el-form-item label="修改次数" prop="trnmod.swiadd.amenbr">
<el-form-item label="修改次数" prop="swiadd.amenbr">
<c-input
v-model.number="model.trnmod.swiadd.amenbr"
v-model.number="model.swiadd.amenbr"
placeholder="请输入修改次数"
></c-input>
</el-form-item>
......@@ -335,10 +335,10 @@
</el-form-item>
</c-col>
<c-col :span="12">
<el-form-item label="装运日期(新)" prop="trnmod.swiadd.newshpdat">
<el-form-item label="装运日期(新)" prop="swiadd.newshpdat">
<c-date-picker
type="date"
v-model="model.trnmod.swiadd.newshpdat"
v-model="model.swiadd.newshpdat"
style="width: 100%"
placeholder="请选择新装运日"
></c-date-picker>
......@@ -346,9 +346,9 @@
</c-col>
<c-col :span="24">
<c-col :span="12">
<el-form-item label="交单期限(新)" prop="trnmod.swiadd.prepers18">
<el-form-item label="交单期限(新)" prop="swiadd.prepers18">
<c-input
v-model.number="model.trnmod.swiadd.prepers18"
v-model.number="model.swiadd.prepers18"
placeholder="请输入交单期限(新)"
></c-input>
</el-form-item>
......@@ -358,9 +358,9 @@
</c-col>
</c-col>
<c-col :span="12">
<el-form-item label="交单期限描述" prop="trnmod.swiadd.prepertxts18">
<el-form-item label="交单期限描述" prop="swiadd.prepertxts18">
<c-input
v-model="model.trnmod.swiadd.prepertxts18"
v-model="model.swiadd.prepertxts18"
maxlength="35"
placeholder="请输入交单期限描述"
></c-input>
......@@ -388,19 +388,19 @@
</c-col>
<c-col :span="24">
<el-form-item label="附加金额" prop="trnmod.swiadd.addamt">
<el-form-item label="附加金额" prop="swiadd.addamt">
<c-input-currency
:disabled="!(this.model.litp.aamp.aammod.addamtflg == 'X')"
v-model="model.trnmod.swiadd.addamt"
v-model="model.swiadd.addamt"
placeholder="请输入附加金额"
></c-input-currency>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="附加金额覆盖" prop="trnmod.swiadd.addamtcov">
<el-form-item label="附加金额覆盖" prop="swiadd.addamtcov">
<c-input
type="textarea"
v-model="model.trnmod.swiadd.addamtcov"
v-model="model.swiadd.addamtcov"
maxlength="140"
show-word-limit
placeholder="请输入附加金额"
......@@ -409,10 +409,10 @@
</el-form-item>
</c-col>
<c-col :span="12">
<el-form-item label=" " prop="trnmod.swiadd.reqcan">
<el-form-item label=" " prop="swiadd.reqcan">
<c-checkbox
class="checkbox-left"
v-model="model.trnmod.swiadd.reqcan"
v-model="model.swiadd.reqcan"
>取消请求</c-checkbox
>
</el-form-item>
......
src/business/litame/views/Narp.vue
......@@ -15,11 +15,11 @@
<el-col :span="12" style="padding-left: 20px;">
<c-col :span="24">
<el-form-item label="叙述内容" prop="trnmod.swiadd.nartxt">
<el-form-item label="叙述内容" prop="swiadd.nartxt">
<c-input
disabled
type="textarea"
v-model="model.trnmod.swiadd.nartxt"
v-model="model.swiadd.nartxt"
maxlength="1750"
show-word-limit
:rows="12"
......
src/business/litame/views/Ovwp1.vue
......@@ -35,9 +35,9 @@
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="客户经理" prop="litp.usr.extkey">
<el-form-item label="客户经理" prop="lidgrp.rec.ownusr">
<c-fullbox>
<c-input disabled v-model="model.litp.usr.extkey" maxlength="8" placeholder="请输入客户经理"></c-input>
<c-input disabled v-model="model.lidgrp.rec.ownusr" maxlength="8" placeholder="请输入客户经理"></c-input>
<template slot="footer">
<c-button
size="small"
......
src/business/litame/views/index.vue
......@@ -58,7 +58,6 @@
<m-setmod
:model="model"
:codes="codes"
@changeSetmodModel="changeSetmodModel"
/>
</c-content>
</el-tab-pane>
......@@ -106,13 +105,6 @@
@select-ety="selectGridEtyPromptData"
>
</c-grid-ety-prompt-dialog>
<c-grid-ety-prompt-dialog
ref="doxpDialog"
:isPty="false"
:promptData="promptData"
@select-ety="selectGridEtyPromptData"
>
</c-grid-ety-prompt-dialog>
</c-page>
</div>
</template>
......
src/business/litdck/event/index.js
......@@ -29,7 +29,11 @@ export default {
transName: this.trnName,
userId: window.sessionStorage.userId || 'ZL',
// lidinr: this.$route.query.inr
lidinr: "00006833"
lidgrp:{
rec:{
inr: "00000266",
}
}
});
if (!res.data) {
return
......@@ -66,7 +70,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, () => {
......@@ -98,17 +102,17 @@ export default {
console.log(key);
},
// 业务信息=》基本信息=》保函编号-----获取保函编号
async queryOwnref() {
async getBrdgrpOwnRef() {
let params = {
ptainr: this.model.gidgrp.apl.pts.ptainr,
businessType: 'LC',
tbl: 'LC',
lidgrp:{
rec: this.model.lidgrp.rec,
}
};
const loading = this.loading();
let res = await Api.post('/service/litdck/getOwnRef', params);
let res = await Api.post('/service/litdck/getBrdgrpOwnRef', params);
if (res.respCode == SUCCESS) {
loading.close();
this.model.gidgrp.rec.ownref = res.data;
this.model.brdgrp.rec.ownref = res.data;
}
},
// 获取gitopn弹框表格数据
......
src/business/litdck/views/Litdckp.vue
......@@ -184,6 +184,7 @@
style="margin: 0 0"
size="small"
type="primary"
@click="getBrdgrpOwnRef"
:disabled="model.brdgrp.rec.ownref !== ''"
>
获取
......@@ -562,6 +563,7 @@
</template>
<script>
import event from '../event';
import Api from '~/service/Api';
export default {
inject: ['root'],
......
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