12011507

src/pages/device/account/index.jsx

@@ -2,7 +2,7 @@
  * @Author: Li Hanlin
  * @Date: 2022-11-10 09:39:56
  * @Last Modified by: Li Hanlin
- * @Last Modified time: 2022-12-01 13:59:27
+ * @Last Modified time: 2022-12-01 15:05:17
  */
 
 import * as React from 'react';
@@ -772,65 +772,60 @@ function Model(props) {
             break;
         }
       };
+      const [request, setrequest] = useState();
       useEffect(() => {
         const fn = async () => {
-          let res = await doFetch({
-            url: '/base/paFormField/queryList',
-            params: {
-              formId: '2',
-            },
-          });
-          if (res?.data?.dataList) {
-            let column = [
-              {
-                title: '扩展字段',
-                valueType: 'split',
+            let res = await doFetch({
+              url: '/base/paFormField/queryList',
+              params: {
+                formId: '2',
               },
-            ];
-            res?.data?.dataList?.forEach((el) => {
-              column.push({
-                ...selectValueType(el.fieldChar, el.valueList),
-                title: el.fieldName,
-                dataIndex: el.id,
-                key: el.id,
+            });
+            if (res?.data?.dataList) {
+              let column = [];
+              res?.data?.dataList?.forEach((el) => {
+                column.push({
+                  ...selectValueType(el.fieldChar, el.valueList),
+                  title: el.fieldName,
+                  dataIndex: el.id,
+                  key: el.id,
+                });
               });
+              setnewfieldscolumns(column);
+            }
+          },
+          fn2 = async () => {
+            const res = await doFetch({
+              url: urlParams.detail,
+              params: { id: drawer?.item?.id },
             });
-            setnewfieldscolumns(columns.concat(column));
-          }
-        };
+            console.log(res?.data?.data);
+            let obj = {};
+            res?.data?.data['equipmentCharList']?.forEach((it) => {
+              obj[it?.fieldId] = it?.fieldRealValue;
+            });
+            console.log('drawerpro:', {
+              ...(res?.data?.data ?? {}),
+              ...obj,
+            });
+            setrequest(
+              {
+                ...(res?.data?.data ?? {}),
+                ...obj,
+              } ?? {},
+            );
+          };
         fn();
+        fn2();
       }, []);
       return (
         <>
-          <ProDescriptions
-            request={async () => {
-              const res = await doFetch({
-                url: urlParams.detail,
-                params: { id: drawer?.item?.id },
-              });
-              let obj = {};
-              res?.data?.data[equipmentCharList]?.forEach((it) => {
-                obj[it?.fieldId] = it?.fieldRealValue;
-              });
-
-              console.log('drawerpro:', {
-                ...(res?.data?.data ?? {}),
-                ...obj,
-              });
-
-              return {
-                success: true,
-                data:
-                  {
-                    ...(res?.data?.data ?? {}),
-                    ...obj,
-                  } ?? {},
-              };
-            }}
-            columns={newfieldscolumns}
-          />
+          <ProDescriptions dataSource={request} columns={columns} />
           <Divider />
-          <h3 className="page-title">扩展字段</h3>
+          <h3 className="page-title" style={{ marginBottom: 16 }}>
+            扩展字段
+          </h3>
+          <ProDescriptions dataSource={request} columns={newfieldscolumns} />
         </>
       );
     };