.

src/components/OrgSelect/index.jsx

@@ -1,52 +0,0 @@
-import { useEffect, useState } from 'react';
-import { Select } from 'antd'
-import { getCooperativeList, getCooperativeDetail } from '@/services/cooperative'
-
-const Option = Select.Option;
-export default (props) => {
-  const { value, onChange, ...otherProps } = props;
-
-  const [list, setList] = useState([])
-
-  const searchData = (val) => {
-    getCooperativeList({ name: val, pageSize: 9999 }).then((res) => {
-      setList(res.records || [])
-    })
-  }
-
-  const handleSearch = (text) => {
-    if (text) {
-      searchData(text)
-    }
-  }
-
-  useEffect(() => {
-    if (value) {
-      getCooperativeDetail(value).then((res) => {
-        setList([res])
-      })
-    }
-  }, [value])
-
-  return (
-    <Select
-      showSearch
-      value={value}
-      defaultActiveFirstOption={false}
-      showArrow={false}
-      filterOption={false}
-      onSearch={handleSearch}
-      onChange={onChange}
-      notFoundContent={null}
-      {...otherProps}
-    >
-      {
-        list.map((item) => {
-          return (
-            <Option key={item.orgId} value={item.orgId}>{item.name}</Option>
-          )
-        })
-      }
-    </Select>
-  )
-}

src/components/TypeSelect/index.jsx

@@ -1,52 +0,0 @@
-import { useEffect, useState } from 'react';
-import { Select } from 'antd'
-import { getMachineryTypeList, getMachineryTypeDetail } from '@/services/machineryType'
-
-const Option = Select.Option;
-export default (props) => {
-  const { value, onChange, ...otherProps } = props;
-
-  const [list, setList] = useState([])
-
-  const searchData = (val) => {
-    getMachineryTypeList({ hotelName: val, pageSize: 9999 }).then((res) => {
-      setList(res.records || [])
-    })
-  }
-
-  const handleSearch = (text) => {
-    if (text) {
-      searchData(text)
-    }
-  }
-
-  useEffect(() => {
-    if (value) {
-      getMachineryTypeDetail(value).then((res) => {
-        setList([res])
-      })
-    }
-  }, [value])
-
-  return (
-    <Select
-      showSearch
-      value={value}
-      defaultActiveFirstOption={false}
-      showArrow={false}
-      filterOption={false}
-      onSearch={handleSearch}
-      onChange={onChange}
-      notFoundContent={null}
-      {...otherProps}
-    >
-      {
-        list.map((item) => {
-          return (
-            <Option key={item.typeId} value={item.typeId}>{item.name}</Option>
-          )
-        })
-      }
-    </Select>
-  )
-}

src/pages/JobStatistics/Order/index.jsx

@@ -1,12 +1,12 @@
-import React, { useState } from 'react';
-import { Button, Modal, Form } from 'antd';
+import React, { useState, useEffect } from 'react';
+import { Button, Modal, Form, Select } from 'antd';
 import { PageHeaderWrapper } from '@ant-design/pro-layout';
 import moment from 'moment';
 import PageTable from '@/components/PageTable';
 import { getOrderList } from '@/services/order'
-import OrgSelect from '@/components/OrgSelect';
 import MachinetySelect from '@/components/MachinetySelect';
-import TypeSelect from '@/components/TypeSelect';;
+import { getMachineryTypeList } from '@/services/machineryType';
+import { getCooperativeList } from '@/services/cooperative';
 import { getevaluation } from '@/services/eval'
 
 const formatterTime = (val) => {
@@ -14,16 +14,28 @@ const formatterTime = (val) => {
 };
 const FormItem = Form.Item;
 const formItemLayout = { labelCol: { span: 6 }, wrapperCol: { span: 14 } };
+const { Option } = Select;
 
 export default (props) => {
   const [show, setShow] = useState(false)
   const [evaluation, setEval] = useState()
+  const [machineryTypeList, setMachineryTypeList] = useState([]);
+  const [cooperativeList, setCooperativeList] = useState([]);
+
   const getEvaluated = (val) => {
     getevaluation(val).then(res => {
       setEval(res)
       setShow(true)
     })
   }
+  useEffect(() => {
+    getCooperativeList().then((res) => {
+      setCooperativeList(res.records);
+    });
+    getMachineryTypeList().then((res) => {
+      setMachineryTypeList(res.records);
+    });
+  }, []);
   const columns = [
     {
       title: '机构',
@@ -31,7 +43,15 @@ export default (props) => {
       key: 'orgId',
       hideInTable: true,
       renderFormItem: (item, field, form) => {
-        return <OrgSelect />
+        return (
+          <Select>
+            {cooperativeList.map((item) => (
+              <Option value={item.orgId} key={item.orgId}>
+                {item.name}
+              </Option>
+            ))}
+          </Select>
+        )
       }
     },
     {
@@ -52,7 +72,13 @@ export default (props) => {
       hideInTable: true,
       renderFormItem: (item, field, form) => {
         return (
-          <TypeSelect />
+          <Select>
+            {machineryTypeList.map((item) => (
+              <Option value={item.typeId} key={item.typeId}>
+                {item.name}
+              </Option>
+            ))}
+          </Select>
         )
       }
     },

src/pages/Machinery/Machinery/edit.jsx

@@ -34,7 +34,7 @@ export default (props) => {
   const Submit = (data) => {
     var newData = { ...data }
     if (data.buyDate) {
-      newData = { ...data, buyDate: data.buyDate.format('YYYY-MM-DDTHH:mm:ss.SSS[Z]') };
+      newData = { ...data, buyDate: data.buyDate.format('YYYY-MM-DD HH:mm:ss') };
     }
     setLoading(true);
 

src/pages/Machinery/Machinery/index.jsx

@@ -66,7 +66,7 @@ export default (props) => {
       key: 'typeId',
       renderFormItem: (item, field, form) => {
         return (
-          <Select style={{ width: '350px' }}>
+          <Select>
             {machineryTypeList.map((item) => (
               <Option value={item.typeId} key={item.typeId}>
                 {item.name}

src/pages/OrderManage/OrderList/index.jsx

@@ -1,12 +1,14 @@
-import React, { useState } from 'react';
+import React, { useState, useEffect } from 'react';
+import { Select } from 'antd';
 import { PageHeaderWrapper } from '@ant-design/pro-layout';
 import moment from 'moment';
 import PageTable from '@/components/PageTable';
 import { getOrderList } from '@/services/order'
-import OrgSelect from '@/components/OrgSelect';
 import MachinetySelect from '@/components/MachinetySelect';
-import TypeSelect from '@/components/TypeSelect';;
+import { getMachineryTypeList } from '@/services/machineryType';
+import { getCooperativeList } from '@/services/cooperative';
 
+const { Option } = Select;
 const formatterTime = (val) => {
   return val ? moment(val).format('YYYY-MM-DD') : '';
 };
@@ -30,6 +32,16 @@ const orderStates = (item) => {
   }
 }
 export default (props) => {
+  const [machineryTypeList, setMachineryTypeList] = useState([]);
+  const [cooperativeList, setCooperativeList] = useState([]);
+  useEffect(() => {
+    getCooperativeList().then((res) => {
+      setCooperativeList(res.records);
+    });
+    getMachineryTypeList().then((res) => {
+      setMachineryTypeList(res.records);
+    });
+  }, []);
   const columns = [
     {
       title: '机构',
@@ -37,7 +49,15 @@ export default (props) => {
       key: 'orgId',
       hideInTable: true,
       renderFormItem: (item, field, form) => {
-        return <OrgSelect />
+        return (
+          <Select>
+            {cooperativeList.map((item) => (
+              <Option value={item.orgId} key={item.orgId}>
+                {item.name}
+              </Option>
+            ))}
+          </Select>
+        )
       }
     },
     {
@@ -58,7 +78,13 @@ export default (props) => {
       hideInTable: true,
       renderFormItem: (item, field, form) => {
         return (
-          <TypeSelect />
+          <Select>
+            {machineryTypeList.map((item) => (
+              <Option value={item.typeId} key={item.typeId}>
+                {item.name}
+              </Option>
+            ))}
+          </Select>
         )
       }
     },

src/pages/OrderManage/index.jsx

@@ -1,13 +1,13 @@
 import { history } from 'umi';
-import { Button, DatePicker } from 'antd';
-import { useState, useRef } from 'react';
+import { Button, DatePicker, Select } from 'antd';
+import { useState, useRef, useEffect } from 'react';
 import { PageHeaderWrapper } from '@ant-design/pro-layout';
 import moment from 'moment';
 import PageTable from '@/components/PageTable';
-import OrgSelect from '@/components/OrgSelect';
 import MachinetySelect from '@/components/MachinetySelect';
-import TypeSelect from '@/components/TypeSelect';
+import { getMachineryTypeList } from '@/services/machineryType';
 import { getDispatchList } from '@/services/dispatch';
+import { getCooperativeList } from '@/services/cooperative';
 
 const { RangePicker } = DatePicker;
 const formatterTime = (val) => {
@@ -16,10 +16,13 @@ const formatterTime = (val) => {
 const getDispatch = (val) => {
   history.push(`./dispatch.jsx?id=${val.orderId}&&did=${val.dispatch || null}`);
 }
+const { Option } = Select;
 
 export default (props) => {
   const [startDate, setStartDate] = useState()
   const [endDate, setEndDate] = useState()
+  const [cooperativeList, setCooperativeList] = useState([]);
+  const [machineryTypeList, setMachineryTypeList] = useState([]);
   const handelChange = (date, dateStrings) => {
     setStartDate(dateStrings[0])
     setEndDate(dateStrings[1])
@@ -32,6 +35,14 @@ export default (props) => {
     setEndDate()
     ref.current.reload();
   }
+  useEffect(() => {
+    getCooperativeList().then((res) => {
+      setCooperativeList(res.records);
+    });
+    getMachineryTypeList().then((res) => {
+      setMachineryTypeList(res.records);
+    });
+  }, []);
   const columns = [
     {
       title: '机构',
@@ -39,7 +50,15 @@ export default (props) => {
       key: 'orgId',
       hideInTable: true,
       renderFormItem: (item, field, form) => {
-        return <OrgSelect />
+        return (
+          <Select>
+            {cooperativeList.map((item) => (
+              <Option value={item.orgId} key={item.orgId}>
+                {item.name}
+              </Option>
+            ))}
+          </Select>
+        )
       }
     },
     {
@@ -79,7 +98,13 @@ export default (props) => {
       hideInTable: true,
       renderFormItem: (item, field, form) => {
         return (
-          <TypeSelect />
+          <Select>
+            {machineryTypeList.map((item) => (
+              <Option value={item.typeId} key={item.typeId}>
+                {item.name}
+              </Option>
+            ))}
+          </Select>
         )
       }
     },