12011420

src/components/ExtendField/index.jsx

@@ -2,7 +2,7 @@
  * @Author: Li Hanlin
  * @Date: 2022-11-29 14:03:07
  * @Last Modified by: Li Hanlin
- * @Last Modified time: 2022-11-29 16:28:29
+ * @Last Modified time: 2022-12-01 11:06:20
  */
 
 import { doFetch } from '@/utils/doFetch';
@@ -10,8 +10,9 @@ import { useRequest } from 'ahooks';
 import { useState, useEffect } from 'react';
 import InitForm from '../InitForm';
 
-export default ({ formId }) => {
-  const [columns, setcolumns] = useState([]);
+const App = ({ setDrawer, onFinish, drawer, actionRef, columns, urlParams, formId }) => {
+  const [value, setValue] = useState('');
+  const [fieldscolumns, setfieldscolumns] = useState(columns);
   const selectValueType = (type, options) => {
     switch (type) {
       case 1:
@@ -43,29 +44,53 @@ export default ({ formId }) => {
       let res = await doFetch({
         url: '/base/paFormField/queryList',
         params: {
-          formId,
+          formId: formId,
         },
       });
       if (res?.data?.dataList) {
-        let column = [];
+        let column = [
+          {
+            title: '扩展字段',
+            valueType: 'split',
+          },
+        ];
         res?.data?.dataList?.forEach((el) => {
           column.push({
-            ...selectValueType(el.fieldChar, el.valueType),
+            ...selectValueType(el.fieldChar, el.valueList),
             title: el.fieldName,
-            dataIndex: 'title',
+            dataIndex: el.fieldName,
             key: el.id,
           });
         });
-        console.log('11111', column);
-        setcolumns(column);
+        setfieldscolumns(fieldscolumns.concat(column));
       }
     };
     fn();
   }, []);
 
+  const selectextendField = (type) => {
+    switch (Number(type)) {
+      case 1:
+        return 'userCharList';
+      case 2:
+        return 'equipmentCharList';
+      case 3:
+        return 'equipmentSupplierCharList';
+      default:
+        break;
+    }
+  };
   return (
     <>
-      <InitForm fields={columns} />
+      <InitForm
+        extendField={selectextendField(formId)}
+        detailpath={urlParams.detail}
+        params={{ id: drawer?.item?.id }}
+        fields={fieldscolumns}
+        onFinish={onFinish}
+      />
     </>
   );
 };
+
+export default App;

src/pages/setting/users/index.jsx

@@ -2,7 +2,7 @@
  * @Author: Li Hanlin
  * @Date: 2022-11-09 14:44:44
  * @Last Modified by: Li Hanlin
- * @Last Modified time: 2022-11-30 16:42:10
+ * @Last Modified time: 2022-12-01 11:13:59
  */
 
 import * as React from 'react';
@@ -14,6 +14,7 @@ import InitForm from '@/components/InitForm';
 import getcolumns from './columns';
 import { doFetch } from '@/utils/doFetch';
 import { message, AutoComplete } from 'antd';
+import ExtendField from '@/components/ExtendField';
 
 function User(props) {
   const actionRef = useRef(),
@@ -298,7 +299,51 @@ function User(props) {
         }}
         {...drawer}
       >
-        {drawer?.type == 'add' ? <Adduser /> : null}
+        {drawer?.type == 'add' ? (
+          <ExtendField
+            setDrawer={setDrawer}
+            drawer={drawer}
+            actionRef={actionRef}
+            columns={columns}
+            formId={'1'}
+            urlParams={urlParams}
+            onFinish={async (vals) => {
+              let userCharReqList = [];
+              for (let i in vals) {
+                if (!isNaN(Number(i))) {
+                  userCharReqList.push({
+                    fieldId: i,
+                    fieldRealValue: vals[i],
+                  });
+                  delete vals[i];
+                }
+              }
+              let params = {
+                ...vals,
+                id: drawer?.title == '编辑' ? drawer?.item?.id : '',
+                userCharReqList,
+              };
+              delete params.shopId;
+              console.log(params, '!!!!');
+              let res = await doFetch({
+                url: urlParams.save,
+                params,
+              });
+              if (res.code === '0000') {
+                if (drawer?.title == '编辑') {
+                  message.success('编辑成功！');
+                } else {
+                  message.success('新增成功！');
+                }
+                setDrawer((s) => ({
+                  ...s,
+                  visible: false,
+                }));
+                actionRef.current.reload();
+              }
+            }}
+          />
+        ) : null}
       </DrawerPro>
     </div>
   );

src/utils/fieldsDetail.js

+import { doFetch } from './doFetch';
+
+export default async (fieldscolumns, setdrawer, row, formId, detailpath) => {
+  let newfieldscolumns = [];
+  const selectValueType = (type, options) => {
+    switch (type) {
+      case 1:
+        return {
+          valueType: 'input',
+        };
+      case 2:
+        return {
+          valueType: 'select',
+          options,
+        };
+      case 3:
+        return {
+          valueType: 'radio',
+          options,
+        };
+      case 4:
+        return {
+          valueType: 'select',
+          options,
+        };
+      default:
+        break;
+    }
+  };
+
+  const selectextendField = (type) => {
+    switch (Number(type)) {
+      case 1:
+        return 'userCharList';
+      case 2:
+        return 'equipmentCharList';
+      case 3:
+        return 'equipmentSupplierCharList';
+      default:
+        break;
+    }
+  };
+  let res = await doFetch({
+    url: '/base/paFormField/queryList',
+    params: {
+      formId,
+    },
+  });
+  if (res?.data?.dataList) {
+    let column = [
+      {
+        title: '扩展字段',
+        valueType: 'split',
+      },
+    ];
+    res?.data?.dataList?.forEach((el) => {
+      column.push({
+        ...selectValueType(el.fieldChar, el.valueList),
+        title: el.fieldName,
+        dataIndex: el.id,
+        key: el.id,
+      });
+    });
+    newfieldscolumns = fieldscolumns.concat(column);
+    console.log('fieldscolumns', newfieldscolumns);
+  }
+  setdrawer((s) => ({
+    ...s,
+    visible: true,
+    item: row,
+    title: '详情',
+    fields: newfieldscolumns,
+    extendField: selectextendField(formId),
+    detailpath,
+    params: { id: row.id },
+    val: 'detail',
+    title: row.fullName + '的详细信息',
+  }));
+};