Commit f157b975 by 潘际乾

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 b5360754 d63f485a
......@@ -149,5 +149,6 @@ export default {
"trtcre.trtmod.finmod.dinmod.jzllgz" :Utils.defaultFunction,
"dftcre.dfdgrp.rec.matdat" :Utils.defaultFunction,
"dftcre.dfdgrp.rec.stttendat" :Utils.defaultFunction,
"brtp.prechkdat" :Utils.defaultFunction,
}
//你可以添加自动default处理
......@@ -169,7 +169,7 @@ export default {
"brtp.prechkdat":[
{type: "date", required: false, message: "输入正确的日期"}
//{type: "date", required: false, message: "输入正确的日期"}
],
"brdgrp.prb.namelc":[
{type: "string", required: true, message: "必输项"},
......
......@@ -497,6 +497,7 @@
v-model="model.brdgrp.rec.docprbrol"
style="width: 100%"
placeholder="请选择交单行"
@change="selectOrCheckboxRule('brdgrp.rec.docprbrol')"
:code="codes.docprbrol"
>
</c-select>
......
......@@ -632,7 +632,9 @@
v-model="model.brdgrp.rec.docprbrol"
style="width: 100%"
placeholder="请选择交单人"
:code="codes.docprbrol"
@change="selectOrCheckboxRule('brdgrp.rec.docprbrol')"
:code="codes.docprbrol1"
>
</c-select>
</el-form-item>
......@@ -642,6 +644,7 @@
<el-form-item label="交单人地址编码" prop="brdgrp.prb.pts.extkey">
<c-fullbox>
<c-input
:disabled="this.flag4"
v-model="model.brdgrp.prb.pts.extkey"
maxlength="16"
placeholder="请输入地址编码"
......@@ -682,7 +685,7 @@
maxlength="140"
show-word-limit
placeholder="请输入名称地址"
disabled
:disabled="model.brdgrp.prb.pts.extkey!=''"
></c-input>
</el-form-item>
</c-col>
......@@ -702,6 +705,7 @@ export default {
mixins: [commonProcess],
data() {
return {
flag4:true,
flag3: true,
cmtflg: [
{ label: "代理行模式", value: "C" },
......@@ -757,6 +761,27 @@ export default {
},
created: function () {},
watch: {
"model.brtp.ischktyp": {
immediate: true,
handler(val, oldVal) {
if (this.model.brtp.ischktyp == "N"||this.model.brtp.ischktyp == "") {
this.model.brtp.prechkdat = "";
}
},
},
"model.brdgrp.rec.docprbrol":function(){
if(this.model.brdgrp.rec.docprbrol=='ADV'){
this.flag4=true;
}
else if(this.model.brdgrp.rec.docprbrol=='BEN'){
this.flag4=true;
}
else if(this.model.brdgrp.rec.docprbrol=='PRB'){
this.flag4=false;
}
},
declareParams() {},
"model.trnmod.cmtflg": {
immediate: true,
......
<template>
<div class="eibs-tab">
<el-collapse v-model="activeNames" @change="handleChange">
<!--el-collapse-item title="备查表" name="addbcb1">
<m-addbcb1 :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/Litcan/Event";
//import Addbcb1 from "~/views/Public/Addbcb1";
import Coninfp from "~/views/Public/Coninfp";
export default {
components: {
"m-coninfp": Coninfp,
//"m-addbcb1": Addbcb1,
},
inject: ["root"],
props: ["model", "codes"],
mixins: [commonProcess],
data() {
return {
activeNames: ["coninfp"],
};
},
methods: {
...Event,
handleChange(val) {
console.log(val);
},
},
created: function () {},
};
</script>
<style>
</style>
<template>
<div class="eContainer">
<c-function-btn
:handleSubmit="handleSubmit"
:handleCheck="handleCheck"
:handleStash="handleStash"
>
<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> -->
<!-- <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 title="出口保函修改">
<el-form
:model="model"
:rules="rules"
......@@ -25,38 +11,89 @@
:validate-on-rule-change="false"
>
<c-tabs v-model="tabVal" ref="elment" type="card" @tab-click="myTabClick">
<el-tab-pane label="业务信息" name="ovwp">
<c-content>
<m-ovwp :model="model" :codes="codes" />
</c-content>
</el-tab-pane>
<el-tab-pane label="统一授信" name="limitbody">
<c-content>
<m-limitbody :model="model" :codes="codes" />
</c-content>
</el-tab-pane>
<el-tab-pane label="费用/账务" name="engp,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 v-if="this.flag" title="会计分录" name="glepan">
<!-- 会计分录 -->
<m-glepan :model="model" :codes="codes" />
</el-collapse-item>
</el-collapse>
</div>
</c-content>
</el-tab-pane>
<el-tab-pane label="备查/附言" name="addbcb">
<c-content>
<m-addbcb :model="model" :codes="codes" />
</c-content>
</el-tab-pane>
<el-tab-pane label="报文/面函" name="docpan">
<c-content>
<m-docpan :model="model" :codes="codes" />
</c-content>
</el-tab-pane>
<el-tab-pane label="附件信息" name="doctre">
<c-content>
<m-doctre :model="model" :codes="codes" />
</c-content>
</el-tab-pane>
<!--gitp PD001291 开立方式 -->
<el-tab-pane label="开立方式" name="opnp">
<!-- <el-tab-pane label="开立方式" name="opnp">
<m-opnp :model="model" :codes="codes" />
</el-tab-pane>
</el-tab-pane> -->
<!--gitamep PD002031 Amendment -->
<el-tab-pane label="保函修改" name="ameps20">
<!-- <el-tab-pane label="保函修改" name="ameps20">
<m-ameps20 :model="model" :codes="codes" />
</el-tab-pane>
</el-tab-pane> -->
<!--gitamep PD002100 修改日期 -->
<el-tab-pane label="修改日期" name="amedat20">
<!-- <el-tab-pane label="修改日期" name="amedat20">
<m-amedat20 :model="model" :codes="codes" />
</el-tab-pane>
</el-tab-pane> -->
<!--gitp PD000002 Overview -->
<el-tab-pane label="概要" name="ovwp">
<!-- <el-tab-pane label="概要" name="ovwp1">
<c-content>
<m-ovwp :model="model" :codes="codes" />
<m-ovwp1 :model="model" :codes="codes" />
</c-content>
</el-tab-pane>
</el-tab-pane> -->
<!--gitp PD000043 Parties -->
<el-tab-pane label="当事人描述" name="ptyp">
<!-- <el-tab-pane label="当事人描述" name="ptyp">
<m-ptyp :model="model" :codes="codes" />
</el-tab-pane>
</el-tab-pane> -->
<!--gitp PD000727 Presentation/ Delivery -->
<el-tab-pane
<!-- <el-tab-pane
v-if="false"
label="演示/交付"
name="preperp"
>
<m-preperp :model="model" :codes="codes" />
</el-tab-pane>
</el-tab-pane> -->
<!--gitp PD000389 Details -->
<el-tab-pane label="详细信息" name="detp">
<!-- <el-tab-pane label="详细信息" name="detp">
<c-content>
<m-detp :model="model" :codes="codes" />
</c-content>
......@@ -68,9 +105,9 @@
name="gidtxtp"
>
<m-gidtxtp :model="model" :codes="codes" />
</el-tab-pane>
</el-tab-pane> -->
<el-tab-pane
<!-- <el-tab-pane
v-if="
model.gitp.swiftflg == 'Y' &&
(model.gidgrp.rec.legfrm == 'STBY' ||
......@@ -80,25 +117,25 @@
name="confp"
>
<m-confp :model="model" :codes="codes" />
</el-tab-pane>
</el-tab-pane> -->
<!--getame PD050035 History -->
<el-tab-pane label="历史信息" name="amephis">
<!-- <el-tab-pane label="历史信息" name="amephis">
<m-amephis :model="model" :codes="codes" />
</el-tab-pane>
</el-tab-pane> -->
<el-tab-pane label="表外" name="liability">
<!-- <el-tab-pane label="表外" name="liability">
<m-engp :model="model" :codes="codes" />
</el-tab-pane>
</el-tab-pane> -->
<el-tab-pane label="费用及账务" name="setpan">
<!-- <el-tab-pane label="费用及账务" name="setpan">
<m-setpan :model="model" :codes="codes" />
</el-tab-pane>
</el-tab-pane> -->
<el-tab-pane v-if="this.flag" label="分录" name="glepan">
<!-- <el-tab-pane v-if="this.flag" label="分录" name="glepan">
<m-glepan :model="model" :codes="codes" />
</el-tab-pane>
</el-tab-pane> -->
<el-tab-pane label="附言" name="Completion">
<!-- <el-tab-pane label="附言" name="Completion">
<m-coninfp :model="model" :codes="codes" />
</el-tab-pane>
......@@ -108,9 +145,9 @@
<el-tab-pane label="交易附件" name="Attachments">
<m-doctre :model="model" :codes="codes" />
</el-tab-pane>
</el-tab-pane> -->
<el-tab-pane
<!-- <el-tab-pane
v-if="
model.gidgrp.rec.purpos == 'ISCO' ||
model.gidgrp.rec.purpos == 'ICCO'
......@@ -199,11 +236,11 @@
name="aamp20"
>
<m-aamp20 :model="model" :codes="codes" />
</el-tab-pane>
</el-tab-pane> -->
<el-tab-pane label="统一授信" name="limitbody">
<!-- <el-tab-pane label="统一授信" name="limitbody">
<m-limitbody :model="model" :codes="codes" />
</el-tab-pane>
</el-tab-pane> -->
</c-tabs>
</el-form>
<c-grid-ety-prompt-dialog
......@@ -212,6 +249,13 @@
v-on:select-ety="selectEty"
>
</c-grid-ety-prompt-dialog>
<c-function-btn
:handleSubmit="handleSubmit"
:handleCheck="handleCheck"
:handleStash="handleStash"
>
</c-function-btn>
</c-page>
</div>
</template>
<script>
......@@ -233,6 +277,7 @@ import Detp from "./Detp";
import Amephis from "./Amephis";
import Gidtxtp from "./Gidtxtp";
import Confp from "./Confp";
import Addbcb from "./Addbcb";
import Ovwpc from "./Ovwpc";
import Ptypc from "./Ptypc";
......@@ -254,6 +299,7 @@ import Limitbody from "~/views/Public/Limitbody";
export default {
name: "Getame",
components: {
"m-addbcb": Addbcb,
"m-opnp": Opnp,
"m-ameps20": Ameps20,
"m-amedat20": Amedat20,
......@@ -289,7 +335,7 @@ export default {
mixins: [commonProcess, commonFuncs], // 里面包含了Default、Check等的公共处理
data() {
return {
tabVal: "opnp",
tabVal: "ovwp",
trnName: "getame",
trnType: "",
model: new Getame().data,
......@@ -300,6 +346,7 @@ export default {
codes: {
...CodeTable,
},
activeNames: ["engp"],
flag: false,
};
},
......
......@@ -450,7 +450,7 @@ export default {
{ label: "MT910", value: "910" },
{ label: "CMT100", value: "CMT" },
{ label: "境内外币清算", value: "100" },
{ label: "Other", value: "OTH" },
{ label: "其他", value: "OTH" },
],
cptselModel: new CptselModel().data,
searchToggle: true,
......
......@@ -185,7 +185,7 @@ export default {
// '0 10 "业务状态" 80',
{
index: 0, position: 10, width: 100, pattern: 'code', label: '业务状态', code: [{ label: "等待", value: "W" },
{ label: "已修改", value: "C" },
{ label: "已打回", value: "C" },
{ label: "已拾取", value: "P" },
{ label: "已拒绝", value: "N" },]
},
......
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