提交 f1918c91 编写于 作者: 刘英杰's avatar 刘英杰

- 20240927 优化保存

上级 b9aed6a1
流水线 #29564 已通过 ,包含阶段
in 1 minute 和 2 second
......@@ -87,8 +87,11 @@ _# 竞赛管理系统
1. 学生、教师赛事报名
2. 学生、教师成绩申报
3. 学生、教师奖励申请
- 20240927
1. 附件预览》兼容大写文件后缀名
2. 待办、已办、我的全部流程“类别”下拉框该为多选;flow_id传数组。GetAlreadyFlowTaskList、GetMyFlowTaskList、GetFlowTaskList
......
.teamCardExtraText[data-v-240dda80]{font-size:18px;font-weight:600;font-family:宋体;color:#1e93ff}.container[data-v-240dda80]{height:100vh;width:100vw}.container .header[data-v-240dda80]{display:flex;justify-content:center;align-items:center;position:relative;width:100%;height:8%;border-top:5px solid #2d8cf0}.container .header .h_left[data-v-240dda80],.container .header .h_right[data-v-240dda80]{width:20%;height:100%;background-color:#fff}.container .header .h_content[data-v-240dda80]{width:60%;height:100%;display:flex;align-items:center;justify-content:center;background-color:#fff}.container .content[data-v-240dda80]{width:100%;height:92%;display:flex;flex-wrap:wrap;align-content:flex-start;justify-content:center;overflow-y:auto;position:relative}.container .content .tableList[data-v-240dda80]{display:flex;justify-content:center;flex-wrap:wrap;max-width:1200px}.container .content .tableList .container1[data-v-240dda80]{border-collapse:collapse;box-sizing:border-box;width:100%;margin-bottom:20px}.container .content .tableList .container1 .row[data-v-240dda80]{width:100%;height:100%}.container .content .tableList .container1 .colTitle[data-v-240dda80]{text-align:center;width:30%;height:50px}.container .content .tableList .container1 .colContent[data-v-240dda80]{height:50px;text-align:center}.container .content .card[data-v-240dda80]{padding:5px 5px}.container .content .teamInfo[data-v-240dda80]{color:#1e93ff;cursor:pointer}.container .content .text[data-v-240dda80]:hover{transform:scale(1.3)}.container .content .aText[data-v-240dda80]:hover{transform:scale(1.2)}.container .content .Atext[data-v-240dda80]{float:right;margin-bottom:.7vw;margin-top:.7vw;font-size:16px}.container .content .Atext[data-v-240dda80]:hover{transform:scale(1.2)}.carClass[data-v-240dda80]{border-radius:0!important;margin-bottom:20px}.carClass[data-v-240dda80] .ivu-card{display:block;background:#fff;border-radius:0!important;font-size:14px;position:relative;transition:all .2s ease-in-out}
\ No newline at end of file
.teamCardExtraText[data-v-1e79f1c0]{font-size:18px;font-weight:600;font-family:宋体;color:#1e93ff}.container[data-v-1e79f1c0]{height:100vh;width:100vw}.container .header[data-v-1e79f1c0]{display:flex;justify-content:center;align-items:center;position:relative;width:100%;height:8%;border-top:5px solid #2d8cf0}.container .header .h_left[data-v-1e79f1c0],.container .header .h_right[data-v-1e79f1c0]{width:20%;height:100%;background-color:#fff}.container .header .h_content[data-v-1e79f1c0]{width:60%;height:100%;display:flex;align-items:center;justify-content:center;background-color:#fff}.container .content[data-v-1e79f1c0]{width:100%;height:92%;display:flex;flex-wrap:wrap;align-content:flex-start;justify-content:center;overflow-y:auto;position:relative}.container .content .tableList[data-v-1e79f1c0]{display:flex;justify-content:center;flex-wrap:wrap;max-width:1200px}.container .content .tableList .container1[data-v-1e79f1c0]{border-collapse:collapse;box-sizing:border-box;width:100%;margin-bottom:20px}.container .content .tableList .container1 .row[data-v-1e79f1c0]{width:100%;height:100%}.container .content .tableList .container1 .colTitle[data-v-1e79f1c0]{text-align:center;width:30%;height:50px}.container .content .tableList .container1 .colContent[data-v-1e79f1c0]{height:50px;text-align:center}.container .content .card[data-v-1e79f1c0]{padding:5px 5px}.container .content .teamInfo[data-v-1e79f1c0]{color:#1e93ff;cursor:pointer}.container .content .text[data-v-1e79f1c0]:hover{transform:scale(1.3)}.container .content .aText[data-v-1e79f1c0]:hover{transform:scale(1.2)}.container .content .Atext[data-v-1e79f1c0]{float:right;margin-bottom:.7vw;margin-top:.7vw;font-size:16px}.container .content .Atext[data-v-1e79f1c0]:hover{transform:scale(1.2)}.carClass[data-v-1e79f1c0]{border-radius:0!important;margin-bottom:20px}.carClass[data-v-1e79f1c0] .ivu-card{display:block;background:#fff;border-radius:0!important;font-size:14px;position:relative;transition:all .2s ease-in-out}
\ No newline at end of file
<!DOCTYPE html><html><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=0"><link rel="shortcut icon" href=favicon.ico><title>竞赛管理</title><link href=css/chunk-vendors~253ae210.71a233fb.css rel=stylesheet><link href=css/chunk-vendors~f9ca8911.6d189742.css rel=stylesheet><link href=css/app~748942c6.a9059f54.css rel=stylesheet></head><body><script src=/a/manager/identify/identify.js></script><noscript><strong>请开启 JavaScript 功能来使用 竞赛管理。</strong></noscript><div id=app></div><script src=js/chunk-vendors~253ae210.c21551cb.js></script><script src=js/chunk-vendors~db300d2f.e266578a.js></script><script src=js/chunk-vendors~690b702c.00a2f77e.js></script><script src=js/chunk-vendors~f9ca8911.781b57dd.js></script><script src=js/app~748942c6.ca4bb24c.js></script></body></html>
\ No newline at end of file
<!DOCTYPE html><html><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=0"><link rel="shortcut icon" href=favicon.ico><title>竞赛管理</title><link href=css/chunk-vendors~253ae210.71a233fb.css rel=stylesheet><link href=css/chunk-vendors~f9ca8911.6d189742.css rel=stylesheet><link href=css/app~748942c6.c0ef6bde.css rel=stylesheet></head><body><script src=/a/manager/identify/identify.js></script><noscript><strong>请开启 JavaScript 功能来使用 竞赛管理。</strong></noscript><div id=app></div><script src=js/chunk-vendors~253ae210.c21551cb.js></script><script src=js/chunk-vendors~db300d2f.e266578a.js></script><script src=js/chunk-vendors~690b702c.00a2f77e.js></script><script src=js/chunk-vendors~f9ca8911.5453d208.js></script><script src=js/app~748942c6.c1fa6848.js></script></body></html>
\ No newline at end of file
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
文件已删除
export interface FlowRequests {
flow_id?: string;
flow_id?: string[];
/** 操作类型 */
action_type?: string;
/** 状态 */
......
......@@ -30,8 +30,6 @@
:placeholder="'请选择'+item.name"
@on-change="selectChange($event,item.id)"
>
<template #prefix>
<div>
{{ item.name }}
......@@ -43,7 +41,25 @@
:value="it.value">{{ it.label }}
</Option>
</Select>
<Select
v-else-if="item.type == 'selectMultiple'"
v-model="searchCondObj[item.id]"
:clearable="!item.clearable"
:placeholder="'请选择'+item.name"
@on-change="selectChange($event,item.id)"
:multiple="true"
>
<template #prefix>
<div>
{{ item.name }}
</div>
</template>
<Option
v-for="it in item.optList"
:key="it.value"
:value="it.value">{{ it.label }}
</Option>
</Select>
<DatePicker
v-else-if="item.type == 'daterange'"
v-model="searchCondObj[item['id']]"
......
......@@ -1556,10 +1556,12 @@
this.fileType = e
this.viewFileUpdataKeys++
}
if (e.suffix === '.jpg' || e.suffix === '.jpeg' || e.suffix === '.png' || e.suffix === '.pdf') {
if (e.suffix === '.jpg' || e.suffix === '.jpeg' || e.suffix === '.png' || e.suffix === '.pdf' || e.suffix === '.JPG' || e.suffix === '.JPEG' || e.suffix === '.PNG' || e.suffix === '.PDF'
) {
fun('image', e)
} else if (e.suffix === '.doc' || e.suffix === '.docx' || e.suffix === '.xls'
|| e.suffix === '.xlsx') {
|| e.suffix === '.xlsx' || e.suffix === '.DOC' || e.suffix === '.DOCX' || e.suffix === '.XLS'
|| e.suffix === '.XLSX') {
fun('office', e)
}
},
......@@ -1570,10 +1572,12 @@
this.fileType = e
this.drawerPreview = true
}
if (e.suffix === '.jpg' || e.suffix === '.jpeg' || e.suffix === '.png' || e.suffix === '.pdf') {
if (e.suffix === '.jpg' || e.suffix === '.jpeg' || e.suffix === '.png' || e.suffix === '.pdf' || e.suffix === '.JPG' || e.suffix === '.JPEG' || e.suffix === '.PNG' || e.suffix === '.PDF'
) {
fun('image', e)
} else if (e.suffix === '.doc' || e.suffix === '.docx' || e.suffix === '.xls'
|| e.suffix === '.xlsx') {
|| e.suffix === '.xlsx' || e.suffix === '.DOC' || e.suffix === '.DOCX' || e.suffix === '.XLS'
|| e.suffix === '.XLSX') {
fun('office', e)
}
},
......
......@@ -75,6 +75,7 @@
import * as zeroApi from '@/api/controller/index'
import * as hooks from "@/hook";
import * as asc from "@api/controller/index.d.ts";
import _ from "lodash";
export default {
......@@ -152,7 +153,7 @@
{
id: 'flow_id',
name: '流程类别',
type: 'select',
type: 'selectMultiple',
show: true,
optList: [
{
......@@ -168,7 +169,7 @@
{
id: 'rewardType',
name: '奖励类别',
type: 'select',
type: 'selectMultiple',
show: true,
optList: [
{
......@@ -181,7 +182,6 @@
},
]
},
{
id: 'way',
name: '竞赛形式',
......@@ -312,18 +312,7 @@
show: true,
minWidth: 150,
},
{
title: '流程状态',
slot: 'status',
show: true,
minWidth: 150,
},
{
title: '操作类型',
slot: 'action_type',
show: true,
minWidth: 150,
},
{
title: '当前节点名称',
key: 'current_node_name',
......@@ -346,7 +335,6 @@
{
title: '发起人工号',
key: 'starter',
show: true,
minWidth: 150,
},
......@@ -357,6 +345,18 @@
show: true,
minWidth: 150,
},
{
title: '流程状态',
slot: 'status',
show: true,
minWidth: 150,
},
{
title: '操作类型',
slot: 'action_type',
show: true,
minWidth: 150,
},
{
title: '发起时间',
key: 'start_time',
......@@ -417,7 +417,8 @@
// 师生奖励三项t
"/flow-awaitDoneList-rewardForTeachersAndStudents": () => {
this.initSearchCondition()
this.init.flow_id1 = 107
let info = this.$route.query.transferParams ? JSON.parse(this.$route.query.transferParams) : ''
this.init.flow_id1 = info.flow_id ? info.flow_id : [106, 107];
this.deleteSearchCondition('flow_id')
this.deleteSearchCondition('declarationType')
this.deleteSearchCondition('eventApplication')
......@@ -466,16 +467,18 @@
// 获奖材料三项
"/flow-awaitDoneList-Certificate": () => {
this.initSearchCondition()
this.init.flow_id1 = 103
this.deleteSearchCondition('flow_id')
this.deleteSearchCondition('rewardType')
this.deleteSearchCondition('eventApplication')
let info = this.$route.query.transferParams ? JSON.parse(this.$route.query.transferParams) : ''
this.init.flow_id1 = info.flow_id ? info.flow_id : [103, 111]
this.deleteSearchCondition('flow_id');
this.deleteSearchCondition('rewardType');
this.deleteSearchCondition('eventApplication');
this.$refs.search.searchCondObj.declarationType = this.init.flow_id1
},
// 赛事审批三项
"/flow-awaitDoneList": () => {
this.initSearchCondition()
this.init.flow_id1 = 102
let info = this.$route.query.transferParams ? JSON.parse(this.$route.query.transferParams) : ''
this.init.flow_id1 = info.flow_id ? info.flow_id : [102, 110]
this.deleteSearchCondition('rewardType');
this.deleteSearchCondition('declarationType');
this.deleteSearchCondition('eventApplication');
......@@ -484,8 +487,8 @@
"/flow-awaitDoneList-eventCatalogue": () => {
//赛事申请三项
this.initSearchCondition()
if (!this.$route.query.transferParams) this.init.flow_id1 = 101
let info = this.$route.query.transferParams ? JSON.parse(this.$route.query.transferParams) : ''
this.init.flow_id1 = info.flow_id ? info.flow_id : [101, 112, 113, 114]
this.deleteSearchCondition('flow_id')
this.deleteSearchCondition('rewardType')
this.deleteSearchCondition('declarationType')
......@@ -496,7 +499,8 @@
// 师生奖励三项t
"/flow-awaitDoneList-rewardForTeachersAndStudents": () => {
this.initSearchCondition()
this.init.flow_id1 = 107
this.init.flow_id1 = [106, 107]
this.deleteSearchCondition('flow_id')
this.deleteSearchCondition('declarationType')
this.deleteSearchCondition('eventApplication')
......@@ -546,7 +550,7 @@
// 获奖材料三项
"/flow-awaitDoneList-Certificate": () => {
this.initSearchCondition()
this.init.flow_id1 = 103
this.init.flow_id1 = [103, 111]
this.deleteSearchCondition('flow_id')
this.deleteSearchCondition('rewardType')
this.deleteSearchCondition('eventApplication')
......@@ -555,7 +559,8 @@
// 赛事审批三项
"/flow-awaitDoneList": () => {
this.initSearchCondition()
this.init.flow_id1 = 102
this.init.flow_id1 = [102, 110]
this.deleteSearchCondition('rewardType')
this.deleteSearchCondition('declarationType')
this.deleteSearchCondition('eventApplication')
......@@ -564,8 +569,7 @@
"/flow-awaitDoneList-eventCatalogue": () => {
//赛事申请三项
this.initSearchCondition()
this.init.flow_id1 = 101
this.init.flow_id1 = [101, 112, 113, 114]
this.deleteSearchCondition('flow_id')
this.deleteSearchCondition('rewardType')
this.deleteSearchCondition('declarationType')
......@@ -604,10 +608,9 @@
},
// 查询条件初始化
mounted() {
this.routerCarryConditionQuery();
//基于路由路径 获取flowid
this.strategy[this.$route.path]()
this.strategy[this.$route.path]();
this.GetFlowTaskList()
hook.storageAddEventListener(async () => {
await this.GetFlowTaskList()
......@@ -739,7 +742,7 @@
{
id: 'flow_id',
name: '流程类别',
type: 'select',
type: 'selectMultiple',
show: true,
optList: [
{
......@@ -755,7 +758,7 @@
{
id: 'rewardType',
name: '奖励类别',
type: 'select',
type: 'selectMultiple',
show: true,
optList: [
{
......@@ -771,7 +774,7 @@
{
id: 'eventApplication',
name: '申请类别',
type: 'select',
type: 'selectMultiple',
show: true,
clearable: true,
optList: [
......@@ -796,7 +799,7 @@
{
id: 'declarationType',
name: '申报类别',
type: 'select',
type: 'selectMultiple',
show: true,
optList: [
{
......@@ -850,21 +853,25 @@
// 搜索
console.log("🚀val🚀🚀,", val)
if (val.rewardType) {
// 奖励申报
this.init = {
...this.init, ...val, flow_id: val.rewardType
}
this.init.flow_id1 = this.init.flow_id
} else if (val.declarationType) {
// 成绩申报
this.init = {
...this.init, ...val, flow_id: val.declarationType
}
this.init.flow_id1 = this.init.flow_id
} else if (val.eventApplication) {
// 申请类别
this.init = {
...this.init, ...val, flow_id: val.eventApplication
}
this.init.flow_id1 = this.init.flow_id
} else if (val.flow_id) {
// 流程类别
this.init = {
...this.init, ...val, flow_id: val.flow_id
}
......
......@@ -229,7 +229,7 @@
{
id: 'flow_id',
name: '流程类别',
type: 'select',
type: 'selectMultiple',
show: true,
optList: [
{
......@@ -245,7 +245,7 @@
{
id: 'rewardType',
name: '奖励类别',
type: 'select',
type: 'selectMultiple',
show: true,
optList: [
{
......@@ -263,7 +263,7 @@
name: '申请类别',
clearable: true,
type: 'select',
type: 'selectMultiple',
show: true,
optList: [
{
......@@ -411,20 +411,7 @@
show: true,
minWidth: 150,
},
{
title: '流程状态',
slot: 'status',
show: true,
minWidth: 150,
},
{
title: '操作类型',
slot: 'action_type',
show: true,
minWidth: 150,
},
{
title: '当前节点名称',
key: 'current_node_name',
......@@ -459,6 +446,19 @@
show: true,
minWidth: 150,
},
{
title: '流程状态',
slot: 'status',
show: true,
minWidth: 150,
},
{
title: '操作类型',
slot: 'action_type',
show: true,
minWidth: 150,
},
{
title: '发起时间',
key: 'start_time',
......@@ -541,7 +541,9 @@
"/flow-processedList-rewardForTeachersAndStudents": () => {
this.initSearchCondition()
this.init.flow_id1 = 107
let info = this.$route.query.transferParams ? JSON.parse(this.$route.query.transferParams) : ''
this.init.flow_id1 = info.flow_id ? info.flow_id : [106, 107];
this.deleteSearchCondition('flow_id')
this.deleteSearchCondition('declarationType')
this.deleteSearchCondition('eventApplication')
......@@ -599,7 +601,8 @@
"/flow-processedList-Certificate": () => {
this.initSearchCondition()
this.init.flow_id1 = 103
let info = this.$route.query.transferParams ? JSON.parse(this.$route.query.transferParams) : ''
this.init.flow_id1 = info.flow_id ? info.flow_id : [103, 111];
this.deleteSearchCondition('flow_id')
this.deleteSearchCondition('rewardType')
this.deleteSearchCondition('eventApplication')
......@@ -610,7 +613,8 @@
"/flow-processedList": () => {
this.initSearchCondition()
this.init.flow_id1 = 102
let info = this.$route.query.transferParams ? JSON.parse(this.$route.query.transferParams) : ''
this.init.flow_id1 = info.flow_id ? info.flow_id : [102, 110];
this.deleteSearchCondition('rewardType')
this.deleteSearchCondition('declarationType')
this.deleteSearchCondition('eventApplication')
......@@ -619,7 +623,7 @@
},
"/flow-processedList-eventCatalogue": () => {
this.initSearchCondition()
if (!this.$route.query.transferParams) this.init.flow_id1 = 101
if (!this.$route.query.transferParams) this.init.flow_id1 = [101, 112, 113, 114]
this.deleteSearchCondition('rewardType')
this.deleteSearchCondition('declarationType')
......@@ -633,7 +637,7 @@
"/flow-processedList-rewardForTeachersAndStudents": () => {
this.initSearchCondition()
this.init.flow_id1 = 107
this.init.flow_id1 = [106, 107]
this.deleteSearchCondition('flow_id')
this.deleteSearchCondition('declarationType')
this.deleteSearchCondition('eventApplication')
......@@ -691,7 +695,7 @@
"/flow-processedList-Certificate": () => {
this.initSearchCondition()
this.init.flow_id1 = 103
this.init.flow_id1 = [103, 111]
this.deleteSearchCondition('flow_id')
this.deleteSearchCondition('rewardType')
this.deleteSearchCondition('eventApplication')
......@@ -702,7 +706,7 @@
"/flow-processedList": () => {
this.initSearchCondition()
this.init.flow_id1 = 102
this.init.flow_id1 = [102, 110]
this.deleteSearchCondition('rewardType')
this.deleteSearchCondition('declarationType')
this.deleteSearchCondition('eventApplication')
......@@ -710,8 +714,7 @@
},
"/flow-processedList-eventCatalogue": () => {
this.initSearchCondition()
this.init.flow_id1 = 101
this.init.flow_id1 = [101, 112, 113, 114]
this.deleteSearchCondition('rewardType')
this.deleteSearchCondition('declarationType')
this.deleteSearchCondition('flow_id')
......@@ -800,7 +803,7 @@
{
id: 'flow_id',
name: '流程类别',
type: 'select',
type: 'selectMultiple',
show: true,
optList: [
{
......@@ -816,7 +819,7 @@
{
id: 'rewardType',
name: '奖励类别',
type: 'select',
type: 'selectMultiple',
show: true,
optList: [
{
......@@ -834,7 +837,7 @@
name: '申请类别',
clearable: true,
type: 'select',
type: 'selectMultiple',
show: true,
optList: [
{
......@@ -858,7 +861,7 @@
{
id: 'declarationType',
name: '申报类别',
type: 'select',
type: 'selectMultiple',
show: true,
optList: [
{
......@@ -1103,7 +1106,7 @@
{
id: 'flow_id',
name: '流程类别',
type: 'select',
type: 'selectMultiple',
show: true,
optList: [
{
......@@ -1119,7 +1122,7 @@
{
id: 'rewardType',
name: '奖励类别',
type: 'select',
type: 'selectMultiple',
show: true,
optList: [
{
......@@ -1135,7 +1138,7 @@
{
id: 'eventApplication',
name: '申请类别',
type: 'select',
type: 'selectMultiple',
clearable: true,
show: true,
......@@ -1161,7 +1164,7 @@
{
id: 'declarationType',
name: '申报类别',
type: 'select',
type: 'selectMultiple',
show: true,
optList: [
{
......
......@@ -613,18 +613,7 @@
show: true,
minWidth: 150,
},
{
title: '流程状态',
slot: 'status',
show: true,
minWidth: 150,
},
{
title: '操作类型',
slot: 'action_type',
show: true,
minWidth: 150,
},
{
title: '当前节点名称',
key: 'current_node_name',
......@@ -657,7 +646,18 @@
{
title: '发起人姓名',
key: 'starter_name',
show: true,
minWidth: 150,
},
{
title: '流程状态',
slot: 'status',
show: true,
minWidth: 150,
},
{
title: '操作类型',
slot: 'action_type',
show: true,
minWidth: 150,
},
......@@ -719,8 +719,11 @@
// 师生奖励三项t
"/flow-myFlowList-rewardForTeachersAndStudents": () => {
this.initSearchCondition()
this.init.flow_id1 = 107;
this.init.rewardType = 107;
let info = this.$route.query.transferParams ? JSON.parse(this.$route.query.transferParams) : ''
this.init.flow_id1 = info.flow_id ? info.flow_id : [106, 107];
;
this.init.rewardType = [106, 107];
this.deleteSearchCondition('flow_id')
this.deleteSearchCondition('declarationType')
this.deleteSearchCondition('eventApplication')
......@@ -768,7 +771,8 @@
"/flow-myFlowList-Certificate": () => {
this.initSearchCondition()
this.init.flow_id1 = 103
let info = this.$route.query.transferParams ? JSON.parse(this.$route.query.transferParams) : ''
this.init.flow_id1 = info.flow_id ? info.flow_id : [103, 111];
this.deleteSearchCondition('rewardType')
this.deleteSearchCondition('flow_id')
this.deleteSearchCondition('eventApplication')
......@@ -777,7 +781,8 @@
// 赛事审批三项
"/flow-myFlowList": () => {
this.initSearchCondition()
this.init.flow_id1 = 102
let info = this.$route.query.transferParams ? JSON.parse(this.$route.query.transferParams) : ''
this.init.flow_id1 = info.flow_id ? info.flow_id : [102, 110];
this.deleteSearchCondition('rewardType')
this.deleteSearchCondition('declarationType')
this.deleteSearchCondition('eventApplication')
......@@ -786,7 +791,8 @@
"/flow-myFlowList-eventCatalogue": () => {
//赛事申请三项
this.initSearchCondition()
if (!this.$route.query.transferParams) this.init.flow_id1 = 101
let info = this.$route.query.transferParams ? JSON.parse(this.$route.query.transferParams) : ''
this.init.flow_id1 = info.flow_id ? info.flow_id : [101, 112, 113, 114];
this.deleteSearchCondition('flow_id')
this.deleteSearchCondition('rewardType')
this.deleteSearchCondition('declarationType')
......@@ -797,8 +803,8 @@
// 师生奖励三项t
"/flow-myFlowList-rewardForTeachersAndStudents": () => {
this.initSearchCondition()
this.init.flow_id1 = 107;
this.init.rewardType = 107;
this.init.flow_id1 = [106, 107];
this.init.rewardType = [106, 107];
this.deleteSearchCondition('flow_id')
this.deleteSearchCondition('declarationType')
this.deleteSearchCondition('eventApplication')
......@@ -846,7 +852,7 @@
"/flow-myFlowList-Certificate": () => {
this.initSearchCondition()
this.init.flow_id1 = 103
this.init.flow_id1 = [103, 111]
this.deleteSearchCondition('rewardType')
this.deleteSearchCondition('flow_id')
this.deleteSearchCondition('eventApplication')
......@@ -856,7 +862,7 @@
// 赛事审批三项
"/flow-myFlowList": () => {
this.initSearchCondition()
this.init.flow_id1 = 102
this.init.flow_id1 = [102, 110]
this.deleteSearchCondition('rewardType')
this.deleteSearchCondition('declarationType')
this.deleteSearchCondition('eventApplication')
......@@ -865,7 +871,7 @@
"/flow-myFlowList-eventCatalogue": () => {
//赛事申请三项
this.initSearchCondition()
this.init.flow_id1 = 101
this.init.flow_id1 = [101, 112, 113, 114]
this.deleteSearchCondition('flow_id')
this.deleteSearchCondition('rewardType')
this.deleteSearchCondition('declarationType')
......@@ -1154,7 +1160,7 @@
{
id: 'flow_id',
name: '流程类别',
type: 'select',
type: 'selectMultiple',
show: true,
optList: [
{
......@@ -1170,7 +1176,7 @@
{
id: 'rewardType',
name: '奖励类别',
type: 'select',
type: 'selectMultiple',
show: true,
optList: [
{
......@@ -1186,7 +1192,7 @@
{
id: 'eventApplication',
name: '申请类别',
type: 'select',
type: 'selectMultiple',
show: true,
clearable: true,
optList: [
......@@ -1211,7 +1217,7 @@
{
id: 'declarationType',
name: '申报类别',
type: 'select',
type: 'selectMultiple',
show: true,
optList: [
{
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册 或