Skip to content

V
vue-gjjs
Commit 140c81fd 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 8d3948e2 27ec6bfb
Showing with 190 additions and 143 deletions
src/business/betcan/views/index.vue
......@@ -90,7 +90,7 @@ import Glentry from "~/components/business/glentry/views";
import Docpan from "~/components/business/docpan/views";
import Doctre from "~/components/business/doctre/views";
import Limitbody from "~/components/business/limitbody/views";
import Glepan from "~/components/business/glentry/views";
......
src/business/betsnd/views/Addbcb.vue
......@@ -10,7 +10,6 @@
<script>
import event from "../event";
import Coninfp from "~/views/Public/Coninfp";
......
src/business/letcan/event/index.js
......@@ -28,7 +28,7 @@ export default {
...params,
transName: this.trnName,
userId: window.sessionStorage.userId || 'ZL',
brdgrp:{
ledgrp:{
rec:{
inr:this.$route.query.inr
}
......@@ -105,15 +105,15 @@ export default {
// 业务信息=》基本信息=》保函编号-----获取保函编号
async queryOwnref() {
let params = {
ptainr: this.model.gidgrp.apl.pts.ptainr,
businessType: 'LG',
tbl: 'LG',
ptainr: this.model.ledgrp.apl.pts.ptainr,
businessType: 'LC',
tbl: 'LC',
};
const loading = this.loading();
let res = await Api.post('/service/letcan/getOwnRef', params);
if (res.respCode == SUCCESS) {
loading.close();
this.model.gidgrp.rec.ownref = res.data;
this.model.ledgrp.rec.ownref = res.data;
}
},
// 获取brtacp弹框表格数据
......@@ -121,7 +121,7 @@ export default {
let params = {
userId: window.sessionStorage.userId || 'ZL',
ptytyp: ptytyp,
extkey: this.model.gidgrp[type.toLowerCase()].pts.extkey,
extkey: this.model.ledgrp[type.toLowerCase()].pts.extkey,
};
let res = await Api.post('/service/ptspta/list', params);
if (res.respCode == SUCCESS) {
......@@ -137,7 +137,7 @@ export default {
};
let res = await Api.post('/service/ptspta/fetch', params);
if (res.respCode == SUCCESS) {
this.$set(this.model.gidgrp, row.role.toLowerCase(), res.data);
this.$set(this.model.ledgrp, row.role.toLowerCase(), res.data);
}
},
// 业务信息=》基本信息=》支出目的
......@@ -147,12 +147,12 @@ export default {
// 初始化保函开立类型码表下拉列表
async queryHndtypCodeTableList(trnName) {
let params = {
gitp: {
swiftflg: this.model.gitp.swiftflg,
letp: {
swiftflg: this.model.letp.swiftflg,
},
gidgrp: {
ledgrp: {
rec: {
purpos: this.model.gidgrp.rec.purpos,
purpos: this.model.ledgrp.rec.purpos,
},
},
transName: trnName.toUpperCase(),
......
src/business/letcan/model/index.js
......@@ -3,6 +3,9 @@ import Pub from '~/components/business/commonModel/index.js';
export default class Letcan {
constructor() {
this.data = {
letp:{
swiftflg:'',
},
brdgrp: {
adv: {
pts: new Pts().data,
......@@ -43,32 +46,33 @@ export default class Letcan {
disdat: '',
totamt: '',
nam: '',
docprbrol: ''
docprbrol: '',
},
cbs: {
opn1: {
cur: ''
cur: '',
},
opn2: {
cur: ''
cur: '',
},
max: {
cur: '',
amt: ''
amt: '',
},
max2: {
amt: ''
}
amt: '',
},
},
matp: {
mattxtlab: ''
}
mattxtlab: '',
},
},
brtp: {
furide: '',
matp: {
mattxtlab: ''
}
mattxtlab: '',
},
},
sndmsg: '',
ledgrp: {
......@@ -97,68 +101,57 @@ export default class Letcan {
avbby: '',
nam: '',
opndat: '',
redclsflg: ''
redclsflg: '',
},
cbs: {
opn1: {
cur: '',
amt: ''
amt: '',
},
nom1: {
cur: '',
amt: ''
}
amt: '',
},
},
rmb: {
rolsetflg: ''
rolsetflg: '',
},
iss: {
pts: {
ref: '',
nam: ''
}
pts: new Pts().data,
},
},
ben: {
pts: {
ref: '',
nam: ''
}
pts: new Pts().data,
},
},
apl: {
pts: {
ref: '',
nam: ''
}
pts: new Pts().data,
},
avbnam: ''
avbnam: '',
},
letp0: {
aammod: {
addamtflg: ''
addamtflg: '',
},
cnftxt: ''
cnftxt: '',
},
letcanf: {
strinf: ''
strinf: '',
},
rmbclm: {
acwacw: {
pts: {
ref: ''
}
pts: new Pts().data,
},
valdat: '',
rmbrmb: {
pts: {
ref: ''
}
pts: new Pts().data,
},
bebbeb: {
pts: {
ref: ''
}
pts: new Pts().data,
},
rmbrol: ''
rmbrol: '',
},
setmod: new Pub().data.Setmod,
mtabut: new Pub().data.Mtabut,
......
src/business/letcan/views/Addbcb.vue
......@@ -5,12 +5,11 @@
<m-coninfp :model="model" :codes="codes" />
</el-collapse-item>
</el-collapse>
</div>
</template>
<script>
import event from '../event'
import event from "../event";
import Coninfp from "~/views/Public/Coninfp";
export default {
......@@ -22,14 +21,12 @@ export default {
mixins: [event],
data() {
return {
activeNames: ["coninfp"],
};
},
methods: {},
created: function () {},
}
};
</script>
<style></style>
......
src/business/letcan/views/Rcldetp.vue
......@@ -105,14 +105,11 @@
</el-form-item>
</c-col>
</c-col>
</div>
</template>
<script>
import event from '../event'
import Ptap from '~/views/Public/Ptap'
export default {
inject: ["root"],
components: { 'c-ptap': Ptap },
......@@ -132,7 +129,6 @@ export default {
)
},
},
rmbrolAdrblkFlag: {
get() {
return (
......@@ -141,10 +137,8 @@ export default {
||this.model.rmbclm.rmbrol=='RMB'
)
},
},
}
}
</script>
<style></style>
src/business/letcan/views/index.vue
......@@ -75,12 +75,13 @@
:promptData="promptData"
>
</c-grid-ety-prompt-dialog>
-->
<c-function-btn
:handleSubmit="handleSubmit"
:handleCheck="handleCheck"
:handleStash="handleStash"
>
</c-function-btn> -->
</c-function-btn>
</c-page>
</div>
</template>
......@@ -90,11 +91,9 @@ import operationFunc from "~/mixin/operationFunc";
import CodeTable from "~/config/CodeTable";
import formRules from '../model/check';
import Letcan from "../model";
import Ovwp from './Ovwp'
import Addbcb from "./Addbcb"
import Rcldetp from "./Rcldetp";
import Engp from "~/components/business/engp/views";
import Setmod from "~/components/business/setmod/views";
// import Glepan from "~/components/business/glepan/views";
......
src/business/letnot/event/buildCommons.js
......@@ -19,15 +19,36 @@ export default {
},
buildCommonData (model, trnName) {
let ptsptaList = [];
if (model.ledgrp.a2b.pts.extkey) {
ptsptaList.push(this.buildPtspta(model.ledgrp.a2b));
}
if (model.ledgrp.con.pts.extkey) {
ptsptaList.push(this.buildPtspta(model.ledgrp.con));
}
if (model.ledgrp.ben.pts.extkey) {
ptsptaList.push(this.buildPtspta(model.ledgrp.ben));
}
if (model.ledgrp.avb.pts.extkey) {
ptsptaList.push(this.buildPtspta(model.ledgrp.avb));
}
if (model.ledgrp.iss.pts.extkey) {
ptsptaList.push(this.buildPtspta(model.ledgrp.iss));
}
if (model.ledgrp.apl.pts.extkey) {
ptsptaList.push(this.buildPtspta(model.ledgrp.apl));
}
if (model.ledgrp.drw.pts.extkey) {
ptsptaList.push(this.buildPtspta(model.ledgrp.drw));
}
if (model.ledgrp.apb.pts.extkey) {
ptsptaList.push(this.buildPtspta(model.ledgrp.apb));
}
if (model.ledgrp.rmb.pts.extkey) {
ptsptaList.push(this.buildPtspta(model.ledgrp.rmb));
}
if (model.ledgrp.adv.pts.extkey) {
ptsptaList.push(this.buildPtspta(model.ledgrp.adv));
}
if (model.ledgrp.ben.pts.extkey) {
ptsptaList.push(this.buildPtspta(model.ledgrp.ben));
}
let dataObj = {
rec: {
objtyp: 'LED',
......@@ -121,7 +142,7 @@ export default {
...this.buildCommonData(model, trnName),
rec: {
objtyp: 'LED',
objinr: model.ledgrp.rec.objinr,
objinr: model.ledgrp.rec.inr,
ownref: model.ledgrp.rec.ownref,
},
};
......@@ -132,7 +153,7 @@ export default {
...this.buildCommonData(model, trnName),
rec: {
objtyp: 'LED',
objinr: model.ledgrp.rec.objinr,
objinr: model.ledgrp.rec.inr,
ownref: model.ledgrp.rec.ownref,
// swiftflg: model.gitp.swiftflg,
},
......
src/business/letnot/event/index.js
......@@ -21,7 +21,14 @@ export default {
...doctre,
async init() {
const params = {
// spt: JSON.parse(localStorage.getItem('row_' + this.trnName))
spt: JSON.parse(localStorage.getItem('row_' + this.trnName)),
trnmod:{
trn:JSON.parse(localStorage.getItem('review_'+this.trnName))
}
}
if ( typeof(this.$route.query.inr) == 'string' ){
params.spt = null
params.trnmod.trn =null
}
const loading = this.loading();
const res = await Api.post('/service/letnot/init', {
......@@ -65,7 +72,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, () => {
......@@ -76,7 +83,7 @@ export default {
let docpanRequest = buildFn.buildDocpan(this.model, this.trnName);
this.processTrndoc(docpanRequest);
break;
case 'glepan':
case 'glentry':
let glentryRequest = buildFn.buildGlentry(this.model, this.trnName);
this.processGlentry(glentryRequest);
break;
......@@ -119,46 +126,46 @@ export default {
this.$set(this.model.ledgrp, row.role.toLowerCase(), res.data);
}
},
//获取信用证编号
async onLitpButgetref() {
let params = {
ptainr: this.model.ledgrp.apl.pts.ptainr,
businessType: 'LG',
tbl: 'LG',
};
const loading = this.loading();
let res = await Api.post('/service/letnot/getOwnRef', params);
if (res.respCode == SUCCESS) {
loading.close();
this.model.ledgrp.rec.ownref = res.data;
}
},
// 初始化开立类型码表下拉列表
async queryHndtypCodeTableList(trnName) {
let params = {
letp: {
swiftflg: this.model.letp.swiftflg,
},
ledgrp: {
rec: {
purpos: this.model.ledgrp.rec.purpos,
},
},
transName: trnName.toUpperCase(),
};
// let res = await Api.post('/service/litopn/initHndtyp', params);
// //获取信用证编号
// async onLitpButgetref() {
// let params = {
// ptainr: this.model.ledgrp.apl.pts.ptainr,
// businessType: 'LG',
// tbl: 'LG',
// };
// const loading = this.loading();
// let res = await Api.post('/service/letnot/getOwnRef', params);
// if (res.respCode == SUCCESS) {
// this.$set(this.codes, 'voHndtyp', res.data);
// loading.close();
// this.model.ledgrp.rec.ownref = res.data;
// }
},
// },
// // 初始化开立类型码表下拉列表
// async queryHndtypCodeTableList(trnName) {
// let params = {
// letp: {
// swiftflg: this.model.letp.swiftflg,
// },
// ledgrp: {
// rec: {
// purpos: this.model.ledgrp.rec.purpos,
// },
// },
// transName: trnName.toUpperCase(),
// };
// // let res = await Api.post('/service/litopn/initHndtyp', params);
// // if (res.respCode == SUCCESS) {
// // this.$set(this.codes, 'voHndtyp', res.data);
// // }
// },
// 是否SWIFT格式修改--联动保函开立类型
handleChangeSwiftflg() {
this.queryHndtypCodeTableList(this.root.trnName);
},
// handleChangeSwiftflg() {
// this.queryHndtypCodeTableList(this.root.trnName);
// },
// 支出目的修改--联动保函开立类型
handleChangePurpos() {
this.queryHndtypCodeTableList(this.root.trnName);
},
// handleChangePurpos() {
// this.queryHndtypCodeTableList(this.root.trnName);
// },
apprulChange(v) {
if (v !== 'OTHR') {
this.model.ledgrp.rec.apprultxt = ''
......
src/business/letnot/views/Addbcb.vue
<template>
<div class="eibs-tab">
<el-collapse v-model="activeNames" @change="handleChange">
<el-collapse v-model="activeNames">
<el-collapse-item title="附言" name="coninfp">
<m-coninfp :model="model" :codes="codes" />
</el-collapse-item>
......
src/business/letnot/views/Detp.vue
......@@ -27,8 +27,6 @@
}"
:noRef="true"
:onlySearch="true"
@onSeainf="onSeainf"
@onAplpDet="onAvbpDet"
:disabledExtkey="!avbFlag"
>
</c-ptap>
......@@ -132,8 +130,6 @@
}"
:noRef="true"
:onlySearch="false"
@onSeainf="onSeainf"
@onAplpDet="onDrwpDet"
:disabledExtkey="blkDftatFlag"
:disabled="blkDftatFlag"
>
......
src/business/letnot/views/Ovwp.vue
<template>
<div class="eibs-tab">
<el-collapse v-model="activeNames" @change="handleChange">
<el-collapse v-model="activeNames">
<el-collapse-item title="内容" name="ovwp1">
<m-ovwp1 :model="model" :codes="codes" />
</el-collapse-item>
......
src/business/letnot/views/Ovwp1.vue
......@@ -23,7 +23,6 @@
style="margin: 0 10px 0 0; padding: 0 12px"
size="small"
type="primary"
@click="onSeainf"
>
<i class="el-icon-info" style="font-size:15px"></i>
</c-button>
......@@ -36,7 +35,6 @@
? false
: true
"
@click="onLetpButgetref"
>
获取
</c-button>
......@@ -90,7 +88,6 @@
size="small"
icon="el-icon-search"
type="primary"
@click="onExtkey"
></c-button>
</template>
</c-fullbox>
......@@ -379,8 +376,6 @@
rol: 'ben',
}"
:disabled="true"
@onSeainf="onSeainf"
@onAplpDet="onBenpDet"
>
</c-ptap>
</c-col>
......@@ -394,8 +389,6 @@
rol: 'iss',
}"
:disabled="true"
@onSeainf="onSeainf"
@onAplpDet="onIsspDet"
>
</c-ptap>
</c-col>
......@@ -409,8 +402,6 @@
rol: 'apl',
}"
:disabled="true"
@onSeainf="onSeainf"
@onAplpDet="onAplpDet"
>
</c-ptap>
</c-col>
......
src/business/letnot/views/Ptyp.vue
......@@ -12,8 +12,6 @@
grp: 'ledgrp',
rol: 'adv',
}"
@onSeainf="onSeainf"
@onAplpDet="onAdvpDet"
disabled
disabledRef
disabledExtkey
......@@ -30,8 +28,6 @@
grp: 'ledgrp',
rol: 'a2b',
}"
@onSeainf="onSeainf"
@onAplpDet="onA2bpDet"
>
</c-ptap>
</c-col>
......@@ -61,8 +57,6 @@
grp: 'ledgrp',
rol: 'apb',
}"
@onSeainf="onSeainf"
@onAplpDet="onApbpDet"
>
</c-ptap>
</c-col>
......@@ -82,8 +76,6 @@
grp: 'ledgrp',
rol: 'rmb',
}"
@onSeainf="onSeainf"
@onAplpDet="onRmbpDet"
>
</c-ptap>
</c-col>
......@@ -98,8 +90,6 @@
rol: 'con',
}"
:onlySearch="true"
@onSeainf="onSeainf"
@onAplpDet="onConpDet"
disabled
disabledRef
disabledExtkey
......
src/business/letnot/views/index.vue
......@@ -14,7 +14,7 @@
v-model="tabVal"
ref="elment"
type="card"
@tab-click="myTabClick"
@tab-click="tabClick"
>
<el-tab-pane label="业务信息" name="ovwp">
<c-content>
......@@ -26,10 +26,10 @@
<m-setmod :model="model" :codes="codes" />
</c-content>
</el-tab-pane>
<el-tab-pane label="会计分录" name="glepan">
<el-tab-pane label="会计分录" name="glentry">
<c-content>
<!-- 会计分录 -->
<m-glepan :model="model" :codes="codes" />
<m-glentry :model="model" :codes="codes" />
</c-content>
</el-tab-pane>
......@@ -64,7 +64,6 @@
ref="doxpDialog"
:isPty="false"
:promptData="promptData"
@select-ety="selectMsg"
>
</c-grid-ety-prompt-dialog>
......@@ -88,7 +87,7 @@ import Addbcb from './Addbcb'
import formRules from '../model/check'
import operationFunc from "~/mixin/operationFunc";
import Setmod from "~/components/business/setmod/views";
import Glepan from "~/components/business/glentry/views";
import Glentry from "~/components/business/glentry/views";
import Docpan from "~/components/business/docpan/views";
import Doctre from "~/components/business/doctre/views";
......@@ -97,7 +96,7 @@ export default {
components: {
'm-ovwp': Ovwp,
'm-setmod': Setmod,
'm-glepan': Glepan,
'm-glentry': Glentry,
'm-docpan': Docpan,
'm-doctre': Doctre,
'm-addbcb': Addbcb,
......@@ -115,7 +114,49 @@ export default {
model: new Letnot().data,
rules:formRules,
codes: { ...CodeTable },
activeNames: ["setpan"]
activeNames: ["setmod"],
promptData: {
title: 'Select a Party',
columns: [
{
prop: 'ptyInr',
label: 'Party Number'
},
{
prop: 'inr',
label: 'Address Number'
},
{
prop: 'branch',
label: 'Branch Code'
},
{
prop: 'bchName',
label: 'Branch Name'
},
{
prop: 'adrName',
label: 'Address Name'
},
{
prop: 'adr1',
label: 'Address1'
},
{
prop: 'locCty',
label: 'City'
},
{
prop: 'locZip',
label: 'Zip'
},
{
prop: 'bicCode',
label: 'BIC'
}
],
data: []
}
}
},
mounted () {
......
src/business/letopn/views/Detp.vue
......@@ -449,7 +449,6 @@ export default {
},
"model.ledgrp.rec.tenmaxday":{
handler(val, oldVal){
console.log(val);
this.model.ledgrp.rec.tenmaxday = `${val}''`.replace(/\D/g, '');
},
immediate: true,
......
src/review/ReviewLetnot.vue 0 → 100644
<template>
<ReviewWrapper>
<Letnot></Letnot>
</ReviewWrapper>
</template>
<script>
import Letnot from "~/business/letnot/views";
import { ReviewWrapper } from "~/components/gj-common.min.js";
export default {
name: "ReviewLetnot",
components: { ReviewWrapper, Letnot },
created() {},
mounted() {},
};
</script>
<style></style>
src/routers/modules/review.js
......@@ -13,5 +13,6 @@ const Business = [
{ path: 'litdav', component: () => import('~/review/ReviewLitdav.vue'), name: 'litdav', meta: { title: '复核-Litdav' } },
{ path: 'litsel', component: () => import('~/review/ReviewLitsel.vue'), name: 'litsel', meta: { title: '复核-Litsel' } },
{ path: 'letopn', component: () => import('~/review/ReviewLetopn.vue'), name: 'letopn', meta: { title: '复核-Letopn' } },
{ path: 'letnot', component: () => import('~/review/ReviewLetnot.vue'), name: 'letnot', meta: { title: '复核-letnot' } },
]
export default Business
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