Skip to content

V
vue-gjjs
Commit 7206cdd7 by wangguangchao
Options

任务列表调整

parent 1663365a
Showing with 262 additions and 93 deletions
src/model/Sptsel/Event.js
...@@ -96,6 +96,33 @@ export default { ...@@ -96,6 +96,33 @@ export default {
//TODO 处理数据逻辑 //TODO 处理数据逻辑
this.stmData.data = res.data.sptstm.rows; this.stmData.data = res.data.sptstm.rows;
}) })
} },
async sptfndHandleReset() {
this.model.chkinc = "";
this.model.chkdzt = "";
this.model.chkpen = "";
this.model.chkcor = "";
this.model.chkaut = "";
this.model.chkdel = "";
this.model.chktco = "";
this.model.chkcan = "";
this.model.selobj = "";
this.model.seltxt = "";
this.model.usfmod.flt = "";
this.model.inidatfro = "";
this.model.inidattil = "";
this.model.dflg = "1";
this.model.chkypt = "";
this.model.yptinf = "";
},
async sptfndHandleSearch() {
this.model.chkpen = "t";
this.executeDefault("sptstm").then(res => {
//TODO 处理数据逻辑
this.stmData.data = res.data.sptstm.rows;
})
}
} }
\ No newline at end of file
src/views/Business/BusRouter.js
...@@ -7,7 +7,9 @@ import Ditsel from "./Ditsel" ...@@ -7,7 +7,9 @@ import Ditsel from "./Ditsel"
import Ditopn from "./Ditopn" import Ditopn from "./Ditopn"
import Office from "./Office" import Office from "./Office"
import Sptsel from "./Sptsel" import Sptsel from "./Sptsel"
import Sptbrk from "./Sptsel/Sptbrk"
import Trnrel from "./Trnrel" import Trnrel from "./Trnrel"
import Trnfnd from "./Trnrel/Trnfnd"
import Tstopn from "./Tstopn" import Tstopn from "./Tstopn"
import Bdtudp from "./Bdtudp" import Bdtudp from "./Bdtudp"
import Bdtdcr from "./Bdtdcr" import Bdtdcr from "./Bdtdcr"
...@@ -62,7 +64,9 @@ const BusRouter = [ ...@@ -62,7 +64,9 @@ const BusRouter = [
{ path: 'ditopn/:inr', component: Ditopn, name: 'DitopnInr', meta: { title: (params) => { return '买方信用证开立-' + params.inr } } }, { path: 'ditopn/:inr', component: Ditopn, name: 'DitopnInr', meta: { title: (params) => { return '买方信用证开立-' + params.inr } } },
{ path: 'office', component: Office, name: 'Office', meta: { title: 'Office' } }, { path: 'office', component: Office, name: 'Office', meta: { title: 'Office' } },
{ path: 'sptsel', component: Sptsel, name: 'Sptsel', meta: { title: '待办任务' } }, { path: 'sptsel', component: Sptsel, name: 'Sptsel', meta: { title: '待办任务' } },
{ path: 'sptbrk', component: Sptbrk, name: 'Sptbrk', meta: { title: '草稿箱' } },
{ path: 'trnrel', component: Trnrel, name: 'Trnrel', meta: { title: '复核任务' } }, { path: 'trnrel', component: Trnrel, name: 'Trnrel', meta: { title: '复核任务' } },
{ path: 'trnfnd', component: Trnfnd, name: 'Trnfnd', meta: { title: '已完成任务' } },
{ path: 'trndtl', query: 'inr', component: Trndtl, name: 'Trndtl', meta: { title: 'Trndtl' } }, { path: 'trndtl', query: 'inr', component: Trndtl, name: 'Trndtl', meta: { title: 'Trndtl' } },
{ path: 'tstopn', component: Tstopn, name: 'Tstopn', meta: { title: 'Tstopn' } }, { path: 'tstopn', component: Tstopn, name: 'Tstopn', meta: { title: 'Tstopn' } },
{ path: 'infpta', component: Infpta, name: 'Infpta', meta: { title: 'Infpta' } }, { path: 'infpta', component: Infpta, name: 'Infpta', meta: { title: 'Infpta' } },
......
src/views/Business/Sptsel/Menu.vue
...@@ -58,6 +58,7 @@ ...@@ -58,6 +58,7 @@
</c-col> </c-col>
</el-row> --> </el-row> -->
<el-row> <el-row>
<c-col :span="23">
<c-col :span="8"> <c-col :span="8">
<el-form-item label="业务编号" prop="selobj" style="width: 100%"> <el-form-item label="业务编号" prop="selobj" style="width: 100%">
<c-input <c-input
...@@ -78,7 +79,7 @@ ...@@ -78,7 +79,7 @@
></c-input> ></c-input>
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="8" v-if="searchSlot.searchToggle&&!isDraftBox"> <c-col :span="8" v-if="searchSlot.searchToggle">
<el-form-item label="来源" style="width: 100%" prop="sourceModel"> <el-form-item label="来源" style="width: 100%" prop="sourceModel">
<el-select <el-select
clearable clearable
...@@ -98,10 +99,11 @@ ...@@ -98,10 +99,11 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</c-col> </c-col>
</c-col>
</el-row> </el-row>
<el-row v-show="searchSlot.searchToggle"> <el-row v-show="searchSlot.searchToggle">
<c-col :span="24"> <c-col :span="23">
<c-col :span="8"> <c-col :span="8">
<el-form-item <el-form-item
label="选择用户" label="选择用户"
...@@ -179,6 +181,8 @@ ...@@ -179,6 +181,8 @@
</c-col> </c-col>
</c-col> </c-col>
<c-col :span="23">
<c-col :span="8" v-if="model.usfmod.flt==='<SELU>'"> <c-col :span="8" v-if="model.usfmod.flt==='<SELU>'">
<el-form-item label="经办柜员" style="width:100%"> <el-form-item label="经办柜员" style="width:100%">
<c-input></c-input> <c-input></c-input>
...@@ -213,6 +217,7 @@ ...@@ -213,6 +217,7 @@
></c-input> ></c-input>
</el-form-item> </el-form-item>
</c-col> --> </c-col> -->
</c-col>
</el-row> </el-row>
</el-form> </el-form>
</template> </template>
...@@ -275,7 +280,7 @@ ...@@ -275,7 +280,7 @@
详情 详情
</c-button> </c-button>
</c-col> --> </c-col> -->
<c-col :span="24"> <c-col :span="23">
<c-istream-table :list="stmData.data" :columns="stmData.columns"> <c-istream-table :list="stmData.data" :columns="stmData.columns">
<el-table-column fixed="right" prop="op" label="操作" width="140px"> <el-table-column fixed="right" prop="op" label="操作" width="140px">
<template slot-scope="scope"> <template slot-scope="scope">
...@@ -300,7 +305,8 @@ ...@@ -300,7 +305,8 @@
</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">
<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>
...@@ -334,7 +340,8 @@ ...@@ -334,7 +340,8 @@
</form> </form>
</div> </div>
</el-card> </el-card>
</el-row> --> </c-col>
</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> <div class="m-list-btns"></div>
</el-dialog> </el-dialog>
...@@ -348,7 +355,7 @@ import Event from "~/model/Sptsel/Event"; ...@@ -348,7 +355,7 @@ import Event from "~/model/Sptsel/Event";
export default { export default {
inject: ["root"], inject: ["root"],
props: ["model", "codes","isDraftBox"], props: ["model", "codes"],
mixins: [CommonProcess], mixins: [CommonProcess],
data() { data() {
...@@ -392,10 +399,9 @@ export default { ...@@ -392,10 +399,9 @@ export default {
}, },
}; };
}, },
mounted() { mounted() {
if(this.root.tag == 'tohandle'){ this.sourceData = [
this.sourceData = [
{ label: "Incoming", value: "chkinc" }, { label: "Incoming", value: "chkinc" },
{ label: "E-Trade", value: "chkdzt" }, { label: "E-Trade", value: "chkdzt" },
// { label: "Break", value: "chkpen" }, // { label: "Break", value: "chkpen" },
...@@ -405,11 +411,7 @@ export default { ...@@ -405,11 +411,7 @@ export default {
{ label: "网银", value: "chktco" }, { label: "网银", value: "chktco" },
{ label: "归档", value: "chkcan" }, { label: "归档", value: "chkcan" },
{ label: "云平台", value: "chkypt" }, { label: "云平台", value: "chkypt" },
] ];
}
else if(this.root.tag == 'draft'){
this.sourceData = [{ label: "Break", value: "chkpen" }]
}
}, },
computed: { computed: {
chkinc: { chkinc: {
...@@ -476,28 +478,27 @@ this.sourceData = [{ label: "Break", value: "chkpen" }] ...@@ -476,28 +478,27 @@ this.sourceData = [{ label: "Break", value: "chkpen" }]
this.model.chkcan = val ? "t" : ""; this.model.chkcan = val ? "t" : "";
}, },
}, },
sourceModel:{ sourceModel: {
get(){ get() {
let arr = []; let arr = [];
this.sourceData.forEach(element => { this.sourceData.forEach((element) => {
if(this.model[element.value]){ if (this.model[element.value]) {
arr.push(element.value); arr.push(element.value);
} }
}); });
return arr; return arr;
}, },
set(val){ set(val) {
let set = new Set(val); let set = new Set(val);
this.sourceData.forEach(element => { this.sourceData.forEach((element) => {
if(set.has(element.value)){ if (set.has(element.value)) {
this.model[element.value]=true; this.model[element.value] = true;
} } else {
else{ this.model[element.value] = false;
this.model[element.value]=false;
} }
}); });
} },
} },
}, },
methods: { ...Event }, methods: { ...Event },
......
src/views/Business/Sptsel/Sptbrk/index.vue 0 → 100644
<template>
<div class="eContainer">
<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"> -->
<!-- <el-tab-pane :value="tabVal" label="待办任务查询" name="menu"> -->
<c-content>
<m-menu :model="model" :codes="codes" ref="Menu"/>
</c-content>
<!-- </el-tab-pane> -->
<!-- </c-tabs> -->
</el-form>
</div>
</template>
<script>
import Api from "~/service/Api"
import CodeTable from "~/config/CodeTable"
import Sptsel from "~/Model/Sptsel"
import CommonProcess from "~/mixin/CommonProcess.js"
import Pattern from "~/Model/Sptsel/Pattern"
import Utils from "~/utils/index"
import Default from "~/model/Sptsel/Default";
import Check from "~/model/Sptsel/Check";
import Menu from "./Menu"
import Event from "~/model/Sptsel/Event"
export default {
name: 'Sptbrk',
components:{
"m-menu" : Menu,
},
provide() {
return {
root: this
}
},
mixins: [CommonProcess], // 里面包含了Default、Check等的公共处理
computed: {
},
data(){
return {
tabVal: "menu",
trnName:"sptsel",
model:new Sptsel().data,
checkRules: Check,
defaultRules: Default,
pattern: Pattern,
rules:null,
codes:{
flt:CodeTable.flt,
dflg:CodeTable.dflg
},
}
},
methods:{...Event},
mounted:async function(){
console.log("进入sptsel交易");
const that = this;
that.init(that.model).then(res => {
//TODO 处理数据逻辑
that.model = Utils.copyValueFromVO(that.model, res.data)
// that.$refs.Menu.stmData.columns = res.data.sptstm.rows;
})
}
}
</script>
<style>
</style>
src/views/Business/Sptsel/index.vue
...@@ -3,9 +3,9 @@ ...@@ -3,9 +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> --> <c-content>
<m-menu :model="model" :codes="codes" ref="Menu" :isDraftBox="isDraftBox"/> <m-menu :model="model" :codes="codes" ref="Menu" />
<!-- </c-content> --> </c-content>
<!-- </el-tab-pane> --> <!-- </el-tab-pane> -->
<!-- </c-tabs> --> <!-- </c-tabs> -->
</el-form> </el-form>
...@@ -33,7 +33,6 @@ export default { ...@@ -33,7 +33,6 @@ export default {
root: this root: this
} }
}, },
props: ["tag","isDraftBox"],
mixins: [CommonProcess], // 里面包含了Default、Check等的公共处理 mixins: [CommonProcess], // 里面包含了Default、Check等的公共处理
computed: { computed: {
......
src/views/Business/Trnrel/Inftrnps.vue
...@@ -395,7 +395,7 @@ ...@@ -395,7 +395,7 @@
fixed="right" fixed="right"
prop="display" prop="display"
label="操作" label="操作"
width="260px" width="200px"
> >
<template> <template>
<!-- <a :href="`/#/display/${scope.row['10'].toLowerCase()}?trn=${scope.row['1']}`" target="_blank" >显示快照</a>--> <!-- <a :href="`/#/display/${scope.row['10'].toLowerCase()}?trn=${scope.row['1']}`" target="_blank" >显示快照</a>-->
...@@ -406,23 +406,7 @@ ...@@ -406,23 +406,7 @@
style="margin-left: 0" style="margin-left: 0"
size="small" size="small"
type="primary" type="primary"
v-if="this.root.tag === 'tocheck'"
>
复核
</c-button>
<c-button
style="margin-left: 0"
size="small"
type="primary"
v-if="this.root.tag === 'tocheck'"
>
退回修改
</c-button>
<c-button
style="margin-left: 0"
size="small"
type="primary"
v-if="this.root.tag === 'tocheck'"
> >
详情 详情
</c-button> </c-button>
...@@ -430,26 +414,20 @@ ...@@ -430,26 +414,20 @@
style="margin-left: 0" style="margin-left: 0"
size="small" size="small"
type="primary" type="primary"
v-if="this.root.tag === 'finish'"
>
信息显示
</c-button>
<c-button
style="margin-left: 0"
size="small"
type="primary"
v-if="this.root.tag === 'finish'"
> >
交易快照 复核
</c-button> </c-button>
<c-button <c-button
style="margin-left: 0" style="margin-left: 0"
size="small" size="small"
type="primary" type="primary"
v-if="this.root.tag === 'finish'"
> >
冲正 退回
</c-button> </c-button>
</template> </template>
</el-table-column> </el-table-column>
</c-istream-table> </c-istream-table>
...@@ -542,16 +520,16 @@ export default { ...@@ -542,16 +520,16 @@ export default {
// '0 12 "Status" 54 1 tdViewTypeEdit:0 1 RELSTA', // '0 12 "Status" 54 1 tdViewTypeEdit:0 1 RELSTA',
// ], // ],
columns: [ columns: [
'10 1 "交易代码" 0', '10 1 "交易代码" 80',
'11 2 "业务编号" 0', '11 2 "业务编号" 150',
'12 3 "币种" 0', '12 3 "币种" 50',
'13 4 "金额" 0', '13 4 "金额" 70',
'14 5 "创建时间" 0', '14 5 "创建时间" 170',
'9 6 "签名要求" 0', '9 6 "签名要求" 70',
'2 7 "签名状态" 0', '2 7 "签名状态" 70',
'16 8 "经办柜员" 0', '16 8 "经办柜员" 70',
'0 9 "业务状态" 0', '0 9 "业务状态" 70',
'15 10 "业务机构" 0', '15 10 "业务机构" 200',
], ],
data: [], data: [],
}, },
...@@ -573,22 +551,17 @@ export default { ...@@ -573,22 +551,17 @@ export default {
}, },
created: function () {}, created: function () {},
mounted() { mounted() {
if (this.root.tag == "tocheck") {
this.relflgCodes = [ this.relflgCodes = [
{ label: "Correct", value: "C" }, { label: "Correct", value: "C" },
{ label: "Closed", value: "M" },
{ label: "Entered", value: "E" }, { label: "Entered", value: "E" },
{ label: "External", value: "X" }, { label: "External", value: "X" },
{ label: "Picked up", value: "P" }, { label: "Picked up", value: "P" },
{ label: "Rejected", value: "N" }, { label: "Rejected", value: "N" },
{ label: "Waiting", value: "W" }, { 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: {},
}; };
......
src/views/Business/Trnrel/Trnfnd/index.vue 0 → 100644
<template>
<div class="eContainer">
<el-form
:model="model"
:rules="rules"
ref="modelForm"
tokenKey="modelForm"
:validate-on-rule-change="false"
label-width="150px"
size="small"
>
<!-- <el-tabs ref="elment" type="card" @tab-click="tabClick">
<el-tab-pane label="复核夹查询"> -->
<c-content>
<m-inftrnps :model="model" :codes="codes" ref="inftrnps" />
</c-content>
<!-- </el-tab-pane>
</el-tabs> -->
</el-form>
</div>
</template>
<script>
import Api from "~/service/Api";
import CodeTable from "~/config/CodeTable";
import Trnrel from "~/Model/Trnrel";
import CommonProcess from "~/mixin/CommonProcess";
import Pattern from "~/Model/Trnrel/Pattern";
import Default from "~/model/Trnrel/Default";
import Check from "~/model/Trnrel/Check";
import Inftrnps from "./Inftrnps";
import Utils from "~/utils/index";
// import * as poinMessage from '@/util/poin-common/messageManage.js'
import {
TabPane,
Col,
Table,
Form,
FormItem,
Upload,
TableColumn,
Card,
Input,
Button,
Dialog,
Select,
Tabs,
Option,
DatePicker,
Row,
} from "element-ui";
import Event from "~/model/Trnrel/Event";
export default {
name: "Trnfnd",
components: {
"m-inftrnps": Inftrnps,
},
mixins: [CommonProcess], // 里面包含了Default、Check等的公共处理
computed: {},
provide() {
return {
root: this,
};
},
data() {
return {
trnName: "trnrel",
model: new Trnrel().data,
checkRules: Check,
defaultRules: Default,
pattern: Pattern,
rules: null,
codes: {
dflg: CodeTable.dflg,
bchtyp: CodeTable.bchtyp,
usrsort: CodeTable.usrsort,
},
};
},
methods: {},
mounted: async function () {
console.log("进入trnrel交易");
const that = this;
that.init(that.model).then((res) => {
//TODO 处理数据逻辑
if ((res.data.trncorco_relflg = "W")) {
res.data.trncorco_relflg = "R";
}
that.model = Utils.copyValueFromVO(that.model, res.data);
// that.$refs.inftrnps.stmData.columns=res.data.trncorco_trnstm.rows
});
},
};
</script>
<style>
</style>
src/views/Business/Trnrel/index.vue
...@@ -74,7 +74,6 @@ export default { ...@@ -74,7 +74,6 @@ export default {
root: this, root: this,
}; };
}, },
props: ["tag"],
data() { data() {
return { return {
trnName: "trnrel", trnName: "trnrel",
...@@ -96,11 +95,6 @@ export default { ...@@ -96,11 +95,6 @@ export default {
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
......
src/views/TaskList/index.vue
...@@ -3,21 +3,21 @@ ...@@ -3,21 +3,21 @@
<c-tabs :value="tabVal" type="card" @tab-click="tabClick"> <c-tabs :value="tabVal" type="card" @tab-click="tabClick">
<el-tab-pane label="待经办列表" name="sptsel"> <el-tab-pane label="待经办列表" name="sptsel">
<!-- <c-table :columnsConfig="tableColumns" :list="tableData"></c-table> --> <!-- <c-table :columnsConfig="tableColumns" :list="tableData"></c-table> -->
<t-sptsel tag="tohandle" :isDraftBox="false"/> <t-sptsel />
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="待复核列表" name="trnrel"> <el-tab-pane label="待复核列表" name="trnrel">
<t-trnrel tag="tocheck" /> <t-trnrel />
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="已完成列表" name="finishedList"> <el-tab-pane label="已完成列表" name="trnfnd">
<t-trnrel tag="finish" /> <t-trnfnd />
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="待申报列表" name="bopsel"> <el-tab-pane label="待申报列表" name="bopsel">
<t-bopsel /> <t-bopsel />
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="草稿箱" name="draftBox"> <el-tab-pane label="草稿箱" name="sptbrk">
<t-sptsel tag="draft" :isDraftBox="true"/> <t-sptbrk />
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="到期提示" name="expirePrompt"> <el-tab-pane label="到期提示" name="diasel">
<t-diasel/> <t-diasel/>
</el-tab-pane> </el-tab-pane>
</c-tabs> </c-tabs>
...@@ -28,7 +28,9 @@ ...@@ -28,7 +28,9 @@
import Sptsel from "~/views/Business/Sptsel"; import Sptsel from "~/views/Business/Sptsel";
import Sptbrk from "~/views/Business/Sptsel/Sptbrk";
import Trnrel from "~/views/Business/Trnrel"; import Trnrel from "~/views/Business/Trnrel";
import Trnfnd from "~/views/Business/Trnrel/Trnfnd";
import Diasel from "~/views/Business/Diasel"; import Diasel from "~/views/Business/Diasel";
import Bopsel from "~/views/Business/Bopsel"; import Bopsel from "~/views/Business/Bopsel";
...@@ -45,7 +47,9 @@ export default { ...@@ -45,7 +47,9 @@ export default {
}, },
components:{ components:{
"t-sptsel" : Sptsel, "t-sptsel" : Sptsel,
"t-sptbrk" : Sptbrk,
"t-trnrel" : Trnrel, "t-trnrel" : Trnrel,
"t-trnfnd" : Trnfnd,
"t-diasel" : Diasel, "t-diasel" : Diasel,
"t-bopsel" : Bopsel, "t-bopsel" : Bopsel,
}, },
......
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