upp

src/pages/A1Project/data.ts

@@ -1,48 +1,15 @@
-export const scheduleCollectArr = [
+export const hasAuditStatusArr = [
   {
     value: "",
     label: "全部",
   },
   {
     value: 1,
-    label: "已完成",
+    label: "是",
   },
   {
     value: 0,
-    label: "未完成",
+    label: "否",
   },
 ];
 
-export const scheduleAuditArr = [
-  {
-    value: "",
-    label: "全部",
-  },
-  {
-    value: 0,
-    label: "存在待审批的文件",
-  },
-  {
-    value: 1,
-    label: "存在审批通过的文件",
-  },
-  {
-    value: 2,
-    label: "存在审批驳回的文件",
-  },
-];
-
-export const projectRoleArr = [
-  {
-    value: "",
-    label: "全部",
-  },
-  {
-    value: 0,
-    label: "我创建的项目",
-  },
-  {
-    value: 1,
-    label: "我参与的项目",
-  },
-];

src/pages/A1Project/index.tsx

@@ -16,7 +16,7 @@ import A1Look from "./A1Look";
 import { A1_APIgetList, A1_APIdelProject } from "@/store/action/A1Project";
 import { getUserListAPI } from "@/store/action/A3User";
 import { A2_APIgetList1 } from "@/store/action/A2Dict";
-import { scheduleCollectArr, scheduleAuditArr, projectRoleArr } from "./data";
+import { hasAuditStatusArr } from "./data";
 import { MessageFu } from "@/utils/message";
 import AuthCom from "@/components/AuthCom";
 
@@ -58,8 +58,7 @@ function A1Project() {
     pmUserId: "",
     bmUserId: "",
     statusId: "",
-    scheduleCollect: "",
-    scheduleAudit: "",
+    hasAuditStatus: "",
     projectRole: "",
     pageNum: 1,
     pageSize: 10,
@@ -127,8 +126,7 @@ function A1Project() {
       pmUserId: "",
       bmUserId: "",
       statusId: "",
-      scheduleCollect: "",
-      scheduleAudit: "",
+      hasAuditStatus: "",
       projectRole: "",
       pageNum: 1,
       pageSize: 10,
@@ -228,11 +226,8 @@ function A1Project() {
       },
       {
         title: "项目状态",
-        dataIndex: "statusName",
-      },
-      {
-        title: "最近编辑时间",
-        dataIndex: "updateTime",
+        render: (item: A1TableType) =>
+          item.statusName ? item.statusName : "（空）",
       },
     ];
 
@@ -260,6 +255,16 @@ function A1Project() {
     }
 
     arr.push({
+      title: "存在待审批文件",
+      render: (item: A1TableType) => (item.hasAuditStatus ? "是" : "否"),
+    });
+
+    arr.push({
+      title: "最近编辑时间",
+      dataIndex: "updateTime",
+    });
+
+    arr.push({
       title: "操作",
       render: (item: A1TableType) => (
         <>
@@ -446,38 +451,14 @@ function A1Project() {
           {topType === "outer" ? null : (
             <>
               <div className="A1SearchRow">
-                <span>收集进度：</span>
-                <Select
-                  style={{ width: 164 }}
-                  value={fromData.scheduleCollect}
-                  onChange={(e) =>
-                    setFromData({ ...fromData, scheduleCollect: e, pageNum: 1 })
-                  }
-                  options={scheduleCollectArr}
-                />
-              </div>
-
-              <div className="A1SearchRow">
-                <span>审批进度：</span>
-                <Select
-                  style={{ width: 164 }}
-                  value={fromData.scheduleAudit}
-                  onChange={(e) =>
-                    setFromData({ ...fromData, scheduleAudit: e, pageNum: 1 })
-                  }
-                  options={scheduleAuditArr}
-                />
-              </div>
-
-              <div className="A1SearchRow">
-                <span>项目角色：</span>
+                <span>是否存在待审批文件：</span>
                 <Select
                   style={{ width: 164 }}
-                  value={fromData.projectRole}
+                  value={fromData.hasAuditStatus}
                   onChange={(e) =>
-                    setFromData({ ...fromData, projectRole: e, pageNum: 1 })
+                    setFromData({ ...fromData, hasAuditStatus: e, pageNum: 1 })
                   }
-                  options={projectRoleArr}
+                  options={hasAuditStatusArr}
                 />
               </div>
             </>

src/types/api/A1Project.d.ts

@@ -17,6 +17,8 @@ export type A1TableType = {
   unit: string;
   updateTime: string;
   amount: string;
+  statusName:string
+  hasAuditStatus:0|1
 };
 
 export type A1OFileType = {