🐞 fix(修复很多bug): 修改

修改

src/pages/device/deviceInfo/index.jsx

@@ -38,8 +38,7 @@ const handleAdd = async (fields) => {
 const handleUpdate = async (fields) => {
   try {
     message.loading('正在修改', key);
-    message.destroy(key);
-    await UpdateDeviceInfoPage(JSON.stringify(fields)).then((r) => {
+    await UpdateDeviceInfo(JSON.stringify(fields)).then((r) => {
       message.destroy(key);
       if (r.data) {
         message.success('修改成功');

src/pages/device/deviceStock/components/CreateForm.jsx

@@ -41,7 +41,11 @@ const CreateForm = (props) => {
           label="原料名称"
           rules={[{ required: true, message: '请选择原料名称' }]}
         >
-          <Select placeholder="请选择原料名称">
+          <Select placeholder="请选择原料名称" showSearch
+            optionFilterProp="children"
+            filterOption={(input, option) =>
+              option.children.toLowerCase().indexOf(input.toLowerCase()) >= 0
+            }>
             {batchingList.map((item, index) => {
               return (
                 <Select.Option index={index} value={item.id} key={item.id}>

src/pages/erp/basic/product/components/CreateForm.jsx

@@ -119,34 +119,35 @@ const CreateForm = (props) => {
         onFinish={props.onFinish}
       >
         <Row gutter={16}>
-          <Col lg={8} md={12} sm={24}>
-            <ProFormText name="id" hidden={true} />
+
+        <Col lg={8} md={12} sm={24}>
             <ProFormText
-              label={fieldLabels.name}
-              name="name"
+              label={fieldLabels.code}
+              name="code"
               rules={[
                 {
                   required: true,
-                  max: 200,
+                  max: 50,
                 },
               ]}
-              placeholder="请输入原料名称"
+              placeholder="请输入原料编码"
+              onChange={(item) => {
+                setCode(item.target.value);
+              }}
             />
           </Col>
           <Col lg={8} md={12} sm={24}>
+            <ProFormText name="id" hidden={true} />
             <ProFormText
-              label={fieldLabels.code}
-              name="code"
+              label={fieldLabels.name}
+              name="name"
               rules={[
                 {
                   required: true,
-                  max: 50,
+                  max: 200,
                 },
               ]}
-              placeholder="请输入原料编码"
-              onChange={(item) => {
-                setCode(item.target.value);
-              }}
+              placeholder="请输入原料名称"
             />
           </Col>
           <Col lg={8} md={12} sm={24}>
@@ -205,20 +206,6 @@ const CreateForm = (props) => {
               placeholder="请选择物料类型"
             />
           </Col>
-          <Col lg={8} md={12} sm={24}>
-            <ProFormSelect
-              label="配料类型"
-              name="batchingType"
-              rules={[
-                {
-                  required: true,
-                  message: '请选择配料类型',
-                },
-              ]}
-              request={async () => props.dicData}
-              placeholder="请选择配料类型"
-            />
-          </Col>
           <Col lg={8} md={12} sm={24}>
             <ProFormSelect
               label={fieldLabels.stockUint}

src/pages/erp/basic/product/index.jsx

@@ -172,12 +172,6 @@ const ProductManage = () => {
         ],
       },
     },
-    {
-      title: '配料类型',
-      dataIndex: 'batchingType',
-      hideInForm: true,
-      valueEnum: dicDataAny,
-    },
     {
       title: '物料编码',
       dataIndex: 'code',
@@ -239,12 +233,6 @@ const ProductManage = () => {
       valueType: 'date',
       hideInForm: true,
     },
-    {
-      title: '更新时间',
-      dataIndex: 'updateAt',
-      valueType: 'date',
-      hideInForm: true,
-    },
     {
       title: '操作',
       dataIndex: 'option',

src/pages/goods/goods-boms-manage/index.jsx

@@ -65,12 +65,12 @@ const GoodsBomsManage = (props) => {
             data[item.value] = { text: item.remark };
           });
         }
-        setDicDataAny(data);
+        //setDicDataAny(data);
         console.log(arr);
         setDicData(arr);
       });
     }
-    intDicData();
+   // intDicData();
   }, []);
 
   /**
@@ -193,12 +193,6 @@ const GoodsBomsManage = (props) => {
       valueType: 'select',
       valueEnum: stockGoods,
     },
-    {
-      title: '配料类型',
-      dataIndex: 'batchingType',
-      hideInForm: true,
-      valueEnum: dicDataAny,
-    },
     {
       title: '状态',
       dataIndex: 'status',

src/pages/sys/org/components/CreateForm.jsx

@@ -61,8 +61,9 @@ const CreateForm = (props) => {
         <Form.Item label={'店铺地址'} name="store_Addr" rules={[{ required: true,max:100 }]}>
           <Input placeholder="成都市武侯区桂溪街道环球中心N5-9111C" />
         </Form.Item>
-        <Form.Item label={'店铺地址坐标'} name="store_Loc" rules={[{ required: true,max:100,pattern: /^(1[1-2][0-9]\.\d{6,12},((3[0-6])|(2[8-9]))\.\d{6,12};){2,}1[1-2][0-9]\.\d{6,12},((3[0-6])|(2[8-9]))\.\d{6,12}$/,
-message: '经纬度格式不对'}]}>
+        {/* ,pattern: /^(1[1-2][0-9]\.\d{6,12},((3[0-6])|(2[8-9]))\.\d{6,12};){2,}1[1-2][0-9]\.\d{6,12},((3[0-6])|(2[8-9]))\.\d{6,12}$/,
+message: '经纬度格式不对'} */}
+        <Form.Item label={'店铺地址坐标'} name="store_Loc" rules={[{ required: true,max:100}]}>
           <Input placeholder="104.070734,30.575041" />
         </Form.Item>
         <Form.Item name="sort" label="排序">