Skip to content

I
isc-web-vue
Commit 4a0865b5 by 李少勇
Options

Merge branch 'develop' of http://114.115.138.98:8900/isc-v3.1/isc-web-vue into develop

parents adb7f49a d63525bb
Showing with 57 additions and 40 deletions
src/page/Frontend/Msgdtlblk/views/Msgdtlp.vue
......@@ -9,10 +9,7 @@
<c-button class="medium_bcs" size="medium" style="margin-left: 40px" type="primary" @click="handleReject">
丢弃
</c-button>
<div style="width: 100%;height: calc(100% - 50px); display: flex;align-item: center;justify-content: space-between;">
<p style="margin-top: 20px;border: 1px solid #333333;width: 49%;height: 100%;overflow: auto;" v-html="model.msgdtll"></p>
<p style="margin-top: 20px;border: 1px solid #333333;width: 49%;height: 100%;overflow: auto;" v-html="model.msgdtlll"></p>
</div>
<p style="margin-top: 20px;border: 1px solid #333333;padding-10px;width: 100%;min-height: 500px;" v-html="model.msgdtll"></p>
<el-dialog v-if="visible" v-dialogDrag :visible="visible" :modal-append-to-body="false" :close-on-click-modal="true"
title="历史记录" destroy-on-close width="50%" @close="visible = false">
......
src/page/Frontend/Msgdtlblk/views/index.vue
......@@ -67,10 +67,6 @@ export default {
if (rtnmsg.respCode === SUCCESS) {
this.model.msgdtll = rtnmsg.data
}
const rtnmsgrsm = await Api.post(`/${this.moduleRouter()}/msgdtl/rsm`, params);
if (rtnmsgrsm.respCode === SUCCESS) {
this.model.msgdtlll = rtnmsgrsm.data
}
}
}
</script>
......
src/page/Frontend/Msgdtlrtm/views/Msgdtlp.vue
......@@ -9,10 +9,7 @@
<c-button class="medium_bcs" size="medium" style="margin-left: 40px" type="primary" @click="handleReject">
丢弃
</c-button>
<div style="width: 100%;height: calc(100% - 50px); display: flex;align-item: center;justify-content: space-between;">
<p style="margin-top: 20px;border: 1px solid #333333;width: 49%;height: 100%;overflow: auto;" v-html="model.msgdtll"></p>
<p style="margin-top: 20px;border: 1px solid #333333;width: 49%;height: 100%;overflow: auto;" v-html="model.msgdtlll"></p>
</div>
<p style="margin-top: 20px;border: 1px solid #333333;padding-10px;width: 100%;min-height: 500px;" v-html="model.msgdtll"></p>
<el-dialog v-if="visible" v-dialogDrag :visible="visible" :modal-append-to-body="false" :close-on-click-modal="true"
title="历史记录" destroy-on-close width="50%" @close="visible = false">
......
src/page/Frontend/Msgdtlrtm/views/index.vue
......@@ -67,10 +67,6 @@ export default {
if (rtnmsg.respCode === SUCCESS) {
this.model.msgdtll = rtnmsg.data
}
const rtnmsgrsm = await Api.post(`/${this.moduleRouter()}/msgdtl/rsm`, params);
if (rtnmsgrsm.respCode === SUCCESS) {
this.model.msgdtlll = rtnmsgrsm.data
}
}
}
</script>
......
src/page/Frontend/Msgdtlsep/views/Msgdtlp.vue
......@@ -4,15 +4,12 @@
历史记录
</c-button>
<c-button class="medium_bcs" size="medium" style="margin-left: 40px" type="primary" @click="handleCheck">
放行
重新发送
</c-button>
<c-button class="medium_bcs" size="medium" style="margin-left: 40px" type="primary" @click="handleReject">
丢弃
</c-button>
<div style="width: 100%;height: calc(100% - 50px); display: flex;align-item: center;justify-content: space-between;">
<p style="margin-top: 20px;border: 1px solid #333333;width: 49%;height: 100%;overflow: auto;" v-html="model.msgdtll"></p>
<p style="margin-top: 20px;border: 1px solid #333333;width: 49%;height: 100%;overflow: auto;" v-html="model.msgdtlll"></p>
</div>
<p style="margin-top: 20px;border: 1px solid #333333;padding-10px;width: 100%;min-height: 500px;" v-html="model.msgdtll"></p>
<el-dialog v-if="visible" v-dialogDrag :visible="visible" :modal-append-to-body="false" :close-on-click-modal="true"
title="历史记录" destroy-on-close width="50%" @close="visible = false">
......@@ -67,7 +64,7 @@ export default {
methods: {
async handleCheck() {
this.$confirm("确定放行该报文？", "提示", {
this.$confirm("确定重新发送该报文？", "提示", {
confirmButtonText: "确认",
cancelButtonText: "取消",
type: "warning",
......
src/page/Frontend/Msgdtlsep/views/index.vue
......@@ -67,10 +67,6 @@ export default {
if (rtnmsg.respCode === SUCCESS) {
this.model.msgdtll = rtnmsg.data
}
const rtnmsgrsm = await Api.post(`/${this.moduleRouter()}/msgdtl/rsm`, params);
if (rtnmsgrsm.respCode === SUCCESS) {
this.model.msgdtlll = rtnmsgrsm.data
}
}
}
</script>
......
src/page/Frontend/Msgrtm/event/index.js
......@@ -27,6 +27,7 @@ export default {
let rtnmsg = await Api.post("/frontend/msgsel/query", {
...this.model.sndp,
dir: ">",
querytyp: "rtm",
pageNum: this.pagination.pageNum,
pageSize: this.pagination.pageSize,
rcvdatsta: moment(rcvdatsta).format("YYYY-MM-DD"),
......
src/page/Frontend/Msgrtm/views/Schpnl.vue
......@@ -152,6 +152,10 @@
</el-table-column>
<el-table-column v-for="(item, key) in stmData.columns" :key="key" :label="item.label" :prop="item.prop"
:min-width="item.width">
<template slot-scope="scope">
<c-select-value-to-label v-if="item.prop == 'sta'" v-model="scope.row.sta" :code="codes.stacod"></c-select-value-to-label>
<span v-else>{{ scope.row[item.prop] }}</span>
</template>
</el-table-column>
</el-table>
......@@ -294,6 +298,14 @@ export default {
},
methods: {
dbClickRow(row) {
this.routerPush({
path: '/business/msgdtlrtm',
query: {
mpsinr: row.inr
}
})
}
},
mounted: function () {
},
......
src/page/Frontend/Msgsep/event/index.js
......@@ -26,7 +26,8 @@ export default {
this.load = true;
let rtnmsg = await Api.post("/frontend/msgsel/query", {
...this.model.sndp,
dir: ">",
dir: "<",
querytyp: "sep",
pageNum: this.pagination.pageNum,
pageSize: this.pagination.pageSize,
rcvdatsta: moment(rcvdatsta).format("YYYY-MM-DD"),
......
src/page/Frontend/Rcvselblk/event/index.js
......@@ -25,6 +25,7 @@ export default {
let rtnmsg = await Api.post("/frontend/msgsel/query", {
...this.model.rcvp,
dir: "<",
querytyp: "rcvblk",
pageNum: this.pagination.pageNum,
pageSize: this.pagination.pageSize,
rcvdatsta: moment(rcvdatsta).format("YYYY-MM-DD"),
......
src/page/Frontend/Rcvselblk/views/Schpnl.vue
......@@ -162,6 +162,10 @@
</el-table-column>
<el-table-column v-for="(item, key) in stmData.columns" :key="key" :label="item.label" :prop="item.prop"
:min-width="item.width">
<template slot-scope="scope">
<c-select-value-to-label v-if="item.prop == 'sta'" v-model="scope.row.sta" :code="codes.stacod"></c-select-value-to-label>
<span v-else>{{ scope.row[item.prop] }}</span>
</template>
</el-table-column>
</el-table>
<el-pagination layout="total, sizes, prev, pager, next, jumper" :total="pagination.total"
......@@ -320,7 +324,16 @@ export default {
deep: true
}
},
methods: {},
methods: {
dbClickRow(row) {
this.routerPush({
path: '/business/msgdtlblk',
query: {
mpsinr: row.inr
}
})
}
},
mounted: function () {
},
};
......
src/page/Frontend/Smpsel/model/index.js
......@@ -4,6 +4,12 @@ import Pub from "~/components/business/commonModel/index.js";
export default class Smpsel {
constructor() {
this.data = {
extkey: "",
chnnam: "",
act: "",
cur: "",
ref: "",
smtno: "",
smpp: {
smpsup: {
smtno: "", // ： .smpp.smpsup.smtno
......
src/page/Frontend/Smpsel/views/Smpp01.vue
......@@ -6,18 +6,18 @@
<el-row>
<c-col :span="24">
<c-col :span="8">
<c-form-item label="BIC码" prop="smpp.smpsup.ptpmod.pty.extkey">
<c-input v-model="model.smpp.smpsup.ptpmod.pty.extkey" maxlength="24"></c-input>
<c-form-item label="BIC码" prop="extkey">
<c-input v-model="model.extkey" maxlength="24"></c-input>
</c-form-item>
</c-col>
<c-col :span="8">
<c-form-item label="账户行名称" prop="smpp.smpsup.ptpmod.pty.chnnam">
<c-input v-model="model.smpp.smpsup.ptpmod.pty.chnnam" maxlength="100"></c-input>
<c-form-item label="账户行名称" prop="chnnam">
<c-input v-model="model.chnnam" maxlength="100"></c-input>
</c-form-item>
</c-col>
<c-col :span="8">
<c-form-item label="帐号" prop="smpp.smpsup.act">
<c-input v-model="model.smpp.smpsup.act" maxlength="40"></c-input>
<c-form-item label="帐号" prop="act">
<c-input v-model="model.act" maxlength="40"></c-input>
</c-form-item>
</c-col>
</c-col>
......@@ -25,18 +25,18 @@
<!-- 可控展示区 -->
<el-row v-show="searchSlot.searchToggle">
<c-col :span="8">
<el-form-item label="币种" prop="smpp.smpsup.cur">
<c-select v-model="model.smpp.smpsup.cur" style="width:100%"></c-select>
<el-form-item label="币种" prop="cur">
<c-select v-model="model.cur" style="width:100%"></c-select>
</el-form-item>
</c-col>
<c-col :span="8">
<c-form-item label="对账单参考号" prop="smpp.smpsup.ref">
<c-input v-model="model.smpp.smpsup.ref" maxlength="16"></c-input>
<c-form-item label="对账单参考号" prop="ref">
<c-input v-model="model.ref" maxlength="16"></c-input>
</c-form-item>
</c-col>
<c-col :span="8">
<c-form-item label="所属单编号" prop="smpp.smpsup.smtno">
<c-input v-model="model.smpp.smpsup.smtno" maxlength="16"></c-input>
<c-form-item label="所属单编号" prop="smtno">
<c-input v-model="model.smtno" maxlength="16"></c-input>
</c-form-item>
</c-col>
......
src/page/Frontend/Sndselcop/views/Schpnl.vue
......@@ -153,6 +153,10 @@
</el-table-column>
<el-table-column v-for="(item, key) in stmData.columns" :key="key" :label="item.label" :prop="item.prop"
:min-width="item.width">
<template slot-scope="scope">
<c-select-value-to-label v-if="item.prop == 'sta'" v-model="scope.row.sta" :code="codes.stacod"></c-select-value-to-label>
<span v-else>{{ scope.row[item.prop] }}</span>
</template>
</el-table-column>
</el-table>
......
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