fix conflict

src/app.jsx

@@ -332,15 +332,15 @@ export const layout = async ({ initialState }) => {
       // },
 
 
-      // params: {
-      //   userId: initialState?.currentUser?.userid,
-      // },
-      // request: async (params, defaultMenuData) => {
-      //   // initialState.currentUser 中包含了所有用户信息
-      //   const menuData = await getMenus();
-      //   // console.log({menuData});
-      //   return menuData.data;
-      // },
+      params: {
+        userId: initialState?.currentUser?.userid,
+      },
+      request: async (params, defaultMenuData) => {
+        // initialState.currentUser 中包含了所有用户信息
+        const menuData = await getMenus();
+        // console.log({menuData});
+        return menuData.data;
+      },
     },
     links: isDev
       ? [

src/components/CAUpload/index.jsx

@@ -7,7 +7,7 @@ import PropTypes from 'prop-types';
 import { Button, Upload, message, Modal, Divider, Menu, Dropdown } from 'antd';
 // import Cookies from 'js-cookie';
 // 服务器地址
-const Host = 'http://localhost:8082';
+const Host = 'http://112.124.59.133:8082';
 
 
 

src/pages/costAccounting/afterCollectionSearch/index.jsx

@@ -1,11 +1,9 @@
 /*
  * @Author: your name
  * @Date: 2021-07-26 10:13:13
-<<<<<<< HEAD
- * @LastEditTime: 2021-08-13 15:47:16
-=======
- * @LastEditTime: 2021-08-13 11:38:52
->>>>>>> 374142147cfc35262bf45d74aed7a48605011ea5
+
+ * @LastEditTime: 2021-08-13 16:19:27
+
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  * @FilePath: /TracerMethodology_PC/src/pages/UserMana/index.js
@@ -86,9 +84,9 @@ const AfterCollectionSearch = () => {
     },
     {
       title: '成本项目',
-      key: 'accountingCode',
+      key: 'productCode',
       hideInTable: true,
-      dataIndex: 'accountingCode',
+      dataIndex: 'productCode',
       renderFormItem: (item, { type, defaultRender, formItemProps, fieldProps, ...rest }, form) => {
         // console.log({item,type, defaultRender,formItemProps, fieldProps,rest,form })
         if (type === 'form') {
@@ -96,7 +94,7 @@ const AfterCollectionSearch = () => {
         }
 
         return (
-          <Form.Item name="accountingCode">
+          <Form.Item name="productCode">
             <ProFormSelect
               request={async () => {
                 const resp = await getCostProjecttList({ pageSize: 100 });
@@ -115,7 +113,7 @@ const AfterCollectionSearch = () => {
                   onChange:(value)=>{setSelectedAccountingCode(value)}
               }}
               width="md"
-              name="accountingCode"
+              name="productCode"
             />
           </Form.Item>
         )
@@ -200,15 +198,11 @@ const AfterCollectionSearch = () => {
 
   //获取列表
   const getList = async (params = {}, sort, filter) => {
-<<<<<<< HEAD
+
     const { dateTime } = params;
     console.log(moment(dateTime).format('yyyyMM'));
     const res = await getAfterIncomeCollectionList({ ...params, date: moment(dateTime).format('yyyyMM') });
-=======
-    const { date } = params;
-    console.log(moment(date).format('YYYY-MM'));
-    const res = await getAfterIncomeCollectionList({ ...params, date: moment(date).format('YYYYMM') });
->>>>>>> 374142147cfc35262bf45d74aed7a48605011ea5
+
     if (res && res.status) {
       const { data: { totalAmount } } = res;
       setTotalCount(totalAmount);