From 38481a979c8349c5773d6666603f499877bfbce8 Mon Sep 17 00:00:00 2001
From: gwbvipvip <gwbvipvip@163.com>
Date: Mon, 25 Jul 2022 14:59:10 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E7=89=A9=E6=96=99=E6=95=B0?=
 =?UTF-8?q?=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/device/deviceInfo/components/CreateForm.jsx | 9 ++++++---
 src/pages/device/deviceInfo/index.jsx                 | 8 +++++++-
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/src/pages/device/deviceInfo/components/CreateForm.jsx b/src/pages/device/deviceInfo/components/CreateForm.jsx
index 8e1001d..2b3f4fc 100644
--- a/src/pages/device/deviceInfo/components/CreateForm.jsx
+++ b/src/pages/device/deviceInfo/components/CreateForm.jsx
@@ -1,5 +1,5 @@
 import React, { useState, useEffect } from 'react';
-import { Modal, Form, Input, Button, Select, TreeSelect } from 'antd';
+import { Modal, Form, Input, Button, Select, TreeSelect,InputNumber } from 'antd';
 
 const CreateForm = (props) => {
   const { Option, OptGroup } = Select;
@@ -82,6 +82,9 @@ const CreateForm = (props) => {
             ) : null
           }
         </Form.Item>
+        <Form.Item label={'设备坐标'} name="deviceLoc">
+          <Input placeholder="104.070734,30.575041" />
+        </Form.Item>
         <Form.Item label={'状态'} name="status" rules={[{ required: true }]}>
           <Select placeholder="请选择状态">
             <OptGroup>
@@ -90,8 +93,8 @@ const CreateForm = (props) => {
             </OptGroup>
           </Select>
         </Form.Item>
-        <Form.Item label={'设备坐标'} name="deviceLoc">
-          <Input placeholder="104.070734,30.575041" />
+        <Form.Item label={'设备物料数量'} name="materialQuantity">
+          <InputNumber />
         </Form.Item>
         <Form.Item label={'设备详细地址'} name="deviceAddr">
           <Input placeholder="成都市武侯区桂溪街道环球中心N5-9111C" />
diff --git a/src/pages/device/deviceInfo/index.jsx b/src/pages/device/deviceInfo/index.jsx
index 0d0350a..820df1d 100644
--- a/src/pages/device/deviceInfo/index.jsx
+++ b/src/pages/device/deviceInfo/index.jsx
@@ -229,7 +229,13 @@ const GoodsTypeManage = () => {
       valueType: 'textarea',
       search: false,
     },
-
+    {
+      title: '设备物料数量',
+      dataIndex: 'materialQuantity',
+      valueType: 'textarea',
+      search: false,
+    },
+    
      {
       title: '设备唯一key',
       dataIndex: 'autoKey',