Skip to content

V
vue-gjjs
Commit 3d64025e by nanrui
Options

Merge branch 'development-202206' of http://114.115.138.98:8900/fukai/vue-gjjs… 

Merge branch 'development-202206' of http://114.115.138.98:8900/fukai/vue-gjjs into development-202206
parents 20ddd33d 90c860be
Showing with 386 additions and 42 deletions
debug.log 0 → 100644
[0906/090726.874:ERROR:exit_code_watcher_win.cc(87)] Failed to wait for process exit or stop event
src/config/CodeTable/index.js
......@@ -3326,6 +3326,10 @@ const CodeTable = {
{ label: "汇出汇款押汇", value: "ECF" },
{ label: "打包贷款", value: "PCL" },
],
fintyp2:[
{ label: "我行融资", value: "B" },
{ label: "我行风险参与", value: "A" },
],
fktype: [
{ label: "邮划", value: "Y" },
{ label: "电划", value: "D" },
......@@ -3399,6 +3403,12 @@ const CodeTable = {
{ label: "不浮动", value: "0" },
{ label: "浮动比率", value: "2" },
],
flttyp1: [
{ label: "浮动点", value: "1" },
{ label: "不浮动", value: "0" },
{ label: "浮动比率", value: "2" },
{ lable: "按协议", value: "3" },
],
fmt: [
{ label: "HTML", value: "HTM" },
{ label: "PDF", value: "PDF" },
......@@ -6046,6 +6056,14 @@ const CodeTable = {
{ label: "资本", value: "2" },
{ label: "其他", value: "3" },
],
trntyp2:[
{ label: "进口信用证", value: "BR" },
{ label: "卖方信用证", value: "BF" },
{ label: "进口代收", value: "BC" },
{ label: "汇出汇款", value: "CP" },
{ label: "买房信用证", value: "BD" },
],
troflg: [
{ label: "TRO entries exist", value: "Y" },
{ label: "No TRO entries exist", value: "" },
......
src/model/Bctset/Event.js
......@@ -86,18 +86,6 @@ export default {
this.$notify.error({title: '错误',message: '服务请求失败！'});
}
},
async onSnd7561Det(){
let rtnmsg = await this.executeRule("snd7561.det")
if(rtnmsg.respCode == SUCCESS)
{
//TODO 处理数据逻辑
}
else
{
this.$notify.error({title: '错误',message: '服务请求失败！'});
}
},
async onSav(){
let rtnmsg = await this.executeRule("sav")
if(rtnmsg.respCode == SUCCESS)
......@@ -470,8 +458,20 @@ export default {
this.$notify.error({title: '错误',message: '服务请求失败！'});
}
},
async onAwipDet(){
let rtnmsg = await this.executeRule("awip.det")
async onTrtpButgetref(){
let rtnmsg = await this.executeRule("trtp.butgetref")
if(rtnmsg.respCode == SUCCESS)
{
//TODO 处理数据逻辑
}
else
{
this.$notify.error({title: '错误',message: '服务请求失败！'});
}
},
async onFippDet(){
let rtnmsg = await this.executeRule("fipp.det")
if(rtnmsg.respCode == SUCCESS)
{
//TODO 处理数据逻辑
......@@ -482,8 +482,8 @@ export default {
this.$notify.error({title: '错误',message: '服务请求失败！'});
}
},
async onActserpDet(){
let rtnmsg = await this.executeRule("actserp.det")
async onDinmodDget(){
let rtnmsg = await this.executeRule("dinmod.dget")
if(rtnmsg.respCode == SUCCESS)
{
//TODO 处理数据逻辑
......@@ -494,8 +494,8 @@ export default {
this.$notify.error({title: '错误',message: '服务请求失败！'});
}
},
async onBeipDet(){
let rtnmsg = await this.executeRule("beip.det")
async onFinmodButget(){
let rtnmsg = await this.executeRule("finmod.butget")
if(rtnmsg.respCode == SUCCESS)
{
//TODO 处理数据逻辑
......@@ -506,8 +506,8 @@ export default {
this.$notify.error({title: '错误',message: '服务请求失败！'});
}
},
async onRcvcor2pDet(){
let rtnmsg = await this.executeRule("rcvcor2p.det")
async onCodselSelbut(){
let rtnmsg = await this.executeRule("codsel.selbut")
if(rtnmsg.respCode == SUCCESS)
{
//TODO 处理数据逻辑
......@@ -518,8 +518,8 @@ export default {
this.$notify.error({title: '错误',message: '服务请求失败！'});
}
},
async onCod202Buttxmsel(){
let rtnmsg = await this.executeRule("cod202.buttxmsel")
async onFinmodButcal(){
let rtnmsg = await this.executeRule("finmod.butcal")
if(rtnmsg.respCode == SUCCESS)
{
//TODO 处理数据逻辑
......@@ -530,8 +530,8 @@ export default {
this.$notify.error({title: '错误',message: '服务请求失败！'});
}
},
async onOripDet(){
let rtnmsg = await this.executeRule("orip.det")
async onDftpButgetref(){
let rtnmsg = await this.executeRule("dftp.butgetref")
if(rtnmsg.respCode == SUCCESS)
{
//TODO 处理数据逻辑
......@@ -542,8 +542,8 @@ export default {
this.$notify.error({title: '错误',message: '服务请求失败！'});
}
},
async onTripDet(){
let rtnmsg = await this.executeRule("trip.det")
async onAplpDet(){
let rtnmsg = await this.executeRule("aplp.det")
if(rtnmsg.respCode == SUCCESS)
{
//TODO 处理数据逻辑
......@@ -554,8 +554,8 @@ export default {
this.$notify.error({title: '错误',message: '服务请求失败！'});
}
},
async onRcvcorpDet(){
let rtnmsg = await this.executeRule("rcvcorp.det")
async onDffpDet(){
let rtnmsg = await this.executeRule("dffp.det")
if(rtnmsg.respCode == SUCCESS)
{
//TODO 处理数据逻辑
......@@ -566,8 +566,8 @@ export default {
this.$notify.error({title: '错误',message: '服务请求失败！'});
}
},
async onBeipDet(){
let rtnmsg = await this.executeRule("beip.det")
async onRecctySelbut1(){
let rtnmsg = await this.executeRule("reccty.selbut1")
if(rtnmsg.respCode == SUCCESS)
{
//TODO 处理数据逻辑
......
src/views/Business/Bctset/Bctsus.vue
......@@ -255,12 +255,13 @@
<c-col :span="12" class="bctdav_bctp_bctovw_cheak">
<c-checkbox :disabled="this.flag1" v-model="model.trtcre.crefinflg"
@change="crefinflgChange"
>Create Financing</c-checkbox
>
</c-col>
<c-col :span="12" class="bctdav_bctp_bctovw_cheak">
<c-checkbox v-model="model.dftcre.dfflag">同业代付</c-checkbox>
<c-checkbox v-model="model.dftcre.dfflag" @change="dfflagChange">同业代付</c-checkbox>
</c-col>
<c-col :span="24" class="bctdav_bctp_bctovw_cheak">
......@@ -311,7 +312,7 @@
v-model="model.setmod.doccur"
style="width: 100%"
placeholder="请选择document currency"
@change=""
@change="1"
>
</c-select>
</el-form-item>
......@@ -379,8 +380,8 @@ import Utils from "~/utils";
import Docpre from "~/views/Public/Docpre";
export default {
components:{
"c-docpre" : Docpre
components: {
"c-docpre": Docpre,
},
inject: ["root"],
props: ["model", "codes"],
......@@ -438,9 +439,21 @@ export default {
methods: {
...Event,
async crefinflgChange() {
let rtnmsg = await this.executeDefault("trtcre.crefinflg");
if (rtnmsg.respCode == SUCCESS) {
Utils.copyValueFromVO(this.model, rtnmsg.data);
}
},
async dfflagChange() {
let rtnmsg = await this.executeDefault("dftcre.dfflag");
if (rtnmsg.respCode == SUCCESS) {
Utils.copyValueFromVO(this.model, rtnmsg.data);
}
},
async multipleSelect(selection) {
console.log(selection);
if (selection.length > 1) {
if (selection.length > 1) {
this.$notify({
title: "error",
message: "You cannot select more than one tenor",
......@@ -449,11 +462,11 @@ export default {
} else {
let chkIds;
if (selection.length === 0) {
chkIds = []
chkIds = [];
// this.model.liaall.tensetstm.rows = []
// this.model.liaall.tenstm.rows = []
} else {
chkIds = [selection[0] + 1]
chkIds = [selection[0] + 1];
}
//
console.log(this.model.liaall.tensetstm);
......@@ -472,7 +485,6 @@ export default {
Utils.copyValueFromVO(this.model, rtnmsg.data);
}
},
},
created: function () {},
};
......
src/views/Business/Bctset/Cips2.vue 0 → 100644
<template>
<div class="eibs-tab">
<!-- SG000227 : 收款直接参与者行号 -->
<c-col :span="12">
<c-form-item :label="$t('trnmod.SG000227')" prop="trnmod.reconebch">
<c-input v-model="model.trnmod.reconebch" maxlength="35" :placeholder="$t('other.please_enter')+$t('trnmod.SG000227')"></c-input>
</c-form-item>
</c-col>
<!-- SG000228 : 收款直接参与者名称 -->
<c-col :span="12">
<c-form-item :label="$t('trnmod.SG000228')" prop="trnmod.reconebchnam">
<c-input type="textarea" v-model="model.trnmod.reconebchnam" maxlength="35" show-word-limit :placeholder="$t('other.please_enter')+$t('trnmod.SG000228')" ></c-input>
</c-form-item>
</c-col>
<!-- SG000229 : 附言 -->
<c-col :span="12">
<c-form-item label="附言" prop="trnmod.commen">
<c-input type="textarea" v-model="model.trnmod.commen" maxlength="30" show-word-limit :placeholder="$t('other.please_enter')+'附言'" ></c-input>
</c-form-item>
</c-col>
<!-- SG000230 : 业务种类 -->
<c-col :span="12">
<el-form-item label="业务种类" prop="trnmod.bustyp">
<c-select v-model="model.trnmod.bustyp" style="width:100%" :placeholder="$t('other.please_enter')+'业务种类'">
</c-select>
</el-form-item>
</c-col>
</div>
</template>
<script>
import Api from "~/service/Api"
import commonProcess from "~/mixin/commonProcess";
import CodeTable from "~/config/CodeTable"
import Event from "~/model/Bctset/Event"
export default {
inject: ['root'],
props:["model","codes"],
mixins: [commonProcess],
data(){
return {
}
},
methods:{...Event},
created:function(){
}
}
</script>
<style>
</style>
src/views/Business/Bctset/Dxzfp.vue 0 → 100644
<template>
<div class="eibs-tab">
<!-- SG000148 : 收款账号 -->
<c-col :span="12">
<c-col :span="24">
<c-form-item label="收款人账号" prop="trtcre.trdgrp.rec.recaccount">
<c-input v-model="model.trtcre.trdgrp.rec.recaccount" maxlength="35" placeholder=""></c-input>
</c-form-item>
</c-col>
<!-- SG000152 : 收款人名称 -->
<c-col :span="24">
<c-form-item label="收款人名称" prop="trtcre.trtp.recname">
<c-input v-model="model.trtcre.trtp.recname" maxlength="80" placeholder=""></c-input>
</c-form-item>
</c-col>
<c-col :span="20">
<c-form-item label="收款人国别代码" prop="trtcre.trdgrp.rec.reccountrycode">
<c-input v-model="model.trtcre.trdgrp.rec.reccountrycode" maxlength="3" placeholder=""
@keyup.enter.native="showGridPromptDialog('trtcre.trdgrp.rec.reccountrycode')"
></c-input>
</c-form-item>
</c-col>
<c-col :span="4">
<c-button size="small" type="primary" icon="el-icon-search" @click="onRecctySelbut1">
</c-button>
</c-col>
<!-- SG000150 : 收款人国别代码 -->
<!-- SG000151 : 收款人国内地区码 -->
<c-col :span="24">
<c-form-item label="收款人国内地区码" prop="trtcre.trdgrp.rec.recdistrictcode">
<c-input v-model="model.trtcre.trdgrp.rec.recdistrictcode" maxlength="6" placeholder=""></c-input>
</c-form-item>
</c-col>
</c-col>
</div>
</template>
<script>
import Api from "~/service/Api"
import commonProcess from "~/mixin/commonProcess";
import CodeTable from "~/config/CodeTable"
import Event from "~/model/Bctset/Event"
export default {
inject: ['root'],
props:["model","codes"],
mixins: [commonProcess],
data(){
return {
}
},
methods:{...Event},
created:function(){
}
}
</script>
<style>
</style>
src/views/Business/Bctset/Rzkx.vue 0 → 100644
<!--D,显示rz1-->
<template>
<div class="eibs-tab">
<!-- <div v-if="model.ledgrp.rec.dflg=='D' || model.dedgrp.rec.dflg=='D'">
<c-col :span="24" style="height: 24px">
<el-form-item label="我行已将上述融资款项" class="messageLabel"></el-form-item>
</c-col>
<c-col :span="24" style="height: 0px">
<el-divider></el-divider>
</c-col>
<br><br>
<c-row>
<c-col :span="12">
<c-checkbox v-model="model.financ.rzkx1">贷记贵司指定账户</c-checkbox>
</c-col>
<c-col :span="12">
<el-form-item label="帐号:" prop="financ.acc">
<c-input v-model="model.financ.acc" maxlength="40" placeholder="请输入帐号" :disabled="model.financ.rzkx1==''||model.financ.rzkx1==null"></c-input>
</el-form-item>
</c-col>
</c-row>
<c-row>
<c-col :span="12">
<c-checkbox v-model="model.financ.rzkx5">支付国内信用证项下款项</c-checkbox>
</c-col>
<c-col :span="12">
<el-form-item label="业务编号" prop="financ.ref5">
<c-input v-model="model.financ.ref5" maxlength="20" placeholder="请输入业务编号" :disabled="model.financ.rzkx1==''||model.financ.rzkx1==null"></c-input>
</el-form-item>
</c-col>
</c-row>
</div> -->
<!-- <div v-if="model.ledgrp.rec.dflg!='D' && model.dedgrp.rec.dflg!='D'"> -->
<div>
<c-col :span="24" style="height: 24px">
<el-form-item label="我行已将上述融资款项" class="messageLabel"></el-form-item>
</c-col>
<c-col :span="24" style="height: 0px">
<el-divider></el-divider>
</c-col>
<br><br>
<c-row>
<c-col :span="12">
<c-checkbox v-model="model.financ.rzkx1">贷记贵司指定账户</c-checkbox>
</c-col>
<c-col :span="12">
<el-form-item label="帐号:" prop="financ.acc" >
<c-input v-model="model.financ.acc" maxlength="40" placeholder="请输入帐号" :disabled="model.financ.rzkx1==''||model.financ.rzkx1==null"></c-input>
</el-form-item>
</c-col>
</c-row>
<c-row>
<c-col :span="12">
<c-checkbox v-model="model.financ.rzkx2">支付进口信用证项下款项</c-checkbox>
</c-col>
<c-col :span="12">
<el-form-item label="业务编号" prop="financ.ref2">
<c-input v-model="model.financ.ref2" maxlength="20" placeholder="请输入业务编号" :disabled="model.financ.rzkx1==''||model.financ.rzkx1==null"></c-input>
</el-form-item>
</c-col>
</c-row>
<c-row>
<c-col :span="12">
<c-checkbox v-model="model.financ.rzkx3">支付进口代收项下款项</c-checkbox>
</c-col>
<c-col :span="12">
<el-form-item label="业务编号" prop="financ.ref3">
<c-input v-model="model.financ.ref3" maxlength="20" placeholder="请输入业务编号" :disabled="model.financ.rzkx1==''||model.financ.rzkx1==null"></c-input>
</el-form-item>
</c-col>
</c-row>
<c-row>
<c-col :span="12">
<c-checkbox v-model="model.financ.rzkx4">支付汇出汇款项下款项</c-checkbox>
</c-col>
<c-col :span="12">
<el-form-item label="业务编号" prop="financ.ref4">
<c-input v-model="model.financ.ref4" maxlength="20" placeholder="请输入业务编号" :disabled="model.financ.rzkx1==''||model.financ.rzkx1==null"></c-input>
</el-form-item>
</c-col>
</c-row>
</div>
</div>
</template>
<script>
import Api from "~/service/Api"
import commonProcess from "~/mixin/commonProcess";
import CodeTable from "~/config/CodeTable"
import Event from "~/model/Bctset/Event"
import Utils from "~/utils";
export default {
inject: ['root'],
props: ["model", "codes"],
mixins: [commonProcess],
data() {
return {
}
},
methods: {
...Event
},
created: function () {
}
}
</script>
<style>
</style>
src/views/Business/Bctset/index.vue
......@@ -24,6 +24,19 @@
</c-content>
</el-tab-pane>
<el-tab-pane label="Financing Details" name="trtcrep">
<c-content>
<m-trtcrep :model="model" :codes="codes" />
</c-content>
</el-tab-pane>
<el-tab-pane label="同业代付" name="dftcrep">
<c-content>
<m-dftcrep :model="model" :codes="codes" />
</c-content>
</el-tab-pane>
<!--PD000018 -->
<el-tab-pane label="Instructions" name="detp">
<m-detp :model="model" :codes="codes" />
......@@ -64,6 +77,10 @@
<m-doctre :model="model" :codes="codes" />
</el-tab-pane>
<el-tab-pane label="融资款项" name="rzkx">
<m-rzkx :model="model" :codes="codes" />
</el-tab-pane>
<el-tab-pane label="外管信息" name="wg">
<m-wg :model="model" :codes="codes" />
</el-tab-pane>
......@@ -84,6 +101,9 @@
<m-basp1 :model="model" :codes="codes" />
</el-tab-pane>
<el-tab-pane label="定向收付" name="dxzfp">
<m-dxzfp :model="model" :codes="codes" />
</el-tab-pane>
<el-tab-pane label="跨境人名币申报" name="cnyp">
<m-cnyp :model="model" :codes="codes" />
</el-tab-pane>
......@@ -92,6 +112,14 @@
<m-cfactlp :model="model" :codes="codes" />
</el-tab-pane>
<el-tab-pane label="Cips" name="cips">
<m-cips :model="model" :codes="codes" />
</el-tab-pane>
<el-tab-pane label="Cips要素" name="cips2">
<m-cips2 :model="model" :codes="codes" />
</el-tab-pane>
<el-tab-pane label="统一授信" name="limitbody">
<m-limitbody :model="model" :codes="codes" />
</el-tab-pane>
......@@ -105,6 +133,19 @@
</el-tab-pane>
</c-tabs>
</el-form>
<c-grid-ety-prompt-dialog
ref="etyDialog"
:promptData="promptData"
v-on:select-ety="selectEty"
>
</c-grid-ety-prompt-dialog>
<c-grid-ety-prompt-dialog
ref="doxpDialog"
:isPty="false"
:promptData="promptData"
@select-ety="selectMsg"
>
</c-grid-ety-prompt-dialog>
</div>
</c-page>
</template>
......@@ -128,11 +169,17 @@ import Cnyp from "./Cnyp";
import Cfactlp from "./Cfactlp";
import Det400 from "./Det400";
import Det202cv from "./Det202cv";
import Cips from "./Cips";
import Cips2 from "./Cips2";
import Dftcrep from "./Dftcrep";
import Dxzfp from "./Dxzfp";
import Rzkx from "./Rzkx";
import Trtcrep from "./Trtcrep";
import Engp from "~/views/Public/Engp";
import Setpan from "~/views/Public/Setpan";
import Coninfp from "~/views/Public/Coninfp";
import Docpan from "~/views/Public/Docpan";
import Docpan from "./Docpan";
import Doctre from "~/views/Public/Doctre";
import Limitbody from "./Limitbody";
import Glepan from "~/views/Public/Glepan";
......@@ -158,6 +205,13 @@ export default {
"m-det202cv": Det202cv,
"m-limitbody": Limitbody,
"m-glepan": Glepan,
"m-cips" :Cips,
"m-dftcrep" :Dftcrep,
"m-dxzfp" : Dxzfp,
"m-rzkx" :Rzkx,
"m-trtcrep" :Trtcrep,
"m-cips2" :Cips2
},
provide() {
return {
......@@ -177,17 +231,19 @@ export default {
codes: { ...CodeTable },
};
},
methods: {},
methods: {
},
created: async function () {
console.log("进入bctset交易");
let rtnmsg = await this.init({});
let rtnmsg = await this.init(this.$route.query);
if (rtnmsg.respCode == SUCCESS) {
//TODO 处理数据逻辑
this.updateModel(rtnmsg.data);
if (this.isInDisplay) {
this.restoreDisplay();
}
// console.log(this.$refs.bctsus);
this.$refs.bctsus.$refs.table.$refs.table.toggleAllSelection();
} else {
this.$notify.error({ title: "错误", message: "服务请求失败！" });
......
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