Skip to content

V
vue-gjjs
Commit d05747d7 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 e1da436b 4afbf691
Showing with 152 additions and 71 deletions
src/business/betset/event/index.js
......@@ -165,6 +165,7 @@ export default {
businessType: 'LC',
tbl: 'LC',
}
}
},
},
};
src/business/brtset/event/buildCommons.js
......@@ -56,9 +56,7 @@ export default {
cur:model.brdgrp.cbs.opn1.cur,
ptytyp:model.brdgrp.prb.ptytyp,
frepayflg:model.brdgrp.rec.frepayflg,
payrol:model.brdgrp.rec.payrol,
dscbckamt:model.brdgrp.rec.dscbckamt,
pclbckamt:model.brdgrp.rec.pclbckamt,
totdat:model.brdgrp.rec.totdat,
// negate:model.brdgrp.rec.dscbckamt.negate,
pclbckamt:model.brdgrp.rec.pclbckamt,
......
src/business/brtset/event/index.js
......@@ -106,18 +106,18 @@ export default {
queryFormData(key) {
console.log(key);
},
// 业务信息=》基本信息=》保函编号-----获取保函编号
async queryOwnref() {
// 业务信息=》基本信息=》融资编号-----获取融资编号
async getTrdgrpOwnRef() {
let params = {
ptainr: this.model.gidgrp.apl.pts.ptainr,
businessType: 'LG',
tbl: 'LG',
trdgrp:{
rec: this.model.trtcre.trdgrp.rec,
}
};
const loading = this.loading();
let res = await Api.post('/service/brtset/getOwnRef', params);
let res = await Api.post('/service/brtset/getTrdgrpOwnRef', params);
if (res.respCode == SUCCESS) {
loading.close();
this.model.gidgrp.rec.ownref = res.data;
this.model.trtcre.trdgrp.rec.ownref = res.data;
}
},
// 获取brtset弹框表格数据
......
src/business/brtset/model/index.js
......@@ -132,8 +132,9 @@ export default class Bctset {
trtcre: {
trtmod: {
finmod: {
act1:'',
accbch: '',
intprd: '',
intprd: '6',
ovdintrat: '',
fincod: '',
fltval: '',
......@@ -141,7 +142,7 @@ export default class Bctset {
spjgdc: '',
shpdch: '',
sxlexi: '',
jzllgz: '',
jzllgz: '1',
chapdm: '',
libor: '',
sheplb: '',
......@@ -169,7 +170,7 @@ export default class Bctset {
djhtno: '',
chapmc: '',
},
intamt: '',
intamt: '0',
flttyp: '',
act3: '',
ratchgdat: '',
......@@ -177,10 +178,9 @@ export default class Bctset {
ovdinttyp: '',
graday: '',
intact: '',
act1: '',
dinjdm: '',
wjdkfl: '',
ratchgtyp: '',
ratchgtyp: '1',
acttyp: '',
intdat: '',
ratchgprd: '',
......@@ -192,25 +192,30 @@ export default class Bctset {
trntyp: '',
trdgrp: {
rec: {
stttendat: '',
fincod:'',
ovdflg: '',
ownusr: window.sessionStorage.userId ? window.sessionStorage.userId : 'ZL',
stttendat: new Date(),
recaccount: '',
pctfin: '',
pctfin: '100',
recdistrictcode: '',
ownref: '',
intrat: '',
intrat: '0.000000',
pntnam: '',
invtyp: '',
invtyp: '1',
fintyp: '',
tenday: '',
guaflg: '',
stagod: '',
stagod: '001',
lprtyp: '',
issdat: '',
issdat: new Date(),
matdat: '',
nam: '',
actrat: '',
actrat: '0.000000',
pntref: '',
reccountrycode: '',
opndat: new Date(),
branchinr: ''
},
cbs: {
max: {
......@@ -227,7 +232,7 @@ export default class Bctset {
trtp: {
act: '',
usr: {
extkey: '',
extkey: window.sessionStorage.userId ? window.sessionStorage.userId : 'ZL',
},
recname: '',
bcdget: {
......@@ -340,11 +345,6 @@ export default class Bctset {
basflg: '',
},
nar754: '',
trdgrp: {
rec: {
},
},
paypsb: '',
dftcre: {
dftp: {
......@@ -381,7 +381,7 @@ export default class Bctset {
flttyp: '',
tenday: '',
rescur: '',
guaflg: '',
guaflg: '0',
dfuflg: '',
trntyp: '',
bankno: '',
......
src/business/brtset/views/Trtcrep.vue
......@@ -8,7 +8,7 @@
<c-fullbox>
<c-input
disabled
v-model="model.trtcre.trdgrp.rec.pntref"
v-model="trtcretrdgrprecpntref"
maxlength="16"
style="width: 98%"
placeholder="请输入单据编号"
......@@ -61,12 +61,7 @@
<c-button
size="small"
type="primary"
:disabled="
model.trtcre.trdgrp.rec.fintyp == '' ||
model.trtcre.trdgrp.fip.pts.adrblk == '' ||
// model.trdgrp.rec.branchinr == ''||
model.trtcre.trdgrp.rec.ownref != ''
"
@click="getTrdgrpOwnRef"
>
获取
</c-button>
......@@ -130,7 +125,7 @@
<el-form-item label="融资品种" prop="trtcre.trdgrp.rec.fintyp">
<c-select
disabled
v-model="model.trtcre.trdgrp.rec.fintyp"
v-model="fintyp"
style="width: 100%"
placeholder="请选择融资品种"
:disable="true"
......@@ -153,6 +148,7 @@
style="width: 100%"
placeholder="请选择货押标识"
>
<el-option
v-for="item in codes.guaflg"
:key="item.value"
......@@ -160,6 +156,7 @@
:value="item.value"
>
</el-option>
</c-select>
</el-form-item>
</c-col>
......@@ -185,7 +182,7 @@
<c-col :span="12">
<el-form-item label="原始币种" prop="trtcre.oricur">
<c-select
v-model="model.trtcre.oricur"
v-model="oricur"
style="width: 100%"
:disabled="true"
placeholder="请选择币种"
......@@ -207,7 +204,7 @@
prop="trtcre.oriamt"
>
<c-input
v-model="model.trtcre.oriamt"
v-model="oriamt"
style="width: 100%"
placeholder="请输入融资金额"
></c-input>
......@@ -241,7 +238,7 @@
<c-col :span="24">
<c-col :span="13">
<el-form-item label="融资金额" prop="trtcre.trdgrp.cbs.max.cur">
<c-select v-model="model.trtcre.trdgrp.cbs.max.cur">
<c-select v-model="maxcur">
<el-option
v-for="item in codes.curtxt2"
:key="item.value"
......@@ -259,7 +256,7 @@
label-width="5px"
>
<c-input
v-model="model.trtcre.trdgrp.cbs.max.amt"
v-model="maxamt"
:disabled="true"
></c-input>
</el-form-item>
......@@ -395,14 +392,14 @@
style="width: 100%"
placeholder="请选择第一还款账号"
>
<el-option
v-for="(item, idx) in codes.codeSet[
'trtcre.trtmod.finmod.act1'
]"
:key="idx"
:label="item.split('\t')[1]"
:value="item.split('\t')[0]"
></el-option>
<!-- <el-option-->
<!-- v-for="(item, idx) in codes.codeSet[-->
<!-- 'trtcre.trtmod.finmod.act1'-->
<!-- ]"-->
<!-- :key="idx"-->
<!-- :label="item.split('\t')[1]"-->
<!-- :value="item.split('\t')[0]"-->
<!-- ></el-option>-->
</c-select>
</el-form-item>
</c-col>
......@@ -842,6 +839,34 @@ export default {
watch: {},
methods: {},
created: function () {},
computed:{
trtcretrdgrprecpntref(){
this.model.trtcre.trtmod.finmod.fincod = this.model.brdgrp.rec.ownref
this.model.trtcre.trdgrp.rec.fincod = this.model.brdgrp.rec.ownref
this.model.trtcre.trdgrp.rec.pntref = this.model.brdgrp.rec.ownref
return this.model.trtcre.trdgrp.rec.pntref
},
fintyp(){
this.model.trtcre.trdgrp.rec.fintyp = 'BRF'
return this.model.trtcre.trdgrp.rec.fintyp
},
oricur(){
this.model.trtcre.oricur = this.model.brdgrp.cbs.max.cur
return this.model.trtcre.oricur
},
oriamt(){
this.model.trtcre.oriamt = this.model.brdgrp.cbs.max.amt * this.model.trtcre.trdgrp.rec.pctfin /100
return this.model.trtcre.oriamt
},
maxcur(){
this.model.trtcre.trdgrp.cbs.max.cur = this.model.trtcre.oricur
return this.model.trtcre.trdgrp.cbs.max.cur
},
maxamt(){
this.model.trtcre.trdgrp.cbs.max.amt = this.model.trtcre.oriamt
return this.model.trtcre.trdgrp.cbs.max.amt
},
}
};
</script>
......
src/business/inftrd/model/index.js
......@@ -13,8 +13,8 @@ export default class Inftrd {
},
infcon: {
chksubcon: '',
opndatfrom: '',
opndatto: '',
opndatfrom: new Date(),
opndatto: new Date(),
seaownref: '',
seaamtfr: '',
seasta: '',
......
src/business/inftrd/views/Infsea.vue
......@@ -307,17 +307,17 @@
</template>
</c-list-search>
<c-col :span="24" style="margin-top: 10px">
<c-button
class="medium_bcs"
size="medium"
type="primary"
style="margin-left: 0px"
@click="toTrtopn"
>进口融资开立
</c-button
>
</c-col>
<!-- <c-col :span="24" style="margin-top: 10px">-->
<!-- <c-button-->
<!-- class="medium_bcs"-->
<!-- size="medium"-->
<!-- type="primary"-->
<!-- style="margin-left: 0px"-->
<!-- @click="toTrtopn"-->
<!-- >进口融资开立-->
<!-- </c-button-->
<!-- >-->
<!-- </c-col>-->
<div style="height: 90%">
<c-col :span="24">
<el-table
......
src/business/litopn/event/index.js
......@@ -197,6 +197,10 @@ export default {
if (res.respCode == SUCCESS) {
this.model.lidgrp.avb.pts.extkey=res.data.avbwth.pts.extkey;
this.model.lidgrp.avb.pts.adrblk=res.data.avbwth.pts.adrblk;
this.model.lidgrp.avb.pts.nam=res.data.avbwth.pts.nam;
this.model.lidgrp.avb.pts.ptainr =res.data.avbwth.pts.ptainr;
this.model.lidgrp.avb.pts.ptyinr=res.data.avbwth.pts.ptyinr;
this.model.lidgrp.avb.pts.rol="AVB";
}
},
},
......
src/business/litopn/model/check.js
......@@ -442,7 +442,7 @@ export default {
{ max: 35, message: '长度不能超过35' },
],
'lidgrp.blk.mixdet': [
{ type: 'string', required: false, message: '必输项' },
{ type: 'string', message: '必输项' },
{ max: 130, message: '长度不能超过130' },
],
'lidgrp.drw.adrelc': [
......@@ -625,7 +625,7 @@ export default {
],
label5: [{ required: true, message: '必输项' }],
"lidgrp.rec.guaflg":[{ required: true, message: '必输项' }],
'lidgrp.blk.insbnk': [
{ type: 'string', required: false, message: '必输项' },
{ max: 12000, message: '长度不能超过12000' },
......@@ -751,7 +751,7 @@ export default {
],
bcbtyp7: [
{ type: 'string', required: false, message: '必输项' },
{ type: 'string', required: true, message: '必输项' },
{ max: 30, message: '长度不能超过30' },
],
bcbdat: [{ type: 'string', required: false, message: '输入正确的日期' }],
......@@ -1018,7 +1018,7 @@ export default {
{ max: 8, message: '长度不能超过8' },
],
'lidgrp.cbs.nom1.cur': [
{ type: 'string', required: true },
{ type: 'string', required: true , message: '必输项' },
{ max: 8, message: '长度不能超过8' },
],
};
......
src/business/litopn/views/Detp.vue
......@@ -91,7 +91,14 @@
</c-col>
<c-col :span="24">
<el-form-item label="议付/延期付款指示" prop="lidgrp.blk.defdet">
<el-form-item
label="议付/延期付款指示"
prop="lidgrp.blk.defdet"
:rules=" [
{ type: 'string', required: flag9, message: '必输项' },
{ max: 140, message: '长度不能超过140' },
]"
>
<c-input
type="textarea"
v-model="model.lidgrp.blk.defdet"
......@@ -292,7 +299,13 @@
</c-col>
<c-col :span="24">
<el-form-item label="混合付款指示" prop="lidgrp.blk.mixdet">
<el-form-item
label="混合付款指示"
prop="lidgrp.blk.mixdet"
:rules="[
{ max: 130, message: '长度不能超过130' },
{ required:!flag3, message:'必输项'}
]">
<c-input
type="textarea"
v-model="model.lidgrp.blk.mixdet"
......@@ -309,12 +322,18 @@
<el-form-item
label="远期汇票最大期限（天）"
prop="lidgrp.rec.tenmaxday"
:required="flag8"
:rules="[
{ required:flag8,pattern:/^((?!^-[1-9]\d*|0$).)*$/, message:'必输项'},
{ type: 'number', message: '请输入数字' },
{ type: 'number', max: 999, message: '不能超过999' },
{ pattern: /(^-?[1-9][0-9]{0,2}$)|0/, message: '-999至999之间' },
]"
>
<c-input
:disabled="!!(this.model.lidgrp.rec.avbby == 'P')"
v-model.number="model.lidgrp.rec.tenmaxday"
placeholder="请输入天数"
maxlength="3"
></c-input>
</el-form-item>
</c-col>
......@@ -341,6 +360,7 @@ export default {
flag6: false,
flag7: false,
flag8: true,
flag9: false,
};
},
methods: {
......@@ -388,6 +408,7 @@ export default {
this.flag2 = true;
this.flag3 = true;
this.flag7 = false;
this.flag9 = true;
this.model.lidgrp.blk.defdet="days after B/L date"
}
if (val == "N") {
......@@ -395,6 +416,8 @@ export default {
this.flag2 = false;
this.flag3 = true;
this.flag7 = true;
this.flag8 = false;
this.flag9 = false;
this.model.lidgrp.blk.defdet="days after B/L date"
}
if (val == "P") {
......@@ -403,6 +426,7 @@ export default {
this.flag3 = true;
this.flag7 = false;
this.flag8 = false;
this.flag9 = false;
this.model.lidgrp.rec.tenmaxday == 0
this.model.lidgrp.blk.defdet=""
}
......@@ -411,6 +435,7 @@ export default {
this.flag2 = true;
this.flag3 = false;
this.flag7 = false;
this.flag9 = false;
this.model.lidgrp.blk.defdet=""
}
if (val == "A") {
......@@ -418,6 +443,7 @@ export default {
this.flag2 = false;
this.flag3 = true;
this.flag7 = true;
this.flag9 = false;
this.model.lidgrp.blk.defdet=""
}
},
......
src/business/litopn/views/Ovwp1.vue
......@@ -286,7 +286,14 @@
</c-col>
<c-col :span="24">
<el-form-item label="其他适用规则" prop="lidgrp.rec.apprultxt">
<el-form-item
label="其他适用规则"
prop="lidgrp.rec.apprultxt"
:rules="[
{ required:!flag, message:'必输项'},
{ max: 35, message: '长度不能超过35' },
]"
>
<c-input
v-model="model.lidgrp.rec.apprultxt"
maxlength="35"
......@@ -660,7 +667,27 @@ export default {
}
}
},
"model.litp.aamp.aammod.addamtflg":{
immediate: true,
deep: true,
handler(val, oldVal) {
if (val == "X") {
this.model.lidgrp.cbs.max2.cur = this.model.lidgrp.cbs.nom1.cur;
this.model.lidgrp.cbs.opn2.cur = this.model.lidgrp.cbs.nom1.cur;
} else {
this.model.lidgrp.cbs.max2.cur = "";
this.model.lidgrp.cbs.opn2.cur = "";
}
},
},
"model.lidgrp.cbs.max2.amt":{
immediate: true,
deep: true,
handler(val, oldVal) {
this.model.lidgrp.cbs.opn2.amt = val;
this.model.lidgrp.blk.addamtcov = `${this.model.lidgrp.cbs.opn2.cur} ${val} `
},
},
},
computed: {
......
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