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

v20241218 1. 所有待办、已办、我的流程列表,成绩统计下赛事报名、成绩申报、奖励申请列表,追加所属院系、竞赛时间查询条件;

上级 1c733b9d
流水线 #31942 已通过 ,包含阶段
in 56 second
...@@ -91,7 +91,10 @@ _# 竞赛管理系统 ...@@ -91,7 +91,10 @@ _# 竞赛管理系统
- 20240927 - 20240927
1. 附件预览》兼容大写文件后缀名 1. 附件预览》兼容大写文件后缀名
2. 待办、已办、我的全部流程“类别”下拉框该为多选;flow_id传数组。GetAlreadyFlowTaskList、GetMyFlowTaskList、GetFlowTaskList 2. 待办、已办、我的全部流程“类别”下拉框该为多选;flow_id传数组。GetAlreadyFlowTaskList、GetMyFlowTaskList、GetFlowTaskList
- 20241218
1. 所有待办、已办、我的流程列表,成绩统计下赛事报名、成绩申报、奖励申请列表,追加所属院系、竞赛时间查询条件;
2. 处理在线文档其他优化项
......
[data-v-38edba32] .ivu-select-single .ivu-select-selection .ivu-select-placeholder{color:#515a6e}[data-v-38edba32] .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-38edba32]:hover{color:#1e93ff;background-color:#f7f7f7}.fileddelete[data-v-38edba32]:hover{color:red;transform:scale(1.5)}[data-v-75924cee] .ivu-select-single .ivu-select-selection .ivu-select-placeholder{color:#515a6e}[data-v-75924cee] .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-75924cee]:hover{color:#1e93ff;background-color:#f7f7f7;cursor:pointer}.fileddelete[data-v-75924cee]:hover{color:red;transform:scale(1.5)}.competitionClassIcon{display:flex;align-items:center;cursor:pointer}.competitionClassIcon:hover{transform:scale(1.5);color:red}.container{overflow-y:auto;width:100%;//min-height:987px;display:flex;align-content:center;justify-content:center;flex-wrap:wrap}.Atext{float:right;margin-bottom:.7vw;margin-top:.7vw;font-size:16px}.Atext:hover{transform:scale(1.2)}.tableList[data-v-c9f37292]{display:flex;justify-content:center;flex-wrap:wrap}.tableList .container1[data-v-c9f37292]{border-collapse:collapse;width:100%;margin-bottom:20px}.tableList .container1 .row[data-v-c9f37292]{width:100%;height:100%}.tableList .container1 .colTitle[data-v-c9f37292]{text-align:center;width:200px;height:50px}.tableList .container1 .colContent[data-v-c9f37292]{width:500px;height:50px;text-align:center}.tableList .container1 .aText[data-v-c9f37292]:hover{transform:scale(1.2)}.tableList .container1 .Atext[data-v-c9f37292]{float:right;margin-bottom:.7vw;margin-top:.7vw;font-size:16px}.tableList .container1 .Atext[data-v-c9f37292]:hover{transform:scale(1.2)}.carClass[data-v-c9f37292]{border-radius:0!important;margin-bottom:20px}.carClass[data-v-c9f37292] .ivu-card{display:block;background:#fff;border-radius:0!important;font-size:14px;position:relative;transition:all .2s ease-in-out} [data-v-38edba32] .ivu-select-single .ivu-select-selection .ivu-select-placeholder{color:#515a6e}[data-v-38edba32] .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-38edba32]:hover{color:#1e93ff;background-color:#f7f7f7}.fileddelete[data-v-38edba32]:hover{color:red;transform:scale(1.5)}[data-v-75924cee] .ivu-select-single .ivu-select-selection .ivu-select-placeholder{color:#515a6e}[data-v-75924cee] .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-75924cee]:hover{color:#1e93ff;background-color:#f7f7f7;cursor:pointer}.fileddelete[data-v-75924cee]:hover{color:red;transform:scale(1.5)}.competitionClassIcon{display:flex;align-items:center;cursor:pointer}.competitionClassIcon:hover{transform:scale(1.5);color:red}.container{overflow-y:auto;width:100%;//min-height:987px;display:flex;align-content:center;justify-content:center;flex-wrap:wrap}.Atext{float:right;margin-bottom:.7vw;margin-top:.7vw;font-size:16px}.Atext:hover{transform:scale(1.2)}.tableList[data-v-77afb83b]{display:flex;justify-content:center;flex-wrap:wrap}.tableList .container1[data-v-77afb83b]{border-collapse:collapse;width:100%;margin-bottom:20px}.tableList .container1 .row[data-v-77afb83b]{width:100%;height:100%}.tableList .container1 .colTitle[data-v-77afb83b]{text-align:center;width:200px;height:50px}.tableList .container1 .colContent[data-v-77afb83b]{width:500px;height:50px;text-align:center}.tableList .container1 .aText[data-v-77afb83b]:hover{transform:scale(1.2)}.tableList .container1 .Atext[data-v-77afb83b]{float:right;margin-bottom:.7vw;margin-top:.7vw;font-size:16px}.tableList .container1 .Atext[data-v-77afb83b]:hover{transform:scale(1.2)}.carClass[data-v-77afb83b]{border-radius:0!important;margin-bottom:20px}.carClass[data-v-77afb83b] .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 \ No newline at end of file
.carClass[data-v-3a85aaaf]{border-radius:0!important;margin-bottom:20px}.carClass[data-v-3a85aaaf] .ivu-card{display:block;background:#fff;border-radius:0!important;font-size:14px;position:relative;transition:all .2s ease-in-out}[data-v-3a85aaaf] .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-3a85aaaf]:hover{color:#1e93ff;background-color:#f7f7f7}.fileddelete[data-v-3a85aaaf]:hover{color:red;transform:scale(1.5)}.teamCardExtraText[data-v-3a85aaaf]{font-size:18px;font-weight:600;font-family:宋体;color:#1e93ff}.Atext[data-v-3a85aaaf]{margin-bottom:.7vw;margin-top:.7vw;font-size:16px;position:absolute}.Atext[data-v-3a85aaaf]:hover{transform:scale(1.2)}.container[data-v-3a85aaaf]{width:100%;min-height:687px;height:auto;align-content:center;overflow-y:auto}.container[data-v-3a85aaaf],.tableList[data-v-6a711470]{display:flex;justify-content:center;flex-wrap:wrap}.tableList .container1[data-v-6a711470]{border-collapse:collapse;width:100%}.tableList .container1 .row[data-v-6a711470]{width:100%;height:100%}.tableList .container1 .colTitle[data-v-6a711470]{text-align:center;width:200px;height:50px}.tableList .container1 .colContent[data-v-6a711470]{width:500px;height:50px;text-align:center}.Atext[data-v-6a711470]{margin-bottom:.7vw;margin-top:.7vw;font-size:16px}.teamCardExtraText[data-v-6a711470]{font-size:18px;font-weight:600;font-family:宋体;color:#1e93ff}.carClass[data-v-6a711470]{border-radius:0!important;margin-bottom:20px}.carClass[data-v-6a711470] .ivu-card{display:block;background:#fff;border-radius:0!important;font-size:14px;position:relative;transition:all .2s ease-in-out} .carClass[data-v-3a85aaaf]{border-radius:0!important;margin-bottom:20px}.carClass[data-v-3a85aaaf] .ivu-card{display:block;background:#fff;border-radius:0!important;font-size:14px;position:relative;transition:all .2s ease-in-out}[data-v-3a85aaaf] .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-3a85aaaf]:hover{color:#1e93ff;background-color:#f7f7f7}.fileddelete[data-v-3a85aaaf]:hover{color:red;transform:scale(1.5)}.teamCardExtraText[data-v-3a85aaaf]{font-size:18px;font-weight:600;font-family:宋体;color:#1e93ff}.Atext[data-v-3a85aaaf]{margin-bottom:.7vw;margin-top:.7vw;font-size:16px;position:absolute}.Atext[data-v-3a85aaaf]:hover{transform:scale(1.2)}.container[data-v-3a85aaaf]{width:100%;min-height:687px;height:auto;align-content:center;overflow-y:auto}.container[data-v-3a85aaaf],.tableList[data-v-b037d618]{display:flex;justify-content:center;flex-wrap:wrap}.tableList .container1[data-v-b037d618]{border-collapse:collapse;width:100%}.tableList .container1 .row[data-v-b037d618]{width:100%;height:100%}.tableList .container1 .colTitle[data-v-b037d618]{text-align:center;width:200px;height:50px}.tableList .container1 .colContent[data-v-b037d618]{width:500px;height:50px;text-align:center}.Atext[data-v-b037d618]{margin-bottom:.7vw;margin-top:.7vw;font-size:16px}.teamCardExtraText[data-v-b037d618]{font-size:18px;font-weight:600;font-family:宋体;color:#1e93ff}.carClass[data-v-b037d618]{border-radius:0!important;margin-bottom:20px}.carClass[data-v-b037d618] .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 \ No newline at end of file
.carClass[data-v-135205d8]{border-radius:0!important;margin-bottom:20px}.carClass[data-v-135205d8] .ivu-card{display:block;background:#fff;border-radius:0!important;font-size:14px;position:relative;transition:all .2s ease-in-out}[data-v-135205d8] .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-135205d8]:hover{color:#1e93ff;background-color:#f7f7f7}.fileddelete[data-v-135205d8]:hover{color:red;transform:scale(1.5)}.teamCardExtraText[data-v-135205d8]{font-size:18px;font-weight:600;font-family:宋体;color:#1e93ff}.Atext[data-v-135205d8]{margin-bottom:.7vw;margin-top:.7vw;font-size:16px;position:absolute}.Atext[data-v-135205d8]:hover{transform:scale(1.2)}.container[data-v-135205d8]{width:100%;min-height:687px;height:auto;align-content:center;overflow-y:auto}.container[data-v-135205d8],.tableList[data-v-0898949e]{display:flex;justify-content:center;flex-wrap:wrap}.tableList .container1[data-v-0898949e]{border-collapse:collapse;width:100%}.tableList .container1 .row[data-v-0898949e]{width:100%;height:100%}.tableList .container1 .colTitle[data-v-0898949e]{text-align:center;width:200px;height:50px}.tableList .container1 .colContent[data-v-0898949e]{width:500px;height:50px;text-align:center}.Atext[data-v-0898949e]{margin-bottom:.7vw;margin-top:.7vw;font-size:16px}.teamCardExtraText[data-v-0898949e]{font-size:18px;font-weight:600;font-family:宋体;color:#1e93ff}.carClass[data-v-0898949e]{border-radius:0!important;margin-bottom:20px}.carClass[data-v-0898949e] .ivu-card{display:block;background:#fff;border-radius:0!important;font-size:14px;position:relative;transition:all .2s ease-in-out} .carClass[data-v-135205d8]{border-radius:0!important;margin-bottom:20px}.carClass[data-v-135205d8] .ivu-card{display:block;background:#fff;border-radius:0!important;font-size:14px;position:relative;transition:all .2s ease-in-out}[data-v-135205d8] .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-135205d8]:hover{color:#1e93ff;background-color:#f7f7f7}.fileddelete[data-v-135205d8]:hover{color:red;transform:scale(1.5)}.teamCardExtraText[data-v-135205d8]{font-size:18px;font-weight:600;font-family:宋体;color:#1e93ff}.Atext[data-v-135205d8]{margin-bottom:.7vw;margin-top:.7vw;font-size:16px;position:absolute}.Atext[data-v-135205d8]:hover{transform:scale(1.2)}.container[data-v-135205d8]{width:100%;min-height:687px;height:auto;align-content:center;overflow-y:auto}.container[data-v-135205d8],.tableList[data-v-42e370e5]{display:flex;justify-content:center;flex-wrap:wrap}.tableList .container1[data-v-42e370e5]{border-collapse:collapse;width:100%}.tableList .container1 .row[data-v-42e370e5]{width:100%;height:100%}.tableList .container1 .colTitle[data-v-42e370e5]{text-align:center;width:200px;height:50px}.tableList .container1 .colContent[data-v-42e370e5]{width:500px;height:50px;text-align:center}.Atext[data-v-42e370e5]{margin-bottom:.7vw;margin-top:.7vw;font-size:16px}.teamCardExtraText[data-v-42e370e5]{font-size:18px;font-weight:600;font-family:宋体;color:#1e93ff}.carClass[data-v-42e370e5]{border-radius:0!important;margin-bottom:20px}.carClass[data-v-42e370e5] .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 \ 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.d66bcaf6.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.760a789e.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.b243057a.js></script><script src=js/app~748942c6.e3f20e1d.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~253ae210.71a233fb.css rel=stylesheet><link href=css/chunk-vendors~f9ca8911.6d189742.css rel=stylesheet><link href=css/app~748942c6.7366d5e6.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.760a789e.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.3b1225a0.js></script><script src=js/app~748942c6.f35e595f.js></script></body></html>
\ No newline at end of file \ No newline at end of file
此差异已折叠。
因为 它太大了无法显示 源差异 。您可以改为 查看blob。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
因为 它太大了无法显示 源差异 。您可以改为 查看blob。
...@@ -59,6 +59,8 @@ export declare function postApiBonusDeclareGetBonusDeclareList(input?: Competiti ...@@ -59,6 +59,8 @@ export declare function postApiBonusDeclareGetBonusDeclareList(input?: Competiti
competitionbatchid: string; competitionbatchid: string;
competitionbatch_name: string; competitionbatch_name: string;
is_del: number; is_del: number;
did: string;
dept_name: string;
}[]; }[];
query: { query: {
[x: string]: any; [x: string]: any;
......
...@@ -70,6 +70,8 @@ export declare function postApiCompetitionSignApiCompetitionSignGetSignList(inpu ...@@ -70,6 +70,8 @@ export declare function postApiCompetitionSignApiCompetitionSignGetSignList(inpu
create_name: string; create_name: string;
course: string; course: string;
is_specialist: number; is_specialist: number;
did: string;
dept_name: string;
}; };
}[]; }[];
query: { query: {
......
import { type AxiosRequestConfig } from "axios";
/**
* 奖励刷新所属部门
* /api/DataRefresh/BonusDeclareDeptRefresh
*/
export declare function getApiDataRefreshBonusDeclareDeptRefresh(config?: AxiosRequestConfig): import("axios").AxiosPromise<{
code: number;
status: string;
msg: string;
msg_detail: string;
response: string;
}>;
import request from "@/plugins/request";
/**
* 奖励刷新所属部门
* /api/DataRefresh/BonusDeclareDeptRefresh
*/
export function getApiDataRefreshBonusDeclareDeptRefresh(config) {
return request.get(`/api/DataRefresh/BonusDeclareDeptRefresh`, config);
}
import { type AxiosRequestConfig } from "axios";
/**
* 报名刷新所属部门
* /api/DataRefresh/SignDeptRefresh
*/
export declare function getApiDataRefreshSignDeptRefresh(config?: AxiosRequestConfig): import("axios").AxiosPromise<{
code: number;
status: string;
msg: string;
msg_detail: string;
response: string;
}>;
import request from "@/plugins/request";
/**
* 报名刷新所属部门
* /api/DataRefresh/SignDeptRefresh
*/
export function getApiDataRefreshSignDeptRefresh(config) {
return request.get(`/api/DataRefresh/SignDeptRefresh`, config);
}
...@@ -2,3 +2,5 @@ export * from "./getApiDataRefreshCertificateRefresh"; ...@@ -2,3 +2,5 @@ export * from "./getApiDataRefreshCertificateRefresh";
export * from "./getApiDataRefreshCertificateNameRefresh"; export * from "./getApiDataRefreshCertificateNameRefresh";
export * from "./getApiDataRefreshSignCreatebyByRun"; export * from "./getApiDataRefreshSignCreatebyByRun";
export * from "./getApiDataRefreshCertificateDeptRefresh"; export * from "./getApiDataRefreshCertificateDeptRefresh";
export * from "./getApiDataRefreshSignDeptRefresh";
export * from "./getApiDataRefreshBonusDeclareDeptRefresh";
...@@ -2,3 +2,5 @@ export * from "./getApiDataRefreshCertificateRefresh"; ...@@ -2,3 +2,5 @@ export * from "./getApiDataRefreshCertificateRefresh";
export * from "./getApiDataRefreshCertificateNameRefresh"; export * from "./getApiDataRefreshCertificateNameRefresh";
export * from "./getApiDataRefreshSignCreatebyByRun"; export * from "./getApiDataRefreshSignCreatebyByRun";
export * from "./getApiDataRefreshCertificateDeptRefresh"; export * from "./getApiDataRefreshCertificateDeptRefresh";
export * from "./getApiDataRefreshSignDeptRefresh";
export * from "./getApiDataRefreshBonusDeclareDeptRefresh";
...@@ -87,6 +87,8 @@ export declare function getApiFlowViewApiFlowFlowInit(params: GetApiFlowViewApiF ...@@ -87,6 +87,8 @@ export declare function getApiFlowViewApiFlowFlowInit(params: GetApiFlowViewApiF
create_name: string; create_name: string;
course: string; course: string;
is_specialist: number; is_specialist: number;
did: string;
dept_name: string;
}; };
certificate: { certificate: {
certificateid: string; certificateid: string;
......
...@@ -89,6 +89,8 @@ export declare function getApiFlowViewApiFlowViewGetFlowInfo(params: GetApiFlowV ...@@ -89,6 +89,8 @@ export declare function getApiFlowViewApiFlowViewGetFlowInfo(params: GetApiFlowV
create_name: string; create_name: string;
course: string; course: string;
is_specialist: number; is_specialist: number;
did: string;
dept_name: string;
}; };
certificate: { certificate: {
certificateid: string; certificateid: string;
...@@ -190,6 +192,8 @@ export declare function getApiFlowViewApiFlowViewGetFlowInfo(params: GetApiFlowV ...@@ -190,6 +192,8 @@ export declare function getApiFlowViewApiFlowViewGetFlowInfo(params: GetApiFlowV
competitionbatchid: string; competitionbatchid: string;
competitionbatch_name: string; competitionbatch_name: string;
is_del: number; is_del: number;
did: string;
dept_name: string;
}; };
subsidy: { subsidy: {
subsidydeclareid: string; subsidydeclareid: string;
......
...@@ -25,4 +25,6 @@ export interface BonusDeclare { ...@@ -25,4 +25,6 @@ export interface BonusDeclare {
competitionbatchid?: string; competitionbatchid?: string;
competitionbatch_name?: string; competitionbatch_name?: string;
is_del?: number; is_del?: number;
did?: string;
dept_name?: string;
} }
...@@ -19,6 +19,8 @@ export interface CompetitionRequests { ...@@ -19,6 +19,8 @@ export interface CompetitionRequests {
dept_id?: string; dept_id?: string;
/** 奖项选项 */ /** 奖项选项 */
h_id?: string; h_id?: string;
begin_time?: string;
end_time?: string;
page_index?: number; page_index?: number;
page_size?: number; page_size?: number;
} }
...@@ -36,4 +36,6 @@ export interface CompetitionSign { ...@@ -36,4 +36,6 @@ export interface CompetitionSign {
create_name?: string; create_name?: string;
course?: string; course?: string;
is_specialist?: number; is_specialist?: number;
did?: string;
dept_name?: string;
} }
...@@ -18,6 +18,12 @@ export interface FlowRequests { ...@@ -18,6 +18,12 @@ export interface FlowRequests {
sponsor?: string; sponsor?: string;
/** 竞赛形式 */ /** 竞赛形式 */
way?: string; way?: string;
/** 批次 */
batch?: string;
/** 归属院系 */
dept_id?: string;
begin_time?: string;
end_time?: string;
page_index?: number; page_index?: number;
page_size?: number; page_size?: number;
} }
...@@ -46,6 +46,7 @@ ...@@ -46,6 +46,7 @@
</Option> </Option>
</Select> </Select>
<Select <Select
v-else-if="item.type == 'selectMultiple'" v-else-if="item.type == 'selectMultiple'"
v-model="searchCondObj[item.id]" v-model="searchCondObj[item.id]"
:clearable="!item.clearable" :clearable="!item.clearable"
...@@ -64,27 +65,32 @@ ...@@ -64,27 +65,32 @@
:value="it.value">{{ it.label }} :value="it.value">{{ it.label }}
</Option> </Option>
</Select> </Select>
<DatePicker <div class="DatePickerCustom" v-else-if="item.type == 'daterange'">
v-else-if="item.type == 'daterange'" <span class="labelText" >
v-model="searchCondObj[item['id']]" {{ item.name }}
:placeholder="'请选择'+item.name" </span>
format="yyyy-MM-dd" <DatePicker
type="daterange" class="labelContent"
@on-change="(val1, val2) => daterangeChange(val1, val2, item.id)"> v-model="searchCondObj[item['id']]"
<template #prefix> :placeholder="'请选择'+item.name"
<div> format="yyyy-MM-dd"
{{ item.name }} type="daterange"
</div> @on-change="(val1, val2) => daterangeChange(val1, val2, item.id)">
</template>
</DatePicker>
<DatePicker </DatePicker>
v-else-if="item.type == 'datetime'" </div>
v-model="searchCondObj[item['id']]" <div style="display: flex" v-else-if="item.type == 'datetime'">
:placeholder="'请选择'+item.name" <span style="width: 15%">
format="yyyy-MM-dd HH:mm" {{ item.name }}
type="datetime" </span>
@on-change="(val1, val2) => datetimeChange(val1, val2, item.id)"/> <DatePicker
style="width: 85%"
v-model="searchCondObj[item['id']]"
:placeholder="'请选择'+item.name"
format="yyyy-MM-dd HH:mm"
type="datetime"
@on-change="(val1, val2) => datetimeChange(val1, val2, item.id)"/>
</div>
</FormItem> </FormItem>
</Col> </Col>
...@@ -98,76 +104,130 @@ ...@@ -98,76 +104,130 @@
</template> </template>
<script> <script>
export default { export default {
props: { props: {
// 搜索项列表 // 搜索项列表
searchCondList: {type: Array, require: true}, searchCondList: {type: Array, require: true},
// label宽度 // label宽度
labelWidth: {type: Number, default: 100}, labelWidth: {type: Number, default: 100},
// label冒号 // label冒号
labelColon: {type: Boolean, default: true}, labelColon: {type: Boolean, default: true},
params: { params: {
type: Object, default: () => { type: Object, default: () => {
}
},
},
data() {
return {
// 搜索条件布局
grid: {
xs: 24,
sm: 12,
md: 12,
lg: 12,
xl: 8,
xxl: 6,
},
// 搜索数据
searchCondObj: {...this.params},
} }
}, },
computed: {}, },
created() { data() {
return {
// 搜索条件布局
grid: {
xs: 24,
sm: 12,
md: 12,
lg: 12,
xl: 8,
xxl: 6,
},
// 搜索数据
searchCondObj: {...this.params},
}
},
computed: {},
created() {
},
mounted() {
},
methods: {
// 搜索
searchBt() {
console.log("🚀🚀this.searchCondObjsearchBt🚀,", this.searchCondObj)
this.$emit('onSubmit', this.searchCondObj)
}, },
mounted() { // 重置
resetBt() {
// console.log('重置按钮')
this.searchCondObj = {}
this.$emit('onReset')
}, },
methods: {
// 搜索
searchBt() {
console.log("🚀🚀this.searchCondObjsearchBt🚀,", this.searchCondObj)
this.$emit('onSubmit', this.searchCondObj)
},
// 重置
resetBt() {
// console.log('重置按钮')
this.searchCondObj = {}
this.$emit('onReset')
},
// 日期时间改变选择 // 日期时间改变选择
datetimeChange(val1, val2, id) { datetimeChange(val1, val2, id) {
// console.log('日期时间改变选择', val1, val2, id) // console.log('日期时间改变选择', val1, val2, id)
this.searchCondObj[id] = val1 this.searchCondObj[id] = val1
},
// 范围日期选择
daterangeChange(val1, val2, id) {
// console.log('日期时间改变选择', val1, val2, id)
this.searchCondObj[id] = val1
},
selectChange($event, key) {
console.log("🚀🚀🚀$event,", $event)
this.$forceUpdate()
console.log("🚀🚀🚀$forceUpdate,", this.searchCondObj)
//select变化 触发父组件的 批次调用
if (key === 'is_tea') this.$emit('watchIsTea', this.searchCondObj.is_tea || 0)
}
}, },
} // 范围日期选择
daterangeChange(val1, val2, id) {
// console.log('日期时间改变选择', val1, val2, id)
this.searchCondObj[id] = val1
},
selectChange($event, key) {
console.log("🚀🚀🚀$event,", $event)
this.$forceUpdate()
console.log("🚀🚀🚀$forceUpdate,", this.searchCondObj)
//select变化 触发父组件的 批次调用
if (key === 'is_tea') this.$emit('watchIsTea', this.searchCondObj.is_tea || 0)
}
},
}
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>
/**
日期选择器样式重写
*/
.DatePickerCustom{
display: flex;
border: 1px solid #DCDEE2;
border-radius: 4px;
height: 32px;
box-sizing: border-box;
z-index: 99888;
.labelText{
width: 80px;
margin-left: 5px;
display: flex;
align-items: center;
}
.labelContent{
/deep/.ivu-input {
display: inline-block;
width: 100%;
height: 29px;
line-height: 1.5;
padding: 4px 7px;
font-size: 14px;
border: unset;
border-radius: 4px;
color: #515a6e;
background-color: #fff;
background-image: none;
position: relative;
cursor: text;
transition: border 0.2s ease-in-out, background 0.2s ease-in-out, box-shadow 0.2s ease-in-out;
}
/deep/.ivu-date-picker-focused input:not([disabled]) {
outline: 0;
box-shadow:unset;
}
/deep/.ivu-input:focus {
box-shadow:unset;
outline: 0;
}
width:85%
}
}
.DatePickerCustom:hover{
border: 1px solid #57A3F4;
transition: border 0.2s ease-in-out, background 0.2s ease-in-out, box-shadow 0.2s ease-in-out;
cursor: pointer;
}
/**
日期选择器样式重写
*/
/* /*
/deep/ .ivu-select-single .ivu-select-selection { /deep/ .ivu-select-single .ivu-select-selection {
......
...@@ -236,3 +236,9 @@ export function decode(value) { ...@@ -236,3 +236,9 @@ export function decode(value) {
//解密 //解密
return JSON.parse(crypto.decodeAesString(value)); return JSON.parse(crypto.decodeAesString(value));
} }
export function dateFormat(time,format='YYYY-MM-DD') {
//格式化日期hook
return dayjs(time).format(format)
}
\ No newline at end of file
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
</Menu> </Menu>
<div style="position: absolute ;bottom: 10px;width: 100%;"> <div style="position: absolute ;bottom: 10px;width: 100%;">
<div style="display: flex;width:100%;height: 50px; justify-content: center;align-items: center;"> <div style="display: flex;width:100%;height: 50px; justify-content: center;align-items: center;">
<span style="font-size: 12px;">build v241202 1.0.1</span> <span style="font-size: 12px;">build v241218 1.0.1</span>
</div> </div>
</div> </div>
</div> </div>
...@@ -113,7 +113,6 @@ ...@@ -113,7 +113,6 @@
this.$refs.submenu.key = new Date(); this.$refs.submenu.key = new Date();
console.log("🚀this.$refs.submenu🚀🚀,", this.$refs.submenu) console.log("🚀this.$refs.submenu🚀🚀,", this.$refs.submenu)
}, 1000) }, 1000)
}) })
}, },
handleUpdateMenuState() { handleUpdateMenuState() {
......
...@@ -267,9 +267,9 @@ ...@@ -267,9 +267,9 @@
import UpdateSignModalStudentSIgn from './components/UpdateSignModalStudentSIgn.vue' import UpdateSignModalStudentSIgn from './components/UpdateSignModalStudentSIgn.vue'
import {fourtableButtonAuthentication} from "../../hook";
import Cookies from "js-cookie"; import Cookies from "js-cookie";
import * as zeroAPi from "@api/controller/index.d.ts"; import * as zeroAPi from "@api/controller/index.d.ts";
import * as zeroApi from "@api/controller/index.d.ts";
export default { export default {
...@@ -284,8 +284,6 @@ ...@@ -284,8 +284,6 @@
signFlag: '', signFlag: '',
// 搜索项 // 搜索项
searchCondList: [ searchCondList: [
{ {
id: 'batch', id: 'batch',
name: '赛事批次', name: '赛事批次',
...@@ -338,7 +336,20 @@ ...@@ -338,7 +336,20 @@
show: true, show: true,
optList: [{label: '学生', value: 0}, {label: '教师', value: 1}] optList: [{label: '学生', value: 0}, {label: '教师', value: 1}]
}, },
{
id: 'dept_id',
name: '所属院系',
type: 'select',
show: this.includesAdminOrDeptPeople(),
optList: []
},
{
id: 'dateRange',
name: '竞赛时间',
type: 'daterange',
show: true,
optList: []
},
], ],
unfold: { unfold: {
State: 0, State: 0,
...@@ -527,6 +538,7 @@ ...@@ -527,6 +538,7 @@
show: true, show: true,
width: 80 width: 80
}, },
{key: 'dept_name', title: '所属院系', minWidth: 150, show: true},
{ {
title: '赛事名称', title: '赛事名称',
key: 'competitionname', key: 'competitionname',
...@@ -696,6 +708,10 @@ ...@@ -696,6 +708,10 @@
status: '' status: ''
}, },
search: { search: {
dept_id: '',
end_time: '',
begin_time: '',
dateRange: [],
is_tea: 0, is_tea: 0,
batch: '', batch: '',
type: '', type: '',
...@@ -767,9 +783,28 @@ ...@@ -767,9 +783,28 @@
await this.GetBatchBySelect() await this.GetBatchBySelect()
this.getCompetitionSignList() this.getCompetitionSignList()
this.GetLevelBySelect() this.GetLevelBySelect()
this.GetTypeBySelect() this.GetTypeBySelect();
this.GetDeptSelect();
}, },
methods: { methods: {
GetDeptSelect() {
//获取类型下拉框
zeroApi.getApiCommonGetDeptSelect({"role_id": Cookies.get('admin-competition-roleId') ? JSON.parse(Cookies.get('admin-competition-roleId')).role_id : '',}).then(res => {
this.searchCondList.forEach(cur => {
if (cur.id === 'dept_id') cur.optList = res.response.map((cur, index) => {
return {
value: cur.id,
label: cur.name,
}
})
})
})
},
includesAdminOrDeptPeople() {
//当前权限是否 是 管理员||学院负责人
let info = Cookies.get('admin-competition-roleId') ? JSON.parse(Cookies.get('admin-competition-roleId')).role_name : ''
return (info === '管理员' || info === '学院负责人')
},
updateViewFile(e) { updateViewFile(e) {
const fun = (e, url) => { const fun = (e, url) => {
this.src = window.location.protocol + '//' + window.location.host + url.path this.src = window.location.protocol + '//' + window.location.host + url.path
...@@ -889,11 +924,16 @@ ...@@ -889,11 +924,16 @@
}) })
}, },
fourtableButtonAuthentication,
cssearch(val) {
cssearch(val) {
console.log("🚀🚀val🚀,",val)
// 搜索 // 搜索
this.search = {...this.search, ...val} this.search = {
...this.search,
...val,
begin_time:val.dateRange[0]? hook.dateFormat(val.dateRange[0]):'',
end_time:val.dateRange[1]? hook.dateFormat(val.dateRange[1]):'',
}
this.searchFun() this.searchFun()
}, },
...@@ -909,10 +949,15 @@ ...@@ -909,10 +949,15 @@
batch: '', batch: '',
levelArray: [], levelArray: [],
dept_id: '',
end_time: '',
begin_time: '',
dateRange: [],
} }
this.search.batch = this.firstBatch this.search.batch = this.firstBatch
this.$refs.search.searchCondObj.batch = this.firstBatch this.$refs.search.searchCondObj.batch = this.firstBatch
this.$refs.search.searchCondObj.is_tea = 0 this.$refs.search.searchCondObj.is_tea = 0
this.$refs.search.searchCondObj.dateRange = []
await this.GetBatchBySelect() await this.GetBatchBySelect()
this.searchFun() this.searchFun()
}, },
...@@ -1051,6 +1096,9 @@ ...@@ -1051,6 +1096,9 @@
"is_tea": this.search.is_tea, "is_tea": this.search.is_tea,
"batch": this.search.batch, "batch": this.search.batch,
"type": this.search.type, "type": this.search.type,
"dept_id": this.search.dept_id,
"begin_time": this.search.begin_time,
"end_time": this.search.end_time,
"page_index": this.init.page_index, "page_index": this.init.page_index,
"page_size": this.init.page_size, "page_size": this.init.page_size,
} }
......
此差异已折叠。
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册 或