Commit 96dec359 by liyixun

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 d9c300e1 eea257a1
......@@ -255,78 +255,106 @@
</c-list-search>
<el-row>
<c-col :span="24" style="text-align: right; height: 100px">
<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>
<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;
"
<c-col :span="24" style="text-align: right; height: 100px">
<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>
<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"
>
<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>
<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"
@click="getTrnInfo(scope.$index, scope.row)"
slot="reference"
>详情</c-button
type="primary"
@click="getButtons(scope.row['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>
</template>
</el-table-column>
</c-istream-table>
</c-col>
</el-row>
<div v-if="dialogFlag" class="m-list-btns">
<m-busbtn
ref="childs"
:ownref="ownref"
trnCode="gitsel"
ownrefPath="gidgrp"
:model="gitselModel"
tabIndex="1"
@onChoose="onChoose"
>11</m-busbtn
>
</div>
<div v-else>
<m-busbtn
ref="childs"
:ownref="ownref"
trnCode="getsel"
ownrefPath="gcdgrp"
:model="getselModel"
tabIndex="3"
@onChoose="onChoose"
>11</m-busbtn
>
</div>
<!-- <el-dialog :visible.sync="initdialog" :title="'交易列表'" append-to-body>
<div class="m-list-btns">
<m-busbtn ref="childs" :ownref="ownref" trnCode="gitsel" ownrefPath="gidgrp" :model="gitselModel" tabIndex=1 @onChoose="onChoose">11</m-busbtn>
</div>
</el-dialog> -->
<!-- <c-col :span="12">
<el-form-item label="Own Reference" prop="infcon.seaownref">
<c-input v-model="model.infcon.seaownref" maxlength="16" placeholder="请输入Own Reference"></c-input>
......@@ -491,15 +519,22 @@ import commonProcess from "~/mixin/commonProcess";
import CodeTable from "~/config/CodeTable";
import Event from "~/model/Infgcd/Event";
import GitselModel from "~/model/Gitsel";
import GetselModel from "~/model/Getsel";
import BusNavbar from "~/views/Public/BusNavbar";
export default {
inject: ["root"],
props: ["model", "codes"],
mixins: [commonProcess],
components: { "m-busbtn": BusNavbar },
data() {
return {
ownref: "",
initdialog: false,
gitselModel: new GitselModel().data,
getselModel: new GetselModel().data,
ownref: "",
dialogTableVisible: false,
dialogFlag: true,
trnData: {
columns: [
'0 1 "Trn ID" 100',
......@@ -515,7 +550,7 @@ export default {
stmData: {
columns: [
'1 1 "Reference" 150',
'2 2 "Resp. User" 150',
'2 2 "Resp. User" 150',
'5 3 "Party Number" 150',
'6 4 "Applicant" 150',
'7 5 "Party Number" 150',
......@@ -523,28 +558,32 @@ export default {
'3 7 "Opened" 150',
'4 8 "Closed" 150',
'9 9 "Cur" 150',
'11 10 "Cur" 150',
'10 11 "Orig.Amount" 150',
'10 10 "Orig.Amount" 150',
'11 11 "Cur" 150',
'12 12 "Open Amount" 150',
],
data: [],
},
};
},
methods: {
methods: {
...Event,
// async getButtons(ownref) {
// this.initdialog = true;
// this.ownref = ownref;
// console.log("ownref:" + ownref);
// setTimeout(() => {
// this.$refs.childs.$emit("childmethods")
// }, 10)
// },
async getButtons(ownref) {
this.ownref = ownref;
this.$refs.childs.initdialog = true;
this.dialogFlag = ownref.startsWith("LG");
console.log("dialogFlag:" + this.dialogFlag);
console.log("ownref:" + ownref);
},
async onChoose(code) {
//跳转交易
this.$router.history.push("/business/" + code);
this.initdialog = false;
this.$refs.childs.initdialog = false;
},
async getDitSelInfo(code) {
//跳转交易
this.$router.history.push("/business/" + code);
this.$refs.childs.initdialog = false;
},
async getTrnInfo(idx, row) {
......@@ -562,14 +601,17 @@ export default {
closeTrn(refId) {
this.$refs[refId].doClose();
},
handleReset: function () {
this.model = {
instNo: "",
instName: "",
};
},
// handleReset: function () {
// this.model = {
// instNo: "",
// instName: "",
// };
// },
},
created: function () {},
watch: {
"model.gidgrp.rec.ownref": function () {},
},
};
</script>
<style>
......
......@@ -144,6 +144,7 @@ export default {
//进口保函
{ inifrm: "13", ininam: "进口保函", pntmiu: "" },
{ inifrm: "infgid", ininam: "进口保函入口交易", pntmiu: "13" },
{ inifrm: "infgcd", ininam: "保函赔付查询", pntmiu: "13" },
// { inifrm: "gitsel", ininam: "进口保函查询", pntmiu: "13" },
// { inifrm: "gitset", ininam: "进口保函赔付", pntmiu: "13" },
// { inifrm: "gitcrq", ininam: "进口保函索赔登记", pntmiu: "13" },
......
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