.

src/pages/Finance/AccountLog/index.jsx

@@ -1,89 +1,3 @@
-import React from 'react';
-// import { getPersonList, exportPersonList } from '@/services/person';
-import { PageHeaderWrapper } from '@ant-design/pro-layout';
-import moment from 'moment';
-import PageTable from '@/components/PageTable';
-
-const formatterTime = (val) => {
-  return val ? moment(val).format('YYYY-MM-DD HH:mm:ss') : '';
-};
-
 export default (props) => {
-  const columns = [
-    {
-      title: '流水号',
-      dataIndex: 'log_id',
-      key: 'log_id',
-    },
-    {
-      title: '订单号',
-      dataIndex: 'orderId',
-      key: 'orderId',
-    },
-    {
-      title: '用户Id',
-      dataIndex: 'userId',
-      key: 'userId',
-    },
-    {
-      title: '收款人',
-      dataIndex: 'name',
-      key: 'name',
-    },
-    {
-      title: '手机号码',
-      dataIndex: 'phone',
-      key: 'phone',
-    },
-    {
-      title: '用户类型',
-      dataIndex: 'type',
-      key: 'type',
-      valueType: 'select',
-      valueEnum: {
-        '': { text: '不限', status: 'Default' },
-        1: { text: '押金' },
-        2: { text: '人工费' },
-      },
-    },
-    {
-      title: '支付方式',
-      dataIndex: 'payType',
-      key: 'payType',
-      valueType: 'select',
-      search: false,
-      valueEnum: {
-        '': { text: '不限', status: 'Default' },
-        1: { text: '微信' },
-        2: { text: '支付宝' },
-      },
-    },
-    {
-      title: '流水金额',
-      dataIndex: 'money',
-      key: 'money',
-      search: false,
-    },
-    {
-      title: '发生时间',
-      dataIndex: 'createDate',
-      key: 'createDate',
-      search: false,
-      render: (t) => formatterTime(t),
-      width: 200,
-    },
-  ];
-
-  return (
-    <PageHeaderWrapper>
-      <PageTable
-        // request={getPersonList}
-        // expfunc={exportPersonList}
-        columns={columns}
-        rowKey="logId"
-        options={false}
-        scroll={{ x: 1000 }}
-      />
-    </PageHeaderWrapper>
-  );
+  return <div>平台流水</div>;
 };

src/pages/Finance/Withdrawal/index.jsx

@@ -1,89 +1,3 @@
-import React from 'react';
-// import { getPersonList, exportPersonList } from '@/services/person';
-import { PageHeaderWrapper } from '@ant-design/pro-layout';
-import moment from 'moment';
-import PageTable from '@/components/PageTable';
-
-const formatterTime = (val) => {
-  return val ? moment(val).format('YYYY-MM-DD HH:mm:ss') : '';
-};
-
 export default (props) => {
-  const columns = [
-    {
-      title: '序号',
-      dataIndex: 'sortId',
-      key: 'sortId',
-      search: false,
-    },
-    {
-      title: '用户账号',
-      dataIndex: 'account_id',
-      key: 'account_id',
-    },
-    {
-      title: '收款人',
-      dataIndex: 'name',
-      key: 'name',
-    },
-    {
-      title: '手机号码',
-      dataIndex: 'phone',
-      key: 'phone',
-    },
-    {
-      title: '提现金额',
-      dataIndex: 'money',
-      key: 'money',
-      search: false,
-    },
-    {
-      title: '账号类型',
-      dataIndex: 'payType',
-      key: 'payType',
-      valueType: 'select',
-      valueEnum: {
-        '': { text: '不限', status: 'Default' },
-        1: { text: '微信' },
-        2: { text: '支付宝' },
-      },
-      search: false,
-    },
-    {
-      title: '提现账号',
-      dataIndex: 'withfrawalNum',
-      key: 'withfrawalNum',
-      search: false,
-    },
-
-    {
-      title: '申请时间',
-      dataIndex: 'createDate',
-      key: 'createDate',
-      search: false,
-      render: (t) => formatterTime(t),
-      search: false,
-    },
-    {
-      title: '更新时间',
-      dataIndex: 'updateDate',
-      key: 'updateDate',
-      valueType: 'date',
-      render: (t) => formatterTime(t),
-      width: 200,
-    },
-  ];
-
-  return (
-    <PageHeaderWrapper>
-      <PageTable
-        // request={getPersonList}
-        // expfunc={exportPersonList}
-        columns={columns}
-        rowKey="withdrawalId"
-        options={false}
-        scroll={{ x: 1000 }}
-      />
-    </PageHeaderWrapper>
-  );
+  return <div>提现管理</div>;
 };

src/pages/Machinery/Machinery/index.jsx

@@ -26,8 +26,8 @@ export default (props) => {
   //列表切换农机状态方法
   const handleOK = (record, data) => {
     const title = record.status
-      ? '您确定要将该农机状态变更为取消发布吗? 取消后该农机将不在移动端显示'
-      : '您确定要将该农机状态变更为发布吗? 发布后该农机可以在移动端显示';
+      ? '您确定要将该农机状态变更为维修中吗? 变更后后该农机将不能调度'
+      : '您确定要将该农机状态变更为正常吗? 变更后该农机可以调度';
     Modal.confirm({
       title: title,
       okText: '确认',
@@ -114,12 +114,12 @@ export default (props) => {
       },
     },
     {
-      title: '发布状态',
+      title: '状态',
       dataIndex: 'status',
       key: 'status',
       search: false,
       render: (_, record) => {
-        return record.status === 1 ? '发布' : '未发布';
+        return record.status === 1 ? '正常' : '维修中';
       },
     },
     {
@@ -127,7 +127,7 @@ export default (props) => {
       valueType: 'option',
       render: (_, record) => [
         <Button style={{ padding: 0 }} type="link" key={1} onClick={() => handleOK(record)}>
-          {record.status === 0 ? '发布' : '取消发布'}
+          {record.status === 0 ? '完成维修' : '维修'}
         </Button>,
         <Button
           style={{ padding: 0 }}

src/pages/OrderManage/JobWarning/index.jsx

@@ -1,94 +1,3 @@
-import React from 'react';
-// import { getPersonList, exportPersonList } from '@/services/person';
-import { PageHeaderWrapper } from '@ant-design/pro-layout';
-import moment from 'moment';
-import PageTable from '@/components/PageTable';
-
-const formatterTime = (val) => {
-  return val ? moment(val).format('YYYY-MM-DD HH:mm:ss') : '';
-};
-
 export default (props) => {
-  const columns = [
-    {
-      title: '订单编号',
-      dataIndex: 'orderNum',
-      key: 'orderNum',
-    },
-    {
-      title: '农机名',
-      dataIndex: 'machineryName',
-      key: 'machineryName',
-    },
-    {
-      title: '农机型号',
-      dataIndex: 'type',
-      key: 'type',
-    },
-    {
-      title: '农机数量',
-      dataIndex: 'machineryNum',
-      key: 'machineryNum',
-    },
-    {
-      title: '需求时间',
-      dataIndex: 'appointment_date',
-      key: 'appointment_date',
-    },
-    {
-      title: '农机价格',
-      dataIndex: 'price',
-      key: 'price',
-      search: false,
-    },
-    {
-      title: '押金',
-      dataIndex: 'deposit',
-      key: 'deposit',
-    },
-    {
-      title: '费用',
-      dataIndex: 'laborCost',
-      key: 'laborCost',
-    },
-    {
-      title: '状态',
-      dataIndex: 'state',
-      key: 'state',
-      valueType: 'select',
-      valueEnum: {
-        '': { text: '不限', status: 'Default' },
-        1: { text: '未付款' },
-        2: { text: '已付款' },
-        3: { text: '待确认' },
-        4: { text: '进行中' },
-        5: { text: '待评价' },
-        6: { text: '已评价' },
-        7: { text: '申请退款' },
-        8: { text: '已退款' },
-      },
-    },
-    {
-      title: '下单时间',
-      dataIndex: 'createDate',
-      key: 'createDate',
-      search: false,
-      render: (t) => formatterTime(t),
-      width: 200,
-    },
-    // 显示待确认和需求时间差距2小时的订单  可以查看订单给农机手打电话和农户打电话
-  ];
-
-  return (
-    <PageHeaderWrapper>
-      <PageTable
-        // request={getPersonList}
-        // expfunc={exportPersonList}
-        columns={columns}
-        rowKey="orderId"
-        options={false}
-        scroll={{ x: 1000 }}
-      />
-    </PageHeaderWrapper>
-  );
+  return <div>预警监管</div>;
 };

src/pages/OrderManage/dispatch.jsx

@@ -2,7 +2,7 @@ import React, { useState, useEffect } from 'react';
 import { Card, Form, Input, Button, Select, message } from 'antd';
 import ProCard from '@ant-design/pro-card';
 import { getOrderDetail } from '@/services/order'
-import { getMachineryList } from '@/services/machinery';
+import { getMachineryList, getduty } from '@/services/machinery';
 import { history } from 'umi';
 import { getUserList } from '@/services/user';
 import { addDispatch, getdispatchId, cancelDispatch } from '@/services/dispatch';
@@ -44,7 +44,14 @@ export default (props) => {
     });
   };
   const changeMachinery = (e) => {
-    setDispatch({ ...dispatch, machineryId: e })
+    getduty(e, { date: dispatch.appointmentDate.substr(0, 10) }).then((res => {
+      if (res.length != 0) {
+        message.info('该农机已调度请选择其他农机');
+        setDispatch({ ...dispatch, machineryId: null })
+      } else {
+        setDispatch({ ...dispatch, machineryId: e })
+      }
+    }))
   }
   const changeUser = (e) => {
     setDispatch({ ...dispatch, workerId: e })
@@ -66,7 +73,7 @@ export default (props) => {
       res.machineryId = null
       res.typeId = res.machineryType
       setDispatch(res)
-      getMachineryList({ orgId: res.orgId, typeId: res.typeId, pageSize: 999 }).then((res2) => {
+      getMachineryList({ orgId: res.orgId, status: 1, typeId: res.typeId, pageSize: 999 }).then((res2) => {
         setMachineryList(res2.records)
       })
       getUserList({ org_id: res.orgId, pageSize: 999 }).then(res3 => {

src/pages/OrderManage/index.jsx

@@ -1,7 +1,6 @@
-import React from 'react';
 import { history } from 'umi';
 import { Button } from 'antd';
-import { getOrderList } from '@/services/order';
+import { getDispatchList } from '@/services/dispatch';
 import { PageHeaderWrapper } from '@ant-design/pro-layout';
 import moment from 'moment';
 import PageTable from '@/components/PageTable';
@@ -88,7 +87,7 @@ export default (props) => {
   return (
     <PageHeaderWrapper>
       <PageTable
-        request={getOrderList}
+        request={getDispatchList}
         // expfunc={exportPersonList}
         columns={columns}
         rowKey="orderId"

src/services/dispatch.js

@@ -1,4 +1,11 @@
 import request from '@/utils/request';
+/**
+ * 调度列表
+ * @param {*} params
+ * @returns
+ */
+export const getDispatchList = (params) => request('/dispatch', { params });
+
 /**
  * 调度
  * @param {*} data

src/services/machinery.js

@@ -34,3 +34,10 @@ export const deleteMachinery = (id) => request(`/machinery/${id}`, { method: 'de
  * @returns
  */
 export const getMachineryDetail = (id) => request(`/machinery/${id}`);
+
+/**
+ * 查询预约状态
+ * @param {*} params
+ * @returns
+ */
+export const getduty = (id, params) => request(`/machinery/${id}/duty`, { params });