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

- 20240926 优化保存

上级 f0f65a4d
文件已添加
.buttonFocus[data-v-c0745264]:focus{background-color:#2d8cf0;color:#fff}.competitionClassIcon[data-v-c0745264]{display:flex;align-items:center;cursor:pointer}.competitionClassIcon[data-v-c0745264]:hover{transform:scale(1.5);color:red}.buttonFocus[data-v-45d6c00e]:focus{background-color:#2d8cf0;color:#fff}.demo-drawer-footer[data-v-45d6c00e]{width:100%;position:absolute;bottom:0;left:0;border-top:1px solid #e8e8e8;padding:10px 16px;text-align:right;background:#fff}
\ No newline at end of file
.carClass[data-v-46a88aa3]{border-radius:0!important;margin-bottom:20px}.carClass[data-v-46a88aa3] .ivu-card{display:block;background:#fff;border-radius:0!important;font-size:14px;position:relative;transition:all .2s ease-in-out}[data-v-46a88aa3] .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-46a88aa3]:hover{color:#1e93ff;background-color:#f7f7f7}.fileddelete[data-v-46a88aa3]:hover{color:red;transform:scale(1.5)}.teamCardExtraText[data-v-46a88aa3]{font-size:18px;font-weight:600;font-family:宋体;color:#1e93ff}.Atext[data-v-46a88aa3]{margin-bottom:.7vw;margin-top:.7vw;font-size:16px;position:absolute}.Atext[data-v-46a88aa3]:hover{transform:scale(1.2)}.container[data-v-46a88aa3]{width:100%;min-height:687px;height:auto;align-content:center;overflow-y:auto}.container[data-v-46a88aa3],.tableList[data-v-1d6c393e]{display:flex;justify-content:center;flex-wrap:wrap}.tableList .container1[data-v-1d6c393e]{border-collapse:collapse;width:100%}.tableList .container1 .row[data-v-1d6c393e]{width:100%;height:100%}.tableList .container1 .colTitle[data-v-1d6c393e]{text-align:center;width:200px;height:50px}.tableList .container1 .colContent[data-v-1d6c393e]{width:500px;height:50px;text-align:center}.Atext[data-v-1d6c393e]{margin-bottom:.7vw;margin-top:.7vw;font-size:16px}.teamCardExtraText[data-v-1d6c393e]{font-size:18px;font-weight:600;font-family:宋体;color:#1e93ff}.carClass[data-v-1d6c393e]{border-radius:0!important;margin-bottom:20px}.carClass[data-v-1d6c393e] .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
.buttonFocus[data-v-c0745264]:focus{background-color:#2d8cf0;color:#fff}.competitionClassIcon[data-v-c0745264]{display:flex;align-items:center;cursor:pointer}.competitionClassIcon[data-v-c0745264]:hover{transform:scale(1.5);color:red}.buttonFocus[data-v-45d6c00e]:focus{background-color:#2d8cf0;color:#fff}.demo-drawer-footer[data-v-45d6c00e]{width:100%;position:absolute;bottom:0;left:0;border-top:1px solid #e8e8e8;padding:10px 16px;text-align:right;background:#fff}[data-v-e2eec3de] .ivu-menu{display:block;margin:0;padding:0;outline:none;list-style:none;color:#515a6e;font-size:14px;position:relative;z-index:1}
\ No newline at end of file
[data-v-6107c188] .ivu-select-single .ivu-select-selection .ivu-select-placeholder{color:#515a6e}[data-v-6107c188] .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-6107c188]:hover{color:#1e93ff;background-color:#f7f7f7}.fileddelete[data-v-6107c188]: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{margin-left:auto;margin-bottom:.7vw;margin-top:.7vw;font-size:16px}
\ No newline at end of file
[data-v-646029d0] .ivu-select-single .ivu-select-selection .ivu-select-placeholder{color:#515a6e}[data-v-646029d0] .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-646029d0]:hover{color:#1e93ff;background-color:#f7f7f7}.fileddelete[data-v-646029d0]:hover{color:red;transform:scale(1.5)}[data-v-5570dc2d] .ivu-select-single .ivu-select-selection .ivu-select-placeholder{color:#515a6e}[data-v-5570dc2d] .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-5570dc2d]:hover{color:#1e93ff;background-color:#f7f7f7}.fileddelete[data-v-5570dc2d]: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)}.carClass[data-v-4aa7d042]{border-radius:0!important;margin-bottom:20px}.carClass[data-v-4aa7d042] .ivu-card{display:block;background:#fff;border-radius:0!important;font-size:14px;position:relative;transition:all .2s ease-in-out}[data-v-4aa7d042] .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-4aa7d042]:hover{color:#1e93ff;background-color:#f7f7f7}.fileddelete[data-v-4aa7d042]:hover{color:red;transform:scale(1.5)}.teamCardExtraText[data-v-4aa7d042]{font-size:18px;font-weight:600;font-family:宋体;color:#1e93ff}.Atext[data-v-4aa7d042]{margin-bottom:.7vw;margin-top:.7vw;font-size:16px;position:absolute}.Atext[data-v-4aa7d042]:hover{transform:scale(1.2)}.container[data-v-4aa7d042]{width:100%;min-height:687px;height:auto;display:flex;align-content:center;justify-content:center;flex-wrap:wrap;overflow-y:auto}.carClass[data-v-46a88aa3]{border-radius:0!important;margin-bottom:20px}.carClass[data-v-46a88aa3] .ivu-card{display:block;background:#fff;border-radius:0!important;font-size:14px;position:relative;transition:all .2s ease-in-out}[data-v-46a88aa3] .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-46a88aa3]:hover{color:#1e93ff;background-color:#f7f7f7}.fileddelete[data-v-46a88aa3]:hover{color:red;transform:scale(1.5)}.teamCardExtraText[data-v-46a88aa3]{font-size:18px;font-weight:600;font-family:宋体;color:#1e93ff}.Atext[data-v-46a88aa3]{margin-bottom:.7vw;margin-top:.7vw;font-size:16px;position:absolute}.Atext[data-v-46a88aa3]:hover{transform:scale(1.2)}.container[data-v-46a88aa3]{min-height:687px;height:auto;align-content:center;overflow-y:auto}.con[data-v-cc7f2272],.container[data-v-46a88aa3]{width:100%;display:flex;justify-content:center;flex-wrap:wrap}.con[data-v-cc7f2272]{height:100%}.card[data-v-cc7f2272]{height:410px;margin:15px auto;padding:15px 50px;background-color:#fff;overflow-y:auto}.filelist[data-v-cc7f2272]:hover{color:#1e93ff;background-color:#f7f7f7;cursor:pointer}.fileddelete[data-v-cc7f2272]:hover{color:red;transform:scale(1.5)}[data-v-14f2980c] .ivu-select-single .ivu-select-selection .ivu-select-placeholder{color:#515a6e}.Select[data-v-14f2980c] .ivu-select-dropdown{width:500px;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}.con[data-v-14f2980c]{width:100%;height:100%;display:flex;justify-content:center;flex-wrap:wrap}.card[data-v-14f2980c]{height:410px;margin:15px auto;padding:15px 50px;background-color:#fff;overflow-y:auto}.filelist[data-v-14f2980c]:hover{color:#1e93ff;background-color:#f7f7f7;cursor:pointer}.fileddelete[data-v-14f2980c]:hover{color:red;transform:scale(1.5)}.con[data-v-7907c181]{width:100%;height:100%;display:flex;justify-content:center;flex-wrap:wrap}.card[data-v-7907c181]{height:410px;margin:15px auto;padding:15px 50px;background-color:#fff;overflow-y:auto}.filelist[data-v-7907c181]:hover{color:#1e93ff;background-color:#f7f7f7;cursor:pointer}.fileddelete[data-v-7907c181]:hover{color:red;transform:scale(1.5)}[data-v-1f6f9472] .ivu-select-single .ivu-select-selection .ivu-select-placeholder{color:#515a6e}.Select[data-v-1f6f9472] .ivu-select-dropdown{width:500px;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}.con[data-v-1f6f9472]{width:100%;height:100%;display:flex;justify-content:center;flex-wrap:wrap}.card[data-v-1f6f9472]{height:410px;margin:15px auto;padding:15px 50px;background-color:#fff;overflow-y:auto}.filelist[data-v-1f6f9472]:hover{color:#1e93ff;background-color:#f7f7f7;cursor:pointer}.fileddelete[data-v-1f6f9472]:hover{color:red;transform:scale(1.5)}.cancel{cursor:not-allowed;color:#c5c8ce}
\ No newline at end of file
.buttonFocus[data-v-c0745264]:focus{background-color:#2d8cf0;color:#fff}.competitionClassIcon[data-v-c0745264]{display:flex;align-items:center;cursor:pointer}.competitionClassIcon[data-v-c0745264]:hover{transform:scale(1.5);color:red}.buttonFocus[data-v-45d6c00e]:focus{background-color:#2d8cf0;color:#fff}.demo-drawer-footer[data-v-45d6c00e]{width:100%;position:absolute;bottom:0;left:0;border-top:1px solid #e8e8e8;padding:10px 16px;text-align:right;background:#fff}[data-v-5a3bcc38] .ivu-menu{display:block;margin:0;padding:0;outline:none;list-style:none;color:#515a6e;font-size:14px;position:relative;z-index:1}
\ No newline at end of file
[data-v-5570dc2d] .ivu-select-single .ivu-select-selection .ivu-select-placeholder{color:#515a6e}[data-v-5570dc2d] .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-5570dc2d]:hover{color:#1e93ff;background-color:#f7f7f7}.fileddelete[data-v-5570dc2d]:hover{color:red;transform:scale(1.5)}[data-v-646029d0] .ivu-select-single .ivu-select-selection .ivu-select-placeholder{color:#515a6e}[data-v-646029d0] .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-646029d0]:hover{color:#1e93ff;background-color:#f7f7f7}.fileddelete[data-v-646029d0]: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-349bc31a]{display:flex;justify-content:center;flex-wrap:wrap}.tableList .container1[data-v-349bc31a]{border-collapse:collapse;width:100%;margin-bottom:20px}.tableList .container1 .row[data-v-349bc31a]{width:100%;height:100%}.tableList .container1 .colTitle[data-v-349bc31a]{text-align:center;width:200px;height:50px}.tableList .container1 .colContent[data-v-349bc31a]{width:500px;height:50px;text-align:center}.tableList .container1 .aText[data-v-349bc31a]:hover{transform:scale(1.2)}.tableList .container1 .Atext[data-v-349bc31a]{float:right;margin-bottom:.7vw;margin-top:.7vw;font-size:16px}.tableList .container1 .Atext[data-v-349bc31a]:hover{transform:scale(1.2)}.carClass[data-v-349bc31a]{border-radius:0!important;margin-bottom:20px}.carClass[data-v-349bc31a] .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
.carClass[data-v-4aa7d042]{border-radius:0!important;margin-bottom:20px}.carClass[data-v-4aa7d042] .ivu-card{display:block;background:#fff;border-radius:0!important;font-size:14px;position:relative;transition:all .2s ease-in-out}[data-v-4aa7d042] .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-4aa7d042]:hover{color:#1e93ff;background-color:#f7f7f7}.fileddelete[data-v-4aa7d042]:hover{color:red;transform:scale(1.5)}.teamCardExtraText[data-v-4aa7d042]{font-size:18px;font-weight:600;font-family:宋体;color:#1e93ff}.Atext[data-v-4aa7d042]{margin-bottom:.7vw;margin-top:.7vw;font-size:16px;position:absolute}.Atext[data-v-4aa7d042]:hover{transform:scale(1.2)}.container[data-v-4aa7d042]{width:100%;min-height:687px;height:auto;align-content:center;overflow-y:auto}.container[data-v-4aa7d042],.tableList[data-v-594d71de]{display:flex;justify-content:center;flex-wrap:wrap}.tableList .container1[data-v-594d71de]{border-collapse:collapse;width:100%}.tableList .container1 .row[data-v-594d71de]{width:100%;height:100%}.tableList .container1 .colTitle[data-v-594d71de]{text-align:center;width:200px;height:50px}.tableList .container1 .colContent[data-v-594d71de]{width:500px;height:50px;text-align:center}.Atext[data-v-594d71de]{margin-bottom:.7vw;margin-top:.7vw;font-size:16px}.teamCardExtraText[data-v-594d71de]{font-size:18px;font-weight:600;font-family:宋体;color:#1e93ff}.carClass[data-v-594d71de]{border-radius:0!important;margin-bottom:20px}.carClass[data-v-594d71de] .ivu-card{display:block;background:#fff;border-radius:0!important;font-size:14px;position:relative;transition:all .2s ease-in-out}
\ No newline at end of file
<!DOCTYPE html><html><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=0"><link rel="shortcut icon" href=favicon.ico><title>竞赛管理</title><link href=css/chunk-vendors~253ae210.71a233fb.css rel=stylesheet><link href=css/chunk-vendors~f9ca8911.6d189742.css rel=stylesheet><link href=css/app~748942c6.a9059f54.css rel=stylesheet></head><body><script src=/a/manager/identify/identify.js></script><noscript><strong>请开启 JavaScript 功能来使用 竞赛管理。</strong></noscript><div id=app></div><script src=js/chunk-vendors~253ae210.c21551cb.js></script><script src=js/chunk-vendors~db300d2f.e266578a.js></script><script src=js/chunk-vendors~690b702c.00a2f77e.js></script><script src=js/chunk-vendors~f9ca8911.aebec7cb.js></script><script src=js/app~748942c6.aaa79cc4.js></script></body></html>
\ No newline at end of file
<!DOCTYPE html><html><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=0"><link rel="shortcut icon" href=favicon.ico><title>竞赛管理</title><link href=css/chunk-vendors~253ae210.71a233fb.css rel=stylesheet><link href=css/chunk-vendors~f9ca8911.6d189742.css rel=stylesheet><link href=css/app~748942c6.a9059f54.css rel=stylesheet></head><body><script src=/a/manager/identify/identify.js></script><noscript><strong>请开启 JavaScript 功能来使用 竞赛管理。</strong></noscript><div id=app></div><script src=js/chunk-vendors~253ae210.c21551cb.js></script><script src=js/chunk-vendors~db300d2f.e266578a.js></script><script src=js/chunk-vendors~690b702c.00a2f77e.js></script><script src=js/chunk-vendors~f9ca8911.59283e75.js></script><script src=js/app~748942c6.ca4bb24c.js></script></body></html>
\ No newline at end of file
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
......@@ -35,6 +35,8 @@ export declare function getApiCertificateApiCertificateGetCertificateInfo(params
class_hour: string;
actual_class_hour: string;
subsidy_total: number;
did: string;
dept_name: string;
files_list: {
id: string;
module: string;
......
......@@ -5,3 +5,4 @@ export * from "./getApiCertificateApiCertificateCertificateDel";
export * from "./postApiCertificateApiCertificateCertificateExportToExcel";
export * from "./getApiCertificateApiCertificateCertificateSetState";
export * from "./getApiCertificateApiCertificateCertificateAutoInsBonus";
export * from "./postApiCertificateApiCertificateCertificateExportToZip";
......@@ -5,3 +5,4 @@ export * from "./getApiCertificateApiCertificateCertificateDel";
export * from "./postApiCertificateApiCertificateCertificateExportToExcel";
export * from "./getApiCertificateApiCertificateCertificateSetState";
export * from "./getApiCertificateApiCertificateCertificateAutoInsBonus";
export * from "./postApiCertificateApiCertificateCertificateExportToZip";
import { type AxiosRequestConfig } from "axios";
import { type CompetitionRequests } from "../../interface";
/**
* 成绩申报导出获奖证书
* /api/Certificate/api/Certificate/CertificateExportToZip
*/
export declare function postApiCertificateApiCertificateCertificateExportToZip(input?: CompetitionRequests, config?: AxiosRequestConfig): import("axios").AxiosPromise<any>;
import request from "@/plugins/request";
/**
* 成绩申报导出获奖证书
* /api/Certificate/api/Certificate/CertificateExportToZip
*/
export function postApiCertificateApiCertificateCertificateExportToZip(input, config) {
return request.post(`/api/Certificate/api/Certificate/CertificateExportToZip`, input, config);
}
......@@ -56,6 +56,8 @@ export declare function postApiCertificateApiCertificateGetCertificateList(input
class_hour: string;
actual_class_hour: string;
subsidy_total: number;
did: string;
dept_name: string;
files_list: {
id: string;
module: string;
......
......@@ -37,6 +37,7 @@ export declare function getApiCommonGetBatchList(params: GetApiCommonGetBatchLis
createtime: string;
competition_method: number;
is_del: number;
is_allow_delete: number;
}[];
query: {
[x: string]: any;
......
import { type AxiosRequestConfig } from "axios";
/**
* 获取所属院系选择框
* /api/Common/GetDeptSelect
*/
export declare function getApiCommonGetDeptSelect(params: GetApiCommonGetDeptSelectParams, config?: AxiosRequestConfig): import("axios").AxiosPromise<{
code: number;
status: string;
msg: string;
msg_detail: string;
response: {
name: string;
id: string;
}[];
}>;
export interface GetApiCommonGetDeptSelectParams {
role_id: string;
}
import request from "@/plugins/request";
/**
* 获取所属院系选择框
* /api/Common/GetDeptSelect
*/
export function getApiCommonGetDeptSelect(params, config) {
const paramsInput = {
role_id: params.role_id,
};
return request.get(`/api/Common/GetDeptSelect`, {
params: paramsInput,
...config,
});
}
......@@ -34,3 +34,4 @@ export * from "./getApiCommonInstructionalScoreEnable";
export * from "./postApiCommonInstructionalScoreEquation";
export * from "./getApiCommonGetBonusRevealing";
export * from "./getApiCommonGetClassHourList";
export * from "./getApiCommonGetDeptSelect";
......@@ -34,3 +34,4 @@ export * from "./getApiCommonInstructionalScoreEnable";
export * from "./postApiCommonInstructionalScoreEquation";
export * from "./getApiCommonGetBonusRevealing";
export * from "./getApiCommonGetClassHourList";
export * from "./getApiCommonGetDeptSelect";
import { type AxiosRequestConfig } from "axios";
/**
* 获奖材料刷新所属部门
* /api/DataRefresh/CertificateDeptRefresh
*/
export declare function getApiDataRefreshCertificateDeptRefresh(config?: AxiosRequestConfig): import("axios").AxiosPromise<{
code: number;
status: string;
msg: string;
msg_detail: string;
response: string;
}>;
import request from "@/plugins/request";
/**
* 获奖材料刷新所属部门
* /api/DataRefresh/CertificateDeptRefresh
*/
export function getApiDataRefreshCertificateDeptRefresh(config) {
return request.get(`/api/DataRefresh/CertificateDeptRefresh`, config);
}
export * from "./getApiDataRefreshCertificateRefresh";
export * from "./getApiDataRefreshCertificateNameRefresh";
export * from "./getApiDataRefreshSignCreatebyByRun";
export * from "./getApiDataRefreshCertificateDeptRefresh";
export * from "./getApiDataRefreshCertificateRefresh";
export * from "./getApiDataRefreshCertificateNameRefresh";
export * from "./getApiDataRefreshSignCreatebyByRun";
export * from "./getApiDataRefreshCertificateDeptRefresh";
......@@ -122,6 +122,8 @@ export declare function getApiFlowViewApiFlowFlowInit(params: GetApiFlowViewApiF
class_hour: string;
actual_class_hour: string;
subsidy_total: number;
did: string;
dept_name: string;
};
bursary: {
bursaryid: string;
......
......@@ -124,6 +124,8 @@ export declare function getApiFlowViewApiFlowViewGetFlowInfo(params: GetApiFlowV
class_hour: string;
actual_class_hour: string;
subsidy_total: number;
did: string;
dept_name: string;
};
bursary: {
bursaryid: string;
......
......@@ -32,4 +32,6 @@ export interface Certificate {
class_hour?: string;
actual_class_hour?: string;
subsidy_total?: number;
did?: string;
dept_name?: string;
}
......@@ -26,5 +26,7 @@ export interface CertificateViewModel {
class_hour?: string;
actual_class_hour?: string;
subsidy_total?: number;
did?: string;
dept_name?: string;
files_list?: CompetitionFile[];
}
......@@ -7,4 +7,5 @@ export interface CompetitionBatch {
createtime?: string;
competition_method?: number;
is_del?: number;
is_allow_delete?: number;
}
......@@ -15,6 +15,8 @@ export interface CompetitionRequests {
is_tea?: number;
/** 审批状态 */
approval_state?: string;
/** 归属院系 */
dept_id?: string;
/** 奖项选项 */
h_id?: string;
page_index?: number;
......
......@@ -1114,6 +1114,16 @@ export function CertificateExportToExcel(data) {
});
}
export function CertificateExportToZip(data) {
//获奖证书导出
return request({
url: `/api/Certificate/api/Certificate/CertificateExportToZip`,
method: 'post',
data,
responseType: 'blob'
});
}
/**
* common
* 赛事批次和赛事目录
......
......@@ -2,51 +2,60 @@
<!-- 通用Table -->
<div>
<Table
class="ivu-mt"
:columns="tableColumns"
:data="tableData"
:loading="tableLoading"
:size="tableSize"
class="ivu-mt"
@on-selection-change="selectionChange"
>
<template slot-scope="{ row, index }" slot="generalSwitch">
<template slot="generalSwitch" slot-scope="{ row, index }">
<Switch
v-model="row.is_enabled"
size="large"
:true-value="1"
:false-value="0"
:true-value="1"
size="large"
@on-change="(val) => switchChange(val, row, index)">
<span type="md-checkmark" slot="open">启用</span>
<span type="md-close" slot="close">停用</span>
<span slot="open" type="md-checkmark">启用</span>
<span slot="close" type="md-close">停用</span>
</Switch>
</template>
<template slot-scope="{ row }" slot="action">
<Button type="info" size="small" @click="edit(row)">编辑</Button>
<Poptip confirm transfer title="是否确认删除?" @on-ok="del(row)">
<Button type="error" size="small" style="margin-left: 8px">删除</Button>
<template slot="action" slot-scope="{ row }">
<Button size="small" type="info" @click="edit(row)">编辑</Button>
<Poptip confirm title="是否确认删除?" transfer @on-ok="del(row)">
<Button size="small" style="margin-left: 8px" type="error">删除</Button>
</Poptip>
</template>
<template slot-scope="{ row }" slot="actionAndDetails">
<template slot="actionAndDetails" slot-scope="{ row }">
<a @click="details(row)">详情</a>
<span v-if="row.hasOwnProperty('createby') && buttonAuzhorization ">
<a v-if="hooks.fourtableButtonAuthentication(row.createby)" @click="edit(row)"
style="margin-left: 8px">编辑</a>
<!-- 本人或admin-->
<span v-if="row.hasOwnProperty('createby') && buttonAuzhorization && openCurentRoleIsAdminAUth ">
<a v-if="hooks.fourtableButtonAuthentication(row.createby) || openCurentRoleIsAdminAUth"
style="margin-left: 8px"
@click="edit(row)">编辑</a>
<a v-else style="margin-left: 8px;color: #7a7e83;">编辑</a>
</span>
<!-- 本人-->
<span v-else-if="row.hasOwnProperty('createby') && buttonAuzhorization ">
<a v-if="hooks.fourtableButtonAuthentication(row.createby)" style="margin-left: 8px"
@click="edit(row)">编辑</a>
<a v-else style="margin-left: 8px;color: #7a7e83;">编辑</a>
</span>
<!-- 不鉴权-->
<span v-else>
<a @click="edit(row)" style="margin-left: 8px">编辑</a>
<a style="margin-left: 8px" @click="edit(row)">编辑</a>
</span>
<Poptip confirm transfer title="是否确认删除?" @on-ok="del(row)">
<Poptip confirm title="是否确认删除?" transfer @on-ok="del(row)">
<a style="margin-left: 8px;color: red;">删除</a>
</Poptip>
</template>
<template slot-scope="{ row }" slot="specialistActionAndDetails">
<template slot="specialistActionAndDetails" slot-scope="{ row }">
<a @click="details(row)">详情</a>
<span v-if="getUserRole()">
<a @click="edit(row)" style="margin-left: 8px">编辑</a>
<a style="margin-left: 8px" @click="edit(row)">编辑</a>
</span>
<Poptip confirm transfer title="是否确认删除?" @on-ok="del(row)">
<a style="margin-left: 8px;color: red;" v-if="getUserRole()">删除</a>
<Poptip confirm title="是否确认删除?" transfer @on-ok="del(row)">
<a v-if="getUserRole()" style="margin-left: 8px;color: red;">删除</a>
</Poptip>
</template>
<!-- 自定义插槽 -->
......@@ -54,14 +63,14 @@
<slot :name="slot" v-bind="scope"></slot>
</template>
</Table>
<div class="ivu-text-center ivu-mt ivu-text-left" v-if="showPage">
<div v-if="showPage" class="ivu-text-center ivu-mt ivu-text-left">
<Page
:total="dataCount"
:current="pageIndex"
:page-size="pageSize"
:page-size-opts="pageSizeOpts"
show-total
:total="dataCount"
show-sizer
show-total
@on-change="handleChangePage"
@on-page-size-change="handleChangePageSize"
/>
......@@ -71,10 +80,12 @@
<script>
import {fourtableButtonAuthentication} from "@/hook";
import * as hooks from "@/hook";
export default {
props: {
buttonAuzhorization: {type: Boolean, require: true, default: false},//按钮级别的鉴权 后加
openCurentRoleIsAdminAUth: {type: Boolean, require: true, default: false},//开启管理员鉴权
showPage: {type: Boolean, require: true, default: true},
tableColumns: {type: Array, require: true},
tableData: {type: Array, require: true},
......@@ -88,7 +99,11 @@
data() {
return {}
},
computed: {},
computed: {
hooks() {
return hooks
}
},
created() {
},
mounted() {
......@@ -129,6 +144,6 @@
}
</script>
<style scoped lang="less">
<style lang="less" scoped>
</style>
......@@ -119,15 +119,15 @@ export function getInitListRequest(fun) {
}
export function isAdmin() {
//validate user is a admin
// if (Cookies.get('admin-competition-userinfo')) {
// let info = JSON.parse(decodeURIComponent(Cookies.get('admin-competition-userinfo')))
// return info ? info.role.map(cur => cur.role_name).includes('管理员') : false
// } else {
// return false
// }
let role = Cookies.get('admin-competition-roleId') ? JSON.parse(decodeURIComponent(Cookies.get('admin-competition-roleId'))) : ''
return role.role_name === '管理员'
}
export function isWayEq2InSetNull(way) {
return way == 2 ? '' : way
}
export function curentRoleIsAdmin() {
let role = Cookies.get('admin-competition-roleId') ? JSON.parse(decodeURIComponent(Cookies.get('admin-competition-roleId'))) : ''
return role.role_name === '管理员'
}
......@@ -159,7 +159,7 @@ export function getUserRole() {
}
export function fourtableButtonAuthentication(dataCard) {
//学生教师奖励 学生补助 教师工作量
//学生教师奖励 学生补助 教师工作量 记录发起人 是否等于 当前用户
let info = JSON.parse(decodeURIComponent(Cookies.get('admin-competition-userinfo')))
return info.card_number === dataCard;
}
......
......@@ -1006,7 +1006,7 @@
"role_id": Cookies.get('admin-competition-roleId') ? JSON.parse(Cookies.get('admin-competition-roleId')).role_id : '',
"name": this.search.name,
"level": this.search.level,
"way": this.search.way,
"way": this.hooks.isWayEq2InSetNull(this.search.way),
"approval_state": this.search.approval_state,
"is_tea": this.search.is_tea,
"batch": this.search.batch,
......
......@@ -2269,7 +2269,7 @@
this.formValidate.competitionname = this.competitionname
let data = _.cloneDeep(this.formValidate)
// 如果runId 存在 则是重新发起流程
if (this.runId) data.run_id = this.runId
if (this.runId) data.runid = this.runId
data.flowid = this.formValidate.competition_method === 0 ? 103 : 111;
const res = await api.FlowCertificateSubmit(data);
......
......@@ -8,13 +8,16 @@
style="width: 100%;height:100%; display: flex;justify-content: center;align-items: center;position: relative;">
<h2 v-title-text-color> 奖励申请</h2>
<div style=" height: 5vh;display: flex; right:0;position: absolute;">
<div style="margin-left: auto;display: flex;align-items: center;">
<h3 v-if="isShowBouns" v-title-text-color style="font-size: 18px;">奖励总额:
<span v-if="bonus.teamFlag" v-text-color style="font-weight: 500;font-size: 16px;font-family: 黑体">{{
<div
style="margin-left: auto;display: flex;align-items: center;">
<h3 v-title-text-color
style="font-size: 18px;">奖励总额:
<span v-if="bonus.teamFlag || approvalState1oR2"
v-text-color style="font-weight: 500;font-size: 16px;font-family: 黑体">{{
formValidate.bonus_total === 'null' || formValidate.bonus_total === null ? 0 : formValidate.bonus_total
}}</span>
<InputNumber
v-if="!bonus.teamFlag"
v-if="!bonus.teamFlag && !approvalState1oR2"
id="bonusValue"
:disabled="false"
:min="Number(0)"
......@@ -26,8 +29,10 @@
</InputNumber>
<span v-text-color style="font-weight: 500;font-size: 16px;font-family: 黑体">元</span>
</h3>
<!-- v-if="buttonAuthorization(formValidate.approval_state,'studentOrTeacherAward')"-->
<Icon
v-if="buttonAuthorization(formValidate.approval_state,'studentOrTeacherAward')"
v-if="!approvalState1oR2 "
style="cursor: pointer;font-size: 20px;" type="md-create"
@click="teamStudentSaveBonusPool()"></Icon>
</div>
......@@ -170,9 +175,12 @@
}}
( 指导教师<span style="color: #1e93ff">{{ item.guide_teacher_list.length }}</span>位,参赛教师
<span style="color: #1e93ff">{{ item.contestant_teacher_list.length }}</span>位);
<span v-if="isShowBouns">可分配奖金<span v-if="bonus.teamFlag" style="color: #1e93ff;">{{
(item.allot_money_teacher || 0)
}}元</span></span>
<span v-if="isShowBouns">
可分配奖金
<span v-if="bonus.teamFlag" style="color: #1e93ff;">
{{ (item.allot_money_teacher || 0) }}元
</span>
</span>
<InputNumber
v-if="!bonus.teamFlag" id="bonusValue" :disabled="false"
:min="Number(0)"
......@@ -180,7 +188,8 @@
style="width: 130px;"
type="number"
v-bind:value="item.allot_money_teacher"
@input="getTeamPeopleBonus($event,item,'kfp_teacher')"></InputNumber>
@input="getTeamPeopleBonus($event,item,'kfp_teacher')">
</InputNumber>
<Icon v-if="buttonAuthorization(formValidate.approval_state,'studentOrTeacherAward')"
style="cursor: pointer;font-size: 20px;" type="md-create"
@click="teamStudentSaveBonusPool(item)"/>
......@@ -228,9 +237,10 @@
placeholder="奖金比例"
style="width: 130px;"
v-bind:value="Number(row.bonus_ratio)"
@input="getTeamPeopleBonus($event,row,'bili')"></InputNumber>
@input="getTeamPeopleBonus($event,row,'bili')">
</InputNumber>
<Icon
v-if="buttonAuthorization(formValidate.approval_state,'studentOrTeacherAward') ||formValidate.approval_state == 0"
v-if="buttonAuthorization(formValidate.approval_state,'studentOrTeacherAward') ||formValidate.approval_state !== 1"
style="cursor: pointer;font-size: 20px;" type="md-create"
@click="teamStudentSaveBonusPool(row)"/>
</div>
......@@ -278,7 +288,7 @@
v-bind:value="Number(row.bonus_ratio)"
@input="getTeamPeopleBonus($event,row,'bili')"></InputNumber>
<Icon
v-if="buttonAuthorization(formValidate.approval_state,'studentOrTeacherAward') || formValidate.approval_state == 0"
v-if="buttonAuthorization(formValidate.approval_state,'studentOrTeacherAward') || formValidate.approval_state !==1"
style="cursor: pointer;font-size: 20px;" type="md-create"
@click="teamStudentSaveBonusPool(row)"/>
</div>
......@@ -301,9 +311,12 @@
参赛学生
<span style="color: #1e93ff">{{ item.student_list.length }}</span>
位);
<span v-if="isShowBouns">可分配奖金<span v-if="bonus.teamFlag" style="color: #1e93ff;">{{
(item.allot_money || 0)
}}元</span></span>
<span v-if="isShowBouns ">
可分配奖金
<span v-if="bonus.teamFlag" style="color: #1e93ff;">
{{ (item.allot_money || 0) }}元
</span>
</span>
<InputNumber v-if="!bonus.teamFlag" id="bonusValue" :disabled="false"
:min="Number(0)"
placeholder="奖金金额"
......@@ -365,7 +378,7 @@
v-bind:value="Number(row.bonus_ratio)"
@input="getTeamPeopleBonus($event,row,'bili')"></InputNumber>
<Icon
v-if="buttonAuthorization(formValidate.approval_state,'studentOrTeacherAward') || formValidate.approval_state ==0"
v-if="buttonAuthorization(formValidate.approval_state,'studentOrTeacherAward') || formValidate.approval_state !=1"
style="cursor: pointer;font-size: 20px;" type="md-create"
@click="teamStudentSaveBonusPool(row)"/>
</div>
......@@ -861,7 +874,13 @@
}
},
//监听属性 类似于data概念",
computed: {},
computed: {
approvalState1oR2() {
//审批状态等于 1|| 2
return (this.formValidate.approval_state === 1 || this.formValidate.approval_state === 2)
}
},
//监控data中的数据变化",
watch: {},
//方法集合",
......
......@@ -13,27 +13,21 @@
@onReset="csreset"
:params="search"
></cs-search-cond-form>
<Button type="primary" :loading="imporFileLoading" @click="importData" style="margin-left: 10px">
证书数据导出
<Button type="primary" :loading="imporFileLoading" @click="importData('dataImport')">
赛事数据导出
</Button>
<Button v-show="includesAdminOrDeptPeople()" type="primary" :loading="imporFileLoading"
@click="importData('fileImport')"
style="margin-left: 10px">
证书附件导出
</Button>
</div>
<!-- <Button type="primary" class="ivu-ml-8" @click="add"><Icon type="md-add"/>新增竞赛</Button>-->
</template>
<template #extra>
<!-- <Input v-model="search.name" placeholder="请输入竞赛名称..." style="width: 15vw;"></Input>-->
<!-- <Button type="primary" :disabled="searchButton" @click="searchFun" style="margin-left: 10px">查找</Button>-->
<!-- <Button type="primary" @click="batchApproval" style="margin-left: 10px">一键审批-->
<!-- </Button>-->
<!-- <Button type="primary" @click="importData" style="margin-left: 10px">证书数据导出</Button>-->
</template>
<Table
:columns="columns"
:data="tableData"
:loading="loading"
>
<template #competitionsubitem_name="{row}">
<Ellipsis :text="row.competitionsubitem_name" :height="80" tooltip :transfer="true"/>
</template>
......@@ -309,6 +303,12 @@
import {publicState} from "@/configState";
import dayjs from "dayjs";
import Cookies from "js-cookie";
import * as zeroApi from '@/api/controller/index'
import * as za from '@/api/controller/index'
import {
postApiCertificateApiCertificateCertificateExportToZip
} from "@api/controller/Certificate/postApiCertificateApiCertificateCertificateExportToZip";
import {CertificateExportToZip} from "../../api/requestUtils";
export default {
name: 'list',
......@@ -383,6 +383,13 @@
show: true,
optList: [{label: '学生', value: 0}, {label: '教师', value: 1}]
},
{
id: 'dept_id',
name: '归属院系',
type: 'select',
show: this.includesAdminOrDeptPeople(),
optList: []
},
],
teamObjectData: {},
columnsStudent: [
......@@ -832,7 +839,7 @@
is_tea: 0,
batch: '',
type: '',
dept_id: '',
way: '',
name: '',
approval_state: '',
......@@ -874,6 +881,7 @@
},
computed: {
publicState() {
return publicState
},
......@@ -886,16 +894,22 @@
}
},
async mounted() {
this.includesAdminOrDeptPeople()
await this.GetBatchBySelect()
this.getGetCertificateList()
this.GetHierarchyNameSelect()
this.GetLevelBySelect()
this.GetDeptSelect()
this.GetTypeBySelect()
},
methods: {
includesAdminOrDeptPeople() {
//当前权限是否 是 管理员||学院负责人
let info = Cookies.get('admin-competition-roleId') ? JSON.parse(Cookies.get('admin-competition-roleId')).role_name : ''
return (info === '管理员' || info === '学院负责人')
},
updateViewFile(e) {
const fun = (e, url) => {
this.src = window.location.protocol + '//' + window.location.host + url.path
......@@ -955,6 +969,19 @@
return res
})
},
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,
}
})
})
})
},
GetTypeBySelect() {
//获取类型下拉框
this.asc.getApiCommonGetTypeBySelect().then(res => {
......@@ -1000,7 +1027,7 @@
batch: '',
currentH_id: '',
h_id: '',
dept_id: '',
wayCurrentValue: '',
nameCurrentValue: '',
approval_stateCurrentValue: '',
......@@ -1089,30 +1116,49 @@
this.CertificateModal = true
this.winningMaterialId = row.certificateid
},
importData() {
hook.myEncapsulationFunction(async () => {
let data = {
h_id: this.search.h_id,
"name": this.search.name,
"level": this.search.level,
"way": this.search.way,
"approval_state": this.search.approval_state,
"is_tea": this.search.is_tea,
"batch": this.search.batch,
"type": this.search.type,
"page_index": this.init.page_index,
"page_size": this.init.page_size,
}
this.imporFileLoading = true
const res = await api.CertificateExportToExcel(data)
this.imporFileLoading = false
this.blobFileImport(res, '证书导出')
importData(key) {
//文件导出
let strategy = {
'dataImport': () => hook.myEncapsulationFunction(() => {
let data = {
h_id: this.search.h_id,
"name": this.search.name,
"level": this.search.level,
"way": this.hooks.isWayEq2InSetNull(this.search.way),
"approval_state": this.search.approval_state,
"is_tea": this.search.is_tea,
"batch": this.search.batch,
"type": this.search.type,
"page_index": this.init.page_index,
"page_size": this.init.page_size,
}
const res = api.CertificateExportToExcel(data)
this.blobFileImport(res, '赛事数据导出')
return res
}, true, '正在导出中...'),
'fileImport': () => this.hooks.myEncapsulationFunction(() => {
let data = {
"role_id": Cookies.get('admin-competition-roleId') ? JSON.parse(Cookies.get('admin-competition-roleId')).role_id : '',
"h_id": this.search.h_id,
"name": this.search.name,
"level": this.search.level,
"way": this.hooks.isWayEq2InSetNull(this.search.way),
"approval_state": this.search.approval_state,
"is_tea": this.search.is_tea,
"batch": this.search.batch,
"type": this.search.type,
"dept_id": this.search.dept_id,
}
return api.CertificateExportToZip(data).then(res => {
this.blobFileImport(res, '赛事证书导出', '.zip');
return new Promise(resolve => {
return resolve({code: 1})
})
// window.location.href = res.response
// return res
})
})
}, true, '正在导出中...'),
}
strategy[key]()
},
batchApproval() {
//一键审批
......@@ -1164,13 +1210,9 @@
this.getGetCertificateList()
},
async searchFun() {
this.pageKey++
this.init.page_index = 1
const res = await this.getGetCertificateList()
},
// 查询
async getGetCertificateList() {
......@@ -1180,11 +1222,12 @@
"h_id": this.search.h_id,
"name": this.search.name,
"level": this.search.level,
"way": this.search.way,
"way": this.hooks.isWayEq2InSetNull(this.search.way),
"approval_state": this.search.approval_state,
"is_tea": this.search.is_tea,
"batch": this.search.batch,
"type": this.search.type,
"dept_id": this.search.dept_id,
"page_index": this.init.page_index,
"page_size": this.init.page_size,
}
......
......@@ -5,13 +5,13 @@
<card>
<!-- 搜索框-->
<cs-search-cond-form
@watchIsTea="watchIsTea"
ref="search"
:labelWidth="120"
:params="init.search"
:searchCondList="init.searchCondList"
@onReset="reset"
@onSubmit="search"
@watchIsTea="watchIsTea"
></cs-search-cond-form>
<!-- <div style="display: flex;">-->
<!-- <Button type="primary" class="ivu-ml-8" @click="add">-->
......@@ -22,8 +22,8 @@
<!-- 列表-->
<cs-c-table
:buttonAuzhorization="true"
:dataCount="init.dataCount"
:openCurentRoleIsAdminAUth="hooks.curentRoleIsAdmin()"
:pageIndex="init.page_index"
:pageSize="init.page_size"
:tableColumns="init.tableColumns.filter(a => a.show)"
......@@ -263,7 +263,7 @@
<h3 v-text-family>(团队信息)学生获奖信息:</h3>
</div>
<!-- 学生奖励团队卡片-->
<Card v-if="flagObject.is_tea === 0" v-for="(item,index) in teamObjectData" :key="index+'44'"
<Card v-for="(item,index) in teamObjectData" v-if="flagObject.is_tea === 0" :key="index+'44'"
class="carClass" dis-hover>
<template #title>
<span style="font-weight: 500;font-size: 16px;font-family: 黑体">{{
......@@ -358,6 +358,8 @@
import _ from "lodash";
import Cookies from "js-cookie";
import * as asc from '@/api/controller/index'
import {curentRoleIsAdmin} from "@/hook";
import * as hooks from "@/hook";
export default {
//import引入的组件需要注入到对象中才能使用",
......@@ -742,7 +744,7 @@
name: '比赛形式',
type: 'select',
show: true,
optList: [{label: '个人', value: 1}, {label: '团队', value: 0}, {label: '不限', value: 2}]
optList: [{label: '个人', value: 1}, {label: '团队', value: 0}, {label: '不限', value: '2'}]
},
{
......@@ -778,7 +780,7 @@
"level": "",
"type": "",
"batch": "",
"way": "0",
"way": '',
"is_tea": 0,
"approval_state": "",//0-未审批,1-审批中,2-审批通过,3-审批不通过
"h_id": "",
......@@ -816,6 +818,9 @@
},
//监听属性 类似于data概念",
computed: {
hooks() {
return hooks
},
publicState() {
return publicState
}
......@@ -824,6 +829,7 @@
watch: {},
//方法集合",
methods: {
curentRoleIsAdmin,
isAuth(value) {
this.isAuth1 = value
//接收师生奖励表单状态;审批通过则禁用按钮
......@@ -932,7 +938,7 @@
"level": "",
"type": "",
"batch": "",
"way": "0",
"way": "",
"is_tea": 0,
"approval_state": "",//0-未审批,1-审批中,2-审批通过,3-审批不通过
"h_id": "",
......@@ -1090,17 +1096,14 @@
// this.init.modal.cmdDetailsModalLoading = false
// })
// if (row.approval_state === 2 || row.approval_state === 0) {
// this.Id = row.bonusdeclareid
// this.CertificateModal = true
// } else {
// this.$Message.warning('此项流程未审批通过,不能进行编辑!')
// }
this.Id = row.bonusdeclareid
this.CertificateModal = true
},
rowDelete(row) {
//删除
......@@ -1121,6 +1124,7 @@
const res = await this.asc.postApiBonusDeclareGetBonusDeclareList(
{
...this.init.search,
way: this.hooks.isWayEq2InSetNull(this.init.search.way),
"role_Id": Cookies.get('admin-competition-roleId') ? JSON.parse(Cookies.get('admin-competition-roleId')).role_id : '',
}
);
......@@ -1266,7 +1270,6 @@
this.GetTypeBySelect()
this.GetHierarchySelect()
},
//生命周期 - 更新之前",数据模型已更新,html模板未更新
......
......@@ -696,7 +696,7 @@
async getCompetitionList() {
this.loading = true
return api.GetReportList(this.search).then(res => {
return api.GetReportList({...this.search, way: hooks.isWayEq2InSetNull(this.search.way)}).then(res => {
this.data = res.response.data
this.init.total = res.response.data_count
this.loading = false
......
......@@ -985,7 +985,7 @@
"competition_level_id": this.init.competition_level_id,//赛事级别
"competition_type_id": this.init.competition_type_id,//赛事类别
"sponsor": this.init.sponsor, //主办单位
"way": this.init.way,//竞赛形式
"way": this.hooks.isWayEq2InSetNull(this.init.way),//竞赛形式
}
this.hooks.setSession('flowSearchParams', data)
const res = await api.GetFlowTaskList(data)
......
......@@ -1322,14 +1322,12 @@
action_type: this.init.action_type1,
status: this.init.status1,
flow_name: this.init.flow_name1,
"competitionsubitem_name": this.init.competitionsubitem_name,//赛项名称
"competition_level_id": this.init.competition_level_id,//赛事级别
"competition_type_id": this.init.competition_type_id,//赛事类别
"sponsor": this.init.sponsor, //主办单位
"way": this.init.way,//竞赛形式
"way": this.hooks.isWayEq2InSetNull(this.init.way),//竞赛形式
}
const res = await api.GetAlreadyFlowTaskList(data)
this.init.total = res.response.data_count
this.tableData = res.response.data
......
......@@ -2150,7 +2150,6 @@
})
},
async TeamAndMemberSel() {
if (this.signid) {
this.loading3 = true
await new Promise((resolve) => {
......@@ -2180,6 +2179,8 @@
})
})
this.loading3 = false
} else {
this.formValidate1.teamname = "团队1"
}
},
createATeam() {
......@@ -2793,7 +2794,7 @@
return false
},
async trainBeforeUpload(file) {
console.log("🚀file🚀🚀,",file)
console.log("🚀file🚀🚀,", file)
let formData = new FormData();
formData.append(`file`, file);
await this.hooks.myEncapsulationFunction(() => {
......@@ -2856,6 +2857,8 @@
} else {
this.$Message.error('未上传培训方案,请上传培训方案')
}
} else {
this.$Message.error('存在未填写表单数据项,请完善表单数据')
}
})
},
......
......@@ -1374,7 +1374,7 @@
"competition_level_id": this.init.competition_level_id,//赛事级别
"competition_type_id": this.init.competition_type_id,//赛事类别
"sponsor": this.init.sponsor, //主办单位
"way": this.init.way,//竞赛形式
"way": this.hooks.isWayEq2InSetNull(this.init.way),//竞赛形式
}
const res = await api.GetMyFlowTaskList(data)
this.init.total = res.response.data_count
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册 或