Skip to content

V
vue-gjjs
Commit e265d65a by 潘际乾
Options

Merge branch 'master' of http://114.115.138.98:8900/fukai/vue-gjjs

parents 14d3fc74 28f0165e
Showing with 97 additions and 54 deletions
src/config/CodeTable/index.js
......@@ -5884,5 +5884,24 @@ const CodeTable = {
atptxt: [
{ label: "开立信用证", value: "DITOPN" },
],
sptrelstatus:[
{label:'Incoming',value:'INC'},
{label:'Automatic',value:'AUT'},
{label:'To Correct',value:'COR'},
{label:'Manual',value:'MAN'},
{label:'Registered',value:'RIM'},
{label:'Pending',value:'PEN'},
{label:'Rejected',value:'REJ'},
{label:'Straight Through',value:'STP'},
{label:'Processing Pending',value:'PUP'},
{label:'Release Pending',value:'PUR'},
{label:'Branch Confirm',value:'CMC'},
{label:'Branch Register',value:'CMP'},
{label:'To Correct',value:'CMR'},
{label:'Branch Pending',value:'CMB'},
{label:'To Correct',value:'CTR'},
{label:'Done',value:'CAN'},
{label:'E Trade',value:'EJS'},
]
}
export default CodeTable;
\ No newline at end of file
src/model/Ditdck/Pattern.js
......@@ -108,8 +108,8 @@ export default {
{max: 20,message:"长度不能超过20"}
],
"didgrp.rec.utlnbr":[
{type: "string", required: false, message: "必输项"},
{max: 3,message:"长度不能超过3"}
{type: "number", required: false, message: "必输项"},
// {max: 3,message:"长度不能超过3"}
],
"bddgrp.prb.pts.extkey":[
{type: "string", required: false, message: "必输项"},
......@@ -194,8 +194,8 @@ export default {
{type: "date", required: false, message: "输入正确的日期"}
],
"bddgrp.rec.tenmaxday":[
{type: "string", required: false, message: "必输项"},
{max: 3,message:"长度不能超过3"}
{type: "number", required: false, message: "必输项"},
// {max: 3,message:"长度不能超过3"}
],
......
src/model/Trnrel/Event.js
......@@ -407,7 +407,6 @@ export default {
const res = await this.executeRule("searow")
that.$refs.inftrnps.stmData.data = res.data.trncorco_trnstm.rows;
this.model.trncorco.trnstm = res.data.trncorco_trnstm;
this.$store.commit("setTaskList", {key: "trnfnd", val: this.stmData.data.length});
this.$refs.paramsForm.clearValidate();
Utils.positioningErrorMsg(res.fieldErrors, this.$refs.paramsForm.fields)
......
src/store/Status.js
......@@ -26,7 +26,6 @@ const Status = {
taskList: {
sptsel: 0,
trnrel: 0,
trnfnd: 0,
bopsel: 0,
sptbrk: 0,
diasel: 0,
......
src/views/Business/BusRouter.js
......@@ -103,8 +103,6 @@ import Sptpopup from "./Sptsel/Sptpopup"
* 带有name的才会被添加进顶部的标签页里
*/
const BusRouter = [
{ path: 'sptpopup', component: Sptpopup, name: 'Sptpopup', meta: { title: '详情' } },
// { path: 'inftrnpsDetail', component: InftrnpsDetail, name: 'InftrnpsDetail', meta: { title: '详情' } },
{ path: 'sptpopup', component: Sptpopup, name: 'Sptpopup', meta: { title: '待经办详情' } },
{ path: 'trnfndsDetail', component: TrnfndsDetail, name: 'TrnfndsDetail', meta: { title: '已完成详情' } },
{ path: 'inftrnpsDetail', component: InftrnpsDetail, name: 'InftrnpsDetail', meta: { title: '待复核详情' } },
......
src/views/Business/Ditdck/index.vue
......@@ -151,7 +151,6 @@ export default {
if (rtnmsg.respCode == SUCCESS) {
//TODO 处理数据逻辑
console.log(rtnmsg);
debugger;
Utils.copyValueFromVO(this.model, rtnmsg.data);
console.log(this.model);
if (this.isInDisplay) {
......
src/views/Business/Infbdd/BusNavbar.vue
......@@ -23,7 +23,7 @@ export default {
trnName:'ditsel',
model:new Litsel().data,
navcode:[
{code:"",label:"",isDis:"",title:""},
// {code:"",label:"",isDis:"",title:""},
],
}
},
......@@ -34,9 +34,10 @@ export default {
let rtnmsg = await this.executeRule("cfgfil.hotsub3")
console.log("cfgfil.code:" + this.model.cfgfil.subtrn1);
if(rtnmsg.respCode = SUCCESS){
this.navcode = []
this.$emit("onChoose",code.toLowerCase());
}else{
this.$notify.error({ title: "错误", message: "服务请求失败！" });
}
},
......@@ -66,6 +67,7 @@ export default {
mounted(){
this.$nextTick(function(){
this.$on('childmethods',async function(){
this.navcode = []
//请求按钮数据
//this.model.didgrp.rec.ownref = 'KZ3500210540AA'
this.model.bddgrp.rec.ownref = this.ownref
......
src/views/Business/Infbdd/Infsea.vue
......@@ -251,7 +251,11 @@
title="历史信息"
width="800"
trigger="click"
:ref="'popover_' + scope.row.IDX"
>
<div style="text-align: right; margin-top: -30px; margin-right: 5px; font-size: 16px;">
<span class="el-icon-close" @click="closeTrn('popover_' + scope.row.IDX)"/>
</div>
<c-istream-table
:list="trnData.data"
:columns="trnData.columns"
......@@ -346,8 +350,10 @@ export default {
'8 6 "Beneficiary" 150',
'9 7 "Party Number" 140',
'10 8 "Presenting Bank" 220',
'3 9 "Opened" 150',
'4 10 "Closed" 80',
// '3 9 "Opened" 150',
// '4 10 "Closed" 80',
{index:3,position:9,width:100,pattern:'date',label:'Opened'},
{index:4,position:10,width:100,pattern:'date',label:'Closed'},
'11 11 "Doc Amount Cur" 120',
'12 12 "Doc Amount" 120',
'13 13 "Open Amount Cur" 130',
......@@ -377,8 +383,11 @@ export default {
this.$router.history.push("/business/" + code)
this.initdialog = false
},
closeTrn(refId){
this.$refs[refId].doClose();
},
async getTrnInfo(idx, row) {
debugger;
this.model.infcon.objinr = row["INR"];
this.model.didgrp.rec.inr = row["INR"];
......
src/views/Business/Infdid/BusNavbar.vue
......@@ -23,7 +23,7 @@ export default {
trnName:'ditsel',
model:new Litsel().data,
navcode:[
{code:"",label:"",isDis:"",title:""},
// {code:"",label:"",isDis:"",title:""},
],
}
},
......@@ -34,9 +34,10 @@ export default {
let rtnmsg = await this.executeRule("cfgfil.hotsub1")
console.log("cfgfil.code:" + this.model.cfgfil.subtrn1);
if(rtnmsg.respCode = SUCCESS){
this.navcode = []
this.$emit("onChoose",code.toLowerCase());
}else{
this.$notify.error({ title: "错误", message: "服务请求失败！" });
}
},
......@@ -66,9 +67,11 @@ export default {
mounted(){
this.$nextTick(function(){
this.$on('childmethods',async function(){
this.navcode = []
//请求按钮数据
this.model.didgrp.rec.ownref = this.ownref
console.log("ownref:" + this.ownref );
let rtnmsg = await this.executeRule("didgrp.rec.ownref");//didgrp_rec_ownref
if(rtnmsg.respCode = SUCCESS){
//重置数组
......@@ -96,6 +99,7 @@ export default {
}
}
})
......
src/views/Business/Infdid/Infsea.vue
......@@ -317,7 +317,11 @@
title="历史信息"
width="800"
trigger="click"
:ref="'popover_' + scope.row.IDX"
>
<div style="text-align: right; margin-top: -30px; margin-right: 5px; font-size: 16px;">
<span class="el-icon-close" @click="closeTrn('popover_' + scope.row.IDX)"/>
</div>
<c-istream-table
:list="trnData.data"
:columns="trnData.columns"
......@@ -342,6 +346,13 @@
>
详情
</c-button>
<!-- <c-button
style="margin-left: 0"
size="small"
>
关闭
</c-button> -->
</el-popover>
<!-- <c-button
......@@ -670,6 +681,9 @@ export default {
this.trnData.data = rtnmsg.data.infcon_trnstm.rows;
}
},
closeTrn(refId){
this.$refs[refId].doClose();
},
toDitopn(){
this.$router.history.push("/business/ditopn")
}
......
src/views/Business/Sptsel/Menu.vue
......@@ -433,7 +433,8 @@ export default {
'4 1 "交易代码" 70 ',
'5 2 "业务编号" 300',
'6 3 "交易名称" 140',
'1 4 "状态" 60 1 tdViewTypeEdit:0 1 SPT:STA',
//'1 4 "状态" 60 1 tdViewTypeEdit:0 1 SPT:STA',
{index:1,position:4,width:100,pattern:'code',label:'状态',code:this.codes.sptrelstatus},
'17 5 "报文类型" 100',
'18 6 "对方银行BIC" 110',
'7 7 "创建时间" 160 20 DateTime 1',
......
src/views/Business/Sptsel/index.vue
......@@ -48,7 +48,8 @@ export default {
rules:null,
codes:{
flt:CodeTable.flt,
dflg:CodeTable.dflg
dflg:CodeTable.dflg,
sptrelstatus:CodeTable.sptrelstatus,
},
}
},
......
src/views/Business/Trnrel/InftrnpsDetail.vue
<template>
<c-page title="">
<div class="eContainer">
<!-- <div class="eContainer"> -->
<c-content :height="120">
<div class="eibs-tab">
<!-- <c-col :span="23">
<div style="float:right;margin-bottom:10px">
......@@ -23,7 +24,6 @@
:validate-on-rule-change="false"
label-width="150px"
size="small"
style="margin-left:15px"
>
<c-content>
......@@ -32,9 +32,9 @@
</el-form-item>
</c-col>
<c-col :span="10" style="text-align:right">
<el-button size="small">交易快照</el-button>
<el-button size="small">智能提示</el-button>
<c-button size="small" @click="exit">返回</c-button>
<c-button size="small" type="primary" style="margin-left:0">交易快照</c-button>
<c-button size="small" type="primary" style="margin-left:0">智能提示</c-button>
<c-button size="small" @click="exit" type="primary" style="margin-left:0">返回</c-button>
</c-col>
<c-col :span="23" style="height: 10px;margin-bottom:10px">
<el-divider></el-divider>
......@@ -52,7 +52,7 @@
</c-col>
<c-col :span="2" style="text-align: right">
<c-button
style="margin:0 0 0 10px;padding: 0 12px;"
style="margin:0;padding: 0 14px;"
size="small"
type="primary"
>
......@@ -69,7 +69,7 @@
</c-col>
<c-col :span="2" style="text-align: right">
<c-button
style="margin:0 0 0 10px;padding: 0 12px;"
style="margin:0;padding: 0 14px;"
size="small"
type="primary"
>
......@@ -142,7 +142,7 @@
</c-col>
<c-col :span="2" style="text-align: right">
<c-button
style="margin:0 0 0 10px;padding: 0 10px;"
style="margin:0;padding: 0 12px;"
size="small"
icon="el-icon-search"
type="primary"
......@@ -153,26 +153,26 @@
</c-col>
<!-- ========================= Right ========================= -->
<c-col :span="12">
<c-col :span="11" :offset="1">
<c-col :span="24">
<el-form-item label-width="30%" label="Ident No.">
<c-col :span="21">
<c-col :span="22">
<el-form-item label="Ident No.">
<c-input v-model="model.trn.inr" disabled placeholder="请输入Ident No."></c-input>
</el-form-item>
</c-col>
<c-col :span="3" style="text-align: right">
<c-col :span="2" style="text-align: right">
<c-button
style="margin:0 0 0 10px;padding: 0 12px;"
style="margin:0;padding: 0 14px;"
size="small"
type="primary"
>
<span style="font-size:15px;font-family:'宋体';font-weight:bold">i</span>
</c-button>
</c-col>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label-width="30%" label="Transaction ID">
<el-form-item label="Transaction ID">
<el-select v-model="model.recpan.atp.cod" style="width: 100%" disabled>
<el-option
v-for="item in codes.atptxt"
......@@ -186,20 +186,20 @@
</c-col>
<c-col :span="24">
<el-form-item label-width="30%" label="Drop Receiver">
<el-form-item label="Drop Receiver">
<c-input v-model="model.trn.objnam" maxlength="40" disabled placeholder="请输入External Readable Object Identification"></c-input>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label-width="30%" label="Release Status of Transaction">
<el-form-item label="Release Status">
<c-input v-model="model.trn.relflg" style="width:100%" disabled placeholder="请选择Release Status of Transaction">
</c-input>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label-width="30%" label="Signatures Required/Obtained">
<!-- <c-col :span="24">
<el-form-item label="Signatures Required/Obtained">
<c-row>
<c-col :span="11">
<c-input v-model="model.trn.relreq" maxlength="3" disabled placeholder="请输入Signatures Required/Obtained"></c-input>
......@@ -215,13 +215,13 @@
</c-col>
<c-col :span="24">
<el-form-item label-width="30%" label="Completion text">
<el-form-item label="Completion text">
<c-input style="font-weight:bold" v-model="model.recpan.cpltxt" disabled placeholder="请输入Based on Ident No."></c-input>
</el-form-item>
</c-col>
</c-col> -->
<c-col :span="24">
<el-form-item label-width="30%" label="Infoflag">
<el-form-item label="Infoflag">
<el-select v-model="model.trn.infdsp" style="width: 100%">
<el-option
v-for="item in codes.infdsp"
......@@ -234,7 +234,7 @@
</c-col>
<c-col :span="24">
<el-form-item label-width="30%" label="Send for Repair to">
<el-form-item label="Send for Repair to">
<c-input v-model="model.recpan.usr.extkey" disabled style="width:100%" placeholder="请选择extkey">
</c-input>
</el-form-item>
......@@ -253,10 +253,10 @@
<!-- -------------------document------------------- -->
<c-col :span="24" style="height:24px">
<el-form-item label="面函" class="messageLabel">
<el-form-item label="面函/报文" class="messageLabel">
</el-form-item>
</c-col>
<c-col :span="23" style="height: 10px">
<c-col :span="23" style="height: 0px">
<el-divider></el-divider>
</c-col>
<c-col :span="23">
......@@ -305,11 +305,11 @@
</el-form-item>
</c-col>
-->
<c-col :span="24" style="height:24px;margin-top:10px">
<c-col :span="24" style="height:24px;margin-top:30px">
<el-form-item label="Signatures" class="messageLabel">
</el-form-item>
</c-col>
<c-col :span="23" style="height:10px;">
<c-col :span="23" style="height:0px;">
<el-divider></el-divider>
</c-col>
<c-col :span="23">
......@@ -345,11 +345,11 @@
</c-col>
<!-- -------------------workflow------------------- -->
<c-col :span="24" style="height:24px;margin-top:10px">
<c-col :span="24" style="height:24px;margin-top:30px">
<el-form-item label="Workflow" class="messageLabel">
</el-form-item>
</c-col>
<c-col :span="23" style="height:10px;">
<c-col :span="23" style="height:0px;">
<el-divider></el-divider>
</c-col>
<c-col :span="23">
......@@ -392,7 +392,8 @@
</c-content>
</el-form>
</div>
</div>
<!-- </div> -->
</c-content>
</c-page>
</template>
......
src/views/Business/Trnrel/Trnfnd/TrnfndsDetail.vue
......@@ -253,7 +253,7 @@
<!-- -------------------document------------------- -->
<c-col :span="24" style="height:24px">
<el-form-item label="面函" class="messageLabel">
<el-form-item label="面函/报文" class="messageLabel">
</el-form-item>
</c-col>
<c-col :span="23" style="height: 10px">
......
src/views/Business/Trnrel/Trnfnd/index.vue
......@@ -90,7 +90,7 @@ export default {
that.model = Utils.copyValueFromVO(that.model, res.data);
// that.$refs.inftrnps.stmData.columns=res.data.trncorco_trnstm.rows
this.$refs.inftrnps.handleSearch();
this.$refs.inftrnps.trnfndhandleSearch();
});
},
};
......
src/views/TaskList/index.vue
......@@ -23,10 +23,6 @@
</el-tab-pane>
<el-tab-pane label="已完成列表" name="trnfnd">
<span slot="label">
已完成列表
<el-badge v-if="$store.state.Status.taskList.trnfnd>0" :value="$store.state.Status.taskList.trnfnd" :max="99"/>
</span>
<c-content :height="160">
<t-trnfnd />
</c-content>
......
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