优化显示

src/pages/push/batchingpush/index.jsx

@@ -80,15 +80,10 @@ const goodspush = () => {
       dataIndex: 'type',
       ellipsis: true,
       valueEnum: {
-        1: {
-          text: '商品',
-        },
         2: {
           text: '物料',
         },
-        3: {
-            text: '配方',
-        },
+       
       },
     },
     {
@@ -255,7 +250,7 @@ const HandleOk= async(values)=>{
           <ProDescriptions.Item label="topic" valueType="text" copyable={true}>
               <a href='#'>{currentRow?.topic}</a>
           </ProDescriptions.Item>
-          <ProDescriptions.Item label="下发数据" valueType="jsonCode" >
+          <ProDescriptions.Item contentStyle={{ maxWidth: '85%'}} label="下发数据" valueType="jsonCode" >
               {currentRow?.dataResore}
           </ProDescriptions.Item>
             </ProDescriptions>

src/pages/push/goodspush/index.jsx

@@ -83,12 +83,7 @@ const goodspush = () => {
         1: {
           text: '商品',
         },
-        2: {
-          text: '物料',
-        },
-        3: {
-            text: '配方',
-        },
+        
       },
     },
     {
@@ -255,7 +250,7 @@ const HandleOk= async(values)=>{
           <ProDescriptions.Item label="topic" valueType="text" copyable={true}>
               <a href='#'>{currentRow?.topic}</a>
           </ProDescriptions.Item>
-          <ProDescriptions.Item label="下发数据" valueType="jsonCode" >
+          <ProDescriptions.Item contentStyle={{ maxWidth: '85%'}} label="下发数据" valueType="jsonCode" >
               {currentRow?.dataResore}
           </ProDescriptions.Item>
             </ProDescriptions>

src/pages/push/technologypush/components/PushFrom.jsx

@@ -102,9 +102,14 @@ const PushFrom = (props) => {
               }
             // }
           })
-          var parm={deviceId:de.id,deviceName:de.name,deviceAutoKey:de.autoKey,type:4,data:data}
-          props.HandleOk(parm)
-          console.log(de)
+          if(data.goodstechnology.length==0){
+            message.error('选择的商品还没有工艺');
+          }else{
+            var parm={deviceId:de.id,deviceName:de.name,deviceAutoKey:de.autoKey,type:4,data:data}
+            props.HandleOk(parm)
+            console.log(de)
+          }
+         
         }
       }}
       onCancel={() => {

src/pages/push/technologypush/index.jsx

@@ -80,15 +80,6 @@ const goodspush = () => {
       dataIndex: 'type',
       ellipsis: true,
       valueEnum: {
-        1: {
-          text: '商品',
-        },
-        2: {
-          text: '物料',
-        },
-        3: {
-            text: '配方',
-        },
         4: {
             text: '工艺',
         },
@@ -258,7 +249,7 @@ const HandleOk= async(values)=>{
           <ProDescriptions.Item label="topic" valueType="text" copyable={true}>
               <a href='#'>{currentRow?.topic}</a>
           </ProDescriptions.Item>
-          <ProDescriptions.Item label="下发数据" valueType="jsonCode" >
+          <ProDescriptions.Item contentStyle={{ maxWidth: '85%'}} label="下发数据" valueType="jsonCode" >
               {currentRow?.dataResore}
           </ProDescriptions.Item>
             </ProDescriptions>

src/pages/scene/foodmenu/index.jsx

@@ -5,7 +5,6 @@ import { PageContainer, FooterToolbar } from '@ant-design/pro-layout';
 import ProTable from '@ant-design/pro-table';
 import CreateForm from './components/CreateForm';
 import FoodMenuGoods from './components/FoodMenuGoods'
-import PushDevice from './components/PushDevice'
 import {
     GetFoodPage,
     FoodAdd,
@@ -92,15 +91,7 @@ const FoodMenu = () => {
        >
          关联商品
        </a>,
-          <a
-          key="update"
-          onClick={() => {
-            setpushdeviceModalVisible(true);
-            setCurrentRow(record);
-          }}
-        >
-          下发
-        </a>,
+       
       ],
     },
   ];
@@ -253,15 +244,6 @@ const handleRemove = async (selectedRows) => {
           message.error(r.errors);
         }
       })
-    }}
-    />
-    <PushDevice pushdeviceModalVisible={pushdeviceModalVisible} values={currentRow || {}}
-     onCancel={() => {
-      setpushdeviceModalVisible(false);
-      setCurrentRow(undefined);
-    }}
-    handleOk={(values)=>{
-
     }}
     />
     </PageContainer>