Commit 3dde5cb7 by huangxin

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 de4d4537 f2611b3f
...@@ -11,85 +11,85 @@ ...@@ -11,85 +11,85 @@
prop="limtyp" prop="limtyp"
label="限制类型" label="限制类型"
sortable sortable
width="150"> width="100">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="cur" prop="cur"
label="业务币种" label="业务币种"
sortable sortable
width="80"> width="100">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="cbeamt" prop="cbeamt"
label="业务发生额" label="业务发生额"
sortable sortable
width="90"> width="120">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="reqtyp1" prop="reqtyp1"
label="Req.Typel" label="Req.Typel"
sortable sortable
width="auto"> width="130">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="limcbeamt" prop="limcbeamt"
label="额度发生额" label="额度发生额"
sortable sortable
width="auto"> width="130">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="reqtyp2" prop="reqtyp2"
label="Req.Type2" label="Req.Type2"
sortable sortable
width="auto"> width="130">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="ckcbeamt" prop="ckcbeamt"
label="敞口发生额" label="敞口发生额"
sortable sortable
width="auto"> width="130">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="credat" prop="credat"
label="额度日期" label="额度日期"
sortable sortable
width="auto"> width="100">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="ptyextkey" prop="ptyextkey"
label="客户编号" label="客户编号"
sortable sortable
width="auto"> width="100">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="ptynam" prop="ptynam"
label="客户名称" label="客户名称"
sortable sortable
width="auto"> width="100">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="ownref" prop="ownref"
label="业务编号" label="业务编号"
sortable sortable
width="auto"> width="100">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="ccvbl" prop="ccvbl"
label="合同保证金比例" label="合同保证金比例"
sortable sortable
width="auto"> width="130">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="limvar" prop="limvar"
label="额度类型" label="额度类型"
sortable sortable
width="auto"> width="100">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="dgzylimref" prop="dgzylimref"
label="额度编号" label="额度编号"
sortable sortable
width="auto"> width="100">
</el-table-column> </el-table-column>
</el-table> </el-table>
<el-pagination <el-pagination
...@@ -109,55 +109,55 @@ ...@@ -109,55 +109,55 @@
prop="dgzylimvar" prop="dgzylimvar"
label="额度品种" label="额度品种"
sortable sortable
width="auto"> width="100">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="tzhamt" prop="tzhamt"
label="调整后业务余额" label="调整后业务余额"
sortable sortable
width="auto"> width="130">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="tzhccv" prop="tzhccv"
label="调整后保证金比例" label="调整后保证金比例"
sortable sortable
width="auto"> width="140">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="tzhlimamt" prop="tzhlimamt"
label="调整后拟占用额度" label="调整后拟占用额度"
sortable sortable
width="auto"> width="140">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="tzhlimck" prop="tzhlimck"
label="调整后拟占用敞口" label="调整后拟占用敞口"
sortable sortable
width="auto"> width="140">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="tzqamt" prop="tzqamt"
label="调整前业务余额" label="调整前业务余额"
sortable sortable
width="auto"> width="130">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="tzqccv" prop="tzqccv"
label="调整后保证金比例" label="调整后保证金比例"
sortable sortable
width="auto"> width="140">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="tzqlimamt" prop="tzqlimamt"
label="调整前已占用额度" label="调整前已占用额度"
sortable sortable
width="auto"> width="140">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="tzqlimck" prop="tzqlimck"
label="调整前已占用敞口" label="调整前已占用敞口"
sortable sortable
width="auto"> width="140">
</el-table-column> </el-table-column>
</el-table> </el-table>
<el-pagination <el-pagination
...@@ -177,79 +177,79 @@ ...@@ -177,79 +177,79 @@
prop="limvar" prop="limvar"
label="额度类型" label="额度类型"
sortable sortable
width="auto"> width="100">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="dgzylimvar" prop="dgzylimvar"
label="额度品种" label="额度品种"
sortable sortable
width="auto"> width="100">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="dglimcur" prop="dglimcur"
label="额度币种" label="额度币种"
sortable sortable
width="auto"> width="100">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="dgsxlimamt" prop="dgsxlimamt"
label="授信额度" label="授信额度"
sortable sortable
width="auto"> width="100">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="dgyylimamt" prop="dgyylimamt"
label="已用额度" label="已用额度"
sortable sortable
width="auto"> width="100">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="dgkylimamt" prop="dgkylimamt"
label="可用额度" label="可用额度"
sortable sortable
width="auto"> width="100">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="dgcklimamt" prop="dgcklimamt"
label="授信敞口" label="授信敞口"
sortable sortable
width="auto"> width="100">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="dgyylimck" prop="dgyylimck"
label="已用敞口" label="已用敞口"
sortable sortable
width="auto"> width="100">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="dgkylimck" prop="dgkylimck"
label="可用敞口" label="可用敞口"
sortable sortable
width="auto"> width="100">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="dghfxh" prop="dghfxh"
label="恢复序号" label="恢复序号"
sortable sortable
width="auto"> width="100">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="dgzylimref" prop="dgzylimref"
label="额度编号" label="额度编号"
sortable sortable
width="auto"> width="100">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="dgzyliminfref" prop="dgzyliminfref"
label="额度明细编号" label="额度明细编号"
sortable sortable
width="auto"> width="130">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="dgccvbl" prop="dgccvbl"
label="保证金比例" label="保证金比例"
sortable sortable
width="auto"> width="130">
</el-table-column> </el-table-column>
</el-table> </el-table>
<el-pagination <el-pagination
......
<template> <template>
<c-page title="出口融资注销"> <div class="eContainer">
<c-page title="出口融资注销">
<div class="eContainer">
<c-function-btn :handleSubmit="handleSubmit" :handleCheck="handleCheck" :handleStash="handleStash">
<el-button size="small">备忘录</el-button>
<el-button size="small" @click="setDraggableContent('cms', '影像信息')">影像信息</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> -->
<el-button size="small">智能提示</el-button>
</c-function-btn>
<!-- <c-bus-button :$pntvm="this"></c-bus-button> --> <!-- <c-bus-button :$pntvm="this"></c-bus-button> -->
<el-form <el-form
:model="model" :model="model"
:rules="rules" :rules="rules"
ref="modelForm" ref="modelForm"
label-width="120px" label-width="120px"
label-position="left" label-position="left"
size="small" size="small"
:validate-on-rule-change="false" :validate-on-rule-change="false"
> >
<c-tabs v-model="tabVal" ref="elment" type="card" @tab-click="tabClick"> <c-tabs v-model="tabVal" ref="elment" type="card" @tab-click="tabClick">
<!--PD000016 --> <!--PD000016 -->
<el-tab-pane label="注销" name="canp"> <el-tab-pane label="业务信息" name="ovwp">
<c-content> <c-content>
<m-canp :model="model" :codes="codes"/> <m-ovwp :model="model" :codes="codes"/>
</c-content>
</el-tab-pane>
<el-tab-pane label="统一授信" name="limitbody2">
<c-content>
<m-limitbody2 :model="model" :codes="codes"/>
</c-content>
</el-tab-pane>
<el-tab-pane label="费用/账务" name="setpan,glepan">
<c-content>
<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-item title="会计分录" name="glepan">
<!-- 会计分录 -->
<m-glepan :model="model" :codes="codes" />
</el-collapse-item>
</el-collapse>
</div>
</c-content> </c-content>
</el-tab-pane> </el-tab-pane>
<!--PD000000 Settlement 账务 公共模块--> <!--PD000000 Settlement 账务 公共模块-->
<el-tab-pane label="费用及账务" name="setpan"> <!-- <el-tab-pane label="费用及账务" name="setpan">
<c-content> <c-content>
<m-setpan :model="model" :codes="codes"/> <m-setpan :model="model" :codes="codes"/>
</c-content> </c-content>
</el-tab-pane> </el-tab-pane> -->
<!-- Bookings--> <!-- Bookings-->
<el-tab-pane label="分录" name="glepan"> <!-- <el-tab-pane label="分录" name="glepan">
<m-glepan :model="model" :codes="codes" ref="glepan" /> <m-glepan :model="model" :codes="codes" ref="glepan" />
</el-tab-pane> </el-tab-pane> -->
<!--PD000000 Completion 附言--> <!--PD000000 Completion 附言-->
<el-tab-pane label="附言" name="coninfp"> <el-tab-pane label="备查/附言" name="addbcb">
<c-content> <c-content>
<m-coninfp :model="model" :codes="codes"/> <m-addbcb :model="model" :codes="codes"/>
</c-content> </c-content>
</el-tab-pane> </el-tab-pane>
<!--PD000529 Messages --> <!--PD000529 Messages -->
<el-tab-pane label="报文面函" name="docpan"> <el-tab-pane label="报文/面函" name="docpan">
<c-content> <c-content>
<m-docpan :model="model" :codes="codes"/> <m-docpan :model="model" :codes="codes"/>
</c-content> </c-content>
</el-tab-pane> </el-tab-pane>
<!--PD000546 Attachments 附件--> <!--PD000546 Attachments 附件-->
<el-tab-pane label="交易附件" name="doctre"> <el-tab-pane label="附件信息" name="doctre">
<c-content> <c-content>
<m-doctre :model="model" :codes="codes"/> <m-doctre :model="model" :codes="codes"/>
</c-content> </c-content>
</el-tab-pane> </el-tab-pane>
<!--PD001139 --> <!--PD001139 -->
<el-tab-pane label="试算结果" name="shisuan"> <!-- <el-tab-pane label="试算结果" name="shisuan">
<c-content> <c-content>
<m-shisuan :model="model" :codes="codes"/> <m-shisuan :model="model" :codes="codes"/>
</c-content> </c-content>
</el-tab-pane> </el-tab-pane> -->
<!--PD000001 --> <!--PD000001 -->
<el-tab-pane label="统一授信" name="limitbody"> <!-- <el-tab-pane label="统一授信" name="limitbody">
<c-content> <c-content>
<m-limitbody :model="model" :codes="codes"/> <m-limitbody :model="model" :codes="codes"/>
</c-content> </c-content>
</el-tab-pane> </el-tab-pane> -->
</c-tabs> </c-tabs>
</el-form> </el-form>
<c-grid-ety-prompt-dialog ref="etyDialog" :promptData="promptData" v-on:select-ety="selectEty"/> <c-grid-ety-prompt-dialog ref="etyDialog" :promptData="promptData" v-on:select-ety="selectEty"/>
</div> <c-function-btn :handleSubmit="handleSubmit" :handleCheck="handleCheck" :handleStash="handleStash">
</c-page> <!-- <el-button size="small">备忘录</el-button> -->
<!-- <el-button size="small" @click="setDraggableContent('cms', '影像信息')">影像信息</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> -->
<!-- <el-button size="small">智能提示</el-button> -->
</c-function-btn>
</c-page>
</div>
</template> </template>
<script> <script>
import Api from "~/service/Api" import Api from "~/service/Api"
...@@ -100,6 +126,9 @@ import Coninfp from "~/views/Public/Coninfp"; ...@@ -100,6 +126,9 @@ import Coninfp from "~/views/Public/Coninfp";
import Docpan from "~/views/Public/Docpan"; import Docpan from "~/views/Public/Docpan";
import Limitbody from "~/views/Public/Limitbody" import Limitbody from "~/views/Public/Limitbody"
import Glepan from "~/views/Public/Glepan"; import Glepan from "~/views/Public/Glepan";
import Limitbody2 from "./Limitbody2";
import Ovwp from './Ovwp';
import Addbcb from './Addbcb';
import Utils from "~/utils"; import Utils from "~/utils";
...@@ -114,6 +143,9 @@ export default { ...@@ -114,6 +143,9 @@ export default {
"m-shisuan" : Shisuan, "m-shisuan" : Shisuan,
"m-limitbody" : Limitbody, "m-limitbody" : Limitbody,
"m-glepan" : Glepan, "m-glepan" : Glepan,
"m-ovwp" : Ovwp,
"m-limitbody2" : Limitbody2,
"m-addbcb" : Addbcb,
}, },
provide() { provide() {
return { return {
...@@ -123,7 +155,8 @@ export default { ...@@ -123,7 +155,8 @@ export default {
mixins: [commonProcess,commonFuncs], // 里面包含了Default、Check等的公共处理 mixins: [commonProcess,commonFuncs], // 里面包含了Default、Check等的公共处理
data(){ data(){
return { return {
tabVal: "canp", activeNames: ["setpan"],
tabVal: "ovwp",
trnName: "bptcan", trnName: "bptcan",
model: new Bptcan().data, model: new Bptcan().data,
checkRules: Check, checkRules: Check,
......
<template> <template>
<div class="eibs-tab"> <div class="eibs-tab">
<el-collapse v-model="activeNames" @change="handleChange"> <el-collapse v-model="activeNames" @change="handleChange">
<c-content>
<el-collapse-item title="附言" name="coninfp"> <el-collapse-item title="附言" name="coninfp">
<m-coninfp :model="model" :codes="codes" /> <m-coninfp :model="model" :codes="codes" />
</el-collapse-item> </el-collapse-item>
</c-content>
</el-collapse> </el-collapse>
</div> </div>
</template> </template>
......
...@@ -17,18 +17,16 @@ ...@@ -17,18 +17,16 @@
<template> <template>
<div class="eibs-tab"> <div class="eibs-tab">
<c-content>
<el-collapse v-model="activeNames" @change="handleChange"> <el-collapse v-model="activeNames" @change="handleChange">
<el-collapse-item title="统一授信" name="limitbody2"> <el-collapse-item title="统一授信" name="limitbody">
<!-- 统一授信 --> <!-- 统一授信 -->
<m-limitbody2 :model="model" :codes="codes" /> <m-limitbody :model="model" :codes="codes" />
</el-collapse-item> </el-collapse-item>
<el-collapse-item title="试算结果" name="shisuan"> <el-collapse-item title="试算结果" name="shisuan">
<!-- 试算结果 --> <!-- 试算结果 -->
<m-shisuan :model="model" :codes="codes" /> <m-shisuan :model="model" :codes="codes" />
</el-collapse-item> </el-collapse-item>
</el-collapse> </el-collapse>
</c-content>
</div> </div>
</template> </template>
<script> <script>
...@@ -37,14 +35,14 @@ import Shisuan from "./Shisuan"; ...@@ -37,14 +35,14 @@ import Shisuan from "./Shisuan";
export default { export default {
components: { components: {
"m-limitbody2" : Limitbody, "m-limitbody" : Limitbody,
"m-shisuan" : Shisuan, "m-shisuan" : Shisuan,
}, },
inject: ["root"], inject: ["root"],
props: ["model", "codes"], props: ["model", "codes"],
data() { data() {
return { return {
activeNames: ["limitbody2"], activeNames: ["limitbody"],
}; };
}, },
}; };
......
<template> <template>
<div class="eibs-tab"> <div class="eibs-tab">
<c-content>
<el-collapse v-model="activeNames" @change="handleChange"> <el-collapse v-model="activeNames" @change="handleChange">
<el-collapse-item title="融资归还" name="bptset2"> <el-collapse-item title="融资归还" name="bptset2">
<!-- 融资归还 --> <!-- 融资归还 -->
...@@ -11,7 +10,6 @@ ...@@ -11,7 +10,6 @@
<m-docpan2 :model="model" :codes="codes" /> <m-docpan2 :model="model" :codes="codes" />
</el-collapse-item> </el-collapse-item>
</el-collapse> </el-collapse>
</c-content>
</div> </div>
</template> </template>
<script> <script>
......
...@@ -11,43 +11,43 @@ ...@@ -11,43 +11,43 @@
prop="limtyp" prop="limtyp"
label="限制类型" label="限制类型"
sortable sortable
width="150"> width="100">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="cur" prop="cur"
label="业务币种" label="业务币种"
sortable sortable
width="80"> width="100">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="cbeamt" prop="cbeamt"
label="业务发生额" label="业务发生额"
sortable sortable
width="90"> width="120">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="reqtyp1" prop="reqtyp1"
label="Req.Typel" label="Req.Typel"
sortable sortable
width="100"> width="130">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="limcbeamt" prop="limcbeamt"
label="额度发生额" label="额度发生额"
sortable sortable
width="100"> width="120">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="reqtyp2" prop="reqtyp2"
label="Req.Type2" label="Req.Type2"
sortable sortable
width="100"> width="130">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="ckcbeamt" prop="ckcbeamt"
label="敞口发生额" label="敞口发生额"
sortable sortable
width="100"> width="130">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="credat" prop="credat"
...@@ -77,7 +77,7 @@ ...@@ -77,7 +77,7 @@
prop="ccvbl" prop="ccvbl"
label="合同保证金比例" label="合同保证金比例"
sortable sortable
width="100"> width="130">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="limvar" prop="limvar"
...@@ -115,49 +115,49 @@ ...@@ -115,49 +115,49 @@
prop="tzhamt" prop="tzhamt"
label="调整后业务余额" label="调整后业务余额"
sortable sortable
width="100"> width="130">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="tzhccv" prop="tzhccv"
label="调整后保证金比例" label="调整后保证金比例"
sortable sortable
width="100"> width="140">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="tzhlimamt" prop="tzhlimamt"
label="调整后拟占用额度" label="调整后拟占用额度"
sortable sortable
width="100"> width="140">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="tzhlimck" prop="tzhlimck"
label="调整后拟占用敞口" label="调整后拟占用敞口"
sortable sortable
width="100"> width="140">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="tzqamt" prop="tzqamt"
label="调整前业务余额" label="调整前业务余额"
sortable sortable
width="100"> width="130">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="tzqccv" prop="tzqccv"
label="调整后保证金比例" label="调整后保证金比例"
sortable sortable
width="100"> width="140">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="tzqlimamt" prop="tzqlimamt"
label="调整前已占用额度" label="调整前已占用额度"
sortable sortable
width="100"> width="140">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="tzqlimck" prop="tzqlimck"
label="调整前已占用敞口" label="调整前已占用敞口"
sortable sortable
width="100"> width="140">
</el-table-column> </el-table-column>
</el-table> </el-table>
<el-pagination <el-pagination
...@@ -243,13 +243,13 @@ ...@@ -243,13 +243,13 @@
prop="dgzyliminfref" prop="dgzyliminfref"
label="额度明细编号" label="额度明细编号"
sortable sortable
width="100"> width="130">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="dgccvbl" prop="dgccvbl"
label="保证金比例" label="保证金比例"
sortable sortable
width="100"> width="130">
</el-table-column> </el-table-column>
</el-table> </el-table>
<el-pagination <el-pagination
......
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