Commit 77a5ce5a by wangguangchao

复核列表优化

parent aba1411e
...@@ -303,7 +303,7 @@ export default { ...@@ -303,7 +303,7 @@ export default {
async handleReset(){ async handleReset(){
this.model.bchcon = ""; this.model.bchcon = "";
this.model.trncorco.ownref = ""; this.model.trncorco.ownref = "";
this.model.trncorco.relflg = "Waiting"; this.model.trncorco.relflg = "";
this.model.usrcon = ""; this.model.usrcon = "";
this.model.trncorco.inidatfro = ""; this.model.trncorco.inidatfro = "";
this.model.trncorco.inidattil = ""; this.model.trncorco.inidattil = "";
......
...@@ -3,7 +3,9 @@ ...@@ -3,7 +3,9 @@
<el-form :model="model" :rules="rules" ref="modelForm" tokenKey="modelForm" label-width="170px" size="small" :validate-on-rule-change="false"> <el-form :model="model" :rules="rules" ref="modelForm" tokenKey="modelForm" label-width="170px" size="small" :validate-on-rule-change="false">
<!-- <c-tabs :value="tabVal" ref="elment" type="card" @tab-click="tabClick"> --> <!-- <c-tabs :value="tabVal" ref="elment" type="card" @tab-click="tabClick"> -->
<!-- <el-tab-pane :value="tabVal" label="待办任务查询" name="menu"> --> <!-- <el-tab-pane :value="tabVal" label="待办任务查询" name="menu"> -->
<c-content>
<m-menu :model="model" :codes="codes" ref="Menu" :isDraftBox="isDraftBox"/> <m-menu :model="model" :codes="codes" ref="Menu" :isDraftBox="isDraftBox"/>
</c-content>
<!-- </el-tab-pane> --> <!-- </el-tab-pane> -->
<!-- </c-tabs> --> <!-- </c-tabs> -->
</el-form> </el-form>
......
<template> <template>
<div class="eibs-tab"> <div class="eibs-tab">
<c-list-search @form-reset="handleReset" @form-search="handleSearch"> <c-list-search @form-reset="handleReset" @form-search="handleSearch">
<template v-slot="searchSlot"> <template v-slot="searchSlot">
<el-form <el-form
class="m-table-search-form" class="m-table-search-form"
ref="paramsForm" ref="paramsForm"
:inline="true" :inline="true"
label-position="right" label-position="right"
label-width="110px" label-width="110px"
size="small" size="small"
>
<el-row>
<c-col :span="23">
<c-col :span="8">
<el-form-item
label="业务机构"
prop="bchcon"
style="width: 100%"
> >
<el-row> <c-select
<c-col :span="23"> v-model="model.bchcon"
<c-col :span="8"> style="width: 100%"
<el-form-item label="业务机构" prop="bchcon" style="width: 100%"> placeholder="请选择Branch"
<c-select >
v-model="model.bchcon" <el-option
style="width: 100%"
placeholder="请选择Branch"
>
<el-option
v-for="item in codes.bchtyp" v-for="item in codes.bchtyp"
:key="item.value" :key="item.value"
:label="item.label" :label="item.label"
:value="item.value" :value="item.value"
> >
</el-option> </el-option>
</c-select> </c-select>
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="8">
<el-form-item label="业务编号" prop="trncorco.ownref" style="width: 100%">
<c-input
v-model="model.trncorco.ownref"
maxlength="16"
placeholder="请输入Reference"
></c-input>
</el-form-item>
</c-col>
<c-col :span="8" v-show="searchSlot.searchToggle"> <c-col :span="8">
<el-form-item label="经办柜员" prop="usrcon" style="width: 100%"> <el-form-item
<c-select label="业务编号"
v-model="model.usrcon" prop="trncorco.ownref"
style="width: 100%" style="width: 100%"
placeholder="请选择User" >
> <c-input
<el-option v-model="model.trncorco.ownref"
v-for="item in codes.usrsort" maxlength="16"
:key="item.value" placeholder="请输入Reference"
:label="item.label" ></c-input>
:value="item.value" </el-form-item>
> </c-col>
</el-option>
</c-select>
</el-form-item>
</c-col>
</c-col> <c-col :span="8" v-show="searchSlot.searchToggle">
</el-row> <el-form-item
<!-- label="经办柜员"
prop="usrcon"
style="width: 100%"
>
<c-select
v-model="model.usrcon"
style="width: 100%"
placeholder="请选择User"
>
<el-option
v-for="item in codes.usrsort"
:key="item.value"
:label="item.label"
:value="item.value"
>
</el-option>
</c-select>
</el-form-item>
</c-col>
</c-col>
</el-row>
<!--
<c-col :span="12"> <c-col :span="12">
<el-form-item label="Drag Drop Sender"> <el-form-item label="Drag Drop Sender">
<c-input v-model="model.atpget.sdamod.dadsnd" placeholder="请输入Drag Drop Sender"></c-input> <c-input v-model="model.atpget.sdamod.dadsnd" placeholder="请输入Drag Drop Sender"></c-input>
</el-form-item> </el-form-item>
</c-col> </c-col>
--> -->
<el-row v-show="searchSlot.searchToggle"> <el-row v-show="searchSlot.searchToggle">
<c-col :span="23"> <c-col :span="23">
<c-col :span="8"> <c-col :span="8">
<el-form-item label="业务状态" prop="trncorco.relflg" style="width: 100%"> <el-form-item
<c-select label="业务状态"
v-model="model.trncorco.relflg" prop="trncorco.relflg"
style="width: 100%" style="width: 100%"
placeholder="请选择Status" >
> <c-select
<el-option v-model="model.trncorco.relflg"
v-for="item in codes.relflg" style="width: 100%"
:key="item.value" placeholder="请选择Status"
:label="item.label" >
:value="item.value" <el-option
> v-for="item in relflgCodes"
</el-option> :key="item.value"
</c-select> :label="item.label"
</el-form-item> :value="item.value"
</c-col> >
</el-option>
</c-select>
</el-form-item>
</c-col>
<c-col :span="8"> <c-col :span="8">
<el-form-item label="创建时间" style="width: 100%"> <el-form-item label="创建时间" style="width: 100%">
<c-col :span="11"> <c-col :span="11">
<el-date-picker <el-date-picker
...@@ -113,75 +126,84 @@ ...@@ -113,75 +126,84 @@
</el-form-item> </el-form-item>
</c-col> </c-col>
<!--
<!--
<c-col :span="12"> <c-col :span="12">
<el-form-item label="and"> <el-form-item label="and">
</el-form-item> </el-form-item>
</c-col> --> </c-col> -->
<c-col :span="8"> <c-col :span="8">
<el-form-item label="交易代码" prop="atp.cod" style="width: 100%"> <el-form-item
<c-col :span="24"> label="交易代码"
<c-col :span="18"> prop="atp.cod"
style="width: 100%"
>
<c-col :span="24">
<c-col :span="18">
<c-input <c-input
v-model="model.atp.cod" v-model="model.atp.cod"
maxlength="6" maxlength="6"
style="width: 100%" style="width: 100%"
placeholder="请输入Transaction Type " placeholder="请输入Transaction Type "
></c-input> ></c-input>
</c-col> </c-col>
<!-- <c-input v-model="model.atpget.sdamod.seainf" style="width:10%" placeholder="i"></c-input> --> <!-- <c-input v-model="model.atpget.sdamod.seainf" style="width:10%" placeholder="i"></c-input> -->
<c-col :span="6"> <c-col :span="6">
<c-button size="small" style="width: 90%" type="primary" @click="onSeainf" icon="el-icon-search" <c-button
></c-button size="small"
> style="width: 85%"
type="primary"
@click="onSeainf"
icon="el-icon-search"
></c-button>
</c-col> </c-col>
</c-col>
</el-form-item>
</c-col> </c-col>
</c-col> </el-form-item>
<c-col :span="23"> </c-col>
<c-col :span="8"> </c-col>
<el-form-item label="业务标志" prop="trncorco.dflg" style="width: 100%"> <c-col :span="23">
<c-select <c-col :span="8">
v-model="model.trncorco.dflg" <el-form-item
style="width: 100%" label="业务标志"
placeholder="请选择业务标志" prop="trncorco.dflg"
> style="width: 100%"
<el-option >
v-for="item in codes.dflg" <c-select
:key="item.value" v-model="model.trncorco.dflg"
:label="item.label" style="width: 100%"
:value="item.value" placeholder="请选择业务标志"
> >
</el-option> <el-option
</c-select> v-for="item in codes.dflg"
</el-form-item> :key="item.value"
</c-col> :label="item.label"
:value="item.value"
<c-col :span="8"> >
<el-form-item label="交易名称" prop="atptxt" style="width: 100%"> </el-option>
<c-input </c-select>
v-model="model.atptxt" </el-form-item>
maxlength="37" </c-col>
placeholder="请输入Transaction Text"
></c-input>
</el-form-item>
</c-col>
</c-col>
</el-row>
</el-form> <c-col :span="8">
</template> <el-form-item
</c-list-search> label="交易名称"
prop="atptxt"
style="width: 100%"
>
<c-input
v-model="model.atptxt"
maxlength="37"
placeholder="请输入Transaction Text"
></c-input>
</el-form-item>
</c-col>
</c-col>
</el-row>
</el-form>
</template>
</c-list-search>
<!-- <!--
<c-col :span="12"> <c-col :span="12">
...@@ -198,17 +220,16 @@ ...@@ -198,17 +220,16 @@
--> -->
<!-- <div style="margin-top:20px;"> --> <!-- <div style="margin-top:20px;"> -->
<!-- <c-button size="small" type="primary" @click="onSeaown"> <!-- <c-button size="small" type="primary" @click="onSeaown">
Search Own Search Own
</c-button> </c-button>
<c-button size="small" type="primary" @click="onSeajbh"> <c-button size="small" type="primary" @click="onSeajbh">
Search All Search All
</c-button> --> </c-button> -->
<!-- <c-button <!-- <c-button
size="small" size="small"
type="primary" type="primary"
disabled="disabled" disabled="disabled"
...@@ -367,19 +388,21 @@ ...@@ -367,19 +388,21 @@
:showSelection="true" :showSelection="true"
v-on:multipleSelect="multipleSelect" v-on:multipleSelect="multipleSelect"
> --> > -->
<el-row> <el-row>
<c-col :span="23"> <c-col :span="23">
<c-istream-table <c-istream-table :list="stmData.data" :columns="stmData.columns">
:list="stmData.data" <el-table-column
:columns="stmData.columns" fixed="right"
> prop="display"
<el-table-column fixed="right" prop="display" label="操作" width="300px"> label="操作"
<template > width="260px"
<!-- <a :href="`/#/display/${scope.row['10'].toLowerCase()}?trn=${scope.row['1']}`" target="_blank" >显示快照</a>--> >
<!-- <a href="javascript:void(0)" @click="display(scope.$index, scope.row)" <template>
<!-- <a :href="`/#/display/${scope.row['10'].toLowerCase()}?trn=${scope.row['1']}`" target="_blank" >显示快照</a>-->
<!-- <a href="javascript:void(0)" @click="display(scope.$index, scope.row)"
>显示快照</a >显示快照</a
> --> > -->
<c-button <c-button
style="margin-left: 0" style="margin-left: 0"
size="small" size="small"
type="primary" type="primary"
...@@ -427,47 +450,47 @@ ...@@ -427,47 +450,47 @@
> >
冲正 冲正
</c-button> </c-button>
</template> </template>
</el-table-column> </el-table-column>
</c-istream-table> </c-istream-table>
</c-col> </c-col>
</el-row> </el-row>
<el-row style="margin-top:2rem;"> <el-row style="margin-top: 2rem">
<c-col :span="23"> <c-col :span="23">
<el-card class="box-card"> <el-card class="box-card">
<div slot="header" class="clearfix"> <div slot="header" class="clearfix">
<span>交易状态信息 —— {{transactionStatus.busiNo}}</span> <span>交易状态信息 —— {{ transactionStatus.busiNo }}</span>
</div>
<div class="text item">
<form class="el-form--label-left el-form--inline">
<div class="el-form-item">
<label class="el-form-item__label">修改次数:</label>
<div class="el-form-item__content">
<span>{{ transactionStatus.modTimes }}</span>
</div> </div>
<div class="text item"> </div>
<form class="el-form--label-left el-form--inline"> <div class="el-form-item">
<div class="el-form-item"> <label class="el-form-item__label transstatus">交单次数:</label>
<label class="el-form-item__label">修改次数:</label> <div class="el-form-item__content">
<div class="el-form-item__content"> <span>{{ transactionStatus.postCount }}</span>
<span>{{transactionStatus.modTimes}}</span> </div>
</div> </div>
</div> <div class="el-form-item">
<div class="el-form-item"> <label class="el-form-item__label transstatus">付款次数:</label>
<label class="el-form-item__label transstatus">交单次数:</label> <div class="el-form-item__content">
<div class="el-form-item__content"> <span>{{ transactionStatus.earnCount }}</span>
<span>{{transactionStatus.postCount}}</span> </div>
</div> </div>
</div> <div class="el-form-item">
<div class="el-form-item"> <label class="el-form-item__label transstatus">付款金额:</label>
<label class="el-form-item__label transstatus">付款次数:</label> <div class="el-form-item__content">
<div class="el-form-item__content"> <span>{{ transactionStatus.earnAmt }} CNY</span>
<span>{{transactionStatus.earnCount}}</span> </div>
</div> </div>
</div> </form>
<div class="el-form-item"> </div>
<label class="el-form-item__label transstatus">付款金额:</label> </el-card>
<div class="el-form-item__content"> </c-col>
<span>{{transactionStatus.earnAmt}} CNY</span>
</div>
</div>
</form>
</div>
</el-card>
</c-col>
</el-row> </el-row>
<!-- <el-dialog :visible.sync="initdialog" :title="'交易列表'" append-to-body> <!-- <el-dialog :visible.sync="initdialog" :title="'交易列表'" append-to-body>
<div class="m-list-btns"> <div class="m-list-btns">
...@@ -488,15 +511,15 @@ export default { ...@@ -488,15 +511,15 @@ export default {
components: {}, components: {},
data() { data() {
return { return {
initdialog:false, initdialog: false,
transactionStatus: { transactionStatus: {
busiNo: "", busiNo: "",
modTimes: 0, modTimes: 0,
postCount: 0, postCount: 0,
accCount: 0, accCount: 0,
earnCount: 0, earnCount: 0,
earnAmt: 0 earnAmt: 0,
}, },
stmData: { stmData: {
// columns: [ // columns: [
// '10 1 "TRN" 50 1 tdViewTypeEdit:0 3 ATPTXT', // '10 1 "TRN" 50 1 tdViewTypeEdit:0 3 ATPTXT',
...@@ -533,6 +556,7 @@ export default { ...@@ -533,6 +556,7 @@ export default {
data: [], data: [],
}, },
relrowDisabled: true, relrowDisabled: true,
relflgCodes:[],
// multipleSelection: [], // multipleSelection: [],
}; };
}, },
...@@ -549,8 +573,22 @@ export default { ...@@ -549,8 +573,22 @@ export default {
}, },
created: function () {}, created: function () {},
mounted() { mounted() {
if (this.root.tag == "tocheck") {
console.log(this.root.tag); this.relflgCodes = [
{ label: "Correct", value: "C" },
{ label: "Entered", value: "E" },
{ label: "External", value: "X" },
{ label: "Picked up", value: "P" },
{ label: "Rejected", value: "N" },
{ label: "Waiting", value: "W" },
];
} else if (this.root.tag == "finish") {
this.relflgCodes = [
{ label: "Closed", value: "M" },
{ label: "Final", value: "F" },
{ label: "Released", value: "R" },
];
}
}, },
computed: {}, computed: {},
}; };
......
...@@ -84,14 +84,6 @@ export default { ...@@ -84,14 +84,6 @@ export default {
pattern: Pattern, pattern: Pattern,
rules: null, rules: null,
codes: { codes: {
relflg: [
{ label: "Correct", value: "C" },
{ label: "Entered", value: "E" },
{ label: "External", value: "X" },
{ label: "Picked up", value: "P" },
{ label: "Rejected", value: "N" },
{ label: "Waiting", value: "W" },
],
dflg: CodeTable.dflg, dflg: CodeTable.dflg,
bchtyp: CodeTable.bchtyp, bchtyp: CodeTable.bchtyp,
usrsort: CodeTable.usrsort, usrsort: CodeTable.usrsort,
...@@ -100,26 +92,16 @@ export default { ...@@ -100,26 +92,16 @@ export default {
}, },
methods: {}, methods: {},
mounted: async function () { mounted: async function () {
if (this.tag == "tocheck") {
this.codes.relflg = [
{ label: "Correct", value: "C" },
{ label: "Entered", value: "E" },
{ label: "External", value: "X" },
{ label: "Picked up", value: "P" },
{ label: "Rejected", value: "N" },
{ label: "Waiting", value: "W" },
];
} else if (this.tag == "finish") {
this.codes.relflg = [
{ label: "Closed", value: "M" },
{ label: "Final", value: "F" },
{ label: "Released", value: "R" },
];
}
console.log("进入trnrel交易"); console.log("进入trnrel交易");
const that = this; const that = this;
that.init(that.model).then((res) => { that.init(that.model).then((res) => {
//TODO 处理数据逻辑 //TODO 处理数据逻辑
if (this.tag == "finish") {
if ((res.data.trncorco_relflg = "W")) {
res.data.trncorco_relflg = "R";
}
}
that.model = Utils.copyValueFromVO(that.model, res.data); that.model = Utils.copyValueFromVO(that.model, res.data);
// that.$refs.inftrnps.stmData.columns=res.data.trncorco_trnstm.rows // that.$refs.inftrnps.stmData.columns=res.data.trncorco_trnstm.rows
}); });
......
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