Skip to content

I
isc-web-vue
Commit b28a195d by jianglong
Options

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

parents bf66c068 704f562e
Showing with 292 additions and 177 deletions
src/page/Frontend/Batdis/event/index.js
......@@ -4,6 +4,53 @@ import Api from '~/service/Api';
export default {
mixins: [commonFunctions],
methods: {
// 双击
async dbClickRow(row) {
let rtnmsg = await Api.post("/frontend/oftsel/dblclick", {
objtyp: row.objtyp,
smdinr: row.objinr,
});
if (rtnmsg.respCode == SUCCESS) {
this.routerPush({
path: '/business/msgdtl',
query: {
mpsinr: rtnmsg.mpsinr
}
})
}
},
// 详情
async toDetails(row) {
let rtnmsg = await Api.post("/frontend/oftsel/display", {
inr: row.inr
});
if (rtnmsg.respCode == SUCCESS) {
this.detailsInfo = rtnmsg.data;
this.$refs.infoShow.visible = true;
}
},
// 取消关联
toCancelRelate(row) {
if (row.objtyp == 'smd') {
this.$notify.error({
title: '错误',
message: '请选择交易待对账记录取消关联',
});
return;
}
if (row.sta != 0) {
this.$notify.error({
title: '错误',
message: '当前记录未关联，无法取消关联',
});
return;
}
this.routerPush({
path: '/business/offrel',
query: {
inr: row.inr
}
})
}
}
}
\ No newline at end of file
src/page/Frontend/Batdis/views/Batdis.vue
......@@ -75,6 +75,7 @@
size="small"
:border="true"
:highlight-current-row="true"
@row-dblclick="dbClickRow"
>
<el-table-column prop="rsptim" label="收发日期" width="100">
</el-table-column>
......@@ -128,23 +129,36 @@
<c-select-value-to-label v-model="scope.row.objtyp" :code="codes.dottyp"></c-select-value-to-label>
</template>
</el-table-column>
<el-table-column fixed="right" label="操作" width="240px">
<template slot-scope="scope">
<c-button style="margin-left: 0" type='text' size="small" @click="toDetails(scope.row)">详情</c-button>
<c-button style="margin-left: 0" type='text' size="small" @click="toCancelRelate(scope.row)">取消关联</c-button>
</template>
</el-table-column>
</el-table>
<el-pagination layout="prev, pager, next" :total="0">
</el-pagination>
</div>
</c-col>
<!-- 详情弹框 -->
<info-show ref="infoShow" :detailsInfo="detailsInfo"></info-show>
</div>
</template>
<script>
import Api from "~/service/Api"
import Event from "../event"
import InfoShow from './InfoShow'
export default {
inject: ['root'],
props: ["model", "codes"],
mixins: [Event],
components: {
InfoShow
},
data() {
return {
detailsInfo: []
}
},
methods: {},
......
src/page/Frontend/Batdis/views/InfoShow.vue 0 → 100644
<template>
<div>
<el-dialog v-if="visible" v-dialogDrag :visible="visible" :modal-append-to-body="false" :close-on-click-modal="false"
title="新增" destroy-on-close width="50%" @close="visible = false">
<div>
<el-table
:data="detailsInfo"
style="width: 100%;margin-top: 10px;"
size="small"
:border="true"
:highlight-current-row="true"
>
<el-table-column v-for="(item, key) in columns" :key="key" :label="item.label" :prop="item.prop"
:min-width="item.width">
</el-table-column>
</el-table>
</div>
<span slot="footer" class="dialog-footer">
<el-button @click="handleCancel()">取 消</el-button>
</span>
</el-dialog>
</div>
</template>
<script>
import Api from "~/service/Api"
export default {
mixins: [],
props: ['detailsInfo'],
computed: {
},
data() {
return {
visible: false,
columns: [
{
label: "操作日期",
prop: "opdate",
width: "150"
},
{
label: "处理交易",
prop: "frmnam",
width: "150"
},
{
label: "操作用户",
prop: "usr",
width: "150"
},
{
label: "备注",
prop: "bak",
width: "150"
},
],
};
},
watch: {
},
methods: {
handleCancel() {
this.visible = false
}
}
};
</script>
<style scoped lang="less"></style>
\ No newline at end of file
src/page/Frontend/Batdis/views/index.vue
......@@ -19,6 +19,7 @@ import Api from "~/service/Api"
import CodeTable from "~/config/CodeTable"
import Batdis from "../model"
import MBatdis from "./Batdis"
import Utils from "~/utils"
import operationFunc from "~/mixin/operationFunc";
import commonDepend from "~/mixin/commonDepend";
......@@ -43,12 +44,7 @@ export default {
model: new Batdis().data,
rules: Check,
codes: {
sta: CodeTable.sta,
kpatyp: CodeTable.kpatyp,
sdcflg: CodeTable.sdcflg,
dottyp: CodeTable.dottyp,
offsta: CodeTable.offsta,
batcharge: CodeTable.batcharge,
...CodeTable
},
}
},
......@@ -60,14 +56,20 @@ export default {
created: async function () {
console.log("进入batdis交易");
let params = {
transName: this.trnName,
qrdgrp: {
rec: {
inr: this.$route.query.inr || "",
},
},
inr: this.$route.query.inr || "",
traname1: ''
};
// this.init(params);
const rtnmsg = await Api.post(`/${this.moduleRouter()}/${this.trnName}/init`, params);
if (rtnmsg.respCode === SUCCESS) {
Utils.copyValueFromVoData(this.model.batgrp, rtnmsg.data);
}
this.model.batgrp.dotlst = [
{
rsptim: '1',
valdat: '1',
ownref: '1',
}
]
}
}
</script>
......
src/page/Frontend/Offrel/event/index.js
......@@ -4,6 +4,17 @@ import Api from '~/service/Api';
export default {
mixins: [commonFunctions],
methods: {
async toSubmit() {
let rtnmsg = await Api.post("/frontend/oftsel/sav", this.model);
if (rtnmsg.respCode == SUCCESS) {
this.$notify.success({
title: '成功',
message: '提交成功',
});
// 关闭标签，返回上一交易
this.$store.commit('delTagsArry', this.$route.path);
this.$router.back()
}
}
}
}
\ No newline at end of file
src/page/Frontend/Offrel/views/index.vue
......@@ -11,6 +11,9 @@
</el-tab-pane>
</c-tabs>
</el-form>
<div style="width: 100%;text-align: center;">
<c-button type='primary' size="small" @click="toSubmit">提交</c-button>
</div>
</c-page>
</div>
</template>
......@@ -19,6 +22,7 @@ import Api from "~/service/Api"
import CodeTable from "~/config/CodeTable"
import Offrel from "../model"
import MOffrel from "./Offrel"
import Utils from "~/utils"
import operationFunc from "~/mixin/operationFunc";
import commonDepend from "~/mixin/commonDepend";
......@@ -60,14 +64,12 @@ export default {
created: async function () {
console.log("进入offrel交易");
let params = {
transName: this.trnName,
qrdgrp: {
rec: {
inr: this.$route.query.inr || "",
},
},
inr: this.$route.query.inr || "",
};
// this.init(params);
const rtnmsg = await Api.post(`/${this.moduleRouter()}/${this.trnName}/init`, params);
if (rtnmsg.respCode === SUCCESS) {
Utils.copyValueFromVoData(this.model.oftgrp, rtnmsg.data);
}
}
}
</script>
......
src/page/Frontend/Oftopn/event/index.js
......@@ -37,50 +37,6 @@ export default {
this.load = false;
this.stmData.data = [];
const { list } = rtnmsg.data;
const { codes: { kpasta, zfqzsta, stacod, offsta, chncod } } = this;
list.forEach(v => {
for (let i in kpasta) {
if (kpasta[i].value == v.typ) {
v.typ = kpasta[i].label;
}
}
for (let i in zfqzsta) {
if (zfqzsta[i].value == v.sta) {
v.sta = zfqzsta[i].label;
}
}
for (let i in stacod) {
if (stacod[i].value == v.area) {
v.area = stacod[i].label;
}
}
for (let i in offsta) {
if (offsta[i].value == v.offsta) {
v.offsta = offsta[i].label;
}
}
for (let i in chncod) {
if (chncod[i].value == v.multimsg) {
v.multimsg = chncod[i].label;
}
}
for (let i in chncod) {
if (chncod[i].value == v.chk) {
v.chk = chncod[i].label;
}
}
for (let i in chncod) {
if (chncod[i].value == v.kpatyp) {
v.kpatyp = chncod[i].label;
}
}
})
this.stmData.data = list;
this.pagination = {
pageNum: rtnmsg.data.pageNum || 1,
......
src/page/Frontend/Oftopn/views/Oftp13.vue
......@@ -124,15 +124,33 @@
<c-col :span="24">
<el-tabs v-model="activeTab" class="y-tabs">
<el-tab-pane label="待关联报文处理" name="fb">
<el-table :data="stmData.data" :columns="stmData.columns" v-loading="load" style="width: 100%"
<el-table
:data="stmData.data"
:columns="stmData.columns"
v-loading="load" style="width: 100%"
@selection-change="handleSelectionChange"
@row-dblclick="dbClickRow"
size="small" :border="true" height="calc(100vh - 480px)"
:highlight-current-row="true">
<el-table-column type="selection" width="55">
</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">
size="small" :border="true"
height="calc(100vh - 420px)"
:highlight-current-row="true"
>
<el-table-column type="selection" width="55"></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 == 'typ'" v-model="scope.row.typ" :code="codes.kpasta"></c-select-value-to-label>
<c-select-value-to-label v-else-if="item.prop == 'sta'" v-model="scope.row.sta" :code="codes.zfqzsta"></c-select-value-to-label>
<c-select-value-to-label v-else-if="item.prop == 'area'" v-model="scope.row.area" :code="codes.stacod"></c-select-value-to-label>
<c-select-value-to-label v-else-if="item.prop == 'offsta'" v-model="scope.row.offsta" :code="codes.offsta"></c-select-value-to-label>
<c-select-value-to-label v-else-if="item.prop == 'multimsg'" v-model="scope.row.multimsg" :code="codes.chncod"></c-select-value-to-label>
<c-select-value-to-label v-else-if="item.prop == 'chk'" v-model="scope.row.chk" :code="codes.chncod"></c-select-value-to-label>
<c-select-value-to-label v-else-if="item.prop == 'kpatyp'" v-model="scope.row.kpatyp" :code="codes.chncod"></c-select-value-to-label>
<span v-else>{{ scope.row[item.prop] }}</span>
</template>
</el-table-column>
</el-table>
......
src/page/Frontend/Oftsel/event/index.js
......@@ -36,50 +36,6 @@ export default {
this.load = false;
this.stmData.data = [];
const { list } = rtnmsg.data;
const { codes: { kpasta, zfqzsta, stacod, offsta, chncod } } = this;
list.forEach(v => {
for (let i in kpasta) {
if (kpasta[i].value == v.typ) {
v.typ = kpasta[i].label;
}
}
for (let i in zfqzsta) {
if (zfqzsta[i].value == v.sta) {
v.sta = zfqzsta[i].label;
}
}
for (let i in stacod) {
if (stacod[i].value == v.area) {
v.area = stacod[i].label;
}
}
for (let i in offsta) {
if (offsta[i].value == v.offsta) {
v.offsta = offsta[i].label;
}
}
for (let i in chncod) {
if (chncod[i].value == v.multimsg) {
v.multimsg = chncod[i].label;
}
}
for (let i in chncod) {
if (chncod[i].value == v.chk) {
v.chk = chncod[i].label;
}
}
for (let i in chncod) {
if (chncod[i].value == v.kpatyp) {
v.kpatyp = chncod[i].label;
}
}
})
this.stmData.data = list;
this.pagination = {
pageNum: rtnmsg.data.pageNum || 1,
......@@ -97,6 +53,26 @@ export default {
async handleReset () {
this.model = new Oftsel().data;
},
async dbClickRow(row) {
// let rtnmsg = await Api.post("/frontend/oftsel/storeDate", {
// inr: row.inr
// });
// if (rtnmsg.respCode == SUCCESS) {
// this.routerPush({
// path: '/business/batdis',
// query: {
// inr: rtnmsg.data
// }
// })
// }
this.routerPush({
path: '/business/batdis',
query: {
inr: '0000000000001594'
}
})
},
// pageSize改变
handleSizeChange (val) {
this.pagination.pageNum = 1;
......
src/page/Frontend/Oftsel/views/Oftp01.vue
......@@ -6,20 +6,21 @@
<el-row>
<c-col :span="24">
<c-col :span="8">
<el-form-item label="报文标准" style="width: 100%">
<c-select v-model="model.oftp.rel.msgtyp" style="width: 100%" :code="codes.msgtyp3" @change="getSubtyp(model.oftp.rel.msgtyp, 'oftp.rel.mty')" />
<el-form-item label="报文标准" style="width: 100%">
<c-select v-model="model.oftp.rel.msgtyp" style="width: 100%" :code="codes.msgtyp3"
@change="getSubtyp(model.oftp.rel.msgtyp, 'oftp.rel.mty')" />
</el-form-item>
</c-col>
<c-col :span="8">
<el-form-item label="报文类型" style="width: 100%">
<el-select v-model="model.oftp.rel.mty" >
<el-form-item label="报文类型" style="width: 100%">
<el-select v-model="model.oftp.rel.mty">
<el-option v-for="code in subtypCodes" :key="code.label" :label="code.label" :value="code.value">
</el-option>
</el-select>
</el-form-item>
</c-col>
<c-col :span="8">
<el-form-item label="起止日期" style="width: 100%">
<el-form-item label="起止日期" style="width: 100%">
<c-col :span="11">
<c-date-picker type="date" v-model="model.oftp.rel.rsptims" style="width: 100%"></c-date-picker>
</c-col>
......@@ -37,67 +38,56 @@
<el-row v-show="searchSlot.searchToggle">
<c-col :span="24">
<c-col :span="8">
<el-form-item label="发报行BIC" style="width: 100%">
<c-input v-model="model.oftp.rel.sedbak" style="width: 100%" />
<el-form-item label="发报行BIC" style="width: 100%">
<c-input v-model="model.oftp.rel.sedbak" style="width: 100%" />
</el-form-item>
</c-col>
<c-col :span="8">
<el-form-item label="收报行BIC" style="width: 100%">
<c-input v-model="model.oftp.rel.revbak" style="width: 100%" />
<el-form-item label="收报行BIC" style="width: 100%">
<c-input v-model="model.oftp.rel.revbak" style="width: 100%" />
</el-form-item>
</c-col>
<c-col :span="8">
<el-form-item label="账户行BIC" style="width: 100%">
<c-input v-model="model.oftp.rel.actbic" style="width: 100%" />
<el-form-item label="账户行BIC" style="width: 100%">
<c-input v-model="model.oftp.rel.actbic" style="width: 100%" />
</el-form-item>
</c-col>
</c-col>
<c-col :span="24">
<c-col :span="8">
<el-form-item label="借贷" style="width: 100%">
<el-form-item label="借贷" style="width: 100%">
<c-select v-model="model.oftp.rel.dcflg" style="width: 100%" :code="codes.dcflg" />
</el-form-item>
</c-col>
<c-col :span="8">
<el-form-item label="币种" style="width: 100%">
<el-form-item label="币种" style="width: 100%">
<c-select v-model="model.oftp.rel.cur" style="width: 100%" dbCode="curtxt" />
</el-form-item>
</c-col>
<c-col :span="8">
<el-form-item
:label="$t('lc.金额区间')"
style="width: 100%"
>
<el-form-item :label="$t('lc.金额区间')" style="width: 100%">
<c-col :span="11">
<c-input
v-model="model.oftp.rel.atmd"
:placeholder="$t('lc.请输入金额下限')"
style="width: 100%"
></c-input>
<c-input v-model="model.oftp.rel.atmd" :placeholder="$t('lc.请输入金额下限')" style="width: 100%"></c-input>
</c-col>
<c-col :span="2" style="text-align: center">
<label style="display: inline-block; width: 100%">-</label>
</c-col>
<c-col :span="11">
<c-input
v-model="model.oftp.rel.amtu"
:placeholder="$t('lc.请输入金额上限')"
style="width: 100%"
></c-input>
<c-input v-model="model.oftp.rel.amtu" :placeholder="$t('lc.请输入金额上限')" style="width: 100%"></c-input>
</c-col>
</el-form-item>
</c-col>
</c-col>
<c-col :span="24">
<c-col :span="8">
<el-form-item label="20域编号" style="width: 100%">
<c-input v-model="model.oftp.rel.ref" maxlength="40" >
<el-form-item label="20域编号" style="width: 100%">
<c-input v-model="model.oftp.rel.ref" maxlength="40">
</c-input>
</el-form-item>
</c-col>
<c-col :span="8">
<el-form-item label="21域编号" style="width: 100%">
<c-input v-model="model.oftp.rel.relref" maxlength="40" >
<el-form-item label="21域编号" style="width: 100%">
<c-input v-model="model.oftp.rel.relref" maxlength="40">
</c-input>
</el-form-item>
</c-col>
......@@ -107,11 +97,11 @@
</c-list-search>
<el-col :span="24" style="margin-top: 2px;margin-bottom: 1px;">
<c-button :disabled="isFoldDisable" class="medium_bcs" size="medium" style="margin-left: 0"
type="primary">{{ $t('public.归档') }}
<c-button :disabled="isFoldDisable" class="medium_bcs" size="medium" style="margin-left: 0" type="primary">{{
$t('public.归档') }}
</c-button>
<c-button :disabled="isRoutingDisable" class="medium_bcs" size="medium"
style="margin-left: 20" type="primary">ReRouting
<c-button :disabled="isRoutingDisable" class="medium_bcs" size="medium" style="margin-left: 20"
type="primary">ReRouting
</c-button>
<c-button class="medium_bcs" size="medium" style="margin-left: 20" type="primary">
{{ $t('public.导出Excel') }}
......@@ -123,20 +113,39 @@
<c-col :span="24">
<el-tabs v-model="activeTab" class="y-tabs">
<el-tab-pane label="已关联报文查询" name="fb">
<el-table :data="stmData.data" :columns="stmData.columns" v-loading="load" style="width: 100%"
@selection-change="handleSelectionChange"
size="small" :border="true" height="calc(100vh - 480px)" :highlight-current-row="true">
<el-table-column type="selection" width="55">
</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">
<el-table
:data="stmData.data"
:columns="stmData.columns"
v-loading="load" style="width: 100%"
@selection-change="handleSelectionChange"
@row-dblclick="dbClickRow"
size="small" :border="true"
height="calc(100vh - 420px)"
:highlight-current-row="true"
>
<el-table-column type="selection" width="55"></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 == 'typ'" v-model="scope.row.typ" :code="codes.kpasta"></c-select-value-to-label>
<c-select-value-to-label v-else-if="item.prop == 'sta'" v-model="scope.row.sta" :code="codes.zfqzsta"></c-select-value-to-label>
<c-select-value-to-label v-else-if="item.prop == 'area'" v-model="scope.row.area" :code="codes.stacod"></c-select-value-to-label>
<c-select-value-to-label v-else-if="item.prop == 'offsta'" v-model="scope.row.offsta" :code="codes.offsta"></c-select-value-to-label>
<c-select-value-to-label v-else-if="item.prop == 'multimsg'" v-model="scope.row.multimsg" :code="codes.chncod"></c-select-value-to-label>
<c-select-value-to-label v-else-if="item.prop == 'chk'" v-model="scope.row.chk" :code="codes.chncod"></c-select-value-to-label>
<c-select-value-to-label v-else-if="item.prop == 'kpatyp'" v-model="scope.row.kpatyp" :code="codes.chncod"></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"
:page-size="pagination.pageSize" :current-page.sync="pagination.pageNum"
@size-change="handleSizeChange"
@current-change="handleCurrentChange">
:page-size="pagination.pageSize" :current-page.sync="pagination.pageNum" @size-change="handleSizeChange"
@current-change="handleCurrentChange">
</el-pagination>
</el-tab-pane>
</el-tabs>
......@@ -278,7 +287,7 @@ export default {
}
},
watch: {
},
methods: {},
mounted: function () {
......
src/page/Home/aside/MenuTabs.vue
......@@ -297,33 +297,36 @@ export default {
return newObj;
},
setDefaultTabs() {
// 页签拷贝
this.defaultTabList.forEach((item, index) => {
let newItem = this.deepCloneObj(item);
if (item.path == "/home") {
newItem["width"] = this.homeTagWidth;
newItem["hidden"] = false;
}
this.tabList.push(newItem);
});
// 处理刷新页签不显示问题
let curRoute = this.$route
let flag = this.defaultTabList.some((item) => {
return item.path == curRoute.path
})
if (curRoute.meta.keepAlive && !flag) {
this.defaultTabList.push({
this.tabList.push({
name: curRoute.name,
path: curRoute.fullPath,
text: curRoute.meta.title || 'no-title',
hidden: false,
routePath: curRoute.path,
routeName: curRoute.name
routeName: curRoute.name,
route: curRoute
})
}
// 页签拷贝
this.defaultTabList.forEach((item, index) => {
let newItem = this.deepCloneObj(item);
if (item.path == "/home") {
newItem["width"] = this.homeTagWidth;
newItem["hidden"] = false;
}
this.tabList.push(newItem);
if (item.path != "/home") {
this.tabList.map((ite, index) => {
if (ite.path != "/home") {
this.calcTagsWidth(index, "+", true);
}
});
})
this.$store.commit("setTagsArry", this.tabList);
},
calcTagsWidth(index, calc, callback) {
......
src/page/index.vue
......@@ -581,8 +581,10 @@ export default {
let orgObj = this.header.orgList.find(item => item.id === param)
let roleObj = this.header.roleTypeList.find(item => item.key === this.header.curRole.id+"")
this.initRoleList(orgObj);
if(this.header.roleList && this.header.roleList.length>0 && ((orgObj.departmentNumber==="1000" && roleObj.value!=="HEAD")
||(orgObj.departmentNumber!=="1000" && roleObj.value==="HEAD"))){
if(this.header.roleList &&
this.header.roleList.length>0 &&
((orgObj.departmentNumber==="1000" && roleObj && roleObj.value!=="HEAD") || (orgObj.departmentNumber!=="1000" && (roleObj && roleObj.value==="HEAD")))
){
this.changeRoles(this.header.roleList[0].id);
sessionStorage.setItem('curRole', JSON.stringify(this.header.roleList[0]));
}
......
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