chenlei 4 天之前
父節點
當前提交
38ebaf1358

+ 6 - 2
src/pages/Assessment/Template/CreateOrEdit/index.tsx

@@ -7,7 +7,11 @@ import {
   getAssTemplateDetailApi,
   saveAssTemplateApi,
 } from "@/api";
-import { AssIndexTreeItemType, IAssTemplateDetail } from "@/types";
+import {
+  ASS_INDEX_TYPE,
+  AssIndexTreeItemType,
+  IAssTemplateDetail,
+} from "@/types";
 import { isString } from "lodash";
 import { DageLoading } from "@dage/pc-components";
 
@@ -36,7 +40,7 @@ const CreateOrEditTemplate: FC = () => {
   };
 
   const getAssIndexTree = async () => {
-    const data = await getAssIndexTreeApi();
+    const data = await getAssIndexTreeApi(params.type as ASS_INDEX_TYPE);
     setList(data);
   };
 

+ 3 - 1
src/pages/AssessmentDetail/components/IndexAssessment/index.tsx

@@ -17,6 +17,7 @@ import { IndexDetailFormModal } from "../IndexDetailModal/form";
 
 export interface IndexAssessmentProps {
   detail: IManageIndexDetail | IManageFormDetail | null;
+  disabled?: boolean;
   isReportDetail?: boolean;
   isEvalutionDetail?: boolean;
 }
@@ -28,6 +29,7 @@ const DEFAULT_PARAMS = {
 
 export const IndexAssessment: FC<IndexAssessmentProps> = ({
   detail,
+  disabled,
   isReportDetail,
   isEvalutionDetail,
 }) => {
@@ -140,7 +142,7 @@ export const IndexAssessment: FC<IndexAssessmentProps> = ({
           align: "center",
           minWidth: 120,
           render: (val) =>
-            !val.selfScore && canUpload ? (
+            !val.selfScore && canUpload && !disabled ? (
               <Button
                 type="text"
                 color="primary"

+ 32 - 27
src/pages/AssessmentDetail/components/OverallAssessment/index.tsx

@@ -38,6 +38,7 @@ import { REVIEW_MATERIAL_STATUS_MAP } from "@/constants";
 
 export interface OverallAssessmentProps {
   detail: IManageIndexDetail | IManageFormDetail | null;
+  disabled?: boolean;
   isReportDetail?: boolean;
   isEvalutionDetail?: boolean;
   isIndexDetail?: boolean;
@@ -46,6 +47,7 @@ export interface OverallAssessmentProps {
 
 export const OverallAssessment: FC<OverallAssessmentProps> = ({
   detail,
+  disabled,
   isIndexDetail,
   isReportDetail,
   isEvalutionDetail,
@@ -106,31 +108,6 @@ export const OverallAssessment: FC<OverallAssessmentProps> = ({
         dataIndex: "creatorName",
         align: "center",
       },
-      {
-        title: "操作",
-        align: "center",
-        render: (val) => (
-          <DageTableActions
-            renderBefore={
-              <Button
-                size="small"
-                type="link"
-                onClick={() => {
-                  downloadFile(
-                    baseUrl + process.env.REACT_APP_IMG_PUBLIC + val.filePath,
-                    val.fileName
-                  );
-                }}
-              >
-                下载
-              </Button>
-            }
-            showDelete={isReportDetail && canUpload}
-            showEdit={false}
-            onDelete={handleDeleteFile.bind(undefined, val.id)}
-          />
-        ),
-      },
     ];
 
     if (isEvalutionDetail || (isReportDetail && isRefund)) {
@@ -212,6 +189,34 @@ export const OverallAssessment: FC<OverallAssessmentProps> = ({
       });
     }
 
+    if (!disabled) {
+      stack.push({
+        title: "操作",
+        align: "center",
+        render: (val) => (
+          <DageTableActions
+            renderBefore={
+              <Button
+                size="small"
+                type="link"
+                onClick={() => {
+                  downloadFile(
+                    baseUrl + process.env.REACT_APP_IMG_PUBLIC + val.filePath,
+                    val.fileName
+                  );
+                }}
+              >
+                下载
+              </Button>
+            }
+            showDelete={isReportDetail && canUpload}
+            showEdit={false}
+            onDelete={handleDeleteFile.bind(undefined, val.id)}
+          />
+        ),
+      });
+    }
+
     return stack;
   }, [detail]);
   const additionalColumns: ColumnsType<any> = [
@@ -285,7 +290,7 @@ export const OverallAssessment: FC<OverallAssessmentProps> = ({
         suffix: item.suffix,
         parentId: item.id,
         module: "fill-assess",
-        moduleId: (detail as IManageFormDetail).accessId,
+        moduleId: detail?.id,
         deptId: detail?.id,
         assessId: (detail as IManageFormDetail).accessId,
       });
@@ -454,7 +459,7 @@ export const OverallAssessment: FC<OverallAssessmentProps> = ({
                   >
                     下载模板
                   </Button>
-                  {canUpload && !isEvalutionDetail && (
+                  {canUpload && !isEvalutionDetail && !disabled && (
                     <DageUploadProvider>
                       <DageUploadConsumer>
                         {(res) => (

+ 15 - 9
src/pages/AssessmentDetail/index.tsx

@@ -20,6 +20,7 @@ import {
   DEPT_STATUS_ENUM,
   IManageFormDetail,
   IManageIndexDetail,
+  PUBLISH_ENUM,
   YES_OR_NO,
 } from "@/types";
 import { DageLoading } from "@dage/pc-components";
@@ -56,6 +57,7 @@ const AssessmentDetailPage: FC = () => {
   // 当前账号是否为该考核单负责人
   const isLeader =
     (detail as IManageFormDetail)?.leaderUserId === YES_OR_NO.YES;
+  const disabled = status === PUBLISH_ENUM.ENDED;
 
   const getDetail = async () => {
     try {
@@ -205,6 +207,7 @@ const AssessmentDetailPage: FC = () => {
               children: (
                 <OverallAssessment
                   detail={detail}
+                  disabled={disabled}
                   isIndexDetail={isIndexDetail.current}
                   isReportDetail={isReportDetail.current}
                   isEvalutionDetail={isEvalutionDetail.current}
@@ -218,6 +221,7 @@ const AssessmentDetailPage: FC = () => {
               children: (
                 <IndexAssessment
                   detail={detail}
+                  disabled={disabled}
                   isReportDetail={isReportDetail.current}
                   isEvalutionDetail={isEvalutionDetail.current}
                 />
@@ -235,16 +239,18 @@ const AssessmentDetailPage: FC = () => {
           DEPT_STATUS_ENUM.EXAMINE_REJECT,
         ].includes((detail as IManageFormDetail)?.deptStatus) && (
           <FormPageFooter>
-            <Button
-              size="large"
-              type="primary"
-              loading={submitLoading}
-              onClick={handleSubmit}
-            >
-              提交
-            </Button>
+            {!disabled && (
+              <Button
+                size="large"
+                type="primary"
+                loading={submitLoading}
+                onClick={handleSubmit}
+              >
+                提交
+              </Button>
+            )}
             <Button size="large" onClick={() => navigate(-1)}>
-              保存并关闭
+              {disabled ? "关闭" : "保存并关闭"}
             </Button>
           </FormPageFooter>
         )}

+ 2 - 0
src/pages/Login/index.tsx

@@ -39,6 +39,8 @@ export default function Login() {
       navigate(list[0].redirect || list[0].path, {
         replace: true,
       });
+    } catch (err) {
+      setTimestamp(new Date().getTime());
     } finally {
       setLoading(false);
     }