Commit a5c83c12 by liyixun

gitopn bug (626,627)

parent d5e244fa
......@@ -4,8 +4,8 @@
"author": "psbc",
"private": true,
"scripts": {
"start": "vue-cli-service serve",
"build": "vue-cli-service build"
"start": "node --max_old_space_size=4096 node_modules/@vue/cli-service/bin/vue-cli-service.js serve",
"build": "node --max_old_space_size=4096 node_modules/@vue/cli-service/bin/vue-cli-service.js build"
},
"dependencies": {
"async-validator": "^3.5.2",
......
......@@ -52,5 +52,7 @@ export default {
"mtabut.clsflg" :Utils.defaultFunction,
"cnybop.outflg" :Utils.defaultFunction,
"gcdgrp.rec.docprbrol" :Utils.defaultFunction,
"setmod.glemod.glepan" :Utils.defaultFunction,
"bopmod.dbdp.basp" :Utils.defaultFunction,
}
//你可以添加自动default处理
......@@ -73,7 +73,7 @@
</c-col>
<c-col :span="24">
<el-form-item label="结算方式" prop="bopmod.dbagrp.bas.methods">
<c-select disabled :code="codes.methods" v-model="model.bopmod.dbagrp.bas.methods" style="width:100%" placeholder="请选择结算方式">
<c-select disabled :code="codes.bopmethods" v-model="model.bopmod.dbagrp.bas.methods" style="width:100%" placeholder="请选择结算方式">
</c-select>
</el-form-item>
</c-col>
......@@ -138,7 +138,7 @@
</c-col>
<c-col :span="24">
<c-form-item label="其它账号/银行卡号" prop="bopmod.dbagrp.bas.othacc">
<c-input v-model="model.bopmod.dbagrp.bas.othacc" maxlength="32" placeholder="请输入银行卡号"></c-input>
<c-input disabled v-model="model.bopmod.dbagrp.bas.othacc" maxlength="32" placeholder="请输入银行卡号"></c-input>
</c-form-item>
</c-col>
</c-col>
......@@ -164,7 +164,7 @@
</c-col>
<c-col :span="24">
<el-form-item label="地区机构号" prop="bopmod.dbdgrp.bas.ownextkey">
<c-select disabled :code="codes.ownextkey" v-model="model.bopmod.dbdgrp.bas.ownextkey" style="width:100%" placeholder="请选择地区机构号">
<c-select disabled :code="codes.ownextkey1" v-model="model.bopmod.dbdgrp.bas.ownextkey" style="width:100%" placeholder="请选择地区机构号">
</c-select>
</el-form-item>
</c-col>
......@@ -234,7 +234,7 @@
</c-col>
<c-col :span="24">
<el-form-item label="结算方式" prop="bopmod.dbdgrp.bas.methods">
<c-select disabled :code="codes.methods" v-model="model.bopmod.dbdgrp.bas.methods" style="width:100%" placeholder="请输入结算方式">
<c-select disabled :code="codes.bopmethods" v-model="model.bopmod.dbdgrp.bas.methods" style="width:100%" placeholder="请输入结算方式">
</c-select>
</el-form-item>
</c-col>
......
......@@ -3,40 +3,40 @@
<!-- S0000042 : 是否报送跨境人民币2101表 -->
<c-col :span="12">
<el-form-item :label="$t('cnybop.S0000042')" prop="cnybop.cnyflg">
<c-select v-model="model.cnybop.cnyflg" style="width:100%" :placeholder="$t('other.please_enter')+$t('cnybop.S0000042')">
<el-form-item label="是否报送跨境人民币2101表" prop="cnybop.cnyflg">
<c-select disabled :code="codes.cnyflg" v-model="model.cnybop.cnyflg" style="width:100%" placeholder="请选择">
</c-select>
</el-form-item>
</c-col>
<!-- S0000045 : 是否报送跨境人民币2107表 -->
<c-col :span="12">
<el-form-item :label="$t('cnybop.S0000045')" prop="cnybop.traflg">
<c-select v-model="model.cnybop.traflg" style="width:100%" :placeholder="$t('other.please_enter')+$t('cnybop.S0000045')">
<el-form-item label="是否报送跨境人民币2107表" prop="cnybop.traflg">
<c-select disabled :code="codes.traflg" v-model="model.cnybop.traflg" style="width:100%" placeholder="请选择">
</c-select>
</el-form-item>
</c-col>
<!-- S0000077 : 是否报送跨境人民币2111表 -->
<c-col :span="12">
<el-form-item :label="$t('cnybop.S0000077')" prop="cnybop.outflg">
<c-select v-model="model.cnybop.outflg" style="width:100%" :placeholder="$t('other.please_enter')+$t('cnybop.S0000077')">
<el-form-item label="是否报送跨境人民币2111表" prop="cnybop.outflg">
<c-select disabled :code="codes.outflg" v-model="model.cnybop.outflg" style="width:100%" placeholder="请选择">
</c-select>
</el-form-item>
</c-col>
<!-- S0000113 : 是否报送跨境人民币2106表 -->
<c-col :span="12">
<el-form-item :label="$t('cnybop.S0000113')" prop="cnybop.libflg">
<c-select v-model="model.cnybop.libflg" style="width:100%" :placeholder="$t('other.please_enter')+$t('cnybop.S0000113')">
<el-form-item label="是否报送跨境人民币2106表" prop="cnybop.libflg">
<c-select disabled :code="codes.libflg" v-model="model.cnybop.libflg" style="width:100%" placeholder="请选择">
</c-select>
</el-form-item>
</c-col>
<!-- S0000142 : 是否报送跨境人民币2122表 -->
<c-col :span="12">
<el-form-item :label="$t('cnybop.S0000142')" prop="cnybop.vouflg">
<c-select v-model="model.cnybop.vouflg" style="width:100%" :placeholder="$t('other.please_enter')+$t('cnybop.S0000142')">
<el-form-item label="是否报送跨境人民币2122表" prop="cnybop.vouflg">
<c-select disabled :code="codes.vouflg" v-model="model.cnybop.vouflg" style="width:100%" placeholder="请选择">
</c-select>
</el-form-item>
</c-col>
......
<template>
<div class="eibs-tab">
<c-row>
<c-rol :span="24">
<c-col :span="24">
<!-- ------页面左侧----------- -->
<c-col :span="12">
<c-col :span="24">
......@@ -28,7 +28,7 @@
</c-col>
</c-col>
</c-col>
</c-rol>
</c-col>
</c-row>
<!-- <c-col :span="12">
......
......@@ -14,7 +14,6 @@
style="margin: 0 10px 0 10px; padding: 0 12px"
size="small"
type="primary"
@click="onSeainf"
>
<span
style="
......@@ -39,7 +38,6 @@
style="margin: 0 10px 0 10px; padding: 0 12px"
size="small"
type="primary"
@click="onSeainf"
>
<span
style="
......@@ -53,10 +51,9 @@
<c-button
style="margin: 0 0"
:disabled="this.flag"
disabled
size="small"
type="primary"
@click="onGitpButgetref"
>
获取
</c-button>
......@@ -251,7 +248,6 @@
style="margin: 0 10px 0 10px; padding: 0 12px"
size="small"
type="primary"
@click="onSeainf"
>
<span style="font-family: '宋体'; font-weight: bold">i</span>
</c-button>
......@@ -260,7 +256,6 @@
type="primary"
v-model="model.gctp.prbp.det"
style="margin: 0 0"
@click="onPrbpDet"
>
Temp.
</c-button>
......@@ -288,7 +283,6 @@
v-model="model.gcdgrp.rec.payrol"
placeholder="请选择Payer"
style="width: 100%"
@change="commonExecuteRule('gcdgrp.rec.payrol')"
>
<el-option
v-for="item in codes.payrol"
......@@ -319,7 +313,6 @@
style="margin: 0 10px 0 10px; padding: 0 12px"
size="small"
type="primary"
@click="onSeainf"
>
<span style="font-family: '宋体'; font-weight: bold">i</span>
</c-button>
......@@ -328,7 +321,6 @@
style="margin: 0 0"
size="small"
type="primary"
@click="onOthpDet"
>
Details
</c-button>
......@@ -681,9 +673,10 @@ export default {
mixins: [commonProcess],
data(){
return {
}
},
computed: {
},
methods:{...Event},
created:function(){
......
......@@ -94,7 +94,7 @@
</el-table>
<el-pagination
layout="prev, pager, next"
:total="pager.liaall_limmod_limpfp_clmcbe.total">
:total="1">
</el-pagination>
</div>
</c-col>
......@@ -162,7 +162,7 @@
</el-table>
<el-pagination
layout="prev, pager, next"
:total="pager.liaall_limmod_limpfp_clmcbb.total">
:total="1">
</el-pagination>
</div>
</c-col>
......@@ -254,7 +254,7 @@
</el-table>
<el-pagination
layout="prev, pager, next"
:total="pager.liaall_limmod_limpfp_clmpty.total">
:total="1">
</el-pagination>
</div>
</c-col>
......
......@@ -7,7 +7,7 @@
<c-col :span="24">
<c-col :span="21">
<el-form-item label="申报类型" prop="bopmod.szflg">
<c-select :code="codes.szflg" v-model="model.bopmod.szflg" style="width:95%" placeholder="请选择申报类型">
<c-select :code="codes.szflg" v-model="model.bopmod.szflg" style="width:95%" placeholder="请选择申报类型" @change="slChange">
</c-select>
</el-form-item>
</c-col>
......@@ -102,6 +102,7 @@ import Api from "~/service/Api"
import commonProcess from "~/mixin/commonProcess";
import CodeTable from "~/config/CodeTable"
import Event from "~/model/Getset/Event"
import Utils from "~/utils";
export default {
inject: ['root'],
......@@ -112,7 +113,16 @@ export default {
}
},
methods:{...Event},
methods:{
...Event,
async slChange(){
// this.executeRule("bopmod.szflg").then((res) => {
// if ((res.respCode == SUCCESS)) {
// Utils.updateModel(this.model, res.data);
// }
// });
}
},
created:function(){
}
......
......@@ -23,9 +23,43 @@
<m-gitsetp1 :model="model" :codes="codes"/>
</c-content>
</el-tab-pane>
<el-tab-pane label="Liability" name="liability">
<c-content>
<m-engp :model="model" :codes="codes"/>
</c-content>
</el-tab-pane>
<el-tab-pane label="Settlement" name="setpan">
<c-content>
<m-setpan :model="model" :codes="codes"/>
</c-content>
</el-tab-pane>
<el-tab-pane v-if="this.flag" label="Bookings" name="glepan">
<c-content>
<m-glepan :model="model" :codes="codes"/>
</c-content>
</el-tab-pane>
<el-tab-pane label="Completion" name="Completion">
<c-content>
<m-coninfp :model="model" :codes="codes"/>
</c-content>
</el-tab-pane>
<el-tab-pane label="Messages" name="Messages">
<m-docpan :model="model" :codes="codes"/>
</el-tab-pane>
<el-tab-pane label="Attachments" name="Attachments">
<c-content>
<m-doctre :model="model" :codes="codes"/>
</c-content>
</el-tab-pane>
<!--lendoc PD000001 收账通知 -->
<el-tab-pane label="收账通知" name="docpan">
<m-docpan :model="model" :codes="codes"/>
<el-tab-pane label="收账通知" name="docpan1">
<m-docpan1 :model="model" :codes="codes"/>
</el-tab-pane>
<!--bopgat PD000006 外管信息 -->
<el-tab-pane label="外管信息" name="wg">
......@@ -43,13 +77,16 @@
</c-content>
</el-tab-pane>
<!--cnybop PD000002 跨境人民币申报 -->
<el-tab-pane label="$t('cnybop.PD000002')" name="cnyp">
<el-tab-pane label="跨境人民币申报" name="cnyp">
<m-cnyp :model="model" :codes="codes"/>
</el-tab-pane>
<!--limmod PD001139 试算结果 -->
<el-tab-pane label="$t('limmod.PD001139')" name="shisuan">
<el-tab-pane label="试算结果" name="shisuan">
<m-shisuan :model="model" :codes="codes"/>
</el-tab-pane>
<el-tab-pane label="统一授信" name="limitbody">
<m-limitbody :model="model" :codes="codes"/>
</el-tab-pane>
</c-tabs>
</el-form>
<c-grid-ety-prompt-dialog ref="etyDialog" :promptData="promptData" v-on:select-ety="selectEty">
......@@ -66,22 +103,38 @@ import Check from "~/model/Getset/Check"
import Default from "~/model/Getset/Default"
import Pattern from "~/model/Getset/Pattern"
import Gitsetp1 from "./Gitsetp1"
import Docpan from "./Docpan"
import Docpan1 from "./Docpan"
import Wg from "./Wg"
import Basp from "./Basp"
import Cnyp from "./Cnyp"
import Shisuan from "./Shisuan"
import Shisuan from "./Shisuan";
import Engp from "~/views/Public/Engp";
import Setpan from "~/views/Public/Setpan";
import Glepan from "~/views/Public/Glepan";
import Coninfp from "~/views/Public/Coninfp";
import Docpan from "~/views/Public/Docpan";
import Doctre from "~/views/Public/Doctre";
import Limitbody from "~/views/Public/Limitbody";
export default {
name: "Getset",
components:{
"m-gitsetp1" : Gitsetp1,
"m-docpan" : Docpan,
"m-docpan1" : Docpan1,
"m-wg" : Wg,
"m-basp" : Basp,
"m-cnyp" : Cnyp,
"m-shisuan" : Shisuan,
"m-engp" :Engp,
"m-setpan" : Setpan,
"m-glepan" :Glepan,
"m-coninfp" :Coninfp,
"m-docpan" :Docpan,
"m-doctre" :Doctre,
"m-limitbody" : Limitbody,
},
provide() {
return {
......@@ -102,6 +155,7 @@ export default {
codes: {
...CodeTable,
},
flag:false,
}
},
methods:{
......@@ -109,11 +163,15 @@ export default {
this.tabClick(tab)
/**
* do it yourself
**/const name = tab.name
**/
const name = tab.name
let rulePath;
if (name === "basp") {
rulePath = "bopmod.dbdp.basp";
}
if(name==="setpan"){
this.flag=true;
}
if (!!rulePath) {
this.executeRule(rulePath).then(res => {
if (res.respCode == SUCCESS) {
......
......@@ -85,7 +85,9 @@
</el-form-item>
</c-col>
<c-col :span="11" :offset="1">
<c-input disabled v-model="model.gidgrp.rec.orcamt" placeholder="请输入Contract Amount "></c-input>
<el-form-item label-width="5px" prop="gidgrp.rec.orcamt">
<c-input disabled v-model="model.gidgrp.rec.orcamt" placeholder="请输入Contract Amount "></c-input>
</el-form-item>
</c-col>
</c-col>
......@@ -116,7 +118,9 @@
</el-form-item>
</c-col>
<c-col :span="11" :offset="1">
<c-input v-if="model.gitp.swiftflg=='Y'" disabled v-model="model.gidgrp.rec.jurlaw" maxlength="35" placeholder="请输入Law of Jurisdiction"></c-input>
<el-form-item v-if="model.gitp.swiftflg=='Y'" label-width="5px" prop="gidgrp.rec.jurlaw">
<c-input disabled v-model="model.gidgrp.rec.jurlaw" maxlength="35" placeholder="请输入Law of Jurisdiction"></c-input>
</el-form-item>
</c-col>
</c-col>
<c-col :span="24">
......
......@@ -518,12 +518,17 @@
</c-select>
<template slot="footer">
<c-input
:disabled="model.gidgrp.blk.apprul=='URDG'||model.gidgrp.blk.apprul=='NONE'||model.gidgrp.blk.apprul=='UCPR'"
v-model="model.gidgrp.blk.apprultxt"
maxlength="35"
placeholder="请输入Applicable Rules"
></c-input>
<el-form-item
label-width="5px"
prop="gidgrp.blk.apprultxt"
>
<c-input
:disabled="model.gidgrp.blk.apprul=='URDG'||model.gidgrp.blk.apprul=='NONE'||model.gidgrp.blk.apprul=='UCPR'"
v-model="model.gidgrp.blk.apprultxt"
maxlength="35"
placeholder="请输入Applicable Rules"
></c-input>
</el-form-item>
</template>
</c-fullbox>
</el-form-item>
......@@ -1226,9 +1231,12 @@
<c-col :span="24">
<c-col :span="20">
<el-form-item v-if="model.gitp.swiftflg=='Y'" label="Expiry Condition/ Evt." prop="gidgrp.blk.exptxt">
<el-form-item v-if="model.gitp.swiftflg=='Y'&&model.gitp.exptxtmodflg==''" label="Expiry Condition/ Evt." prop="gidgrp.blk.exptxt">
<c-input type="textarea" rows="4" :disabled="model.gitp.exptxtmodflg==''" v-model="model.gidgrp.blk.exptxt" maxlength="780" show-word-limit placeholder="请输入Expiry Condition/ Evt." ></c-input>
</el-form-item>
<el-form-item v-if="model.gitp.swiftflg=='Y'&&model.gitp.exptxtmodflg=='X'" label="Expiry Condition/ Evt." prop="gidgrp.blk.atxexptxt">
<c-input type="textarea" rows="4" :disabled="model.gitp.exptxtmodflg==''" v-model="model.gidgrp.blk.atxexptxt" maxlength="780" show-word-limit placeholder="请输入Expiry Condition/ Evt." ></c-input>
</el-form-item>
</c-col>
<c-col :span="4">
<c-checkbox v-if="model.gitp.swiftflg=='Y'" v-model="model.gitp.exptxtmodflg" :disabled="model.gidgrp.rec.exptyp=='FIXD'||model.gidgrp.rec.exptyp=='OPEN'||model.gidgrp.rec.exptyp==''" style="margin:0 0 0 10px">Modify Text</c-checkbox>
......
......@@ -87,7 +87,7 @@
</c-content>
</el-tab-pane>
<el-tab-pane label="Messages" name="Messages">
<el-tab-pane label="Messages" name="docpan">
<m-docpan :model="model" :codes="codes"/>
</el-tab-pane>
......@@ -320,6 +320,8 @@ export default {
}
if(name==='dclpp'){
rulePath = "dclpp";
}if(name='docpan'){
rulePath="trnmod.trndoc.docpan";
}
if (!!rulePath) {
this.executeRule(rulePath).then(res => {
......
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