Skip to content

V
vue-gjjs
Commit 453f6401 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 a3db72c6 3c0ffb3d
Showing with 301 additions and 82 deletions
src/model/Brtdck/Pattern.js
......@@ -130,7 +130,7 @@ export default {
{pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
],
"brdgrp.prb.pts.adrblk":[
{type: "string", required: true, message: "必输项"},
//{type: "string", required: true, message: "必输项"},
{max: 140,message:"长度不能超过140"}
],
"brdgrp.prb.dbfadrblkcn":[
......@@ -190,7 +190,7 @@ export default {
{max: 35,message:"长度不能超过35"}
],
"brtp.oth.pts.adrblk":[
{type: "string", required: true, message: "必输项"},
//{type: "string", required: true, message: "必输项"},
{max: 140,message:"长度不能超过140"}
],
"brtp.oth.dbfadrblkcn":[
......
src/model/Trnrel/Event.js
......@@ -108,7 +108,7 @@ export default {
const selIds = [idx + 1];
const selDst = "trncorco.trnstm" //列表对应后台模型中的stream
let params = { selDst, selIds };
this.executeRule("dsp,reldsp",params).then((res) => {
this.executeRule("dsp",params).then((res) => {
if ((res.respCode == SUCCESS)) {
Utils.copyValueFromVO(this.model, res.data);
sessionStorage.setItem('InftrnpsDetail', JSON.stringify(this.model));
......@@ -127,7 +127,7 @@ export default {
const selIds = [idx + 1];
const selDst = "trncorco.trnstm" //列表对应后台模型中的stream
let params = { selDst, selIds };
this.executeRule("dsp,reldsp",params).then((res) => {
this.executeRule("dsp",params).then((res) => {
if ((res.respCode == SUCCESS)) {
Utils.copyValueFromVO(this.model, res.data);
sessionStorage.setItem('InftrnpsDetail', JSON.stringify(this.model));
......
src/views/Business/Brtdck/Brtdckp.vue
......@@ -502,23 +502,26 @@
v-model="model.brdgrp.rec.docprbrol"
style="width: 100%"
placeholder="请选择 Presented by"
:code="codes.docprbrol"
@change="selectOrCheckboxRule('brdgrp.rec.docprbrol')"
:code="codes.docprbrol1"
>
</c-select>
</el-form-item>
</c-col>
<c-col :span="24">
<c-ptap1
<c-ptap
:model="model"
:argadr="{
title: '',
grp: 'brdgrp',
rol: 'prb',
}"
:disabled="true"
@onSeainf="onSeainf" @onAplpDet="onPrbpDet"
:disabled="this.flag2"
:disabledExtkey="this.flag"
:isAdrblk="true"
:noRef="true"
>
</c-ptap1>
</c-ptap>
</c-col>
<!-- SF000087 : Payer -->
<c-col :span="24">
......@@ -527,24 +530,26 @@
v-model="model.brdgrp.rec.payrol"
style="width: 100%"
placeholder="请输入付款人"
@change="selectOrCheckboxRule('brdgrp.rec.payrol')"
:code="codes.payrol1"
>
</c-select>
</el-form-item>
</c-col>
<c-col :span="24">
<c-ptap1
<c-ptap
:model="model"
:argadr="{
title: '',
grp: 'brtp',
rol: 'oth',
}"
:disabled="true"
disabled1
@onSeainf="onSeainf" @onAplpDet="onOthpDet"
:disabled="this.flag3"
:disabledExtkey="this.flag4"
:isAdrblk="true"
:noRef="true"
>
</c-ptap1>
</c-ptap>
<!-- <c-ptap
:model="model"
:argadr="{
......@@ -573,20 +578,71 @@ import commonProcess from "~/mixin/commonProcess";
import CodeTable from "~/config/CodeTable";
import Event from "~/model/Brtdck/Event";
import Ptap1 from "~/views/Public/Ptap1";
// import Ptap from "~/views/Public/Ptap";
import Ptap from "~/views/Public/Ptap";
import Ptsmsg from "~/views/Public/Ptsmsg";
export default {
components: {
"c-ptap1": Ptap1,
// "c-ptap": Ptap,
"c-ptap": Ptap,
"c-ptsmsg": Ptsmsg,
},
inject: ["root"],
props: ["model", "codes"],
mixins: [commonProcess],
data() {
return {};
return {
flag:true,
flag2:true,
flag3:true,
flag4:true,
};
},
watch:{
"model.brdgrp.rec.docprbrol":function(){
if(this.model.brdgrp.rec.docprbrol=='ADV'){
this.flag=true;
}
else if(this.model.brdgrp.rec.docprbrol=='BEN'){
this.flag=true;
}
else if(this.model.brdgrp.rec.docprbrol=='PRB'){
this.flag=false;
}
},
"model.brdgrp.prb.pts.extkey" :{
immediate:true,
handler(val ,oldVal){
if(this.model.brdgrp.prb.pts.extkey!=''){
this.flag2=true;
}else{
this.flag2=false;
}
}
},
"model.brdgrp.rec.payrol":function(){
if(this.model.brdgrp.rec.payrol=='APL'){
this.flag4=true;
}
else if(this.model.brdgrp.rec.payrol=='OTH'){
this.flag4=false;
}
},
"model.brtp.oth.pts.extkey" :{
immediate:true,
handler(val ,oldVal){
if(this.model.brtp.oth.pts.extkey!=''){
this.flag3=true;
}else{
this.flag3=false;
}
}
},
},
methods: { ...Event, onSeainf(){}},
created: function () {},
......
src/views/Business/Gitcrj/Ovwp.vue 0 → 100644
<template>
<div class="eibs-tab">
<el-collapse v-model="activeNames" @change="handleChange">
<el-collapse-item title="拒付详情" name="gitsetp1">
<m-gitsetp1 :model="model" :codes="codes" />
</el-collapse-item>
<el-collapse-item title="银行指令" name="gitbin">
<m-gitbin :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/Gitcrj/Event";
import Gitsetp1 from "./Gitsetp1"
import Gitbin from "./Gitbin"
export default {
components:{
"m-gitsetp1" : Gitsetp1,
"m-gitbin" : Gitbin,
},
inject: ["root"],
props: ["model", "codes"],
mixins: [commonProcess],
data() {
return {
activeNames: ["gitsetp1"],
};
},
methods: { ...Event },
created: function () {},
};
</script>
<style>
</style>
\ No newline at end of file
src/views/Business/Gitcrj/index.vue
<template>
<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">影像信息</el-button>
<c-page title="进口保函拒付">
<!-- <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>
<el-form :model="model" :rules="rules" ref="modelForm" label-width="120px" label-position="right" size="small" :validate-on-rule-change="false">
<!-- <el-button size="small">智能提示</el-button> -->
<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">
<el-tab-pane label="业务信息" name="ovwp">
<c-content>
<m-ovwp :model="model" :codes="codes"/>
</c-content>
</el-tab-pane>
<!--PD000031 -->
<el-tab-pane label="拒付" name="gitsetp1">
<!-- <el-tab-pane label="拒付" name="gitsetp1">
<c-content>
<m-gitsetp1 :model="model" :codes="codes"/>
</c-content>
</el-tab-pane> -->
<!--PD000001 -->
<el-tab-pane label="统一授信" name="limitbody">
<c-content>
<m-limitbody :model="model" :codes="codes"/>
</c-content>
</el-tab-pane>
<!--PD000000 -->
<el-tab-pane label="费用及账务" name="setpan">
<m-setpan :model="model" :codes="codes"/>
</el-tab-pane>
<el-tab-pane label="费用/账务" name="setpann">
<c-content>
<div class="eibs-tab">
<el-collapse v-model="activeNames">
<el-collapse-item title="结算" name="setpan">
<!-- 结算 -->
<m-setpan :model="model" :codes="codes" />
</el-collapse-item>
</el-collapse>
</div>
</c-content>
</el-tab-pane>
<!--PD000000 -->
<el-tab-pane label="附言" name="coninfp">
<m-coninfp :model="model" :codes="codes"/>
</el-tab-pane>
<el-tab-pane label="备查/附言" name="coninfp">
<c-content>
<div class="eibs-tab">
<el-collapse v-model="activeNames">
<el-collapse-item title="附言" name="coninfp">
<c-content>
<m-coninfp :model="model" :codes="codes" />
</c-content>
</el-collapse-item>
</el-collapse>
</div>
</c-content>
</el-tab-pane>
<!--PD000529 -->
<el-tab-pane label="面函" name="docpan">
<el-tab-pane label="报文/面函" name="docpan">
<c-content>
<m-docpan :model="model" :codes="codes"/>
</c-content>
</el-tab-pane>
<!--PD000546 -->
<el-tab-pane label="交易附件" name="doctre">
<el-tab-pane label="附件信息" name="doctre">
<c-content>
<m-doctre :model="model" :codes="codes"/>
</c-content>
</el-tab-pane>
<!--PD000076 -->
<el-tab-pane label="银行指令" name="gitbin">
<!-- <el-tab-pane label="银行指令" name="gitbin">
<m-gitbin :model="model" :codes="codes"/>
</el-tab-pane>
<!--PD000001 -->
<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"
......@@ -64,8 +103,17 @@
@select-ety="selectMsg"
>
</c-grid-ety-prompt-dialog>
</c-page>
<c-function-btn
:handleSubmit="handleSubmit"
:handleCheck="handleCheck"
:handleStash="handleStash"
>
</c-function-btn>
</div>
</c-page>
</template>
<script>
import Api from "~/service/Api"
......@@ -85,6 +133,7 @@ import Doctre from "~/views/Public/Doctre"
import Docpan from "~/views/Public/Docpan"
import Setpan from "~/views/Public/Setpan"
import Coninfp from "~/views/Public/Coninfp"
import Ovwp from "./Ovwp"
export default {
......@@ -97,6 +146,7 @@ export default {
"m-doctre" : Doctre,
"m-gitbin" : Gitbin,
"m-limitbody" : Limitbody,
"m-ovwp" : Ovwp,
},
provide() {
return {
......@@ -106,7 +156,7 @@ export default {
mixins: [commonProcess,commonFuncs], // 里面包含了Default、Check等的公共处理
data(){
return {
tabVal: "gitsetp1",
tabVal: "ovwp",
trnName: "gitcrj",
model: new Gitcrj().data,
checkRules: Check,
......@@ -115,6 +165,7 @@ export default {
rules: null,
codes: {...CodeTable
},
activeNames: ["setpan","coninfp"],
}
},
methods:{
......
src/views/Business/Gitsel/index.vue
......@@ -35,7 +35,7 @@ export default {
mixins: [commonProcess], // 里面包含了Default、Check等的公共处理
data(){
return {
tabVal: "",
tabVal: "sel",
trnName: "gitsel",
model: new Gitsel().data,
checkRules: Check,
......
src/views/Business/Litame/Amep.vue
......@@ -91,10 +91,10 @@
<c-col :span="12">
<el-form-item label="" prop="trnmod.swiadd.ameamt">
<c-input-currency
<c-input-currency-min
v-model="model.trnmod.swiadd.ameamt"
placeholder="请输入增减金额."
></c-input-currency>
></c-input-currency-min>
</el-form-item>
</c-col>
<c-col :span="12">
......
src/views/Business/Litdla/Amep.vue
......@@ -209,7 +209,7 @@
</c-col>
<c-col :span="24">
<c-checkbox disabled v-model="model.litp.aamp.aammod.addamtflg">附加金额</c-checkbox>
<c-checkbox v-model="model.litp.aamp.aammod.addamtflg">附加金额</c-checkbox>
</c-col>
......
src/views/Business/Litdla/Ovwp.vue
......@@ -29,12 +29,22 @@
<!-- 当事人信息 -->
<m-ptyp :model="model" :codes="codes" />
</el-collapse-item>
<el-collapse-item title="货物" name="dogp">
<!-- 货物 -->
<m-dogp :model="model" :codes="codes" :dtyp="'dorp'" :rec="'lid'" />
</el-collapse-item>
<el-collapse-item title="货物修改" name="dogpame">
<!-- 货物修改 -->
<m-dogpame :model="model" :codes="codes" />
</el-collapse-item>
<el-collapse-item title="单据" name="dorp">
<!-- 单据 -->
<m-dorp :model="model" :codes="codes" :dtyp="'adcp'" :rec="'lid'" />
</el-collapse-item>
<el-collapse-item title="单据修改" name="dorpame">
<!-- 单据修改-->
<m-dorpame :model="model" :codes="codes" :dtyp="'dogp'" :rec="'lid'" />
......@@ -84,20 +94,11 @@
<m-inspame :model="model" :codes="codes" :dtyp="'adcp'" :rec="'lid'" />
</el-collapse-item>
<el-collapse-item title="货物" name="dogp">
<!-- 货物 -->
<m-dogp :model="model" :codes="codes" :dtyp="'dorp'" :rec="'lid'" />
</el-collapse-item>
<el-collapse-item title="单据" name="dorp">
<!-- 单据 -->
<m-dorp :model="model" :codes="codes" :dtyp="'adcp'" :rec="'lid'" />
</el-collapse-item>
<el-collapse-item title="试算结果" name="shisuan">
<!-- <el-collapse-item title="试算结果" name="shisuan"> -->
<!-- 试算结果 -->
<m-shisuan :model="model" :codes="codes" />
</el-collapse-item>
<!-- <m-shisuan :model="model" :codes="codes" />
</el-collapse-item> -->
</el-collapse>
......
src/views/Business/Litdla/Spbpame.vue
......@@ -46,7 +46,7 @@
<c-checkbox
style=" margin: 0px 0 10px 150px;"
style=" margin: 0px 0px 10px 120px;" class="checkbox-left"
@change="open"
v-model="model.litamep.spcbenamep.modflg">修改要替换的文本</c-checkbox>
......@@ -55,13 +55,13 @@
<c-col :span="12">
<c-checkbox
@change="open1"
style=" margin: 0px 0 10px 125px;"
style=" margin: 0px 0 10px 120px;"
v-model="model.litamep.spcbenamep.modmanflg">内部修改文本</c-checkbox>
</c-col>
<c-col :span="12">
<c-button
style=" margin: 0px 0 10px 150px;"
style=" margin: 0px 0 10px 120px;"
size="small" type="primary" @click="onLcrdocamepButdif">
显示差异
</c-button>
......@@ -69,7 +69,7 @@
<c-col :span="24">
<c-button
style=" margin: 0px 0 10px 150px;"
style=" margin: 0px 0 10px 120px;"
disabled
size="small" type="primary" @click="onLcrdocamepButadd">
添加文本
......@@ -78,7 +78,7 @@
<c-col :span="24">
<c-button
style=" margin: 0px 0 10px 150px;"
style=" margin: 0px 0 10px 120px;"
disabled
size="small" type="primary" icon="el-icon-delete" @click="onLcrdocamepButdel">
删除文本
......
src/views/Business/Litdla/Sprpame.vue
......@@ -47,7 +47,7 @@
<c-checkbox
style=" margin: 0px 0 10px 150px;"
style=" margin: 0px 0px 10px 120px;" class="checkbox-left"
@change="open"
v-model="model.litamep.spcrcbamep.modflg">修改要替换的文本</c-checkbox>
......@@ -56,13 +56,13 @@
<c-col :span="12">
<c-checkbox
@change="open1"
style=" margin: 0px 0 10px 125px;"
style=" margin: 0px 0 10px 120px;"
v-model="model.litamep.spcrcbamep.modmanflg">内部修改文本</c-checkbox>
</c-col>
<c-col :span="12">
<c-button
style=" margin: 0px 0 10px 150px;"
style=" margin: 0px 0 10px 120px;"
size="small" type="primary" @click="onLcrdocamepButdif">
显示差异
</c-button>
......@@ -70,7 +70,7 @@
<c-col :span="24">
<c-button
style=" margin: 0px 0 10px 150px;"
style=" margin: 0px 0 10px 120px;"
disabled
size="small" type="primary" @click="onLcrdocamepButadd">
添加文本
......@@ -79,7 +79,7 @@
<c-col :span="24">
<c-button
style=" margin: 0px 0 10px 150px;"
style=" margin: 0px 0 10px 120px;"
disabled
size="small" type="primary" icon="el-icon-delete" @click="onLcrdocamepButdel">
删除文本
......
src/views/Business/Litdla/index.vue
......@@ -91,9 +91,20 @@
<m-ccvpan :model="model" :codes="codes" />
</el-tab-pane>
<el-tab-pane label="统一授信" name="limitbody">
<m-limitbody :model="model" :codes="codes" />
</el-tab-pane>
<el-tab-pane label="统一授信" name="limitbody,shisuan">
<c-content>
<div class="eibs-tab">
<el-collapse v-model="activeNames1">
<el-collapse-item title="统一授信" name="limitbody">
<m-limitbody :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>
</c-content>
</el-tab-pane>
<el-tab-pane label="费用/账务" name="engp,setpan,glepan">
<c-content>
......@@ -275,6 +286,7 @@ export default {
codes: {... CodeTable
},
activeNames: ["engp","coninfp",],
activeNames1: ["limitbody"],
}
},
methods:{
......
src/views/Docpan/DocRouter.js
import Show from "./Show"
import Detail from "./Detail"
import Swift from "./Swift"
const BusRouter = [
{path:'show',component:Show},
{path:'detail',component:Detail},
{path:'swift',component:Swift},
]
export default BusRouter
\ No newline at end of file
src/views/Docpan/Swift.vue 0 → 100644
<template>
<div>
<div style="height: 800px; overflow: auto;padding: 20px;">
<!-- {{data}} -->
<c-row v-if="!this.model.docXML">
<c-col v-for="(item, index) in model.docTXT" :key="index" >
<div>
{{item}}
</div>
</c-col>
</c-row>
</div>
</div>
</template>
<script>
export default {
data() {
return {
model: { docTXT: "",
docXML: "",
},
};
},
created() {
let doclang= window.sessionStorage.doclang||"";
this.model.docXML = window.sessionStorage.docXML;
this.model.docTXT = window.sessionStorage.docTXT
.split("\n")
// .filter((item) => item)
// .map((item) => {
// let idx = item.indexOf(":");
// return [
// item.substring(0, idx).trim(),
// item.substring(idx + 1).trim(),
// ];
// });
},
};
</script>
<style scoped>
</style>
\ No newline at end of file
src/views/Public/Docpan.vue
......@@ -587,10 +587,14 @@ export default {
rtnmsg = await Api.post(`${this.requestPrefix}/executeDocpan`, this.wrapper(params))
if (rtnmsg.respCode == SUCCESS) {
if (cortyp == 'SWT' || cortyp == 'FMT' || cortyp == 'CMT') {
let viewurl = rtnmsg.data.setmod_msgmod_docpth;
this.viewurl = viewurl
// let viewurl = rtnmsg.data.setmod_msgmod_docpth;
let viewurl = "/#/docpan/swift";
// this.viewurl = viewurl
// window.sessionStorage.docTXT = rtnmsg.data.lidgrp_blk_feetxt + rtnmsg.data.lidgrp_blk_insbnk ;
let doctxt = rtnmsg.data.trnmod_trndoc_doceot[index]['doctxt']
window.sessionStorage.docTXT = doctxt.rows.filter(d => d != '').join('\n')
this.title = "报文"
//window.open(viewurl, 'newwindow', 'height=1200,width=800,top=100,left=100,toolbar=no,resizable=no,menubar=no,location=no, status=no');
window.open(viewurl, 'newwindow', 'height=1200,width=800,top=100,left=100,toolbar=no,resizable=no,menubar=no,location=no, status=no');
}
else if (cortyp == 'ELC') {
Modal.info({
......
src/views/Public/EngpDialog.vue
......@@ -54,7 +54,7 @@
<c-col :span="12">
<el-form-item label="记账账号">
<c-col >
<c-input v-model="formData.acc" />
<c-select v-model="formData.acc" />
</c-col>
</el-form-item>
......@@ -63,7 +63,7 @@
<c-col :span="12">
<el-form-item label="抵扣账号">
<c-col >
<c-input v-model="formData.acc2" />
<c-input v-model="formData.acc2" disabled />
</c-col>
</el-form-item>
......
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