Skip to content

V
vue-gjjs
Commit 6df058de by taojinrui
Options

临时提交

parent 664734fa
Showing with 365 additions and 176 deletions
src/components/IStreamTable.vue
......@@ -5,8 +5,8 @@
icon="el-icon-s-tools"
@click="clounmSetting"
style=""
></c-button
></div>
></c-button>
</div>
<el-table
ref="table"
:data="
......@@ -16,7 +16,10 @@
class="eContainer-table"
@selection-change="handleSelectionChange"
:row-key="getRowKey"
:header-cell-style="{ background: 'rgb(235, 235, 235)', color: 'rgb(51, 51, 51)' }"
:header-cell-style="{
background: 'rgb(235, 235, 235)',
color: 'rgb(51, 51, 51)',
}"
:highlight-current-row="true"
@row-click="rowClick"
:border="true"
......@@ -38,7 +41,9 @@
>
<template v-slot="{ scope }">
<!-- <template slot-scope="{ scope }"> -->
<span>{{!item.render ? scope.row[item.prop] : item.render(item,scope)}}</span>
<span>{{
!item.render ? scope.row[item.prop] : item.render(item, scope)
}}</span>
</template>
</c-table-column>
<slot></slot>
......@@ -65,7 +70,10 @@
<span slot="footer">
<el-checkbox
class="selectAllClass"
:indeterminate="columnGroup.length > 0 && columnGroup.length < tableColumnsOrigin.length"
:indeterminate="
columnGroup.length > 0 &&
columnGroup.length < tableColumnsOrigin.length
"
v-model="selectAll"
@change="setAll"
>全选</el-checkbox
......@@ -130,12 +138,12 @@ export default {
type: Boolean,
required: false,
default: false,
}
},
},
watch: {
columns() {
this.generateColumns();
}
},
},
computed: {
tableData() {
......@@ -159,14 +167,14 @@ export default {
.join("\n");
}
it["IDX"] = i;
it['INR'] = items[0];
if(it['INR'].length < 8){
it['INR'] = items[1];
it["INR"] = items[0];
if (it["INR"].length < 8) {
it["INR"] = items[1];
}
it.srcStr = d;
arr.push(it);
}
this.currentPage=1
this.currentPage = 1;
return arr;
},
},
......@@ -180,9 +188,9 @@ export default {
selectAll: true,
columnGroup: [],
setColumnFlg: false,
codes:{
...CodeTable
}
codes: {
...CodeTable,
},
};
},
mounted() {
......@@ -196,24 +204,25 @@ export default {
const obj = {};
for (let i = 0; i < lines.length; i++) {
const line = lines[i];
if(typeof line === "object" ){
if (typeof line === "object") {
//如果是对象，支持自定义处理
//{width,position,index,label,pattern,render}
let {width,position,index,label,pattern,render,...rest} = line
position += ''
let { width, position, index, label, pattern, render, ...rest } =
line;
position += "";
if (!obj[position]) {
obj[position] = [];
}
obj[position].push({
idx:index,
prop:label,
idx: index,
prop: label,
// width:width+'px',
width:width === 'auto' ? width : width +'px',
width: width === "auto" ? width : width + "px",
pattern,
render,
...rest
})
continue
...rest,
});
continue;
}
if (etyReg.test(line)) {
const gs = line.match(etyReg);
......@@ -228,7 +237,8 @@ export default {
idx: colPropArr[0],
prop: columnName,
// width: colPropArr[3] + 'px',
width: colPropArr[3] === 'auto' ? colPropArr[3] : colPropArr[3] + 'px',
width:
colPropArr[3] === "auto" ? colPropArr[3] : colPropArr[3] + "px",
});
}
}
......@@ -243,14 +253,14 @@ export default {
// width: "auto",
index: k,
children: o,
}
};
//支持自定义处理
if(o.length == 1){
if(o[0].pattern && this[o[0].pattern]){
colInfo.render = this[o[0].pattern]
colInfo.code = o[0].code
}else if(o[0].render){
colInfo.render = o[0].render
if (o.length == 1) {
if (o[0].pattern && this[o[0].pattern]) {
colInfo.render = this[o[0].pattern];
colInfo.code = o[0].code;
} else if (o[0].render) {
colInfo.render = o[0].render;
}
}
columnArr.push(colInfo);
......@@ -299,68 +309,75 @@ export default {
},
saveColumnEvent() {
this.setColumnFlg = false;
const arr = this.columnGroup.map(idx => parseInt(idx));
arr.sort((a,b) => a - b);
const arr = this.columnGroup.map((idx) => parseInt(idx));
arr.sort((a, b) => a - b);
this.columnGroup = arr;
this.tableColumns = this.columnGroup.map(
(index) => this.tableColumnsOrigin[parseInt(index) - 1]
);
},
setAll(val) {
this.columnGroup = val ? this.tableColumnsOrigin.map((item) => parseInt(item.index)) : [];
this.columnGroup = val
? this.tableColumnsOrigin.map((item) => parseInt(item.index))
: [];
},
handleColumnChange() {
this.selectAll = this.tableColumnsOrigin.length === this.columnGroup.length;
this.selectAll =
this.tableColumnsOrigin.length === this.columnGroup.length;
},
//补充自定义列处理函数
//去掉日期的时分秒毫秒
date(item,scope){
let value = scope.row[item.prop]
if(!value){
return ""
date(item, scope) {
let value = scope.row[item.prop];
if (!value) {
return "";
}
let idx = value.indexOf(" ")
if(idx > 0)
return value.substring(0,idx)
return value
let idx = value.indexOf(" ");
if (idx > 0) return value.substring(0, idx);
return value;
},
//code映射
code(item,scope){
let value = scope.row[item.prop]
let code = item.code
if(typeof code == 'string'){
code = this.codes[code]
code(item, scope) {
let value = scope.row[item.prop];
let code = item.code;
if (typeof code == "string") {
code = this.codes[code];
}
if(!value || !code){
return ""
if (!value || !code) {
return "";
}
let em = code.find(item=>item.value.trim() == value.trim())
if(!em){
return value
let em = code.find((item) => item.value.trim() == value.trim());
if (!em) {
return value;
}
return em.label
return em.label;
},
//去掉时间的毫秒
time(item,scope){
time(item, scope) {
let value = scope.row[item.prop];
if(!value){
return ""
if (!value) {
return "";
}
let idx = value.indexOf(".");
if(idx>0)
return value.substring(0,idx);
return value
if (idx > 0) return value.substring(0, idx);
return value;
},
//日期格式化
dateFormat(item,scope){
dateFormat(item, scope) {
let value = scope.row[item.prop];
if(!value){
return ""
if (!value) {
return "";
}
return value.substring(0,4)+"-"+value.substring(4,6)+"-"+value.substring(6)
return (
value.substring(0, 4) +
"-" +
value.substring(4, 6) +
"-" +
value.substring(6)
);
},
},
}
};
</script>
......@@ -398,7 +415,7 @@ export default {
.eContainer-table-block >>> .el-table .cell {
white-space: pre-wrap;
}
.buttonDiv{
.buttonDiv {
text-align: left;
display: inline-block;
margin: 0;
......
src/views/Business/Cnysel/Selp.vue
......@@ -91,10 +91,10 @@
:showButtonFlg="true"
>
<el-table-column fixed="right" prop="op" label="操作" width="200px">
<template slot="header">
<c-col :span="11" style="text-align: left"><span>操作</span></c-col>
<!-- <template slot="header">
<c-col :span="11" style="text-align: left"><span>操作</span></c-col> -->
<!-- <c-col :span="12" style="text-align:right"><c-button icon="el-icon-s-tools"></c-button></c-col> -->
</template>
<!-- </template>-->
</el-table-column>
</c-istream-table>
</c-col>
......
src/views/Business/Cptati/Wg.vue
......@@ -47,7 +47,7 @@
:disabled="model.bopmod.szflg==='3' ||model.bopmod.szflg===''"
>
<el-option
v-for="item in codes.ownextkey"
v-for="item in codes.ownextkey1"
:key="item.value"
:label="item.label"
:value="item.value"
......
src/views/Business/Cptrel/Inftrnps.vue
......@@ -26,9 +26,7 @@
</c-input>
</c-col>
<c-button size="small" type="primary"
>Show_Set</c-button
>
<c-button size="small" type="primary">Show_Set</c-button>
</el-form-item>
</c-fullbox>
</c-col>
......@@ -122,11 +120,7 @@
</c-col>
<c-col :span="8">
<el-form-item
label="Amount between"
prop=""
style="width: 100%"
>
<el-form-item label="Amount between" prop="" style="width: 100%">
<c-col :span="11">
<c-input-currency
v-model="model.amt1"
......@@ -189,16 +183,11 @@
</c-col>
<c-col :span="8">
<el-form-item
label="branch"
prop="branch"
style="width: 100%"
>
<el-form-item label="branch" prop="branch" style="width: 100%">
<c-input
v-model="model.branch"
maxlength="24"
placeholder="请输入Select Single Party"
>
</c-input>
</el-form-item>
......@@ -237,12 +226,50 @@
</c-col>
<c-col :span="24">
<c-istream-table :list="stmData.data" :columns="stmData.columns" :showButtonFlg="true">
<el-table-column fixed="right" prop="op" label="操作" width="140px">
<c-istream-table
:list="stmData.data"
:columns="stmData.columns"
:showButtonFlg="true"
>
<el-table-column fixed="right" prop="op" label="操作" width="150px">
<template slot="header">
<c-col :span="11" style="text-align: left"><span>操作</span></c-col>
<!-- <c-col :span="12" style="text-align: right">
<c-button icon="el-icon-s-tools"></c-button>
</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>
<m-busbtn ref="childs" :ownref="ownref" trnCode="cptsel" :model="CptselModel" ownrefPath="cpdgrp" @onChoose="onChoose" >11</m-busbtn>
<!-- ======================================原码=================================================== -->
<!-- <c-col :span="12">
......@@ -459,13 +486,18 @@ import Api from "~/service/Api";
import commonProcess from "~/mixin/commonProcess";
import CodeTable from "~/config/CodeTable";
import Event from "~/model/Cptrel/Event";
import BusNavbar from "~/views/Public/BusNavbar";
import CptselModel from "~/model/Cptsel"
export default {
inject: ["root"],
props: ["model", "codes"],
mixins: [commonProcess],
components: { "m-busbtn": BusNavbar },
data() {
return {
CptselModel: new CptselModel().data,
ownref: "",
stmData: {
columns: [
// '0 1 "业务编号" 110',
......@@ -476,50 +508,78 @@ export default {
// '5 6 "业务发生日期" 150 20 30 1',
// '6 7 "复核状态" 120 1 0:0 1 RELSTA',
// "10 1 \"TRN\" 50 1 0:0 3 ATPTXT",
// "11 2:1 \"Own Reference\" 186",
// "17 2:2 \"Message Type\" 186",
// "12 3 \"Cur\" 137",
// "13 4 \"Relevant Amount\" 80 2 8:1 2 5",
// "14 5 \"Entry\" 104 20 30 1",
// "9 6:1 \"Req\" 135",
// "2 6:2 \"Sig\" 135",
// "6 8:1 \"Rq0\" 135",
// "3 8:2 \"Rel0\" 135",
// "7 9:1 \"Rq1\" 135",
// "4 9:2 \"Rel1\" 135",
// "8 10:1 \"Rq2\" 135",
// "5 10:2 \"Rel2\" 135",
// "16 11:1 \"User\" 160",
// "18 11:2 \"\" 60",
// "0 12 \"Status\" 54 1 0:0 1 RELSTA",
// "15 13 \"Branch\" 142",
"10 1 \"TRN\" 100 1 0:0 3 ATPTXT",
"11 2 \"Own Reference\" 186",
"17 3 \"Message Type\" 186",
"12 4 \"Cur\" 137",
"13 5 \"Relevant Amount\" 80 2 8:1 2 5",
"14 6 \"Entry\" 104 20 30 1",
"9 7 \"Req\" 135",
"2 8 \"Sig\" 135",
"6 9 \"Rq0\" 135",
"3 10 \"Rel0\" 135",
"7 11 \"Rq1\" 135",
"4 12 \"Rel1\" 135",
"8 13 \"Rq2\" 135",
"5 14 \"Rel2\" 135",
"16 15 \"User\" 160",
"18 16 \"\" 60",
"0 17 \"Status\" 54 1 0:0 1 RELSTA",
"15 18 \"Branch\" 142",
'10 1 "TRN" 100 1 0:0 3 ATPTXT',
'11 2 "Own Reference" 186',
'17 3 "Message Type" 186',
'12 4 "Cur" 137',
'13 5 "Relevant Amount" 80 2 8:1 2 5',
'14 6 "Entry" 104 20 30 1',
'9 7 "Req" 135',
'2 8 "Sig" 135',
'6 9 "Rq0" 135',
'3 10 "Rel0" 135',
'7 11 "Rq1" 135',
'4 12 "Rel1" 135',
'8 13 "Rq2" 135',
'5 14 "Rel2" 135',
'16 15 "User" 160',
'18 16 "" 60',
'0 17 "Status" 54 1 0:0 1 RELSTA',
'15 18 "Branch" 142',
],
data: [],
},
trnData: {
columns: [
'1 1 "编号" 200',
'2 2 "交易名称" 130',
// '3 3 "日期" 200',
{ index: 3, position: 3, width: 110, pattern: "date", label: "日期" },
// '4 4 "状态" 50',
{
index: 4,
position: 4,
width: 100,
pattern: "code",
label: "状态",
code: this.codes.relstaEN,
},
'5 5 "币种" 80',
'6 6 "金额" 100',
],
data: [],
},
searchToggle: true
searchToggle: true,
};
},
methods: { ...Event },
methods: {
...Event,
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();
},
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;
},
},
created: function () {},
};
</script>
......
src/views/Business/Cptsel/index.vue 0 → 100644
<template>
<div class="eContainer">
<el-form :model="model" :rules="rules" ref="modelForm" label-width="150px" label-position="right" size="small" :validate-on-rule-change="false">
<c-tabs v-model="tabVal" ref="elment" type="card" @tab-click="myTabClick">
<!--cptsel PD000125 Menu -->
<el-tab-pane :label="$t('cptsel.PD000125')" name="sel">
<m-sel :model="model" :codes="codes"/>
</el-tab-pane>
</c-tabs>
</el-form>
</div>
</template>
<script>
import Api from "~/service/Api"
import CodeTable from "~/config/CodeTable"
import Cptsel from "~/model/Cptsel"
import commonProcess from "~/mixin/commonProcess"
import Check from "~/model/Cptsel/Check"
import Default from "~/model/Cptsel/Default"
import Pattern from "~/model/Cptsel/Pattern"
import Sel from "./Sel"
export default {
name: "Cptsel",
components:{
"m-sel" : Sel,
},
provide() {
return {
root: this
}
},
mixins: [commonProcess], // 里面包含了Default、Check等的公共处理
data(){
return {
tabVal: "",
trnName: "cptsel",
trnType: "",
model: new Cptsel().data,
checkRules: Check,
defaultRules: Default,
pattern: Pattern,
rules: null,
codes: {
},
}
},
methods:{
myTabClick(tab){
this.tabClick(tab)
/**
* do it yourself
**/
}
},
created:async function(){
console.log("进入cptsel交易");
let rtnmsg = await this.init({})
if(rtnmsg.respCode == SUCCESS)
{
this.updateModel(rtnmsg.data)
//TODO 处理数据逻辑
}
else
{
this.$notify.error({title: '错误',message: '服务请求失败！'});
}
}
}
</script>
<style>
</style>
src/views/Business/Infcpd/Infsea.vue
......@@ -111,7 +111,7 @@
v-model="model.infcon.pty.extkey"
maxlength="24"
placeholder="请输入Select Single Party"
:disabled=this.flag1
:disabled="this.flag1"
>
</c-input>
</el-form-item>
......@@ -144,7 +144,7 @@
v-model="model.infcon.seapty"
maxlength="24"
placeholder="请输入Party Name/BIC"
:disabled=this.flag2
:disabled="this.flag2"
></c-input>
</el-form-item>
</c-col>
......@@ -193,7 +193,11 @@
</el-form-item>
</c-col>
<c-col :span="8">
<el-form-item label="Currency" prop="infcon.seacur" style="width: 100%" >
<el-form-item
label="Currency"
prop="infcon.seacur"
style="width: 100%"
>
<c-select
v-model="model.infcon.seacur"
style="width: 100%"
......@@ -305,19 +309,43 @@
<!-- </c-infsearch-group> -->
<c-col style="margin-top: 10px">
<c-button class="medium_bcs" size="medium" type="primary" style="margin-left: 0"
@click="toCptopn">swift汇入</c-button
<c-button
class="medium_bcs"
size="medium"
type="primary"
style="margin-left: 0"
@click="toCptopn"
>swift汇入</c-button
>
<c-button class="medium_bcs" size="medium" type="primary" style="margin-left: 0"
@click="toCptadv">swift汇出</c-button
<c-button
class="medium_bcs"
size="medium"
type="primary"
style="margin-left: 0"
@click="toCptadv"
>swift汇出</c-button
>
<c-button class="medium_bcs" size="medium" type="primary" style="margin-left: 0"
@click="toCptati">境内外币汇入</c-button
<c-button
class="medium_bcs"
size="medium"
type="primary"
style="margin-left: 0"
@click="toCptati"
>境内外币汇入</c-button
>
<c-button class="medium_bcs" size="medium" type="primary" style="margin-left: 0"
@click="toCptato">境内外币汇出</c-button
<c-button
class="medium_bcs"
size="medium"
type="primary"
style="margin-left: 0"
@click="toCptato"
>境内外币汇出</c-button
>
<c-button class="medium_bcs" size="medium" type="primary" style="float:right;margin-right:10px;"
<c-button
class="medium_bcs"
size="medium"
type="primary"
style="float: right; margin-right: 10px"
>导Excel</c-button
>
<!-- <c-button size="small" type="primary" style="margin-left: 0"
......@@ -329,7 +357,11 @@
</c-col>
<c-col :span="24">
<c-istream-table :list="stmData.data" :columns="stmData.columns" :showButtonFlg="true">
<c-istream-table
:list="stmData.data"
:columns="stmData.columns"
:showButtonFlg="true"
>
<el-table-column fixed="right" prop="op" label="操作" width="140px">
<!-- <template slot="header">
<c-col :span="11" style="text-align: left">
......@@ -406,8 +438,15 @@
</c-istream-table>
</c-col>
<m-busbtn ref="childs" :ownref="ownref" trnCode="cptsel" :model="cptselModel" ownrefPath="cpdgrp" @onChoose="onChoose" >11</m-busbtn>
<m-busbtn
ref="childs"
:ownref="ownref"
trnCode="cptsel"
:model="cptselModel"
ownrefPath="cpdgrp"
@onChoose="onChoose"
>11</m-busbtn
>
</div>
</template>
<script>
......@@ -416,8 +455,7 @@ import commonProcess from "~/mixin/commonProcess";
import CodeTable from "~/config/CodeTable";
import Event from "~/model/Infcpd/Event";
import BusNavbar from "~/views/Public/BusNavbar";
import CptselModel from "~/model/Cptsel"
import CptselModel from "~/model/Cptsel";
export default {
inject: ["root"],
......@@ -426,16 +464,16 @@ export default {
components: { "m-busbtn": BusNavbar },
data() {
return {
flag1:false,
flag2:false,
searol:[
flag1: false,
flag2: false,
searol: [
{ label: "Ordering Customer", value: "ORC" },
{ label: "Ordering Institution", value: "ORI" },
{ label: "Paying Bank", value: "PYB" },
{ label: "Payee", value: "PYE" },
{ label: "Reimb. Bank Transfer", value: "RMT" },
],
swftyp:[
swftyp: [
{ label: "MT103", value: "103" },
{ label: "MT202", value: "202" },
{ label: "MT910", value: "910" },
......@@ -516,25 +554,24 @@ export default {
},
};
},
watch:{
watch: {
"model.infcon.seapty": function () {
if (this.model.infcon.seapty == '') {
if (this.model.infcon.seapty == "") {
this.flag1 = false;
} else {
this.flag1 = true;
this.model.infcon.pty.extkey="";
this.model.infcon.pty.extkey = "";
}
},
"model.infcon.pty.extkey":function(){
if(this.model.infcon.pty.extkey == ''){
"model.infcon.pty.extkey": function () {
if (this.model.infcon.pty.extkey == "") {
this.flag2 = false;
} else {
this.flag2 = true;
this.model.infcon.seapty="";
}
this.model.infcon.seapty = "";
}
},
},
methods: {
...Event,
/* handleSearch(callback) {
......@@ -547,20 +584,20 @@ export default {
callback();
}, 1000);
}, */
async getButtons(ownref){
this.ownref = ownref
this.$refs.childs.initdialog = true
console.log("ownref:" +ownref);
async getButtons(ownref) {
this.ownref = ownref;
this.$refs.childs.initdialog = true;
console.log("ownref:" + ownref);
},
async onChoose(code){
async onChoose(code) {
//跳转交易
this.$router.history.push("/business/" + code)
this.$refs.childs.initdialog = false
} ,
async getDitSelInfo(code){
this.$router.history.push("/business/" + code);
this.$refs.childs.initdialog = false;
},
async getDitSelInfo(code) {
//跳转交易
this.$router.history.push("/business/" + code)
this.$refs.childs.initdialog = false
this.$router.history.push("/business/" + code);
this.$refs.childs.initdialog = false;
},
async getTrnInfo(idx, row) {
this.model.infcon.objinr = row["INR"];
......@@ -574,21 +611,21 @@ export default {
this.trnData.data = rtnmsg.data.infcon_trnstm.rows;
}
},
closeTrn(refId){
closeTrn(refId) {
this.$refs[refId].doClose();
},
toCptopn(){
this.$router.history.push("/business/cptopn")
toCptopn() {
this.$router.history.push("/business/cptopn");
},
toCptadv(){
this.$router.history.push("/business/cptadv")
toCptadv() {
this.$router.history.push("/business/cptadv");
},
toCptati(){
this.$router.history.push("/business/cptati")
toCptati() {
this.$router.history.push("/business/cptati");
},
toCptato() {
this.$router.history.push("/business/cptato");
},
toCptato(){
this.$router.history.push("/business/cptato")
}
},
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