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

- 20240529

    - 成绩申报流程审批三项(待办,已办,我的)去除“流程类型”下拉框;
    - 成绩申报流程审批三项(待办,已办,我的)可查询“学生”或“教师”赛事申报;
    - 成绩申报审批和提交表单区分“学生申报”和“教师申报”;
    - 师生奖励”详情“和”表单填写“状态为审批通过才能查看”成员金额“;
    - 师生奖励成员初始化有奖金则无需通过比例计算成员奖金;
    - 师生奖励审批状态为“审批通过”才显示成员奖金;
    - 师生奖励填写团队“可分配奖金”自动基于成员比例计算成员奖励金额;
    - 师生奖励团队成员奖励金额保留两位小数点;
上级 9c1e2947
流水线 #26405 已失败 ,包含阶段
in 9 second
...@@ -3,10 +3,9 @@ ...@@ -3,10 +3,9 @@
- 更新日志 - 更新日志
- 20240517 - 20240517
- 系统角色切换; - 系统角色切换;
- 教师奖励和学生奖励合并成”师生奖励“ - 教师奖励和学生奖励合并成”师生奖励“;
- 学生补助和教师工作量和成绩申报合并成 “成绩申报“ - 学生补助和教师工作量和成绩申报合并成 “成绩申报“;
- ”师生奖励“和“成绩申报“ 表单界面优化 - ”师生奖励“和“成绩申报“ 表单界面优化;
- 20240520 - 20240520
- 放开师生奖励提交表单按钮; - 放开师生奖励提交表单按钮;
- 成绩申报和师生奖励详情更新团队数据字段; - 成绩申报和师生奖励详情更新团队数据字段;
...@@ -15,3 +14,12 @@ ...@@ -15,3 +14,12 @@
- 审批流程缩减为三种,赛事审批、赛事申报、师生奖励; - 审批流程缩减为三种,赛事审批、赛事申报、师生奖励;
- 教师奖励和学生奖励融合为师生奖励流程;通过select查询师生奖励类型; - 教师奖励和学生奖励融合为师生奖励流程;通过select查询师生奖励类型;
- 放开师生奖励表单“提交”功能; - 放开师生奖励表单“提交”功能;
- 20240529
- 成绩申报流程审批三项(待办,已办,我的)去除“流程类型”下拉框;
- 成绩申报流程审批三项(待办,已办,我的)可查询“学生”或“教师”赛事申报;
- 成绩申报审批和提交表单区分“学生申报”和“教师申报”;
- 师生奖励”详情“和”表单填写“状态为审批通过才能查看”成员金额“;
- 师生奖励成员初始化有奖金则无需通过比例计算成员奖金;
- 师生奖励审批状态为“审批通过”才显示成员奖金;
- 师生奖励填写团队“可分配奖金”自动基于成员比例计算成员奖励金额;
- 师生奖励团队成员奖励金额保留两位小数点;
.carClass[data-v-138b81d2]{border-radius:0!important;margin-bottom:20px}.carClass[data-v-138b81d2] .ivu-card{display:block;background:#fff;border-radius:0!important;font-size:14px;position:relative;transition:all .2s ease-in-out}[data-v-138b81d2] .ivu-select-dropdown{width:inherit;max-height:600px;overflow:auto;margin:5px 0;padding:5px 0;background-color:#fff;box-sizing:border-box;border-radius:4px;box-shadow:0 1px 6px rgba(0,0,0,.2);position:absolute;z-index:900}.filelist[data-v-138b81d2]:hover{color:#1e93ff;background-color:#f7f7f7}.fileddelete[data-v-138b81d2]:hover{color:red;transform:scale(1.5)}.teamCardExtraText[data-v-138b81d2]{font-size:18px;font-weight:600;font-family:宋体;color:#1e93ff}.Atext[data-v-138b81d2]{margin-bottom:.7vw;margin-top:.7vw;font-size:16px;position:absolute}.Atext[data-v-138b81d2]:hover{transform:scale(1.2)}.container[data-v-138b81d2]{width:100%;min-height:687px;height:auto;align-content:center;overflow-y:auto}.container[data-v-138b81d2],.tableList[data-v-14e41c83]{display:flex;justify-content:center;flex-wrap:wrap}.tableList .container1[data-v-14e41c83]{border-collapse:collapse}.tableList .container1 .row[data-v-14e41c83]{width:100%;height:100%}.tableList .container1 .colTitle[data-v-14e41c83]{text-align:center;width:200px;height:50px}.tableList .container1 .colContent[data-v-14e41c83]{width:500px;height:50px;text-align:center}.Atext[data-v-14e41c83]{margin-bottom:.7vw;margin-top:.7vw;font-size:16px}.teamCardExtraText[data-v-14e41c83]{font-size:18px;font-weight:600;font-family:宋体;color:#1e93ff}
\ No newline at end of file
.carClass[data-v-04ab3c11]{border-radius:0!important;margin-bottom:20px}.carClass[data-v-04ab3c11] .ivu-card{display:block;background:#fff;border-radius:0!important;font-size:14px;position:relative;transition:all .2s ease-in-out}[data-v-04ab3c11] .ivu-select-dropdown{width:inherit;max-height:600px;overflow:auto;margin:5px 0;padding:5px 0;background-color:#fff;box-sizing:border-box;border-radius:4px;box-shadow:0 1px 6px rgba(0,0,0,.2);position:absolute;z-index:900}.filelist[data-v-04ab3c11]:hover{color:#1e93ff;background-color:#f7f7f7}.fileddelete[data-v-04ab3c11]:hover{color:red;transform:scale(1.5)}.teamCardExtraText[data-v-04ab3c11]{font-size:18px;font-weight:600;font-family:宋体;color:#1e93ff}.Atext[data-v-04ab3c11]{margin-bottom:.7vw;margin-top:.7vw;font-size:16px;position:absolute}.Atext[data-v-04ab3c11]:hover{transform:scale(1.2)}.container[data-v-04ab3c11]{width:100%;min-height:687px;height:auto;align-content:center;overflow-y:auto}.container[data-v-04ab3c11],.tableList[data-v-047c10e4]{display:flex;justify-content:center;flex-wrap:wrap}.tableList .container1[data-v-047c10e4]{border-collapse:collapse}.tableList .container1 .row[data-v-047c10e4]{width:100%;height:100%}.tableList .container1 .colTitle[data-v-047c10e4]{text-align:center;width:200px;height:50px}.tableList .container1 .colContent[data-v-047c10e4]{width:500px;height:50px;text-align:center}.Atext[data-v-047c10e4]{margin-bottom:.7vw;margin-top:.7vw;font-size:16px}.teamCardExtraText[data-v-047c10e4]{font-size:18px;font-weight:600;font-family:宋体;color:#1e93ff}
\ No newline at end of file
.carClass[data-v-17df25da]{border-radius:0!important;margin-bottom:20px}.carClass[data-v-17df25da] .ivu-card{display:block;background:#fff;border-radius:0!important;font-size:14px;position:relative;transition:all .2s ease-in-out}[data-v-17df25da] .ivu-select-dropdown{width:inherit;max-height:600px;overflow:auto;margin:5px 0;padding:5px 0;background-color:#fff;box-sizing:border-box;border-radius:4px;box-shadow:0 1px 6px rgba(0,0,0,.2);position:absolute;z-index:900}.filelist[data-v-17df25da]:hover{color:#1e93ff;background-color:#f7f7f7}.fileddelete[data-v-17df25da]:hover{color:red;transform:scale(1.5)}.teamCardExtraText[data-v-17df25da]{font-size:18px;font-weight:600;font-family:宋体;color:#1e93ff}.Atext[data-v-17df25da]{margin-bottom:.7vw;margin-top:.7vw;font-size:16px;position:absolute}.Atext[data-v-17df25da]:hover{transform:scale(1.2)}.container[data-v-17df25da]{width:100%;min-height:687px;height:auto;align-content:center;overflow-y:auto}.container[data-v-17df25da],.tableList[data-v-34f51df7]{display:flex;justify-content:center;flex-wrap:wrap}.tableList .container1[data-v-34f51df7]{border-collapse:collapse}.tableList .container1 .row[data-v-34f51df7]{width:100%;height:100%}.tableList .container1 .colTitle[data-v-34f51df7]{text-align:center;width:200px;height:50px}.tableList .container1 .colContent[data-v-34f51df7]{width:500px;height:50px;text-align:center}.Atext[data-v-34f51df7]{margin-bottom:.7vw;margin-top:.7vw;font-size:16px}.teamCardExtraText[data-v-34f51df7]{font-size:18px;font-weight:600;font-family:宋体;color:#1e93ff} .carClass[data-v-8c48577a]{border-radius:0!important;margin-bottom:20px}.carClass[data-v-8c48577a] .ivu-card{display:block;background:#fff;border-radius:0!important;font-size:14px;position:relative;transition:all .2s ease-in-out}[data-v-8c48577a] .ivu-select-dropdown{width:inherit;max-height:600px;overflow:auto;margin:5px 0;padding:5px 0;background-color:#fff;box-sizing:border-box;border-radius:4px;box-shadow:0 1px 6px rgba(0,0,0,.2);position:absolute;z-index:900}.filelist[data-v-8c48577a]:hover{color:#1e93ff;background-color:#f7f7f7}.fileddelete[data-v-8c48577a]:hover{color:red;transform:scale(1.5)}.teamCardExtraText[data-v-8c48577a]{font-size:18px;font-weight:600;font-family:宋体;color:#1e93ff}.Atext[data-v-8c48577a]{margin-bottom:.7vw;margin-top:.7vw;font-size:16px;position:absolute}.Atext[data-v-8c48577a]:hover{transform:scale(1.2)}.container[data-v-8c48577a]{width:100%;min-height:687px;height:auto;align-content:center;overflow-y:auto}.container[data-v-8c48577a],.tableList[data-v-784d685d]{display:flex;justify-content:center;flex-wrap:wrap}.tableList .container1[data-v-784d685d]{border-collapse:collapse}.tableList .container1 .row[data-v-784d685d]{width:100%;height:100%}.tableList .container1 .colTitle[data-v-784d685d]{text-align:center;width:200px;height:50px}.tableList .container1 .colContent[data-v-784d685d]{width:500px;height:50px;text-align:center}.Atext[data-v-784d685d]{margin-bottom:.7vw;margin-top:.7vw;font-size:16px}.teamCardExtraText[data-v-784d685d]{font-size:18px;font-weight:600;font-family:宋体;color:#1e93ff}
\ No newline at end of file \ 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.064c214c.css rel=stylesheet><link href=css/app.b2432e52.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.66401d3f.js></script><script src=js/app.661dbbd3.js></script></body></html> <!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.064c214c.css rel=stylesheet><link href=css/app.341d7a69.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.8b929078.js></script><script src=js/app.25f1d9e8.js></script></body></html>
\ No newline at end of file \ No newline at end of file
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
文件已添加
import { type AxiosRequestConfig } from "axios";
/**
* 获取所有流程个数
* /api/FlowView/api/FlowView/GetFlowListCount
*/
export declare function getApiFlowViewApiFlowViewGetFlowListCount(config?: AxiosRequestConfig): import("axios").AxiosPromise<{
code: number;
status: string;
msg: string;
msg_detail: string;
response: {
sign_wait_count: number;
sign_already_count: number;
sign_me_count: number;
certificate_wait_count: number;
certificate_already_count: number;
certificate_me_count: number;
bonus_wait_count: number;
bonus_already_count: number;
bonus_me_count: number;
};
}>;
import request from "@/plugins/request";
/**
* 获取所有流程个数
* /api/FlowView/api/FlowView/GetFlowListCount
*/
export function getApiFlowViewApiFlowViewGetFlowListCount(config) {
return request.get(`/api/FlowView/api/FlowView/GetFlowListCount`, config);
}
...@@ -6,3 +6,4 @@ export * from "./getApiFlowViewApiFlowViewGetFlowInfo"; ...@@ -6,3 +6,4 @@ export * from "./getApiFlowViewApiFlowViewGetFlowInfo";
export * from "./getApiFlowViewApiFlowFlowInit"; export * from "./getApiFlowViewApiFlowFlowInit";
export * from "./getApiFlowViewApiFlowGetFlowIdSelect"; export * from "./getApiFlowViewApiFlowGetFlowIdSelect";
export * from "./getApiFlowViewApiFlowViewGetFlowLogList"; export * from "./getApiFlowViewApiFlowViewGetFlowLogList";
export * from "./getApiFlowViewApiFlowViewGetFlowListCount";
...@@ -6,3 +6,4 @@ export * from "./getApiFlowViewApiFlowViewGetFlowInfo"; ...@@ -6,3 +6,4 @@ export * from "./getApiFlowViewApiFlowViewGetFlowInfo";
export * from "./getApiFlowViewApiFlowFlowInit"; export * from "./getApiFlowViewApiFlowFlowInit";
export * from "./getApiFlowViewApiFlowGetFlowIdSelect"; export * from "./getApiFlowViewApiFlowGetFlowIdSelect";
export * from "./getApiFlowViewApiFlowViewGetFlowLogList"; export * from "./getApiFlowViewApiFlowViewGetFlowLogList";
export * from "./getApiFlowViewApiFlowViewGetFlowListCount";
export interface FlowCountResponses {
/** 报名审批待办 */
sign_wait_count?: number;
/** 报名审批已办 */
sign_already_count?: number;
/** 报名审批我的 */
sign_me_count?: number;
/** 成绩审批待办 */
certificate_wait_count?: number;
/** 成绩审批已办 */
certificate_already_count?: number;
/** 成绩审批我的 */
certificate_me_count?: number;
/** 奖励审批待办 */
bonus_wait_count?: number;
/** 奖励审批已办 */
bonus_already_count?: number;
/** 奖励审批我的 */
bonus_me_count?: number;
}
import { type FlowCountResponses } from "../../interface";
export interface FlowCountResponsesMessageModel {
code?: number;
status?: string;
msg?: string;
msg_detail?: string;
response?: FlowCountResponses;
}
...@@ -3,6 +3,8 @@ export interface TeamMembersModel { ...@@ -3,6 +3,8 @@ export interface TeamMembersModel {
teammembersid?: string; teammembersid?: string;
/** 奖金 */ /** 奖金 */
bonus?: number; bonus?: number;
/** 奖金比例 */
bonus_ratio?: number;
/** 学生类型 */ /** 学生类型 */
subsidytypeid?: string; subsidytypeid?: string;
/** 补贴天数 */ /** 补贴天数 */
......
...@@ -35,6 +35,8 @@ export * from "./apiTypes/ConfigRequests"; ...@@ -35,6 +35,8 @@ export * from "./apiTypes/ConfigRequests";
export * from "./apiTypes/FlowBonusDeclareRequests"; export * from "./apiTypes/FlowBonusDeclareRequests";
export * from "./apiTypes/FlowBursaryRequests"; export * from "./apiTypes/FlowBursaryRequests";
export * from "./apiTypes/FlowCertificateRequests"; export * from "./apiTypes/FlowCertificateRequests";
export * from "./apiTypes/FlowCountResponses";
export * from "./apiTypes/FlowCountResponsesMessageModel";
export * from "./apiTypes/FlowDesign"; export * from "./apiTypes/FlowDesign";
export * from "./apiTypes/FlowDesignMessageModel"; export * from "./apiTypes/FlowDesignMessageModel";
export * from "./apiTypes/FlowDesignMessageModelPageModel"; export * from "./apiTypes/FlowDesignMessageModelPageModel";
......
...@@ -35,6 +35,8 @@ export * from "./apiTypes/ConfigRequests"; ...@@ -35,6 +35,8 @@ export * from "./apiTypes/ConfigRequests";
export * from "./apiTypes/FlowBonusDeclareRequests"; export * from "./apiTypes/FlowBonusDeclareRequests";
export * from "./apiTypes/FlowBursaryRequests"; export * from "./apiTypes/FlowBursaryRequests";
export * from "./apiTypes/FlowCertificateRequests"; export * from "./apiTypes/FlowCertificateRequests";
export * from "./apiTypes/FlowCountResponses";
export * from "./apiTypes/FlowCountResponsesMessageModel";
export * from "./apiTypes/FlowDesign"; export * from "./apiTypes/FlowDesign";
export * from "./apiTypes/FlowDesignMessageModel"; export * from "./apiTypes/FlowDesignMessageModel";
export * from "./apiTypes/FlowDesignMessageModelPageModel"; export * from "./apiTypes/FlowDesignMessageModelPageModel";
......
...@@ -20,13 +20,14 @@ ...@@ -20,13 +20,14 @@
:open-names="openNames" :open-names="openNames"
width="auto"> width="auto">
<template v-if="!menuCollapse" v-for="(item, index) in filterSider"> <template v-if="!menuCollapse" v-for="(item, index) in filterSider">
<i-menu-side-item v-if="item.children === undefined || !item.children.length" :menu="item" :key="index"/> <i-menu-side-item :count="{a:1}" v-if="item.children === undefined || !item.children.length" :menu="item"
:key="index"/>
<i-menu-side-submenu v-else :menu="item" :key="index"/> <i-menu-side-submenu v-else :menu="item" :key="index"/>
</template> </template>
<template v-else> <template v-else>
<Tooltip :content="tTitle(item.title)" placement="right" <Tooltip :content="tTitle(item.title)" placement="right"
v-if="item.children === undefined || !item.children.length" :key="index"> v-if="item.children === undefined || !item.children.length" :key="index">
<i-menu-side-item :menu="item" hide-title/> <i-menu-side-item :count="{a:1}" :menu="item" hide-title/>
</Tooltip> </Tooltip>
<i-menu-side-collapse v-else :menu="item" :key="index" top-level/> <i-menu-side-collapse v-else :menu="item" :key="index" top-level/>
</template> </template>
...@@ -34,78 +35,93 @@ ...@@ -34,78 +35,93 @@
</div> </div>
</template> </template>
<script> <script>
import iMenuSideItem from './menu-item'; import iMenuSideItem from './menu-item';
import iMenuSideSubmenu from './submenu'; import iMenuSideSubmenu from './submenu';
import iMenuSideCollapse from './menu-collapse'; import iMenuSideCollapse from './menu-collapse';
import tTitle from '../mixins/translate-title'; import tTitle from '../mixins/translate-title';
import {mapState, mapGetters} from 'vuex'; import {mapState, mapGetters} from 'vuex';
import * as api from "@api/controller/index.d.ts";
// 元素是否在可视区域 // 元素是否在可视区域
function isElementInViewport(el) { function isElementInViewport(el) {
let rect = el.getBoundingClientRect(); let rect = el.getBoundingClientRect();
return (rect.top >= 0 && rect.left >= 0 && rect.bottom <= (window.innerHeight || document.documentElement.clientHeight) && rect.right <= (window.innerWidth || document.documentElement.clientWidth)); return (rect.top >= 0 && rect.left >= 0 && rect.bottom <= (window.innerHeight || document.documentElement.clientHeight) && rect.right <= (window.innerWidth || document.documentElement.clientWidth));
} }
export default { export default {
name: 'iMenuSide', name: 'iMenuSide',
mixins: [tTitle], mixins: [tTitle],
components: {iMenuSideItem, iMenuSideSubmenu, iMenuSideCollapse}, components: {iMenuSideItem, iMenuSideSubmenu, iMenuSideCollapse},
props: { props: {
hideLogo: { hideLogo: {
type: Boolean, type: Boolean,
default: false default: false
} }
}, },
computed: { data() {
...mapState('admin/layout', [ return {
'siderTheme', count: {},
'menuAccordion', }
'menuCollapse' },
]), computed: {
...mapState('admin/menu', [ ...mapState('admin/layout', [
'activePath', 'siderTheme',
'openNames' 'menuAccordion',
]), 'menuCollapse'
...mapGetters('admin/menu', [ ]),
'filterSider' ...mapState('admin/menu', [
]), 'activePath',
}, 'openNames'
watch: { ]),
'$route': { ...mapGetters('admin/menu', [
handler() { 'filterSider'
this.handleUpdateMenuState(); ]),
},
watch: {
'$route': {
handler() {
this.handleUpdateMenuState();
},
immediate: true
}, },
immediate: true // 在展开/收起侧边菜单栏时,更新一次 menu 的状态
menuCollapse() {
this.handleUpdateMenuState();
}
}, },
// 在展开/收起侧边菜单栏时,更新一次 menu 的状态 mounted() {
menuCollapse() { this.getMenuCount()
this.handleUpdateMenuState(); },
} methods: {
}, getMenuCount() {
methods: { //获取审批三项数量
handleUpdateMenuState() { api.getApiFlowViewApiFlowViewGetFlowListCount().then(res => {
this.$nextTick(() => { this.count = res.response
if (this.$refs.menu) { })
this.$refs.menu.updateActiveName(); },
if (this.menuAccordion) this.$refs.menu.updateOpened(); handleUpdateMenuState() {
// 聚焦当前项 this.$nextTick(() => {
this.$nextTick(() => { if (this.$refs.menu) {
const $activeMenu = document.getElementsByClassName('ivu-menu-item ivu-menu-item-active ivu-menu-item-selected'); this.$refs.menu.updateActiveName();
if ($activeMenu && $activeMenu.length && !isElementInViewport($activeMenu[0])) { if (this.menuAccordion) this.$refs.menu.updateOpened();
const activeMenuTop = $activeMenu[0].getBoundingClientRect().top; // 聚焦当前项
const $menu = this.$refs.menu.$el; this.$nextTick(() => {
setTimeout(() => { const $activeMenu = document.getElementsByClassName('ivu-menu-item ivu-menu-item-active ivu-menu-item-selected');
this.$ScrollTop($menu, { if ($activeMenu && $activeMenu.length && !isElementInViewport($activeMenu[0])) {
to: activeMenuTop, const activeMenuTop = $activeMenu[0].getBoundingClientRect().top;
time: 0 const $menu = this.$refs.menu.$el;
}); setTimeout(() => {
}, 300); this.$ScrollTop($menu, {
} to: activeMenuTop,
}); time: 0
} });
}); }, 300);
}
});
}
});
}
} }
} }
}
</script> </script>
<template> <template>
<div> <div>
<MenuItem :to="menu.path" :replace="menu.replace" :target="menu.target" :name="menu.path" @click.native="handleClick(menu.path)"> <MenuItem :to="menu.path" :replace="menu.replace" :target="menu.target" :name="menu.path"
<i-menu-side-title :menu="menu" :hide-title="hideTitle" /> @click.native="handleClick(menu.path)">
<Badge class="i-layout-menu-side-badge" v-if="badgeData" v-bind="badgeData" /> <i-menu-side-title :menu="menu" :hide-title="hideTitle"/>
</MenuItem> <!-- <div v-if="isAuth(menu.path)" class="aaa">{{ strategy(menu.path) }}</div>-->
</div> <Badge class="i-layout-menu-side-badge" v-if="badgeData" v-bind="badgeData"/>
</MenuItem>
</div>
</template> </template>
<script> <script>
import iMenuSideTitle from './menu-title'; import iMenuSideTitle from './menu-title';
import clickItem from '../mixins/click-item'; import clickItem from '../mixins/click-item';
import menuBadge from '../mixins/menu-badge'; import menuBadge from '../mixins/menu-badge';
import * as api from '@/api/controller/index'
export default { export default {
name: 'iMenuSideItem', name: 'iMenuSideItem',
components: { iMenuSideTitle }, components: {iMenuSideTitle},
mixins: [ clickItem, menuBadge ], mixins: [clickItem, menuBadge],
props: { props: {
menu: { count: {
type: Object, type: Object,
default () { default: () => {
return {} return {}
}
},
hideTitle: {
type: Boolean,
default: false
}
} }
},
menu: {
type: Object,
default() {
return {}
}
},
hideTitle: {
type: Boolean,
default: false
}
},
data() {
return {
timer: "",
}
},
methods: {
strategy(path) {
//基于路径获取值
},
isAuth(path) {
return path === '/flow-myFlowList' || path === '/flow-awaitDoneList' || path === '/flow-processedList' ||
path === '/flow-awaitDoneList-Certificate' || path === '/flow-processedList-Certificate' || path === '/flow-myFlowList-Certificate' ||
path === '/flow-awaitDoneList-rewardForTeachersAndStudents' || path === '/flow-processedList-rewardForTeachersAndStudents' || path === '/flow-myFlowList-rewardForTeachersAndStudents'
},
},
mounted() {
} }
}
</script> </script>
<style>
.aaa {
float: right;
width: 50px;
height: 30px;
color: #1890ff;
background: #e6f7ff;
display: flex;
justify-content: center;
align-items: center;
border-radius: 20px;
border: 1px solid #91d5ff;
}
</style>
...@@ -88,6 +88,14 @@ Vue.prototype.getUserRole = () => { ...@@ -88,6 +88,14 @@ Vue.prototype.getUserRole = () => {
return false return false
} }
} }
Vue.prototype.count1 = function () {
let count = {}
//获取审批三项数量
return asc.getApiFlowViewApiFlowViewGetFlowListCount().then(res => {
count = res.response
return count
})
}
Vue.directive('textColor', (element, elementAttribute, curVnode, oldVnode) => { Vue.directive('textColor', (element, elementAttribute, curVnode, oldVnode) => {
//字体颜色 //字体颜色
element.style.color = '#1e93ff' element.style.color = '#1e93ff'
......
...@@ -1573,6 +1573,8 @@ ...@@ -1573,6 +1573,8 @@
}) })
}, },
save() { save() {
this.hooks.myEncapsulationFunction(async () => { this.hooks.myEncapsulationFunction(async () => {
const res = await this.api.CertificateSave(this.formValidate) const res = await this.api.CertificateSave(this.formValidate)
if (res.code === 1) this.FlowInit() if (res.code === 1) this.FlowInit()
...@@ -1701,7 +1703,7 @@ ...@@ -1701,7 +1703,7 @@
await this.hooks.myEncapsulationFunction(async () => { await this.hooks.myEncapsulationFunction(async () => {
this.formValidate.competitionname = this.competitionname this.formValidate.competitionname = this.competitionname
let data = _.cloneDeep(this.formValidate) let data = _.cloneDeep(this.formValidate)
data.flowid = 103 data.flowid = this.formValidate.competition_method === 0 ? 103 : 111;
const res = await api.FlowCertificateSubmit(data); const res = await api.FlowCertificateSubmit(data);
if (res.code === 1) { if (res.code === 1) {
this.$emit('getData', '') this.$emit('getData', '')
......
...@@ -186,7 +186,8 @@ ...@@ -186,7 +186,8 @@
<Table v-if="!!item.guide_teacher_list.length" :columns="guidecolumnsTeacher" <Table v-if="!!item.guide_teacher_list.length" :columns="guidecolumnsTeacher"
:data="item.guide_teacher_list"> :data="item.guide_teacher_list">
<template #bonus="{row,index}"> <template #bonus="{row,index}">
<div style="width: 100%;height: 100%;display: flex;align-items: center;"> <div v-if="formValidate.approval_state === 2"
style="width: 100%;height: 100%;display: flex;align-items: center;">
<span v-if="bonus.teamFlag" <span v-if="bonus.teamFlag"
v-text-color style="font-weight: 500;font-size: 16px;font-family: 黑体">{{ v-text-color style="font-weight: 500;font-size: 16px;font-family: 黑体">{{
(row.bonus || 0) (row.bonus || 0)
...@@ -231,7 +232,8 @@ ...@@ -231,7 +232,8 @@
<Table v-if="!!item.contestant_teacher_list.length" :columns="columnsTeacher" <Table v-if="!!item.contestant_teacher_list.length" :columns="columnsTeacher"
:data="item.contestant_teacher_list"> :data="item.contestant_teacher_list">
<template #bonus="{row,index}"> <template #bonus="{row,index}">
<div style="width: 100%;height: 100%;display: flex;align-items: center;"> <div v-if="formValidate.approval_state === 2"
style="width: 100%;height: 100%;display: flex;align-items: center;">
<span v-text-color style="font-weight: 500;font-size: 16px;font-family: 黑体" v-if="bonus.teamFlag" <span v-text-color style="font-weight: 500;font-size: 16px;font-family: 黑体" v-if="bonus.teamFlag"
>{{ >{{
(row.bonus || 0) (row.bonus || 0)
...@@ -285,7 +287,7 @@ ...@@ -285,7 +287,7 @@
<!-- 团队卡片--> <!-- 团队卡片-->
<Card dis-hover class="carClass" v-for="(item,index) in teamObjectData" :key="index+'44'"> <Card dis-hover class="carClass" v-for="(item,index) in teamObjectData" :key="index+'44'">
<template #title> <template #title>
<sapn style="font-weight: 500;font-size: 16px;font-family: 黑体">{{ <span style="font-weight: 500;font-size: 16px;font-family: 黑体">{{
item.teanname item.teanname
}}( }}(
参赛学生 参赛学生
...@@ -305,7 +307,7 @@ ...@@ -305,7 +307,7 @@
@click="teamStudentSaveBonusPool(item)" @click="teamStudentSaveBonusPool(item)"
type="md-create" type="md-create"
style="cursor: pointer;font-size: 20px;"/> style="cursor: pointer;font-size: 20px;"/>
</sapn> </span>
</template> </template>
<template #extra> <template #extra>
<div class="teamCardExtraText">{{ item.hierarchy_name }}</div> <div class="teamCardExtraText">{{ item.hierarchy_name }}</div>
...@@ -317,7 +319,8 @@ ...@@ -317,7 +319,8 @@
{{ row.hierarchy_name }} {{ row.hierarchy_name }}
</template> </template>
<template #bonus="{row,index}"> <template #bonus="{row,index}">
<div style="width: 100%;height: 100%;display: flex;align-items: center;"> <div v-if="formValidate.approval_state === 2"
style="width: 100%;height: 100%;display: flex;align-items: center;">
<span v-text-color style="font-weight: 500;font-size: 16px;font-family: 黑体" v-if="bonus.teamFlag" <span v-text-color style="font-weight: 500;font-size: 16px;font-family: 黑体" v-if="bonus.teamFlag"
>{{ >{{
(row.bonus || 0) (row.bonus || 0)
...@@ -877,14 +880,17 @@ ...@@ -877,14 +880,17 @@
cur.student_list = cur.student_list.map((cu, inde) => { cur.student_list = cur.student_list.map((cu, inde) => {
if (cu.teammembersid === row.teammembersid) { if (cu.teammembersid === row.teammembersid) {
if (this.distributionForm === 0) { if (this.distributionForm === 0) {
cu.allot_money_teacher = cur.allot_money_teacher
cu.bonus = Number(value / 100) * Number(cu.allot_money) cu.bonus = Number(value / 100) * Number(cu.allot_money)
cu.bonus_ratio = Number(value) cu.bonus_ratio = Number(value)
} }
} }
return cu return cu
}) })
cur.guide_teacher_list = cur.guide_teacher_list.map((cu, inde) => { cur.guide_teacher_list = cur.guide_teacher_list.map((cu, inde) => {
if (cu.teammembersid === row.teammembersid) { if (cu.teammembersid === row.teammembersid) {
cu.allot_money_teacher = cur.allot_money_teacher
cu.bonus = Number(value / 100) * Number(cu.allot_money_teacher) cu.bonus = Number(value / 100) * Number(cu.allot_money_teacher)
cu.bonus_ratio = Number(value) cu.bonus_ratio = Number(value)
} }
...@@ -892,6 +898,7 @@ ...@@ -892,6 +898,7 @@
}) })
cur.contestant_teacher_list = cur.contestant_teacher_list.map((cu, inde) => { cur.contestant_teacher_list = cur.contestant_teacher_list.map((cu, inde) => {
if (cu.teammembersid === row.teammembersid) { if (cu.teammembersid === row.teammembersid) {
cu.allot_money_teacher = cur.allot_money_teacher
cu.bonus = Number(value / 100) * Number(cu.allot_money_teacher) cu.bonus = Number(value / 100) * Number(cu.allot_money_teacher)
cu.bonus_ratio = Number(value) cu.bonus_ratio = Number(value)
} }
...@@ -900,19 +907,39 @@ ...@@ -900,19 +907,39 @@
} }
return cur return cur
}) })
console.log("🚀🚀🚀,", this.teamObjectData)
}, },
'kfp_teacher': () => { 'kfp_teacher': () => {
this.teamObjectData = this.teamObjectData.map((cur, index) => { this.teamObjectData = this.teamObjectData.map((cur, index) => {
if (row.teamid === cur.teamid) cur.allot_money_teacher = value if (row.teamid === cur.teamid) {
cur.allot_money_teacher = Number(value)
cur.guide_teacher_list = cur.guide_teacher_list.map((cu, inde) => {
cu.allot_money_teacher = value
cu.bonus = Number(Number(cu.bonus_ratio / 100) * Number(value)).toFixed(2)
return cu
})
cur.contestant_teacher_list = cur.contestant_teacher_list.map((cu, inde) => {
cu.allot_money_teacher = value
cu.bonus = Number(Number(cu.bonus_ratio / 100) * Number(value)).toFixed(2)
return cu
})
}
return cur return cur
}) })
}, },
'kfp_student': () => { 'kfp_student': () => {
this.teamObjectData = this.teamObjectData.map((cur, index) => { this.teamObjectData = this.teamObjectData.map((cur, index) => {
if (row.teamid === cur.teamid) cur.allot_money = value if (row.teamid === cur.teamid) {
cur.allot_money = Number(value)
cur.student_list = cur.student_list.map((cu, inde) => {
cu.allot_money = value
cu.bonus = Number(Number(cu.bonus_ratio / 100) * Number(value)).toFixed(2)
return cu
})
}
return cur return cur
}) })
}, },
'jj': () => { 'jj': () => {
...@@ -1193,7 +1220,7 @@ ...@@ -1193,7 +1220,7 @@
hierarchy_name: cur.hierarchy_name, hierarchy_name: cur.hierarchy_name,
teamFlag: true, teamFlag: true,
"allot_money": cur.allot_money, "allot_money": cur.allot_money,
bonus: Number(cu.bonus_ratio / 100) * Number(cur.allot_money) bonus: Number(cu.bonus) !== 0 ? cu.bonus : (Number(cu.bonus_ratio / 100) * Number(cur.allot_money)).toFixed(2)
} }
}) })
cur.guide_teacher_list = cur.guide_teacher_list.map((cu, inde) => { cur.guide_teacher_list = cur.guide_teacher_list.map((cu, inde) => {
...@@ -1203,7 +1230,7 @@ ...@@ -1203,7 +1230,7 @@
hierarchy_name: cur.hierarchy_name, hierarchy_name: cur.hierarchy_name,
teamFlag: true, teamFlag: true,
"allot_money_teacher": cur.allot_money_teacher, "allot_money_teacher": cur.allot_money_teacher,
bonus: Number(cu.bonus_ratio / 100) * Number(cur.allot_money_teacher) bonus: Number(cu.bonus) !== 0 ? cu.bonus : (Number(cu.bonus_ratio / 100) * Number(cur.allot_money)).toFixed(2)
} }
}) })
cur.contestant_teacher_list = cur.contestant_teacher_list.map((cu, inde) => { cur.contestant_teacher_list = cur.contestant_teacher_list.map((cu, inde) => {
...@@ -1213,7 +1240,7 @@ ...@@ -1213,7 +1240,7 @@
hierarchy_name: cur.hierarchy_name, hierarchy_name: cur.hierarchy_name,
teamFlag: true, teamFlag: true,
"allot_money_teacher": cur.allot_money_teacher, "allot_money_teacher": cur.allot_money_teacher,
bonus: Number(Number(cu.bonus_ratio) / 100) * Number(cur.allot_money_teacher) bonus: Number(cu.bonus) !== 0 ? cu.bonus : (Number(cu.bonus_ratio / 100) * Number(cur.allot_money)).toFixed(2)
} }
}) })
return cur return cur
......
...@@ -277,20 +277,29 @@ ...@@ -277,20 +277,29 @@
</template> </template>
<Table v-if="!!item.guide_teacher_list.length" :columns="guidecolumnsTeacher" <Table v-if="!!item.guide_teacher_list.length" :columns="guidecolumnsTeacher"
:data="item.guide_teacher_list"> :data="item.guide_teacher_list">
<!-- <template #action="{row}">-->
<!-- <a style="color: red" @click="TeamMembersDel(row)">删除</a>--> <template #instructionalscore="{row}">
<!-- </template>--> <span v-text-color>{{ row.instructionalscore }}分</span>
</template>
</Table> </Table>
<Table v-if="!!item.contestant_teacher_list.length" :columns="columnsTeacher" <Table v-if="!!item.contestant_teacher_list.length" :columns="columnsTeacher"
:data="item.contestant_teacher_list"> :data="item.contestant_teacher_list">
<!-- <template #action="{row}">-->
<!-- <a style="color: red" @click="TeamMembersDel(row)">删除</a>--> <template #instructionalscore="{row}">
<!-- </template>--> <span v-text-color>{{ row.instructionalscore }}分</span>
</template>
</Table> </Table>
<Table v-if="!!item.student_list.length" :columns="columnsStudent" :data="item.student_list"> <Table v-if="!!item.student_list.length" :columns="columnsStudent" :data="item.student_list">
<!-- <template #action="{row}">--> <template #subsidytype_name="{row}">
<!-- <a style="color: red" @click="TeamMembersDel(row)">删除</a>--> <span v-text-color>{{ row.subsidytype_name }}</span>
<!-- </template>--> </template>
<template #subsidy_day="{row}">
<span v-text-color>{{ row.subsidy_day }}天</span>
</template>
<template #subsidy_num="{row}">
<span v-text-color>{{ row.subsidy_num }}元</span>
</template>
</Table> </Table>
</Card> </Card>
</div> </div>
...@@ -464,20 +473,20 @@ ...@@ -464,20 +473,20 @@
}, },
{ {
title: '学生类型', title: '学生类型',
minWidth: 150, minWidth: 100,
key: 'subsidytype_name', slot: 'subsidytype_name',
fixed: 'right' fixed: 'right'
}, },
{ {
title: '补贴天数', title: '补贴天数',
minWidth: 150, minWidth: 100,
key: 'subsidy_day', slot: 'subsidy_day',
fixed: 'right', fixed: 'right',
}, },
{ {
title: '补贴金额', title: '补贴金额',
minWidth: 100, minWidth: 100,
key: 'subsidy_num', slot: 'subsidy_num',
fixed: 'right', fixed: 'right',
}, },
// { // {
...@@ -532,7 +541,7 @@ ...@@ -532,7 +541,7 @@
{ {
title: '教学分', title: '教学分',
minWidth: 150, minWidth: 150,
key: 'instructionalscore', slot: 'instructionalscore',
fixed: 'right', fixed: 'right',
}, },
...@@ -583,7 +592,7 @@ ...@@ -583,7 +592,7 @@
{ {
title: '教学分', title: '教学分',
minWidth: 150, minWidth: 150,
key: 'instructionalscore', slot: 'instructionalscore',
fixed: 'right', fixed: 'right',
}, },
......
...@@ -88,10 +88,9 @@ ...@@ -88,10 +88,9 @@
</template> </template>
</Modal> </Modal>
<Drawer :width="800" title="详细" :closable="true" v-model="drawer"> <Drawer :width="800" title="详细" :closable="true" v-model="drawer">
<div class="tableList" style="position: relative"> <div class="tableList" style="position: relative">
<Spin fix v-if="dLoading"></Spin> <Spin fix v-if="dLoading"></Spin>
<h1 style="display: flex;justify-content: center">教师奖励</h1> <h1 style="display: flex;justify-content: center">{{ ['学生奖励', '教师奖励'][flagObject.is_tea] }}</h1>
<table border="1" class="container1"> <table border="1" class="container1">
<tr class="row" v-for="(item,index) in drawerKeyValueArray" :key="index"> <tr class="row" v-for="(item,index) in drawerKeyValueArray" :key="index">
<th v-if="item[0]==='level'" class="colTitle">{{ item[2] }}</th> <th v-if="item[0]==='level'" class="colTitle">{{ item[2] }}</th>
...@@ -172,13 +171,23 @@ ...@@ -172,13 +171,23 @@
<h3>{{ <h3>{{
item.teanname item.teanname
}}( }}(
参赛教师 参赛学生
<span style="color: #1e93ff">{{ item.student_list.length }}</span> <span style="color: #1e93ff">{{ item.student_list.length }}</span>
位); 位,
参赛教师
<span style="color: #1e93ff">{{ item.contestant_teacher_list.length }}</span>
位,
指导教师
<span style="color: #1e93ff">{{ item.guide_teacher_list.length }}</span>
位,
);
<span>可分配奖金<span style="color: #1e93ff;">{{ <span>可分配奖金<span style="color: #1e93ff;">{{
(item.allot_money_teacher || 0) (item.allot_money_teacher || 0)
}}元</span></span> }}元</span></span>
</h3> </h3>
</template> </template>
<template #extra> <template #extra>
<div class="teamCardExtraText">{{ item.hierarchy_name }}</div> <div class="teamCardExtraText">{{ item.hierarchy_name }}</div>
...@@ -186,25 +195,52 @@ ...@@ -186,25 +195,52 @@
<Table v-if="!!item.student_list.length" :columns="columnsStudent" :data="item.student_list"> <Table v-if="!!item.student_list.length" :columns="columnsStudent" :data="item.student_list">
<template #bonus="{row,index}"> <template #bonus="{row,index}">
<div style="width: 100%;height: 100%;display: flex;align-items: center;"> <div style="width: 100%;height: 100%;display: flex;align-items: center;"
>
<span v-if="approvalState == 2"
style="font-family: 楷体;color: #1e93ff;font-weight: 600;">{{ (row.bonus || 0) }}元</span>
</div>
</template>
<template #bonus_ratio="{row,index}">
<div style="width: 100%;height: 100%;display: flex;align-items: center;"
>
<span <span
style="font-family: 楷体;color: #1e93ff;font-weight: 600;">{{ (row.bonus || 0) }}元</span> style="font-family: 楷体;color: #1e93ff;font-weight: 600;">{{ (row.bonus_ratio || 0) }}%</span>
</div> </div>
</template> </template>
</Table> </Table>
<Table v-if="!!item.contestant_teacher_list.length" :columns="columnsTeacher" :data="item.student_list"> <Table v-if="!!item.contestant_teacher_list.length" :columns="columnsTeacher"
:data="item.contestant_teacher_list">
<template #bonus="{row,index}"> <template #bonus="{row,index}">
<div style="width: 100%;height: 100%;display: flex;align-items: center;"> <div
style="width: 100%;height: 100%;display: flex;align-items: center;">
<span v-if="approvalState == 2"
style="font-family: 楷体;color: #1e93ff;font-weight: 600;">{{ (row.bonus || 0) }}元</span>
</div>
</template>
<template #bonus_ratio="{row,index}">
<div style="width: 100%;height: 100%;display: flex;align-items: center;"
>
<span <span
style="font-family: 楷体;color: #1e93ff;font-weight: 600;">{{ (row.bonus || 0) }}元</span> style="font-family: 楷体;color: #1e93ff;font-weight: 600;">{{ (row.bonus_ratio || 0) }}%</span>
</div> </div>
</template> </template>
</Table> </Table>
<Table v-if="!!item.guide_teacher_list.length" :columns="guidecolumnsTeacher" :data="item.student_list"> <Table v-if="!!item.guide_teacher_list.length" :columns="guidecolumnsTeacher"
:data="item.guide_teacher_list">
<template #bonus="{row,index}"> <template #bonus="{row,index}">
<div style="width: 100%;height: 100%;display: flex;align-items: center;"> <div
style="width: 100%;height: 100%;display: flex;align-items: center;">
<span v-if="approvalState == 2"
style="font-family: 楷体;color: #1e93ff;font-weight: 600;">{{ (row.bonus || 0) }}元</span>
</div>
</template>
<template #bonus_ratio="{row,index}">
<div style="width: 100%;height: 100%;display: flex;align-items: center;"
>
<span <span
style="font-family: 楷体;color: #1e93ff;font-weight: 600;">{{ (row.bonus || 0) }}元</span> style="font-family: 楷体;color: #1e93ff;font-weight: 600;">{{ (row.bonus_ratio || 0) }}%</span>
</div> </div>
</template> </template>
</Table> </Table>
...@@ -240,6 +276,7 @@ ...@@ -240,6 +276,7 @@
data() { data() {
//这里存放数据", //这里存放数据",
return { return {
approvalState: '',
flagObject: {}, flagObject: {},
columnsStudent: [ columnsStudent: [
{ {
...@@ -280,7 +317,7 @@ ...@@ -280,7 +317,7 @@
}, },
{ {
title: '奖励比例', title: '奖励比例',
minWidth: 150, minWidth: 100,
slot: 'bonus_ratio', slot: 'bonus_ratio',
fixed: 'right', fixed: 'right',
}, },
...@@ -337,7 +374,7 @@ ...@@ -337,7 +374,7 @@
}, },
{ {
title: '奖励比例', title: '奖励比例',
minWidth: 150, minWidth: 100,
slot: 'bonus_ratio', slot: 'bonus_ratio',
fixed: 'right', fixed: 'right',
}, },
...@@ -387,7 +424,7 @@ ...@@ -387,7 +424,7 @@
}, },
{ {
title: '奖励比例', title: '奖励比例',
minWidth: 150, minWidth: 100,
slot: 'bonus_ratio', slot: 'bonus_ratio',
fixed: 'right', fixed: 'right',
}, },
...@@ -742,6 +779,16 @@ ...@@ -742,6 +779,16 @@
cu.hierarchy_name = cur.hierarchy_name cu.hierarchy_name = cur.hierarchy_name
cu.teamFlag = true cu.teamFlag = true
}) })
cur.guide_teacher_list.forEach((cu, inde) => {
cu.hierarchy_id = cur.hierarchy_id
cu.hierarchy_name = cur.hierarchy_name
cu.teamFlag = true
})
cur.contestant_teacher_list.forEach((cu, inde) => {
cu.hierarchy_id = cur.hierarchy_id
cu.hierarchy_name = cur.hierarchy_name
cu.teamFlag = true
})
return cur return cur
}) })
}) })
...@@ -751,12 +798,15 @@ ...@@ -751,12 +798,15 @@
}, },
rowDetails(row) { rowDetails(row) {
//详情 //详情
this.approvalState = row.approval_state
this.drawer = true this.drawer = true
this.dLoading = true this.dLoading = true
// TeamAndMemberSelCondition // TeamAndMemberSelCondition
this.asc.getApiBonusDeclareGetBonusDeclareInfo({id: row.bonusdeclareid}).then(res => { this.asc.getApiBonusDeclareGetBonusDeclareInfo({id: row.bonusdeclareid}).then(res => {
let array = _.cloneDeep(res.response) let array = _.cloneDeep(res.response)
this.flagObject = _.cloneDeep(res.response) this.flagObject = _.cloneDeep(res.response)
this.TeamAndMemberSel() this.TeamAndMemberSel()
let keyArray = [ let keyArray = [
"competitionname", "competitionname",
......
...@@ -460,6 +460,7 @@ ...@@ -460,6 +460,7 @@
total: 0, total: 0,
flow_id: '', flow_id: '',
rewardType: '', rewardType: '',
declarationType: '',
}, },
pageKey: 1, pageKey: 1,
strategy: { strategy: {
...@@ -467,155 +468,64 @@ ...@@ -467,155 +468,64 @@
"/flow-awaitDoneList-rewardForTeachersAndStudents": () => { "/flow-awaitDoneList-rewardForTeachersAndStudents": () => {
this.initSearchCondition() this.initSearchCondition()
this.init.flow_id1 = 107 this.init.flow_id1 = 107
this.searchCondList.forEach((cur, index) => { this.deleteSearchCondition('flow_id')
if (cur.id === 'flow_id') this.searchCondList.splice(index, 1) this.deleteSearchCondition('declarationType')
})
},
"/flow-processedList-rewardForTeachersAndStudents": () => {
this.initSearchCondition()
this.init.flow_id1 = 107
this.searchCondList.forEach((cur, index) => {
if (cur.id === 'flow_id') this.searchCondList.splice(index, 1)
})
},
"/flow-myFlowList-rewardForTeachersAndStudents": () => {
this.initSearchCondition()
this.init.flow_id1 = 107
this.searchCondList.forEach((cur, index) => {
if (cur.id === 'flow_id') this.searchCondList.splice(index, 1)
})
}, },
// 教师工作量三项 // 教师工作量三项
"/flow-awaitDoneList-WorkloadDeclare": () => { "/flow-awaitDoneList-WorkloadDeclare": () => {
this.initSearchCondition() this.initSearchCondition()
this.init.flow_id1 = 109 this.init.flow_id1 = 109
this.searchCondList.forEach((cur, index) => { this.deleteSearchCondition('rewardType')
if (cur.id === 'rewardType') this.searchCondList.splice(index, 1) this.deleteSearchCondition('declarationType')
})
},
"/flow-processedList-WorkloadDeclare": () => {
this.initSearchCondition()
this.init.flow_id1 = 109
this.searchCondList.forEach((cur, index) => {
if (cur.id === 'rewardType') this.searchCondList.splice(index, 1)
})
},
"/flow-myFlowList-WorkloadDeclare": () => {
this.initSearchCondition()
this.init.flow_id1 = 109
this.searchCondList.forEach((cur, index) => {
if (cur.id === 'rewardType') this.searchCondList.splice(index, 1)
})
}, },
// 教师奖励三项 // 教师奖励三项
"/flow-awaitDoneList-TeacherBonusDeclare": () => { "/flow-awaitDoneList-TeacherBonusDeclare": () => {
this.initSearchCondition() this.initSearchCondition()
this.init.flow_id1 = 107 this.init.flow_id1 = 107
this.searchCondList.forEach((cur, index) => { this.deleteSearchCondition('rewardType')
if (cur.id === 'rewardType') this.searchCondList.splice(index, 1) this.deleteSearchCondition('declarationType')
})
},
"/flow-processedList-TeacherBonusDeclare": () => {
this.initSearchCondition()
this.init.flow_id1 = 107
this.searchCondList.forEach((cur, index) => {
if (cur.id === 'rewardType') this.searchCondList.splice(index, 1)
})
},
"/flow-myFlowList-TeacherBonusDeclare": () => {
this.initSearchCondition()
this.init.flow_id1 = 107
this.searchCondList.forEach((cur, index) => {
if (cur.id === 'rewardType') this.searchCondList.splice(index, 1)
})
}, },
// 学生补助三项 // 学生补助三项
"/flow-awaitDoneList-SubsidyDeclare": () => { "/flow-awaitDoneList-SubsidyDeclare": () => {
this.initSearchCondition() this.initSearchCondition()
this.init.flow_id1 = 108 this.init.flow_id1 = 108
this.searchCondList.forEach((cur, index) => { this.deleteSearchCondition('rewardType')
if (cur.id === 'rewardType') this.searchCondList.splice(index, 1) this.deleteSearchCondition('declarationType')
})
},
"/flow-processedList-SubsidyDeclare": () => {
this.initSearchCondition()
this.init.flow_id1 = 108
this.searchCondList.forEach((cur, index) => {
if (cur.id === 'rewardType') this.searchCondList.splice(index, 1)
})
},
"/flow-myFlowList-SubsidyDeclare": () => {
this.initSearchCondition()
this.init.flow_id1 = 108
this.searchCondList.forEach((cur, index) => {
if (cur.id === 'rewardType') this.searchCondList.splice(index, 1)
})
}, },
// 学生奖励三项 // 学生奖励三项
"/flow-awaitDoneList-StudentBonusDeclare": () => { "/flow-awaitDoneList-StudentBonusDeclare": () => {
this.initSearchCondition() this.initSearchCondition()
this.init.flow_id1 = 106; this.init.flow_id1 = 106;
this.searchCondList.forEach((cur, index) => { this.deleteSearchCondition('rewardType')
if (cur.id === 'rewardType') this.searchCondList.splice(index, 1) this.deleteSearchCondition('declarationType')
})
},
"/flow-processedList-StudentBonusDeclare": () => {
this.initSearchCondition()
this.init.flow_id1 = 106
this.searchCondList.forEach((cur, index) => {
if (cur.id === 'rewardType') this.searchCondList.splice(index, 1)
})
},
"/flow-myFlowList-StudentBonusDeclare": () => {
this.initSearchCondition()
this.init.flow_id1 = 106
this.searchCondList.forEach((cur, index) => {
if (cur.id === 'rewardType') this.searchCondList.splice(index, 1)
})
}, },
// 获奖材料三项 // 获奖材料三项
"/flow-awaitDoneList-Certificate": () => { "/flow-awaitDoneList-Certificate": () => {
this.initSearchCondition() this.initSearchCondition()
this.init.flow_id1 = 103 this.init.flow_id1 = 103
this.searchCondList.forEach((cur, index) => {
if (cur.id === 'rewardType') this.searchCondList.splice(index, 1) this.deleteSearchCondition('flow_id')
}) this.deleteSearchCondition('rewardType')
},
"/flow-processedList-Certificate": () => {
this.initSearchCondition()
this.init.flow_id1 = 103
this.searchCondList.forEach((cur, index) => {
if (cur.id === 'rewardType') this.searchCondList.splice(index, 1)
})
},
"/flow-myFlowList-Certificate": () => {
this.initSearchCondition()
this.init.flow_id1 = 103
this.searchCondList.forEach((cur, index) => {
if (cur.id === 'rewardType') this.searchCondList.splice(index, 1)
})
}, },
// 赛事审批三项 // 赛事审批三项
"/flow-awaitDoneList": () => { "/flow-awaitDoneList": () => {
this.initSearchCondition() this.initSearchCondition()
this.init.flow_id1 = 102 this.init.flow_id1 = 102
this.searchCondList.forEach((cur, index) => { this.deleteSearchCondition('rewardType')
if (cur.id === 'rewardType') this.searchCondList.splice(index, 1) this.deleteSearchCondition('declarationType')
})
},
"/flow-processedList": () => {
this.initSearchCondition()
this.init.flow_id1 = 102
this.searchCondList.forEach((cur, index) => {
if (cur.id === 'rewardType') this.searchCondList.splice(index, 1)
})
},
"/flow-myFlowList": () => {
this.initSearchCondition()
this.init.flow_id1 = 102
this.searchCondList.forEach((cur, index) => {
if (cur.id === 'rewardType') this.searchCondList.splice(index, 1)
})
}, },
} //基于路由获取流程id } //基于路由获取流程id
} }
...@@ -668,8 +578,8 @@ ...@@ -668,8 +578,8 @@
this.GetFlowIdSelect() this.GetFlowIdSelect()
}, },
methods: { methods: {
deleteSearchArrayData(key) { deleteSearchCondition(key) {
//删除查询下拉框数据 //删除搜索条件数据
this.searchCondList.forEach((cur, index) => { this.searchCondList.forEach((cur, index) => {
if (cur.id === key) this.searchCondList.splice(index, 1) if (cur.id === key) this.searchCondList.splice(index, 1)
}) })
...@@ -769,10 +679,25 @@ ...@@ -769,10 +679,25 @@
}, },
] ]
}, },
{
id: 'declarationType',
name: '申报类别',
type: 'select',
show: true,
optList: [
{
label: '教师申报',
value: 111,
},
{
label: '学生申报',
value: 103,
},
]
},
] ]
}, },
cssearch(val) { cssearch(val) {
// 搜索 // 搜索
if (val.rewardType) { if (val.rewardType) {
// this.strategy[this.$route.path]() // this.strategy[this.$route.path]()
...@@ -780,6 +705,11 @@ ...@@ -780,6 +705,11 @@
...this.init, ...val, flow_id: val.rewardType ...this.init, ...val, flow_id: val.rewardType
} }
this.init.flow_id1 = this.init.flow_id 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 { } else {
this.strategy[this.$route.path]() this.strategy[this.$route.path]()
this.init = { this.init = {
......
...@@ -515,161 +515,79 @@ ...@@ -515,161 +515,79 @@
pageKey: 1, pageKey: 1,
strategy: { strategy: {
// 师生奖励三项t // 师生奖励三项t
"/flow-awaitDoneList-rewardForTeachersAndStudents": () => {
this.initSearchCondition()
this.init.flow_id1 = 107
this.init.flow_id = 107
this.searchCondList.forEach((cur, index) => {
if (cur.id === 'flow_id') this.searchCondList.splice(index, 1)
})
},
"/flow-processedList-rewardForTeachersAndStudents": () => { "/flow-processedList-rewardForTeachersAndStudents": () => {
this.initSearchCondition() this.initSearchCondition()
this.init.flow_id1 = 107 this.init.flow_id1 = 107
this.searchCondList.forEach((cur, index) => { this.deleteSearchCondition('flow_id')
if (cur.id === 'flow_id') this.searchCondList.splice(index, 1) this.deleteSearchCondition('declarationType')
})
},
"/flow-myFlowList-rewardForTeachersAndStudents": () => {
this.initSearchCondition()
this.init.flow_id1 = 107
this.searchCondList.forEach((cur, index) => {
if (cur.id === 'flow_id') this.searchCondList.splice(index, 1)
})
}, },
// 教师工作量三项 // 教师工作量三项
"/flow-awaitDoneList-WorkloadDeclare": () => {
this.initSearchCondition()
this.init.flow_id1 = 109
this.searchCondList.forEach((cur, index) => {
if (cur.id === 'rewardType') this.searchCondList.splice(index, 1)
})
},
"/flow-processedList-WorkloadDeclare": () => { "/flow-processedList-WorkloadDeclare": () => {
this.initSearchCondition() this.initSearchCondition()
this.init.flow_id1 = 109 this.init.flow_id1 = 109
this.searchCondList.forEach((cur, index) => { this.deleteSearchCondition('rewardType')
if (cur.id === 'rewardType') this.searchCondList.splice(index, 1) this.deleteSearchCondition('declarationType')
})
},
"/flow-myFlowList-WorkloadDeclare": () => {
this.initSearchCondition()
this.init.flow_id1 = 109
this.searchCondList.forEach((cur, index) => {
if (cur.id === 'rewardType') this.searchCondList.splice(index, 1)
})
}, },
// 教师奖励三项 // 教师奖励三项
"/flow-awaitDoneList-TeacherBonusDeclare": () => {
this.initSearchCondition()
this.init.flow_id1 = 107
this.searchCondList.forEach((cur, index) => {
if (cur.id === 'rewardType') this.searchCondList.splice(index, 1)
})
},
"/flow-processedList-TeacherBonusDeclare": () => { "/flow-processedList-TeacherBonusDeclare": () => {
this.initSearchCondition() this.initSearchCondition()
this.init.flow_id1 = 107 this.init.flow_id1 = 107
this.searchCondList.forEach((cur, index) => { this.deleteSearchCondition('rewardType')
if (cur.id === 'rewardType') this.searchCondList.splice(index, 1) this.deleteSearchCondition('declarationType')
})
},
"/flow-myFlowList-TeacherBonusDeclare": () => {
this.initSearchCondition()
this.init.flow_id1 = 107
this.searchCondList.forEach((cur, index) => {
if (cur.id === 'rewardType') this.searchCondList.splice(index, 1)
})
}, },
// 学生补助三项 // 学生补助三项
"/flow-awaitDoneList-SubsidyDeclare": () => {
this.initSearchCondition()
this.init.flow_id1 = 108
this.searchCondList.forEach((cur, index) => {
if (cur.id === 'rewardType') this.searchCondList.splice(index, 1)
})
},
"/flow-processedList-SubsidyDeclare": () => { "/flow-processedList-SubsidyDeclare": () => {
this.initSearchCondition() this.initSearchCondition()
this.init.flow_id1 = 108 this.init.flow_id1 = 108
this.searchCondList.forEach((cur, index) => { this.deleteSearchCondition('rewardType')
if (cur.id === 'rewardType') this.searchCondList.splice(index, 1) this.deleteSearchCondition('declarationType')
})
},
"/flow-myFlowList-SubsidyDeclare": () => {
this.initSearchCondition()
this.init.flow_id1 = 108
this.searchCondList.forEach((cur, index) => {
if (cur.id === 'rewardType') this.searchCondList.splice(index, 1)
})
}, },
// 学生奖励三项 // 学生奖励三项
"/flow-awaitDoneList-StudentBonusDeclare": () => {
this.initSearchCondition()
this.init.flow_id1 = 106;
this.searchCondList.forEach((cur, index) => {
if (cur.id === 'rewardType') this.searchCondList.splice(index, 1)
})
},
"/flow-processedList-StudentBonusDeclare": () => { "/flow-processedList-StudentBonusDeclare": () => {
this.initSearchCondition() this.initSearchCondition()
this.init.flow_id1 = 106 this.init.flow_id1 = 106
this.searchCondList.forEach((cur, index) => { this.deleteSearchCondition('rewardType')
if (cur.id === 'rewardType') this.searchCondList.splice(index, 1) this.deleteSearchCondition('declarationType')
})
},
"/flow-myFlowList-StudentBonusDeclare": () => {
this.initSearchCondition()
this.init.flow_id1 = 106
this.searchCondList.forEach((cur, index) => {
if (cur.id === 'rewardType') this.searchCondList.splice(index, 1)
})
}, },
// 获奖材料三项 // 获奖材料三项
"/flow-awaitDoneList-Certificate": () => {
this.initSearchCondition()
this.init.flow_id1 = 103
this.searchCondList.forEach((cur, index) => {
if (cur.id === 'rewardType') this.searchCondList.splice(index, 1)
})
},
"/flow-processedList-Certificate": () => { "/flow-processedList-Certificate": () => {
this.initSearchCondition() this.initSearchCondition()
this.init.flow_id1 = 103 this.init.flow_id1 = 103
this.searchCondList.forEach((cur, index) => {
if (cur.id === 'rewardType') this.searchCondList.splice(index, 1) this.deleteSearchCondition('flow_id')
})
}, this.deleteSearchCondition('rewardType')
"/flow-myFlowList-Certificate": () => {
this.initSearchCondition()
this.init.flow_id1 = 103
this.searchCondList.forEach((cur, index) => {
if (cur.id === 'rewardType') this.searchCondList.splice(index, 1)
})
}, },
// 赛事审批三项 // 赛事审批三项
"/flow-awaitDoneList": () => {
this.initSearchCondition()
this.init.flow_id1 = 102
this.searchCondList.forEach((cur, index) => {
if (cur.id === 'rewardType') this.searchCondList.splice(index, 1)
})
},
"/flow-processedList": () => { "/flow-processedList": () => {
this.initSearchCondition() this.initSearchCondition()
this.init.flow_id1 = 102 this.init.flow_id1 = 102
this.searchCondList.forEach((cur, index) => { this.deleteSearchCondition('rewardType')
if (cur.id === 'rewardType') this.searchCondList.splice(index, 1) this.deleteSearchCondition('declarationType')
})
},
"/flow-myFlowList": () => {
this.initSearchCondition()
this.init.flow_id1 = 102
this.searchCondList.forEach((cur, index) => {
if (cur.id === 'rewardType') this.searchCondList.splice(index, 1)
})
}, },
} //基于路由获取流程id } //基于路由获取流程id
} }
}, },
...@@ -703,6 +621,12 @@ ...@@ -703,6 +621,12 @@
this.GetFlowIdSelect() this.GetFlowIdSelect()
}, },
methods: { methods: {
deleteSearchCondition(key) {
//删除搜索条件数据
this.searchCondList.forEach((cur, index) => {
if (cur.id === key) this.searchCondList.splice(index, 1)
})
},
initSearchCondition() { initSearchCondition() {
//初始化查询条件 //初始化查询条件
this.searchCondList = [ this.searchCondList = [
...@@ -798,16 +722,37 @@ ...@@ -798,16 +722,37 @@
}, },
] ]
}, },
{
id: 'declarationType',
name: '申报类别',
type: 'select',
show: true,
optList: [
{
label: '教师申报',
value: 111,
},
{
label: '学生申报',
value: 103,
},
]
},
] ]
}, },
cssearch(val) { cssearch(val) {
// 搜索
if (val.rewardType) { if (val.rewardType) {
// this.strategy[this.$route.path]() // this.strategy[this.$route.path]()
this.init = { this.init = {
...this.init, ...val, flow_id: val.rewardType ...this.init, ...val, flow_id: val.rewardType
} }
this.init.flow_id1 = this.init.flow_id 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 { } else {
this.strategy[this.$route.path]() this.strategy[this.$route.path]()
this.init = { this.init = {
...@@ -815,8 +760,6 @@ ...@@ -815,8 +760,6 @@
} }
this.init.flow_id1 = this.init.flow_id this.init.flow_id1 = this.init.flow_id
} }
// 搜索
this.search() this.search()
}, },
csreset() { csreset() {
......
...@@ -258,6 +258,23 @@ ...@@ -258,6 +258,23 @@
}, },
] ]
}, },
{
id: 'declarationType',
name: '申报类别',
type: 'select',
show: true,
optList: [
{
label: '学生申报',
value: 103,
},
{
label: '教师申报',
value: 111,
},
]
},
], ],
flowSelect: [], flowSelect: [],
ddd: '', ddd: '',
...@@ -453,161 +470,67 @@ ...@@ -453,161 +470,67 @@
pageKey: 1, pageKey: 1,
strategy: { strategy: {
// 师生奖励三项t // 师生奖励三项t
"/flow-awaitDoneList-rewardForTeachersAndStudents": () => {
this.initSearchCondition();
this.init.flow_id1 = 107;
this.$nextTick(() => this.init.rewardType = 107)
this.searchCondList.forEach((cur, index) => {
if (cur.id === 'flow_id') this.searchCondList.splice(index, 1)
})
},
"/flow-processedList-rewardForTeachersAndStudents": () => {
this.initSearchCondition()
this.init.flow_id1 = 107;
this.init.rewardType = 107;
this.searchCondList.forEach((cur, index) => {
if (cur.id === 'flow_id') this.searchCondList.splice(index, 1)
})
},
"/flow-myFlowList-rewardForTeachersAndStudents": () => { "/flow-myFlowList-rewardForTeachersAndStudents": () => {
this.initSearchCondition() this.initSearchCondition()
this.init.flow_id1 = 107; this.init.flow_id1 = 107;
this.init.rewardType = 107; this.init.rewardType = 107;
this.searchCondList.forEach((cur, index) => { this.deleteSearchCondition('flow_id')
if (cur.id === 'flow_id') this.searchCondList.splice(index, 1)
}) this.deleteSearchCondition('declarationType')
}, },
// 教师工作量三项 // 教师工作量三项
"/flow-awaitDoneList-WorkloadDeclare": () => {
this.initSearchCondition()
this.init.flow_id1 = 109
this.searchCondList.forEach((cur, index) => {
if (cur.id === 'rewardType') this.searchCondList.splice(index, 1)
})
},
"/flow-processedList-WorkloadDeclare": () => {
this.initSearchCondition()
this.init.flow_id1 = 109
this.searchCondList.forEach((cur, index) => {
if (cur.id === 'rewardType') this.searchCondList.splice(index, 1)
})
},
"/flow-myFlowList-WorkloadDeclare": () => { "/flow-myFlowList-WorkloadDeclare": () => {
this.initSearchCondition() this.initSearchCondition()
this.init.flow_id1 = 109 this.init.flow_id1 = 109
this.searchCondList.forEach((cur, index) => { this.deleteSearchCondition('rewardType')
if (cur.id === 'rewardType') this.searchCondList.splice(index, 1) this.deleteSearchCondition('declarationType')
})
}, },
// 教师奖励三项 // 教师奖励三项
"/flow-awaitDoneList-TeacherBonusDeclare": () => {
this.initSearchCondition()
this.init.flow_id1 = 107
this.searchCondList.forEach((cur, index) => {
if (cur.id === 'rewardType') this.searchCondList.splice(index, 1)
})
},
"/flow-processedList-TeacherBonusDeclare": () => {
this.initSearchCondition()
this.init.flow_id1 = 107
this.searchCondList.forEach((cur, index) => {
if (cur.id === 'rewardType') this.searchCondList.splice(index, 1)
})
},
"/flow-myFlowList-TeacherBonusDeclare": () => { "/flow-myFlowList-TeacherBonusDeclare": () => {
this.initSearchCondition() this.initSearchCondition()
this.init.flow_id1 = 107 this.init.flow_id1 = 107
this.searchCondList.forEach((cur, index) => { this.deleteSearchCondition('rewardType')
if (cur.id === 'rewardType') this.searchCondList.splice(index, 1) this.deleteSearchCondition('declarationType')
})
}, },
// 学生补助三项 // 学生补助三项
"/flow-awaitDoneList-SubsidyDeclare": () => {
this.initSearchCondition()
this.init.flow_id1 = 108
this.searchCondList.forEach((cur, index) => {
if (cur.id === 'rewardType') this.searchCondList.splice(index, 1)
})
},
"/flow-processedList-SubsidyDeclare": () => {
this.initSearchCondition()
this.init.flow_id1 = 108
this.searchCondList.forEach((cur, index) => {
if (cur.id === 'rewardType') this.searchCondList.splice(index, 1)
})
},
"/flow-myFlowList-SubsidyDeclare": () => { "/flow-myFlowList-SubsidyDeclare": () => {
this.initSearchCondition() this.initSearchCondition()
this.init.flow_id1 = 108 this.init.flow_id1 = 108
this.searchCondList.forEach((cur, index) => { this.deleteSearchCondition('rewardType')
if (cur.id === 'rewardType') this.searchCondList.splice(index, 1) this.deleteSearchCondition('declarationType')
})
}, },
// 学生奖励三项 // 学生奖励三项
"/flow-awaitDoneList-StudentBonusDeclare": () => {
this.initSearchCondition()
this.init.flow_id1 = 106;
this.searchCondList.forEach((cur, index) => {
if (cur.id === 'rewardType') this.searchCondList.splice(index, 1)
})
},
"/flow-processedList-StudentBonusDeclare": () => {
this.initSearchCondition()
this.init.flow_id1 = 106
this.searchCondList.forEach((cur, index) => {
if (cur.id === 'rewardType') this.searchCondList.splice(index, 1)
})
},
"/flow-myFlowList-StudentBonusDeclare": () => { "/flow-myFlowList-StudentBonusDeclare": () => {
this.initSearchCondition() this.initSearchCondition()
this.init.flow_id1 = 106 this.init.flow_id1 = 106
this.searchCondList.forEach((cur, index) => { this.deleteSearchCondition('rewardType')
if (cur.id === 'rewardType') this.searchCondList.splice(index, 1) this.deleteSearchCondition('declarationType')
})
}, },
// 获奖材料三项 // 获奖材料三项
"/flow-awaitDoneList-Certificate": () => {
this.initSearchCondition()
this.init.flow_id1 = 103
this.searchCondList.forEach((cur, index) => {
if (cur.id === 'rewardType') this.searchCondList.splice(index, 1)
})
},
"/flow-processedList-Certificate": () => {
this.initSearchCondition()
this.init.flow_id1 = 103
this.searchCondList.forEach((cur, index) => {
if (cur.id === 'rewardType') this.searchCondList.splice(index, 1)
})
},
"/flow-myFlowList-Certificate": () => { "/flow-myFlowList-Certificate": () => {
this.initSearchCondition() this.initSearchCondition()
this.init.flow_id1 = 103 this.init.flow_id1 = 103
this.searchCondList.forEach((cur, index) => { this.deleteSearchCondition('flow_id')
if (cur.id === 'rewardType') this.searchCondList.splice(index, 1) this.deleteSearchCondition('rewardType')
})
}, },
// 赛事审批三项 // 赛事审批三项
"/flow-awaitDoneList": () => {
this.initSearchCondition()
this.init.flow_id1 = 102
this.searchCondList.forEach((cur, index) => {
if (cur.id === 'rewardType') this.searchCondList.splice(index, 1)
})
},
"/flow-processedList": () => {
this.initSearchCondition()
this.init.flow_id1 = 102
this.searchCondList.forEach((cur, index) => {
if (cur.id === 'rewardType') this.searchCondList.splice(index, 1)
})
},
"/flow-myFlowList": () => { "/flow-myFlowList": () => {
this.initSearchCondition() this.initSearchCondition()
this.init.flow_id1 = 102 this.init.flow_id1 = 102
this.searchCondList.forEach((cur, index) => { this.deleteSearchCondition('rewardType')
if (cur.id === 'rewardType') this.searchCondList.splice(index, 1) this.deleteSearchCondition('declarationType')
})
}, },
} //基于路由获取流程id } //基于路由获取流程id
} }
...@@ -642,6 +565,12 @@ ...@@ -642,6 +565,12 @@
this.GetFlowIdSelect() this.GetFlowIdSelect()
}, },
methods: { methods: {
deleteSearchCondition(key) {
//删除搜索条件数据
this.searchCondList.forEach((cur, index) => {
if (cur.id === key) this.searchCondList.splice(index, 1)
})
},
initSearchCondition() { initSearchCondition() {
//初始化查询条件 //初始化查询条件
this.searchCondList = [ this.searchCondList = [
...@@ -737,6 +666,22 @@ ...@@ -737,6 +666,22 @@
}, },
] ]
}, },
{
id: 'declarationType',
name: '申报类别',
type: 'select',
show: true,
optList: [
{
label: '教师申报',
value: 111,
},
{
label: '学生申报',
value: 103,
},
]
},
] ]
}, },
cssearch(val) { cssearch(val) {
...@@ -747,6 +692,11 @@ ...@@ -747,6 +692,11 @@
...this.init, ...val, flow_id: val.rewardType ...this.init, ...val, flow_id: val.rewardType
} }
this.init.flow_id1 = this.init.flow_id 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 { } else {
this.strategy[this.$route.path]() this.strategy[this.$route.path]()
this.init = { this.init = {
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册 或