Commit 19c92103 by nanrui

版本覆盖处理

parent ec3a7397
...@@ -4,8 +4,8 @@ ...@@ -4,8 +4,8 @@
"author": "psbc", "author": "psbc",
"private": true, "private": true,
"scripts": { "scripts": {
"start": "node --max_old_space_size=4096 node_modules/@vue/cli-service/bin/vue-cli-service.js serve", "build:prod": "node --max_old_space_size=102400 node_modules/@vue/cli-service/bin/vue-cli-service.js build",
"build": "node --max_old_space_size=4096 node_modules/@vue/cli-service/bin/vue-cli-service.js build" "serve": "node --max_old_space_size=102400 node_modules/@vue/cli-service/bin/vue-cli-service.js serve --open"
}, },
"dependencies": { "dependencies": {
"async-validator": "^3.5.2", "async-validator": "^3.5.2",
......
<template>
<div class="eibs-tab">
<el-collapse v-model="activeNames" @change="handleChange">
<!--el-collapse-item title="备查表" name="addbcb">
<m-addbcb :model="model" :codes="codes" />
</el-collapse-item-->
<el-collapse-item title="附言" name="coninfp">
<m-coninfp :model="model" :codes="codes" />
</el-collapse-item>
</el-collapse>
</div>
</template>
<script>
import Api from "~/service/Api";
import commonProcess from "~/mixin/commonProcess";
import Utils from "~/utils";
import Event from "~/model/Gitcan/Event";
import Coninfp from "~/views/Public/Coninfp";
export default {
components: {
"m-coninfp": Coninfp,
},
inject: ["root"],
props: ["model", "codes"],
mixins: [commonProcess],
data() {
return {
activeNames: ["coninfp"],
};
},
methods: {
...Event,
handleChange(val) {
console.log(val);
},
},
created: function () { },
};
</script>
<style>
</style>
\ No newline at end of file
<template> <template>
<div class="eibs-tab"> <div class="eibs">
<c-col :span="11"> <c-col :span="11">
<c-col :span="24"> <c-col :span="24">
<el-form-item <el-form-item
......
<template>
<div class="eibs-tab">
<el-collapse v-model="activeNames" @change="handleChange">
<el-collapse-item title="统一授信" name="limitbody1">
<m-limitbody1 :model="model" :codes="codes" />
</el-collapse-item>
<el-collapse-item title="试算结果" name="shisuan">
<m-shisuan :model="model" :codes="codes" />
</el-collapse-item>
</el-collapse>
</div>
</template>
<script>
import Api from "~/service/Api";
import commonProcess from "~/mixin/commonProcess";
import Utils from "~/utils";
import Event from "~/model/Gitcan/Event";
import Limitbody1 from "~/views/Public/Limitbody";
import Shisuan from "./Shisuan";
export default {
components: {
"m-limitbody1": Limitbody1,
"m-shisuan": Shisuan,
},
inject: ["root"],
props: ["model", "codes"],
mixins: [commonProcess],
data() {
return {
activeNames: ["limitbody1"],
};
},
methods: {
...Event,
handleChange(val) {
console.log(val);
},
},
created: function () { },
};
</script>
<style>
</style>
\ No newline at end of file
<template> <template>
<div class="eibs-tab"> <div class="eibs">
<c-col :span="11"> <c-col :span="11">
<c-col :span="24"> <c-col :span="24">
<el-form-item label="缩减日期" prop="gidgrp.rec.reddat"> <el-form-item label="缩减日期" prop="gidgrp.rec.reddat">
......
<template>
<div class="eibs-tab">
<el-collapse v-model="activeNames" @change="handleChange">
<el-collapse-item title="注销" name="canp">
<m-canp :model="model" :codes="codes" />
</el-collapse-item>
<el-collapse-item title="Mt769" name="Mt769p" v-if="model.gidgrp.rec.purcan == 'RR'">
<m-mt769p :model="model" :codes="codes" />
</el-collapse-item>
</el-collapse>
</div>
</template>
<script>
import Api from "~/service/Api";
import commonProcess from "~/mixin/commonProcess";
import CodeTable from "~/config/CodeTable";
import Event from "~/model/Gitcan/Event";
import Canp from "./Canp";
import Mt769p from "./Mt769p";
export default {
components: {
"m-canp": Canp,
"m-mt769p": Mt769p,
},
inject: ["root"],
props: ["model", "codes"],
mixins: [commonProcess],
data() {
return {
activeNames: ["canp"],
};
},
methods: {
...Event,
handleChange(val) {
console.log(val);
},
},
created: function () { },
};
</script>
<style>
.marginLable {
padding-left: 160px;
}
</style>
\ No newline at end of file
<template> <template>
<div class="eibs-tab"> <div class="eibs">
<c-col :span="24"> <c-col :span="24">
<div class="e-table-wrapper"> <div class="e-table-wrapper">
......
<template> <template>
<c-page title="进口保函注销"> <c-page title="进口保函注销">
<div class="eContainer"> <div class="eContainer">
<c-function-btn <el-form :model="model" :rules="rules" ref="modelForm" label-width="120px" label-position="right" size="small"
:handleSubmit="handleSubmit" :validate-on-rule-change="false">
:handleCheck="handleCheck" <c-tabs v-model="tabVal" ref="elment" type="card" @tab-click="myTabClick">
:handleStash="handleStash" <el-tab-pane label="业务信息" name="ovwp">
> <c-content>
<el-button size="small">备忘录</el-button> <m-ovwp :model="model" :codes="codes" />
<el-button size="small">影像信息</el-button> </c-content>
<!-- <el-button size="small">保存模板</el-button>
<el-button size="small">使用模板</el-button> -->
<el-button size="small">制裁信息</el-button>
<!-- <el-button size="small">拆分报文</el-button> -->
<el-button size="small">智能提示</el-button>
</c-function-btn>
<el-form
:model="model"
:rules="rules"
ref="modelForm"
label-width="120px"
label-position="right"
size="small"
:validate-on-rule-change="false"
>
<c-tabs
v-model="tabVal"
ref="elment"
type="card"
@tab-click="myTabClick"
>
<!--PD000026 -->
<el-tab-pane label="注销" name="canp">
<m-canp :model="model" :codes="codes" />
</el-tab-pane>
<el-tab-pane
label="Mt769"
name="Mt769p"
v-if="model.gidgrp.rec.purcan == 'RR'"
>
<m-mt769p :model="model" :codes="codes" />
</el-tab-pane>
<!--PD000027 -->
<el-tab-pane label="表外" name="engp">
<m-engp :model="model" :codes="codes" />
</el-tab-pane> </el-tab-pane>
<!--PD000001 --> <!--PD000001 -->
<el-tab-pane label="保证金" name="ccvpan"> <el-tab-pane label="保证金" name="ccvpan">
<c-content>
<m-ccvpan :model="model" :codes="codes" /> <m-ccvpan :model="model" :codes="codes" />
</c-content>
</el-tab-pane> </el-tab-pane>
<!--PD000000 --> <!--PD000001 -->
<el-tab-pane label="费用及账务" name="setpan"> <el-tab-pane label="统一授信" name="limitbody">
<m-setpan :model="model" :codes="codes" /> <c-content>
<m-limitbody :model="model" :codes="codes" />
</c-content>
</el-tab-pane> </el-tab-pane>
<!--PD000000 --> <el-tab-pane label="费用/账务" name="engp,setpan,glepan">
<el-tab-pane label="附言" name="coninfp"> <c-content>
<m-coninfp :model="model" :codes="codes" /> <div class="eibs-tab">
<el-collapse v-model="activeNames">
<el-collapse-item title="表外记账" name="engp">
<!-- 表外记账 -->
<m-engp :model="model" :codes="codes" />
</el-collapse-item>
<el-collapse-item title="结算" name="setpan">
<!-- 结算 -->
<m-setpan :model="model" :codes="codes" />
</el-collapse-item>
</el-collapse>
</div>
</c-content>
</el-tab-pane> </el-tab-pane>
<!--PD000529 --> <!--PD000510 -->
<el-tab-pane label="面函" name="docpan"> <el-tab-pane label="备查/附言" name="addbcb">
<m-docpan :model="model" :codes="codes" /> <c-content>
<m-addbcb :model="model" :codes="codes" />
</c-content>
</el-tab-pane> </el-tab-pane>
<!--PD000546 -->
<el-tab-pane label="交易附件" name="doctre">
<m-doctre :model="model" :codes="codes" />
</el-tab-pane>
<!--PD001139 -->
<el-tab-pane label="试算结果" name="shisuan"> <el-tab-pane label="报文/面函" name="docpan">
<m-shisuan :model="model" :codes="codes" /> <c-content>
<m-docpan :model="model" :codes="codes" />
</c-content>
</el-tab-pane> </el-tab-pane>
<!--PD000001 --> <!--trndoc PD000546 Attachments -->
<el-tab-pane label="统一授信" name="limitbody"> <el-tab-pane label="附件" name="doctre">
<m-limitbody :model="model" :codes="codes" /> <c-content>
<m-doctre :model="model" :codes="codes" />
</c-content>
</el-tab-pane> </el-tab-pane>
</c-tabs> </c-tabs>
</el-form> </el-form>
<c-grid-ety-prompt-dialog <c-grid-ety-prompt-dialog ref="etyDialog" :promptData="promptData" v-on:select-ety="selectEty">
ref="etyDialog"
:promptData="promptData"
v-on:select-ety="selectEty"
>
</c-grid-ety-prompt-dialog> </c-grid-ety-prompt-dialog>
<c-function-btn :handleSubmit="handleSubmit" :handleCheck="handleCheck" :handleStash="handleStash">
</c-function-btn>
</div> </div>
</c-page> </c-page>
</template> </template>
...@@ -101,32 +81,31 @@ import commonFuncs from "~/mixin/commonFuncs"; ...@@ -101,32 +81,31 @@ import commonFuncs from "~/mixin/commonFuncs";
import Check from "~/model/Gitcan/Check"; import Check from "~/model/Gitcan/Check";
import Default from "~/model/Gitcan/Default"; import Default from "~/model/Gitcan/Default";
import Pattern from "~/model/Gitcan/Pattern"; import Pattern from "~/model/Gitcan/Pattern";
import Canp from "./Canp";
import Shisuan from "./Shisuan";
import Mt769p from "./Mt769p";
import Limitbody from "~/views/Public/Limitbody"; import Ovwp from "./Ovwp";
import Ccvpan from "~/views/Public/Ccvpan";
import Limitbody from "./Limitbody";
import Engp from "~/views/Public/Engp"; import Engp from "~/views/Public/Engp";
import Doctre from "~/views/Public/Doctre";
import Docpan from "~/views/Public/Docpan";
import Setpan from "~/views/Public/Setpan"; import Setpan from "~/views/Public/Setpan";
import Addbcb from "./Addbcb";
import Coninfp from "~/views/Public/Coninfp"; import Coninfp from "~/views/Public/Coninfp";
import Ccvpan from "~/views/Public/Ccvpan"; import Docpan from "~/views/Public/Docpan";
import Doctre from "~/views/Public/Doctre";
export default { export default {
name: "Gitcan", name: "Gitcan",
components: { components: {
"m-canp": Canp, "m-ovwp": Ovwp,
"m-engp": Engp,
"m-ccvpan": Ccvpan, "m-ccvpan": Ccvpan,
"m-limitbody": Limitbody,
"m-engp": Engp,
"m-setpan": Setpan, "m-setpan": Setpan,
'm-addbcb': Addbcb,
"m-coninfp": Coninfp, "m-coninfp": Coninfp,
"m-docpan": Docpan, "m-docpan": Docpan,
"m-doctre": Doctre, "m-doctre": Doctre,
"m-shisuan": Shisuan,
"m-limitbody": Limitbody,
"m-mt769p": Mt769p,
}, },
provide() { provide() {
return { return {
...@@ -136,7 +115,8 @@ export default { ...@@ -136,7 +115,8 @@ export default {
mixins: [commonProcess, commonFuncs], // 里面包含了Default、Check等的公共处理 mixins: [commonProcess, commonFuncs], // 里面包含了Default、Check等的公共处理
data() { data() {
return { return {
tabVal: "canp", tabVal: "ovwp",
activeNames: ["engp"],
trnName: "gitcan", trnName: "gitcan",
model: new Gitcan().data, model: new Gitcan().data,
checkRules: Check, checkRules: Check,
...@@ -170,4 +150,5 @@ export default { ...@@ -170,4 +150,5 @@ export default {
}; };
</script> </script>
<style> <style>
</style> </style>
...@@ -284,7 +284,7 @@ ...@@ -284,7 +284,7 @@
style="margin-left: 0" style="margin-left: 0"
size="small" size="small"
type="primary" type="primary"
@click="getButtons(scope.row['Reference'])" @click="getButtons(scope.row['信用证编号'])"
> >
处理 处理
</c-button> </c-button>
......
...@@ -361,7 +361,7 @@ ...@@ -361,7 +361,7 @@
style="margin-left: 0" style="margin-left: 0"
size="small" size="small"
type="primary" type="primary"
@click="getButtons(scope.row['Reference'])" @click="getButtons(scope.row['信用证编号'])"
> >
处理 处理
</c-button> </c-button>
......
...@@ -430,7 +430,7 @@ ...@@ -430,7 +430,7 @@
<c-col :span="8"> <c-col :span="8">
<el-form-item <el-form-item
label="" label=""
style="margin-left: 110px" style="margin-left: 218px"
prop="model.cmtflg" prop="model.cmtflg"
> >
<c-checkbox v-model="model.cmtflg">跨境人民币保函</c-checkbox> <c-checkbox v-model="model.cmtflg">跨境人民币保函</c-checkbox>
...@@ -439,7 +439,7 @@ ...@@ -439,7 +439,7 @@
<c-col :span="8"> <c-col :span="8">
<el-form-item <el-form-item
label="" label=""
style="margin-left: 110px" style="margin-left: 218px"
prop="model.fingua" prop="model.fingua"
> >
<c-checkbox v-model="model.fingua">融资性对外担保</c-checkbox> <c-checkbox v-model="model.fingua">融资性对外担保</c-checkbox>
...@@ -478,15 +478,15 @@ ...@@ -478,15 +478,15 @@
</c-col> </c-col>
<c-col :span="24"> <c-col :span="24">
<c-istream-table :list="stmData.data" :columns="stmData.columns"> <c-istream-table :list="stmData.data" :columns="stmData.columns" :showButtonFlg="true">
<el-table-column fixed="right" prop="op" label="操作" width="140px"> <el-table-column fixed="right" prop="op" label="操作" width="140px">
<template slot="header"> <template slot="header">
<c-col :span="11" style="text-align: left"> <c-col :span="11" style="text-align: center">
<span>操作</span> <span>操作</span>
</c-col> </c-col>
<c-col :span="12" style="text-align: right"> <!-- <c-col :span="12" style="text-align: right">
<c-button icon="el-icon-s-tools"></c-button> <c-button icon="el-icon-s-tools"></c-button>
</c-col> </c-col> -->
</template> </template>
<template slot-scope="scope"> <template slot-scope="scope">
<el-popover <el-popover
...@@ -533,7 +533,7 @@ ...@@ -533,7 +533,7 @@
> >
</el-popover> </el-popover>
<c-button <c-button
style="margin-left: 0" style="margin-left: 5px"
size="small" size="small"
type="primary" type="primary"
@click="getButtons(scope.row['保函编号'])" @click="getButtons(scope.row['保函编号'])"
...@@ -652,8 +652,8 @@ export default { ...@@ -652,8 +652,8 @@ export default {
label: "处理类型", label: "处理类型",
code: this.codes.hndtyp, code: this.codes.hndtyp,
}, },
'6 21"电子渠道类型" 150', '6 21 "电子渠道类型" 150',
'7 22"其他编号" 150', '7 22 "其他编号" 150',
], ],
data: [], data: [],
}, },
......
...@@ -502,7 +502,7 @@ ...@@ -502,7 +502,7 @@
<el-table-column fixed="right" prop="op" label="操作" width="140px"> <el-table-column fixed="right" prop="op" label="操作" width="140px">
<template slot="header"> <template slot="header">
<c-col :span="11" style="text-align: left"><span>操作</span></c-col> <c-col :span="11" style="text-align: center"><span>操作</span></c-col>
<!-- <c-col :span="12" style="text-align: right" <!-- <c-col :span="12" style="text-align: right"
><c-button icon="el-icon-s-tools"></c-button ><c-button icon="el-icon-s-tools"></c-button
></c-col> --> ></c-col> -->
...@@ -552,7 +552,7 @@ ...@@ -552,7 +552,7 @@
</c-button> </c-button>
</el-popover> </el-popover>
<c-button <c-button
style="margin-left: 0" style="margin-left: 5px"
size="small" size="small"
type="primary" type="primary"
@click="getButtons(scope.row['信用证编号'])" @click="getButtons(scope.row['信用证编号'])"
......
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