.

src/pages/JobStatistics/Order/index.jsx

@@ -31,12 +31,12 @@ export default (props) => {
     });
   }
   useEffect(() => {
-    getCooperativeList().then((res) => {
+    getCooperativeList({ pageSize: 999 }).then((res) => {
       setCooperativeList(res.records);
     }).catch((err) => {
       console.log(err.message)
     });
-    getMachineryTypeList().then((res) => {
+    getMachineryTypeList({ pageSize: 999 }).then((res) => {
       setMachineryTypeList(res.records);
     }).catch((err) => {
       console.log(err.message)

src/pages/Machinery/Machinery/edit.jsx

@@ -79,17 +79,17 @@ export default (props) => {
     };
   };
   useEffect(() => {
-    getMachineryTypeList().then((res) => {
+    getMachineryTypeList({ pageSize: 999 }).then((res) => {
       setMachineryTypeList(res.records);
     }).catch((err) => {
       console.log(err.message)
     });
-    getRegionList().then((res) => {
+    getRegionList({ pageSize: 999 }).then((res) => {
       setRegionList(res.records);
     }).catch((err) => {
       console.log(err.message)
     });
-    getCooperativeList().then((res) => {
+    getCooperativeList({ pageSize: 999 }).then((res) => {
       setCooperativeList(res.records);
     }).catch((err) => {
       console.log(err.message)

src/pages/Machinery/Machinery/index.jsx

@@ -49,12 +49,12 @@ export default (props) => {
     });
   };
   useEffect(() => {
-    getCooperativeList().then((res) => {
+    getCooperativeList({ pageSize: 999 }).then((res) => {
       setCooperativeList(res.records);
     }).catch((err) => {
       console.log(err.message)
     });
-    getMachineryTypeList().then((res) => {
+    getMachineryTypeList({ pageSize: 999 }).then((res) => {
       setMachineryTypeList(res.records);
     }).catch((err) => {
       console.log(err.message)

src/pages/Machinery/Org/index.jsx

@@ -52,7 +52,7 @@ export default (props) => {
   // 刷新左侧列表
   const handelReset = () => {
     setData([]);
-    getCooperativeList()
+    getCooperativeList({ pageSize: 999 })
       .then((res) => {
         const list = res.records?.map((item) => {
           return { title: item.name, key: item.orgId };

src/pages/Machinery/Person/index.jsx

@@ -227,7 +227,7 @@ export default (props) => {
       console.log(err.message)
     });
     //获取合作社列表数据
-    getCooperativeList().then((res) => {
+    getCooperativeList({ pageSize: 999 }).then((res) => {
       setCooperativeList(res.records);
       const list = res.records?.map((item) => {
         return { title: item.name, key: item.orgId };
@@ -237,7 +237,7 @@ export default (props) => {
       console.log(err.message)
     });
     //获取角色列表数据
-    getRoleList().then((res) => {
+    getRoleList({ pageSize: 999 }).then((res) => {
       setRoleList(res.records);
     }).catch((err) => {
       console.log(err.message)
@@ -392,32 +392,14 @@ export default (props) => {
           <FormItem label="邮箱" name="email" rules={[{ required: true, message: '请输入' }]}>
             <Input placeholder="请输入" />
           </FormItem>
-          <FormItem label="登录账号">
-            <Input.Group compact>
-              <Form.Item
-                name="loginName"
-                noStyle
-                rules={[{ required: true, message: '请输入登录账号' }]}
-              >
-                <Input placeholder="请输入" />
-              </Form.Item>
-              <span style={{ opacity: '0.7' }}>默认密码{password}</span>
-            </Input.Group>
+          <FormItem label="登录账号" name="loginName" rules={[{ required: true, message: '请输入登录账号' }]}>
+            <Input placeholder="请输入" />
+          </FormItem>
+          <FormItem label=" " colon={false} style={{ height: '4px', marginTop: '-28px' }}>
+            <span style={{ opacity: '0.7' }}>默认密码{password}</span>
           </FormItem>
           <FormItem label="所属合作社" name="orgId" rules={[{ required: true, message: '请输入' }]}>
-            <Search placeholder="请选择合作社" onChange={handelChange} />
-            {/* <Select
-              placeholder="请选择合作社"
-              showSearch
-              onSearch={handelFormSearch}
-              onChange={handelFormSearch}
-            >
-              {cooperativeList.map((item) => (
-                <Option value={item.orgId} key={item.orgId}>
-                  {item.name}
-                </Option>
-              ))}
-            </Select> */}
+            <Search placeholder="请输入合作社" onChange={handelChange} />
           </FormItem>
           <FormItem label="状态" name="status" rules={[{ required: true, message: '请选择' }]}>
             <Select placeholder="请选择是否启用">

src/pages/OrderManage/JobWarning/index.jsx

@@ -3,7 +3,7 @@ import { Button } from 'antd'
 import { PageHeaderWrapper } from '@ant-design/pro-layout';
 import moment from 'moment';
 import PageTable from '@/components/PageTable';
-import { getOrderDetail, getWarnList } from '@/services/order'
+import { getWarnList } from '@/services/order'
 
 const formatterTime = (val) => {
   return val ? moment(val).format('YYYY-MM-DD') : '';
@@ -19,13 +19,19 @@ export default (props) => {
       key: 'createDate',
       render: (t) => formatterTime(t),
       search: false,
-      width: 80
+      width: 120
+    },
+    {
+      title: '接单人',
+      dataIndex: 'person',
+      key: 'person',
+      search: false,
     },
     {
       title: '消息',
       dataIndex: 'orderNo',
       key: 'orderNo',
-      render: (_, record) => '您有 【' + record.orderNo + '】 将于 【' + formatterTime(record.appointmentDate) + '】 预约作业，请尽快处理'
+      render: (_, record) => '您有一个 ' + record.orderNo + ' 订单将于 ' + formatterTime(record.appointmentDate) + ' 预约作业，请尽快处理'
     },
     {
       title: '操作',

src/pages/OrderManage/OrderList/index.jsx

@@ -37,12 +37,12 @@ export default (props) => {
   const [machineryTypeList, setMachineryTypeList] = useState([]);
   const [cooperativeList, setCooperativeList] = useState([]);
   useEffect(() => {
-    getCooperativeList().then((res) => {
+    getCooperativeList({ pageSize: 999 }).then((res) => {
       setCooperativeList(res.records);
     }).catch((err) => {
       console.log(err.message)
     });
-    getMachineryTypeList().then((res) => {
+    getMachineryTypeList({ pageSize: 999 }).then((res) => {
       setMachineryTypeList(res.records);
     }).catch((err) => {
       console.log(err.message)

src/pages/OrderManage/index.jsx

@@ -36,12 +36,12 @@ export default (props) => {
     ref.current.reload();
   }
   useEffect(() => {
-    getCooperativeList().then((res) => {
+    getCooperativeList({ pageSize: 999 }).then((res) => {
       setCooperativeList(res.records);
     }).catch((err) => {
       console.log(err.message)
     });
-    getMachineryTypeList().then((res) => {
+    getMachineryTypeList({ pageSize: 999 }).then((res) => {
       setMachineryTypeList(res.records);
     }).catch((err) => {
       console.log(err.message)