修改合同管理

src/pages/ContractManager/component/Modal.jsx

@@ -192,7 +192,7 @@ const ContractModal = (props) => {
       } else if (type == Type.check && data?.status == Status.Checking) {
         let result = {
           id: data?.id,
-          check_by: user.CName,
+          check_by: user?.CName,
           check_result: values.check_result,
           is_pass: values.is_pass,
           check_desc: values?.check_desc,
@@ -537,7 +537,7 @@ const ContractModal = (props) => {
           <Col span={10} offset={1}>
             <Form.Item
               name="created_name"
-              initialValue={data?.created_name || user.CName}
+              initialValue={data?.created_name || user?.CName}
               label="创建人："
             >
               <Input disabled />
@@ -562,7 +562,7 @@ const ContractModal = (props) => {
                 <Col span={10} offset={1}>
                   <Form.Item
                     name="check_by"
-                    initialValue={user.CName}
+                    initialValue={user?.CName}
                     label="审核人："
                   >
                     <Input disabled />

src/pages/ContractManager/index.jsx

@@ -28,6 +28,7 @@ const ConteactManager = (props) => {
   const [visible, setVisible] = useState(false);
   const [detail, setDetail] = useState({});
   const [data, setData] = useState([]);
+  const [pagination, setPagination] = useState({ current: 0 });
   const typeRef = useRef();
   const parentIdRef = useRef(0);
 
@@ -190,7 +191,10 @@ const ConteactManager = (props) => {
       let resultData = data?.list?.map((item) => {
         return item.sub_num > 0 ? { ...item, children: [] } : item;
       });
+
       setData(resultData);
+      setPagination(data?.pagination);
+      // setData({ list: resultData, pagination: data?.pagination });
       console.log(data);
     },
   });
@@ -245,6 +249,8 @@ const ConteactManager = (props) => {
       if (idx > -1) {
         resultData[idx].children = res?.data?.list;
         setData(resultData);
+        setPagination(res.data?.pagination);
+        // setData({ list: resultData, pagination: res.data?.pagination });
       }
     }
   };
@@ -256,6 +262,9 @@ const ConteactManager = (props) => {
       calRun(data);
     }
   };
+  const onPageChange = (page) => {
+    run({ ...searchData, current: page });
+  };
   return (
     <PageContainer>
       <div className={styles.searchContent}>
@@ -357,7 +366,7 @@ const ConteactManager = (props) => {
           console.log(expanded, record);
           if (expanded) handleQueryChildren({ is_parent: record.id });
         }}
-        // pagination={data?.pagination}
+        pagination={{ ...pagination, onChange: onPageChange }}
       />
       <ContractModal
         detail={detail}