Skip to content

V
vue-gjjs
Commit 7039dfb7 by zhujiazhan
Options

Merge remote-tracking branch 'origin/development-202206' into development-202206

parents 5bbf9ef6 2a4e4c24
Showing with 85 additions and 29 deletions
src/config/CodeTable/index.js
......@@ -4740,7 +4740,7 @@ const CodeTable = {
],
ownextkey: [
{ label: "08350012北京分行", value: "08350012" },
{ label: "08350012", value: "08350012" },
// { label: "08350012", value: "08350012" }, value值重复
{ label: "08357113", value: "08357113" },
],
ownextkey1: [
......
src/model/Trtopn/index.js
......@@ -40,6 +40,7 @@ export default class Trtopn{
amt:"", // 融资金额 .trdgrp.cbs.max.amt
},
},
},
trtp:{
bcdget:{
......
src/views/Business/Trtame/Ovwp.vue
......@@ -7,33 +7,50 @@
<!--------------------顶部=左----------------------->
<c-col :span="12">
<c-col :span="20">
<c-col :span="24">
<c-form-item label="父交易参考号" prop="trdgrp.rec.pntref">
<c-input v-model="model.trdgrp.rec.pntref" maxlength="16" :disabled="true" :placeholder="$t('other.please_enter')+$t('trtp0.SF000049')"></c-input>
<c-fullbox>
<c-input
v-model="model.trdgrp.rec.pntref"
maxlength="16" :disabled="true"
:placeholder="$t('other.please_enter')+$t('trtp0.SF000049')"
style="width:90%"></c-input>
<c-button
size="small"
type="primary;width:10%"
@click="onSeainf"
style="width:10%">
i
</c-button>
</c-fullbox>
</c-form-item>
</c-col>
<c-col :span="4">
<!-- <c-col :span="4">
<el-form-item label="" label-width="15px">
<c-button size="small" type="primary;width:10%" @click="onSeainf">
i
</c-button>
</el-form-item>
</c-col>
</c-col> -->
<c-col :span="20">
<c-col :span="24">
<c-form-item label="参考号" prop="trdgrp.rec.ownref">
<c-input v-model="model.trdgrp.rec.ownref" maxlength="16" :disabled="true" :placeholder="$t('other.please_enter')+$t('trtp0.S0000077')"></c-input>
<c-fullbox>
<c-input
v-model="model.trdgrp.rec.ownref"
maxlength="16"
:disabled="true"
:placeholder="$t('other.please_enter')+$t('trtp0.S0000077')"
style="width:90%"></c-input>
<c-button
size="small"
ype="primary;width:10%"
@click="onSeainf"
style="width:10%">
i
</c-button>
</c-fullbox>
</c-form-item>
</c-col>
<c-col :span="4">
<el-form-item label="" label-width="15px">
<c-button size="small" type="primary;width:10%" @click="onSeainf">
i
</c-button>
</el-form-item>
</c-col>
<c-col :span="24">
<c-form-item label="融资比例" prop="trdgrp.rec.pctfin">
......@@ -112,7 +129,7 @@
</c-col>
<c-col :span="24">
<c-form-item label="Name of Party" prop="trdgrp.fip.pts.nam">
<c-form-item prop="trdgrp.fip.pts.nam">
<c-input v-model="model.trdgrp.fip.pts.nam" maxlength="40" :disabled="true" :placeholder="$t('other.please_enter')+'Name of Party'"></c-input>
</c-form-item>
</c-col>
......@@ -216,17 +233,23 @@
</c-form-item>
</c-col>
<c-col :span="12">
<c-col :span="24">
<c-form-item label="计息日期" prop="trtmod.finmod.intdat">
<c-input v-model="model.trtmod.finmod.intdat" maxlength="2" :placeholder="$t('other.please_enter')+'计息日期'"></c-input>
<c-fullbox>
<c-input
v-model="model.trtmod.finmod.intdat"
maxlength="2"
:placeholder="$t('other.please_enter')+'计息日期'"
style="width:60%"></c-input>
<c-checkbox
v-model="model.trtmod.finmod.wjdkfl"
style="width:30%"
>是否到期主动扣收款</c-checkbox>
</c-fullbox>
</c-form-item>
</c-col>
<c-col :span="12">
<c-checkbox v-model="model.trtmod.finmod.wjdkfl">是否到期主动扣收款</c-checkbox>
</c-col>
<c-col :span="12">
<el-form-item label="利率调整周期" prop="trtmod.finmod.ratchgprd">
<c-select v-model="model.trtmod.finmod.ratchgprd" style="width:100%" :placeholder="$t('other.please_enter')+'利率调整周期'">
<el-option v-for="item in codes.ratchgprd" :key="item.value" :label="item.label" :value="item.value"></el-option>
......@@ -281,7 +304,10 @@
<c-col :span="12">
<c-form-item label="罚息比率" prop="trtmod.finmod.ovdintrat">
<c-input v-model="model.trtmod.finmod.ovdintrat" :placeholder="$t('other.please_enter')+'罚息比率'"></c-input>%
<c-input
v-model="model.trtmod.finmod.ovdintrat"
style="width:90%"
:placeholder="$t('other.please_enter')+'罚息比率'"></c-input>%
</c-form-item>
</c-col>
......@@ -311,8 +337,11 @@ import Api from "~/service/Api"
import commonProcess from "~/mixin/commonProcess";
import CodeTable from "~/config/CodeTable"
import Event from "~/model/Trtame/Event"
import Ptap from "~/views/Public/Ptap";
export default {
components: { "c-ptap": Ptap },
inject: ['root'],
props:["model","codes"],
mixins: [commonProcess],
......
src/views/Business/Trtopn/Cfactlp.vue
......@@ -51,8 +51,8 @@
</c-col>
</c-col>
<c-col :span="8" >
<el-form-item label="地区机构号" prop="cfatrt.ownextkey">
<c-select v-model="model.cfatrt.ownextkey" style="width:100%" placeholder="请选择地区机构号">
<el-form-item label="地区机构号" prop="cfadft.ownextkey">
<c-select v-model="model.cfadft.ownextkey" style="width:100%" :disabled="true" placeholder="请选择地区机构号">
<el-option v-for="item in codes.ownextkey" :key="item.value" :label="item.label" :value="item.value">
</el-option>
</c-select>
......
src/views/Business/Trtopn/index.vue
......@@ -23,6 +23,16 @@
</c-content>
</el-tab-pane>
<el-tab-pane
v-if="model.gitp.swiftflg == 'Y'"
label="Presentation/Delivery"
name="preperp"
>
<c-content>
<m-preperp :model="model" :codes="codes" :sndto="sndto" />
</c-content>
</el-tab-pane>
<!--dftcre PD000001 同业代付 -->
<el-tab-pane label="同业代付" name="dftcrep" v-if="model.trtp.dfflag">
<c-content>
......@@ -140,6 +150,7 @@ export default {
pattern: Pattern,
rules: null,
codes: {...CodeTable},
sndto: [],
}
},
methods:{
......@@ -148,7 +159,20 @@ export default {
/**
* do it yourself
**/
}
},
buildSndto(data){
var result = [];
for(let i = 0; i < data.length; i++){
var temp = data[i].split('\t');
let newList = {
value: temp[0],
label: temp[1],
}
result.push(newList);
}
this.sndto = result;
console.log(this.sndto)
},
},
// initPanel(val) {
// if (val) {
......@@ -171,6 +195,8 @@ export default {
if(rtnmsg.respCode == SUCCESS)
{
this.updateModel(rtnmsg.data)
console.log(rtnmsg.codeSet['gidgrp.rec.sndto'])
this.buildSndto(rtnmsg.codeSet['gidgrp.rec.sndto'] || []);
//TODO 处理数据逻辑
if(this.isInDisplay){
this.restoreDisplay();
......
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