Skip to content

V
vue-gjjs
Commit 338aa655 by “yanyuxin”
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 87211c2c 1b8c69e7
Showing with 196 additions and 48 deletions
src/model/Cptrep/Pattern.js
......@@ -850,7 +850,7 @@ export default {
{max: 16,message:"长度不能超过16"}
],
"cpdgrp.blk.contag72":[
{type: "string", required: true, message: "必输项"},
{type: "string", required: false, message: "必输项"},
{max: 35,message:"长度不能超过35"}
],
"cpdgrp.rmt.pts.extkey":[
......
src/model/Sptcpt/Event.js
......@@ -62,5 +62,20 @@ export default {
this.$notify.error({title: '错误',message: '服务请求失败！'});
}
},
async handleSearch() {
let rtnmsg = await this.executeRule("searow")
if(rtnmsg.respCode == SUCCESS)
{
this.stmData.data = rtnmsg.data.trncorco_trnstm.rows;
}
else
{
this.$notify.error({title: '错误',message: '服务请求失败！'});
}
},
async handleReset() {
}
}
\ No newline at end of file
src/views/Business/Cptrep/Opnp1.vue
......@@ -99,7 +99,14 @@
<c-col :span="12">
<el-form-item label="汇款语种" prop="cptp.payuil">
<c-input v-model="model.cptp.payuil" disabled></c-input>
<c-select v-model="model.cptp.payuil" disabled>
<el-option
v-for="item in codes.payuil"
:key="item.value"
:label="item.label"
:value="item.value"
></el-option>
</c-select>
</el-form-item>
</c-col>
</c-col>
......@@ -390,22 +397,22 @@
<c-col v-show="model.cpdgrp.rec.swftyp == 'BEP'||model.cpdgrp.rec.swftyp == 'BEQ'||model.cpdgrp.rec.swftyp == 'BES'||model.cpdgrp.rec.swftyp == 'CIU'||model.cpdgrp.rec.swftyp == 'CIV'||model.cpdgrp.rec.swftyp == 'CIW'||model.cpdgrp.rec.swftyp == 'CMT'||model.cpdgrp.rec.swftyp == 'CMY'||model.cpdgrp.rec.swftyp == 'CMX'||model.cpdgrp.rec.swftyp == 'FMS'||model.cpdgrp.rec.swftyp == 'HVP'||model.cpdgrp.rec.swftyp == 'HVR'||model.cpdgrp.rec.swftyp == 'HVQ'">
<c-col :span="24">
<el-form-item label="汇款人名称" prop="cptgrp.cptp.orcnam">
<c-input v-model="model.cptp.orcnam"></c-input>
<c-input v-model="model.cptp.orcnam" type="textarea"></c-input>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="汇款人地址" prop="cptp.orcadr">
<c-input v-model="model.cptp.orcadr"></c-input>
<c-input type="textarea" v-model="model.cptp.orcadr"></c-input>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="收款人名称" prop="cptp.pyenam">
<c-input v-model="model.cptp.pyenam"></c-input>
<c-input type="textarea" v-model="model.cptp.pyenam"></c-input>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="收款人地址" prop="cptp.pyeadr">
<c-input v-model="model.cptp.pyeadr"></c-input>
<c-input type="textarea" v-model="model.cptp.pyeadr"></c-input>
</el-form-item>
</c-col>
</c-col>
......
src/views/Business/Sptcpt/Menu.vue
......@@ -28,56 +28,136 @@
</c-col>
</c-row>
<c-col :span="24">
<el-form-item label="Reference" prop="selobj" style="width:100%">
<c-input v-model="model.selobj" style="width:100%"></c-input>
</el-form-item>
<el-form-item label="Name" prop="seltxt">
<c-input v-model="model.seltxt" style="width:100%"></c-input>
</el-form-item>
<c-col :span="24">
<c-col :span="11">
<el-form-item label="Reference" prop="selobj" style="width:100%">
<c-input v-model="model.selobj" style="width:100%"></c-input>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="Selection of Users" prop="usfmod.flt">
<c-fullbox>
<c-select v-model="model.usfmod.flt" style="width:100%" placeholder="请输入Selection of User">
<el-option
v-for="item in flt"
:key="item.value"
:label="item.label"
:value="item.value"
></el-option>
</c-select>
<c-col :span="11" :offset="1">
<el-form-item label="Name" prop="seltxt" style="width:100%">
<c-input v-model="model.seltxt" style="width:100%"></c-input>
</el-form-item>
</c-col>
</c-col>
<c-col :span="24">
<c-col :span= "11">
<el-form-item label="Selection of Users" prop="usfmod.flt" style="width:100%">
<c-fullbox>
<c-select v-model="model.usfmod.flt" placeholder="请输入Selection of User" style="width:100%">
<el-option
v-for="item in flt"
:key="item.value"
:label="item.label"
:value="item.value"
></el-option>
</c-select>
<template slot="footer">
<c-button size="small" type="primary">Show_Set</c-button>
</c-fullbox>
</el-form-item>
</template>
</c-fullbox>
</el-form-item>
</c-col>
<el-form-item label="Between" prop="inidatfro">
<c-date-picker
type="date"
v-model="model.inidatfro"
value-format="yyyy-MM-dd"
style="width:100%"
palceholder="请选择Opening between"
></c-date-picker>
<c-col :span="11" :offset="1">
<el-form-item label="Between" prop="inidatfro" style="width:100%">
<c-date-picker
type="date"
v-model="model.inidatfro"
value-format="yyyy-MM-dd"
style="width:48%"
palceholder="请选择Opening between"
></c-date-picker>
<span>-</span>
<span> - </span>
<c-date-picker
type="date"
v-model="model.inidattil"
value-format="yyyy-MM-dd"
placeholder="请选择Open Date to"
></c-date-picker>
</el-form-item>
<c-date-picker
type="date"
v-model="model.inidattil"
value-format="yyyy-MM-dd"
style="width :48%"
placeholder="请选择Open Date to"
></c-date-picker>
</el-form-item>
</c-col>
</c-col>
<c-col
:span="24"
style="text-align: right; height: 36.8px"
v-if="true"
>
<el-button size="small" @click="handleReset">重置</el-button>
<el-button
type="primary"
icon="el-icon-search"
size="small"
@click="handleSearch"
>查询</el-button
>
<!-- <el-button type="text" @click="searchToggle = true">
收起
<i class="el-icon-arrow-up"></i>
</el-button> -->
</c-col>
</el-form>
<c-col :span="24">
<c-istream-table :list="stmData.data" :columns="stmData.columns" >
<el-table-column fixed="right" prop="op" label="操作" width="140px">
<template slot="header">
<c-col :span="11" style="text-align: left"><span>操作</span></c-col>
</template>
<template slot-scope="scope">
<el-popover
placement="top-start"
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"
>
<el-table-column prop="op" label="操作" width="0">
<template slot-scope="scope">
<c-button
style="margin-left: 0"
size="small"
@click="display(scope.row['INR'])"
>
详情
</c-button>
</template>
</el-table-column>
</c-istream-table>
<c-button
style="margin-left: 0"
size="small"
@click="getTrnInfo(scope.$index, scope.row)"
slot="reference"
>
详情
</c-button>
</el-popover>
<c-button
style="margin-left: 0"
size="small"
type="primary"
@click="getButtons(scope.row['Reference'])"
>
处理
</c-button>
</template>
</el-table-column>
</c-istream-table>
</c-col>
<!-- SF000045 : Type of Items
......@@ -264,9 +344,54 @@ export default {
{ label: "All Users", value: "<ALL>" },
{ label: "Selected User", value: "<SELU>" },
],
stmData:{
columns:[
"4 1 \"TRN\" 150 ",
"5 2 \"Reference\" 160",
"6 3 \"Name\" 120",
"7 5 \"Creation\" 101 20 30 1",
"1 6 \"Status\" 160 1 0:0 1 SPT:STA",
"8 7 \"By User\" 166",
"15 8 \"Work User\" 176",
"17 9 \"Work Branch\" 176",
"16 10 \"Last User\" 176",
"3 11 \"Info\" 150 1 20:0 1 FormatINFDSP",
"10 12 \"Infotext\" 200"
],
data:[],
}
}
},
methods:{...Event},
methods:{
...Event,
async getButtons(ownref) {
this.ownref = ownref;
this.$refs.childs.initdialog = true;
console.log("ownref:" + ownref);
},
async onChoose(code) {
//跳转交易
this.$router.history.push("/business/" + code);
this.$refs.childs.initdialog = false;
},
async getTrnInfo(idx, row) {
this.model.objinr = row["INR"];
this.model.inr = row["INR"];
this.model.infcon.chksubcon = "X";
this.dialogTableVisible = true;
let rtnmsg = await this.executeDefault("infcon.chksubcon");
if ((rtnmsg.respCode = SUCCESS)) {
this.trnData.data = rtnmsg.data.infcon_trnstm.rows;
}
},
closeTrn(refId) {
this.$refs[refId].doClose();
},
},
created:function(){
}
......
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