111

src/pages/issue/detail/components/ApplyInfo.jsx

@@ -1,13 +1,13 @@
-import React from 'react';
-import { ProTable } from '@ant-design/pro-components';
-import { Card } from 'antd';
-import { getTaIssueApply } from '@/service/taissueapply';
-import { getSysOrg } from '@/service/sysorg';
-import { queryTable, queryDict } from '@/utils/request';
-import useBool from '@/utils/hooks/useBool';
-import { processEnum } from '@/utils/biz';
+import React from "react";
+import { ProTable } from "@ant-design/pro-components";
+import { Card } from "antd";
+import { getTaIssueApply } from "@/service/taissueapply";
+import { getSysOrg } from "@/service/sysorg";
+import { queryTable, queryDict } from "@/utils/request";
+import useBool from "@/utils/hooks/useBool";
+import { processEnum } from "@/utils/biz";
 
-const fetchOrg = queryDict(getSysOrg, { labelKey: 'name', valueKey: 'orgId' });
+const fetchOrg = queryDict(getSysOrg, { labelKey: "name", valueKey: "orgId" });
 const fetchData = queryTable(getTaIssueApply);
 
 export default (props) => {
@@ -17,12 +17,16 @@ export default (props) => {
     {
       title: "申请日期",
       dataIndex: "createDate",
-      valueType: 'date',
+      valueType: "date",
     },
     {
       title: "申请类别",
       dataIndex: "applyType",
-      valueEnum: processEnum
+      valueEnum: processEnum,
+    },
+    {
+      title: "申请理由",
+      dataIndex: "remark",
     },
     {
       title: "申请人",
@@ -31,7 +35,7 @@ export default (props) => {
     {
       title: "审批日期",
       dataIndex: "verifyDate",
-      valueType: 'date',
+      valueType: "date",
     },
     {
       title: "审批人",
@@ -42,18 +46,18 @@ export default (props) => {
       dataIndex: "verifyStatus",
       valueEnum: {
         ready: {
-          text: '未审批',
-          status: 'Default',
+          text: "未审批",
+          status: "Default",
         },
         pass: {
-          text: '通过',
-          status: 'Success',
+          text: "通过",
+          status: "Success",
         },
         reject: {
-          text: '驳回',
-          status: 'Error',
+          text: "驳回",
+          status: "Error",
         },
-      }
+      },
     },
     {
       title: "审批意见",
@@ -61,11 +65,11 @@ export default (props) => {
     },
     {
       title: "申请单位",
-      valueType: 'select',
+      valueType: "select",
       dataIndex: "orgId",
-      request: fetchOrg
-    }
-  ]
+      request: fetchOrg,
+    },
+  ];
 
   return (
     <Card title="申请流程">
@@ -78,5 +82,5 @@ export default (props) => {
         toolBarRender={false}
       />
     </Card>
-  )
-}
+  );
+};

src/pages/issue/detail/components/BasicProfile.jsx

@@ -58,7 +58,7 @@ export default (props) => {
       });
     }
   }, [issueId]);
-
+console.log(detail)
   return (
     <Card title="基础信息" loading={loading}>
       <Descriptions layout="vertical" column={3} bordered>

src/pages/issue/index.jsx

@@ -1,21 +1,28 @@
-import React from 'react';
-import { Button, Badge } from 'antd';
-import { useNavigate } from 'react-router-dom';
-import List from '@/components/Page/List';
-import { getTaIssue, getTaOrgIssue, exportTaIssue, exportTaOrgIssue } from '@/service/taissue';
-import { getTdLocType } from '@/service/tdloctype';
-import { getSysOrg } from '@/service/sysorg';
-import { queryDict } from '@/utils/request';
-import { processEnum, processStatus } from '@/utils/biz';
-import useBool from '@/utils/hooks/useBool';
-import useOrgResponsible from '@/utils/hooks/useOrgResponsible';
-import dayjs from 'dayjs';
+import React from "react";
+import { Button, Badge } from "antd";
+import { useNavigate } from "react-router-dom";
+import List from "@/components/Page/List";
+import {
+  getTaIssue,
+  getTaOrgIssue,
+  exportTaIssue,
+  exportTaOrgIssue,
+} from "@/service/taissue";
+import { getTdLocType } from "@/service/tdloctype";
+import { getSysOrg } from "@/service/sysorg";
+import { queryDict } from "@/utils/request";
+import { processEnum, processStatus } from "@/utils/biz";
+import useBool from "@/utils/hooks/useBool";
+import useOrgResponsible from "@/utils/hooks/useOrgResponsible";
+import dayjs from "dayjs";
 
-const queryOrg = queryDict(getSysOrg, { labelKey: 'name', valueKey: 'orgId' });
-const queryLocType = queryDict(getTdLocType, { labelKey: 'name', valueKey: 'typeId' });
-
-const yestoday = dayjs().subtract(1, 'day').format('YYYY-MM-DD');
+const queryOrg = queryDict(getSysOrg, { labelKey: "name", valueKey: "orgId" });
+const queryLocType = queryDict(getTdLocType, {
+  labelKey: "name",
+  valueKey: "typeId",
+});
 
+const yestoday = dayjs().subtract(1, "day").format("YYYY-MM-DD");
 export default (props) => {
   const [loading, startLoading, stopLoading] = useBool();
   const navigate = useNavigate();
@@ -27,7 +34,7 @@ export default (props) => {
       isResponsible ? getTaOrgIssue : getTaIssue,
       isResponsible ? { orgId: org?.orgId } : { all: true },
       isResponsible ? exportTaOrgIssue : exportTaIssue,
-    ]
+    ];
   }, [isResponsible, org]);
 
   const columns = [
@@ -35,16 +42,44 @@ export default (props) => {
       title: "问题单号",
       dataIndex: "issueId",
     },
+    {
+      title: "创建时间",
+      dataIndex: "createdAt",
+      valueType: "dateRange",
+      hideInTable: true,
+      search: {
+        transform: (value) => {
+          return {
+            createDateStart: value[0],
+            createDateEnd: value[1],
+          };
+        },
+      },
+    },
+    {
+      title: "办结时间",
+      dataIndex: "createdAts",
+      valueType: "dateRange",
+      hideInTable: true,
+      search: {
+        transform: (value) => {
+          return {
+            endDateStart: value[0],
+            endDateEnd: value[1],
+          };
+        },
+      },
+    },
     {
       title: "上报日期",
       dataIndex: "createDate",
-      valueType: 'date',
+      valueType: "date",
       hideInSearch: true,
     },
     {
       title: "点位",
       dataIndex: "locId",
-      valueType: 'select',
+      valueType: "select",
       request: queryLocType,
     },
     {
@@ -61,23 +96,26 @@ export default (props) => {
     {
       title: "责任单位",
       dataIndex: "orgId",
-      valueType: 'select',
+      valueType: "select",
       request: queryOrg,
       hideInSearch: isResponsible,
     },
     {
       title: "流程状态",
       dataIndex: "bizStatus",
-      valueType: 'select',
+      valueType: "select",
       valueEnum: processEnum,
       render: (_, row) => {
-        if (row.processNode != '03' && yestoday > row.expireDate) {
+        console.log(row)
+        if (row.processNode != "03" && yestoday > row.expireDate) {
           return <Badge status="error" text="已逾期" />;
+        } else if(row.processNode=="03"&& yestoday > row.expireDate){
+          return <Badge status="warning" text="延期办结" />;
         } else {
-          const st = processStatus.filter(x => x.value == row.processNode)[0];
+          const st = processStatus.filter((x) => x.value == row.processNode)[0];
           return <Badge status={st?.badge} text={st?.label} />;
         }
-      }
+      },
     },
     {
       title: "截止日期",
@@ -88,25 +126,27 @@ export default (props) => {
       title: "上报人",
       dataIndex: "userName",
       hideInSearch: true,
-    }
+    },
   ];
 
   const onExport = () => {
     startLoading();
-    exportFn(paramsRef.current).then(() => {
-      stopLoading();
-    }).catch(() => {
-      stopLoading();
-    });
-  }
+    exportFn(paramsRef.current)
+      .then(() => {
+        stopLoading();
+      })
+      .catch(() => {
+        stopLoading();
+      });
+  };
 
   const beforeSearchSubmit = (params) => {
     paramsRef.current = {
-      ...params || {},
+      ...(params || {}),
       all: true,
     };
     return params;
-  }
+  };
 
   return (
     <List
@@ -116,20 +156,19 @@ export default (props) => {
       params={params}
       beforeSearchSubmit={beforeSearchSubmit}
       optionRender={(_, row) => [
-        <Button key="detail" type="link" onClick={() => navigate(`/issue/detail?id=${row.issueId}`)}>详情</Button>
+        <Button
+          key="detail"
+          type="link"
+          onClick={() => navigate(`/issue/detail?id=${row.issueId}`)}
+        >
+          详情
+        </Button>,
       ]}
       toolBarRender={() => [
-        (
-          <Button
-            key="1"
-            type="primary"
-            loading={loading}
-            onClick={onExport}
-          >
-            导出
-          </Button>
-        )
+        <Button key="1" type="primary" loading={loading} onClick={onExport}>
+          导出
+        </Button>,
       ]}
     />
-  )
-}
+  );
+};

src/utils/biz.js

@@ -1,22 +1,22 @@
-
-import { Badge } from 'antd';
+import { Badge } from "antd";
 
 export const processStatus = [
-  { value: '01', label: "待交办", badge: 'default' },
-  { value: '02', label: "已交办", badge: 'processing' },
-  { value: '03', label: "已办结", badge: 'success' },
-  { value: 'expired', label: "已逾期", badge: 'error' },
-  { value: '0201', label: "驳回申请中", badge: 'processing' },
-  { value: '0202', label: "延期申请中", badge: 'processing' },
-  { value: '0203', label: "单位审核中", badge: 'processing' },
-  { value: '0204', label: "消单申请中", badge: 'processing' },
-]
+  { value: "01", label: "待交办", badge: "default" },
+  { value: "02", label: "已交办", badge: "processing" },
+  { value: "03", label: "已办结", badge: "success" },
+  { value: "expired", label: "已逾期", badge: "error" },
+  { value: "0201", label: "驳回申请中", badge: "processing" },
+  { value: "0202", label: "延期申请中", badge: "processing" },
+  { value: "0203", label: "单位审核中", badge: "processing" },
+  { value: "0204", label: "消单申请中", badge: "processing" },
+  { value: "expiredEnd", label: "延期办结", badge: "warning" },
+];
 
 export const processEnum = processStatus.reduce((acc, it) => {
   return {
     ...acc,
     [it.value]: {
       text: it.label,
-    }
-  }
+    },
+  };
 }, {});