Merge branch 'master' into groupmealweb

src/pages/device/productmanage/index.jsx

@@ -308,8 +308,9 @@ const bomtechnology = (props) => {
                 await deleteproducttopics([record.id]).then((r) => {
   
                   message.success('删除成功，即将刷新');
-                  var params={productId:props.location.query.values.productId,current:1,pageSize:10}
-                  LoadtopisData(params)
+                  actiontopisRef.current.reload();
+                  // var params={productId:props.location.query.values.productId,current:1,pageSize:10}
+                  // LoadtopisData(params)
                 });
               }}
               onCancel={() => { }}
@@ -532,7 +533,7 @@ const handleRemove = async (ids) => {
       id="table1"
       actionRef={actiontopisRef}
       rowKey="id"
-      pagination={{ defaultPageSize: 10,total:total }}
+      pagination={{ defaultPageSize: 10 }}
       search={{labelWidth: 120}}
       columns={topicscolumns}
       toolBarRender={() => [
@@ -549,7 +550,7 @@ const handleRemove = async (ids) => {
      
       ]}
       //数据绑定
-      dataSource={dataSource}
+      // dataSource={dataSource}
       request={async (params) => {
         var data = [];
         var total = 0;
@@ -581,11 +582,11 @@ const handleRemove = async (ids) => {
       actionRef={actiontopismrRef}
       rowKey="id"
       search={false}
-      pagination={{ defaultPageSize: 10,total:total }}
+      pagination={{ defaultPageSize: 10}}
       columns={topicsmrcolumns}
       toolBarRender={false}
       //数据绑定
-      dataSource={dataSource}
+      // dataSource={dataSource}
       request={async (params) => {
         var data = [];
         var total = 0;