Merge branch 'featurr/project_log' into work20230919

src/pages/PurchaseAdmin/PurchaseList/Approval/List.js

@@ -104,19 +104,20 @@ function List(props) {
         return str;
       },
     },
-    {
-      title: '规模',
-      dataIndex: 'process_info',
-      render: info => {
-        let str = '';
-        if (info) {
-          const data = JSON.parse(info) || [];
-          const list = data.map(item => item.scale);
-          str = list.join('+');
-        }
-        return str;
-      },
-    },
+    // {
+    //   title: '规模',
+    //   dataIndex: 'process_info',
+    //   render: info => {
+    //     let str = '';
+    //     if (info) {
+    //       const data = JSON.parse(info) || [];
+    //       console.log('-----------------', data);
+    //       const list = data.map(item => item.scale);
+    //       str = list.join('+');
+    //     }
+    //     return str;
+    //   },
+    // },
 
     {
       title: '项目种类',
@@ -337,7 +338,10 @@ function List(props) {
         callback: () => setAddVisible(false),
       });
     }
+    // 刷新table
+    queryList({ current: 1 });
   };
+
   const onDelete = item => {
     Modal.confirm({
       title: '删除',
@@ -353,6 +357,7 @@ function List(props) {
       },
     });
   };
+
   const onSubmitAuth = item => {
     Modal.confirm({
       title: '提交审核',
@@ -371,6 +376,7 @@ function List(props) {
       },
     });
   };
+
   const queryList = page => {
     dispatch({
       type: 'approval/queryApproval',

src/pages/PurchaseAdmin/PurchaseList/DailyRecord/index.js

@@ -23,7 +23,7 @@ const DailyRecord = props => {
   const { currentUser, projects, loading: propsLoading, dispatch } = props;
 
   const [date, setDate] = useState({});
-  const [pageInfo, setPageInfo] = useState({ current: 1, pageSize: 10, total: 999 });
+  const [pageInfo, setPageInfo] = useState({ current: 1, pageSize: 9, total: 999 });
   const [writeVisible, setWriteVisible] = useState(false);
   const [detailVisible, setDetailVisible] = useState(false);
   const [editMode, setEditMode] = useState(false);
@@ -180,7 +180,6 @@ const DailyRecord = props => {
   };
 
   const handlePageChange = (page, pageSize) => {
-    console.log(page, pageSize);
     let params = '';
     if (date) {
       params = date;