Merge branch 'master' of http://47.100.234.193:9527/wuhao/ems3.3

src/components/InitForm/EditTable/index.jsx

@@ -34,6 +34,9 @@ const EditTable = (props) => {
         success: true,
         total: dataSource?.length ?? 0,
       };
+    console.log('====================================');
+    console.log(extraparams);
+    console.log('====================================');
     let newparams = {
       ...params,
       ...extraparams, //父组件传参

src/components/InitForm/Expandable/index.jsx

+import { doFetch } from '@/utils/doFetch';
 import React, { useState, useEffect } from 'react';
-import AutoTable from '../../AutoTable';
+import AutoTable from '../../AutoTable/mtable';
 import EditTable from '../EditTable';
 
-function Expandables({ value, onChange, item }) {
-  console.log(value);
+function Expandables({ value = [], onChange, item }) {
+  const [allDatasource, setallDatasource] = useState({});
+
   return (
     <div>
       <AutoTable
@@ -11,9 +13,41 @@ function Expandables({ value, onChange, item }) {
         path={item?.path}
         extraparams={item?.extraparams}
         expandable={{
+          expandRowByClick: true,
+          onExpand: (expanded, record) => {
+            if (!expanded) return;
+            //找到value中当前展开的值
+            let curvalue = value
+              ? value.filter((it) => it.lifePieceAccountId == record.id)?.[0]
+              : {};
+            //value中的list
+            let curvalist = curvalue?.lineStockUseList ?? [];
+            doFetch({ url: item.expandablePath, params: { lifePieceAccountId: record.id } }).then(
+              (res) => {
+                //展开接口返回的结果
+                let curDatasource = res?.data?.dataList ?? [];
+                //组合数据
+                let result = curDatasource?.map((it) => {
+                  const itemval =
+                    curvalist?.filter?.((item) => item.lineStockId == it.id)?.[0] ?? false;
+                  if (itemval) {
+                    it.operateNum = itemval.operateNum;
+                  }
+                  return it;
+                });
+
+                setallDatasource((s) => ({
+                  ...s,
+                  [record.id]: result,
+                }));
+              },
+            );
+          },
           expandedRowRender: (record) => {
+            let curvalue = value
+              ? value.filter((it) => it.lifePieceAccountId == record.id)?.[0]
+              : {};
             return (
-              <div>
               <EditTable
                 resizeable={false}
                 alwaysShowAlert={false}
@@ -59,29 +93,22 @@ function Expandables({ value, onChange, item }) {
                     },
                   },
                 ]}
-                  path={item?.expandablePath}
-                  extraparams={{ lifePieceAccountId: record?.id }}
+                dataSource={allDatasource[record.id]}
+                extraparams={allDatasource}
                 rowSelection={{
                   getCheckboxProps: (record) => ({
                     disabled: record.isAsh == '1',
                   }),
                   columnWidth: 44,
                   preserveSelectedRowKeys: true,
-                    selectedRowKeys:
-                      value && value.length > 0
-                        ? value?.filter?.((it) => it?.lifePieceAccountId == record.id)[0]
-                          ? value
-                              ?.filter?.((it) => it?.lifePieceAccountId == record.id)[0]
-                              ?.lineStockUseList?.map?.((it) => it?.lineStockId)
-                          : []
+                  selectedRowKeys: curvalue?.lineStockUseList
+                    ? curvalue.lineStockUseList?.map?.((it) => it?.lineStockId)
                     : [],
                   onChange: (selectedKeys, selectedRows) => {
                     //   debugger;
-                      const curval =
-                        value?.filter?.((it) => it?.lifePieceAccountId == record.id)[0]
-                          ?.lineStockUseList ?? [];
-                      const rowkeylist =
-                        curval && curval.length > 0 ? curval?.map((it) => it?.lineStockId) : [];
+                    const curval = curvalue?.lineStockUseList ?? [];
+                    const rowkeylist = curval?.map?.((it) => it?.lineStockId);
+
                     const newValue = selectedRows?.map((its) => {
                       if (rowkeylist?.includes(its?.id)) {
                         return curval?.filter((it) => it?.lineStockId == its?.id)[0];
@@ -92,17 +119,18 @@ function Expandables({ value, onChange, item }) {
                         };
                       }
                     });
+
                     let nvalue = value ? [...value] : [];
-                      if (value && value?.some((it) => it.lineStockId == record?.id)) {
+                    if (value && value?.some((it) => it.lifePieceAccountId == record?.id)) {
                       nvalue = value?.map((it, i) => {
-                          if (it.lineStockId == record.id) {
+                        if (it.lifePieceAccountId == record.id) {
                           it.lineStockUseList = newValue;
                         }
                         return it;
                       });
                     } else {
                       nvalue.push({
-                          id: record?.id,
+                        lifePieceAccountId: record?.id,
                         lineStockUseList: newValue,
                       });
                     }
@@ -111,10 +139,7 @@ function Expandables({ value, onChange, item }) {
                 }}
                 editable={{
                   onValuesChange: (rower, recordList) => {
-                      console.log(rower);
-                      const curval =
-                        value?.filter?.((it) => it?.lifePieceAccountId == record.id)[0]
-                          ?.lineStockUseList ?? [];
+                    const curval = curvalue?.lineStockUseList ?? [];
                     const newValue = curval?.map((its) => {
                       if (its?.lineStockId == rower?.id) {
                         return {
@@ -126,9 +151,9 @@ function Expandables({ value, onChange, item }) {
                       }
                     });
                     let nvalue = value ? [...value] : [];
-                      if (value && value?.some((it) => it.id == record?.id)) {
+                    if (value && value?.some((it) => it.lifePieceAccountId == record?.id)) {
                       nvalue = value?.map((it, i) => {
-                          if (it.id == record.id) {
+                        if (it.lifePieceAccountId == record.id) {
                           it.lineStockUseList = newValue;
                         }
                         return it;
@@ -141,12 +166,8 @@ function Expandables({ value, onChange, item }) {
                     }
                     onChange(nvalue);
                   },
-                    onExpandedRowsChange: (expandedRows) => {
-                      console.log(expandedRows);
-                    },
                 }}
               />
-              </div>
             );
           },
         }}

src/components/InitForm/FormItems.jsx

@@ -1488,7 +1488,6 @@ function FormList({ item, colProps, formRef }) {
 }
 
 const Todo = ({ actionRef, value, item, params, rowKey, chooses, onChange }) => {
-  console.log(params);
   return (
     <EditTable
       actionRef={actionRef}

src/pages/repair/order/index.jsx

@@ -713,7 +713,7 @@ function Failure(props) {
   const Finishrepair = () => {
     const EditTableItem = ({ record }) => {
       const [value, setvalue] = useState([]);
-      console.log(value);
+
       return (
         <div>
           <EditTable
@@ -789,7 +789,6 @@ function Failure(props) {
                   const newValue = value.concat(rower);
                   return [...newValue];
                 });
-                console.log(value);
               },
             }}
           />
@@ -1051,8 +1050,8 @@ function Failure(props) {
           },
         ],
         path: '/sparepart/lifePieceAccount/queryPageByEquipment',
+        expandablePath: '/sparepart/lineStock/queryReplaceStockAll',
         extraparams: { equipmentId: drawer?.item?.equipmentId },
-        expandablePath: '/sparepart/lineStock/queryReplaceStock',
       },
     ];
     return (