12081548

config/config.js

@@ -25,7 +25,7 @@ const keepalive = getList(authRoutes)
   })
   .map((it) => it.path);
 
-console.log(keepalive);
+//console.log(keepalive);
 
 export default defineConfig({
   outputPath: 'package',

config/proxy.js

@@ -13,12 +13,13 @@ export default {
   dev: {
     [defaultSetting.proxypath]: {
       // 要代理的地址
-      target: 'http://192.168.40.117:8000',
+      // target: 'http://192.168.40.117:8000',  //jf哥
+      target: 'http://192.168.40.203:8000', //dj哥
       changeOrigin: true,
     },
     '/token': {
       // 要代理的地址
-      target: 'http://192.168.40.117:8000',
+      target: 'http://192.168.40.203:8000',
       changeOrigin: true,
     },
     '/staticfile/': {

config/routes.js

@@ -2,7 +2,7 @@
 
 let allauth = authRoutes; // .map((it) => ({ ...it, wrappers: ['@/wrappers/auth'] }));
 
-console.log(allauth);
+//console.log(allauth);
 
 export default [
   {

src/app.jsx

@@ -13,7 +13,7 @@ import routes from '../config/authRoutes';
 const { LinkOutlined } = Ant4Icons;
 // const isDev = process.env.NODE_ENV === 'development';
 const isDev = true;
-console.log(isDev);
+//console.log(isDev);
 const loginPath = '/user/login';
 
 /**
@@ -141,7 +141,7 @@ export const layout = ({ initialState, setInitialState }) => {
         userId: initialState?.currentUser?.id,
       },
       request: (params, defaultMenuData) => {
-        console.log(initialState);
+        //console.log(initialState);
         let lastArr = initialState?.newMenu?.userHavePermList
             ? JSON.parse(JSON.stringify(initialState?.newMenu?.userHavePermList))
             : [],

src/components/Addform/index.jsx

@@ -109,7 +109,7 @@ const App = ({ url, actionRef, setdrawer }) => {
         formRef={formRef}
         fields={columns}
         onValuesChange={(changedValues, allValues) => {
-          console.log(changedValues, allValues);
+          //console.log(changedValues, allValues);
           if (Object.keys(changedValues)[0] == 'faultDetailId') {
             doFetch({
               url: '/repair/umFaultSettingDetail/queryById',
@@ -117,7 +117,7 @@ const App = ({ url, actionRef, setdrawer }) => {
                 id: changedValues?.faultDetailId,
               },
             }).then((res) => {
-              console.log(res);
+              //console.log(res);
               formRef?.current?.setFieldsValue({
                 faultDescription: res?.data?.data.faultPhenomenon,
               });
@@ -125,7 +125,7 @@ const App = ({ url, actionRef, setdrawer }) => {
           }
         }}
         onFinish={async (vals) => {
-          console.log(vals);
+          //console.log(vals);
           let params = {
             ...vals,
           };

src/components/AutoTable/mtable.jsx

@@ -349,7 +349,7 @@ const Mtable = (props) => {
       {...components}
       size={size}
       onSubmit={(params) => {
-        //console.log(params, 'onSubmit');
+        ////console.log(params, 'onSubmit');
         let newparams = {};
         columns.map((it, i) => {
           if (

src/components/DetailPro/index.jsx

@@ -25,15 +25,15 @@ function DetailPro(props) {
             res?.data?.data[props.extendField]?.forEach((it) => {
               obj[it?.fieldId] = it?.fieldRealValue;
             });
-            console.log('extendField:', obj);
+            //console.log('extendField:', obj);
             setcuritem({
               ...(res?.data?.data ?? {}),
               ...obj,
             });
-            console.log('drawerpro:', {
-              ...(res?.data?.data ?? {}),
-              ...obj,
-            });
+            // console.log('drawerpro:', {
+            //   ...(res?.data?.data ?? {}),
+            //   ...obj,
+            // });
 
             return {
               success: res?.code == '0000',

src/components/InitForm/Diyrule/index.jsx

@@ -31,7 +31,7 @@ let Diyrule = (props) => {
       );
     }, [defval?.other]);
 
-  console.log(other);
+  //console.log(other);
 
   let { data, loading } = useRequest(() => {
     return doFetch({ url: '/base/bmNoRule/querySelect', params: {} });

src/components/InitForm/EditTable/index.jsx

@@ -119,7 +119,7 @@ const EditTable = (props) => {
       recordCreatorProps={false}
       size={size}
       onSubmit={(params) => {
-        console.log(params, 'onSubmit');
+        //console.log(params, 'onSubmit');
       }}
       onSizeChange={(size) => {
         localStorage.setItem('size', size); //设置全局表格规格缓存

src/components/InitForm/FormItems.jsx

@@ -497,11 +497,11 @@ function LinkSelect({ item, colProps, formRef, name, curindex }) {
                   } else {
                     ifclean = res?.data?.dataList.filter((it) => it.value == curval)?.[0]?.value;
                   }
-                  console.log(
-                    curval,
-                    res?.data?.dataList?.map((it) => it.value),
-                    curkey,
-                  );
+                  //console.log(
+                  //   curval,
+                  //   res?.data?.dataList?.map((it) => it.value),
+                  //   curkey,
+                  // );
 
                   formRef?.current?.setFieldsValue({ [curkey]: ifclean });
                 }
@@ -1179,7 +1179,7 @@ function UploadImg({ value, onChange, fieldProps }) {
       <div style={{ marginTop: 8 }}>上传图片</div>
     </div>
   );
-  console.log(value?.length, fieldProps.limit);
+  //console.log(value?.length, fieldProps.limit);
   return (
     <>
       <Image

src/components/InitForm/index.jsx

@@ -86,7 +86,7 @@ let FormRender = memo(({ fields = [], colProps, proformRef }) => {
 function InitForm({
   formRef,
   onFinish = (vals) => {
-    console.log(vals);
+    //console.log(vals);
   },
   formKey,
   params = {},
@@ -97,7 +97,7 @@ function InitForm({
   extendField = '',
   colProps = { xs: 24, sm: 24, md: 12, lg: 12, xl: 12, xxl: 12 },
   onValuesChange = (changedValues, allValues) => {
-    console.log(changedValues, allValues);
+    //console.log(changedValues, allValues);
   },
 }) {
   let proformRef = useRef();
@@ -118,16 +118,16 @@ function InitForm({
       request={async (params) => {
         if (detailpath) {
           let res = await doFetch({ url: detailpath, params });
-          console.log({
-            ...(res?.data?.data ?? {}),
-            ...defaultFormValue,
-          });
+          // console.log({
+          //   ...(res?.data?.data ?? {}),
+          //   ...defaultFormValue,
+          // });
           if (extendField) {
             let obj = {};
             res?.data?.data[extendField]?.forEach((it) => {
               obj[it?.fieldId] = it?.fieldRealValue;
             });
-            console.log('extendField:', obj);
+            //console.log('extendField:', obj);
             return {
               ...(res?.data?.data ?? {}),
               ...obj,
@@ -139,9 +139,9 @@ function InitForm({
             ...defaultFormValue,
           };
         } else {
-          console.log({
-            ...defaultFormValue,
-          });
+          // console.log({
+          //   ...defaultFormValue,
+          // });
           return {
             ...defaultFormValue,
           };

src/components/RightContent/AvatarDropdown.jsx

@@ -30,7 +30,7 @@ const loginOut = async () => {
 
 const AvatarDropdown = ({ menu }) => {
   const { initialState, setInitialState } = useModel('@@initialState');
-  console.log('initialState,', initialState);
+  //console.log('initialState,', initialState);
   const [visible, cv] = useState(false),
     [formRef] = Form.useForm(),
     { run, loading } = useRequest(doFetch, {

src/components/TagView/index.jsx

@@ -55,7 +55,7 @@ const TagView = ({ children, home }) => {
     if (currentMenu.path) {
       const tagsCopy = tagList.map((item) => {
         if (currentMenu?.path === item.path) {
-          console.log(item);
+          //console.log(item);
           hasOpen = true;
           // 刷新浏览器时，重新覆盖当前 path 的 children
           return { ...item, active: true, children: item.children };

src/components/TreeRender/index.jsx

@@ -422,7 +422,7 @@ function TreeRender({ url, deleteurl, saveurl, onselected, params, noaction, max
 
       <Tree
         onSelect={(selectedKeys, e) => {
-          // console.log(selectedKeys);
+          // //console.log(selectedKeys);
           onselected?.(selectedKeys, e, alldata);
         }}
         autoExpandParent={autoExpandParent}

src/components/index.md

@@ -81,7 +81,7 @@ export default () => {
         },
       ]}
       onSearch={(value) => {
-        console.log('input', value);
+        //console.log('input', value);
       }}
     />
   );

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-07 13:43:37
+ * @Last Modified time: 2022-12-08 15:08:04
  */
 
 import * as React from 'react';
@@ -481,9 +481,9 @@ function Model(props) {
               // detailpath: urlParams.detail,
               // params: { id: row.id },
               // onFinish: async (vals) => {
-              //   console.log(1);
+              //   //console.log(1);
               //   let equipmentCharList = [];
-              //   console.log('id:', row.id);
+              //   //console.log('id:', row.id);
               //   for (let i in vals) {
               //     if (!isNaN(Number(i))) {
               //       equipmentCharList.push({
@@ -567,7 +567,7 @@ function Model(props) {
                     val: 'only',
                     title: '编辑子设备',
                     // onFinish: async (vals) => {
-                    //   console.log(1);
+                    //   //console.log(1);
                     //   let params = {
                     //     ...vals,
                     //     id: row.id,
@@ -607,7 +607,7 @@ function Model(props) {
                     val: 'only',
                     title: '履历登记',
                     // onFinish: async (vals) => {
-                    //   console.log(1);
+                    //   //console.log(1);
                     //   let params = {
                     //     ...vals,
                     //     id: row.id,
@@ -799,7 +799,7 @@ function Model(props) {
               url: urlParams.detail,
               params: { id: drawer?.item?.id },
             });
-            console.log(res?.data?.data);
+            //console.log(res?.data?.data);
             let obj = {};
             res?.data?.data['equipmentCharList']?.forEach((it) => {
               obj[it?.fieldId] = it?.fieldRealValue;
@@ -1191,7 +1191,7 @@ function Model(props) {
           url: '/asset/equipment/children/selected/queryList',
           params: { id: drawer?.item?.id },
         });
-        // console.log(result);
+        // //console.log(result);
         if (!result?.data?.dataList.length == 0) {
           setSelectArr(result?.data?.dataList.map((it) => it.id));
         }
@@ -1365,13 +1365,13 @@ function Model(props) {
             selectedRowKeys: selectArr,
             // defaultSelectedRowKeys: ,
             onSelect: (record, selected, selectedRows, nativeEvent) => {
-              console.log('selectedRowKeys changed: ', record, selected, selectedRows);
+              //console.log('selectedRowKeys changed: ', record, selected, selectedRows);
               setSelectArr(() => {
                 return selectedRows.map((it) => it.id);
               });
             },
             onSelectAll: (selected, selectedRows, changeRows) => {
-              console.log(selected, selectedRows, changeRows);
+              //console.log(selected, selectedRows, changeRows);
               if (selected) {
                 let arr = selectArr.concat(changeRows.map((it) => it.id));
                 setSelectArr(arr);
@@ -1380,7 +1380,7 @@ function Model(props) {
               }
             },
             onSelectNone: () => {
-              console.log(11);
+              //console.log(11);
               setSelectArr([]);
             },
           }}
@@ -1388,7 +1388,7 @@ function Model(props) {
         <Space style={{ marginTop: 16 }}>
           <Button
             onClick={() => {
-              console.log(drawer);
+              //console.log(drawer);
               setDrawer((s) => ({
                 ...s,
                 visible: false,
@@ -1406,7 +1406,7 @@ function Model(props) {
           <Button
             type="primary"
             onClick={async () => {
-              console.log(selectArr);
+              //console.log(selectArr);
               let res = await doFetch({
                 url: urlParams_childEquipment.save,
                 params: {
@@ -1444,7 +1444,7 @@ function Model(props) {
           url: '/asset/equipment/children/selected/queryList',
           params: { id: drawer?.item?.id },
         });
-        // console.log(result);
+        // //console.log(result);
         if (!result?.data?.dataList.length == 0) {
           setSelectArr(result?.data?.dataList.map((it) => it.id));
         }
@@ -1891,7 +1891,7 @@ function Model(props) {
                 <InitForm
                   fields={fields[activeTab]}
                   onFinish={async (vals) => {
-                    console.log(vals);
+                    //console.log(vals);
                     let res = await doFetch({
                       url: urlParams_resume.save,
                       params: { ...vals, type: '1', equipmentId: drawer?.item?.id },
@@ -1916,7 +1916,7 @@ function Model(props) {
                 <InitForm
                   fields={fields[activeTab]}
                   onFinish={async (vals) => {
-                    console.log(vals);
+                    //console.log(vals);
                     let res = await doFetch({
                       url: urlParams_resume.save,
                       params: { ...vals, type: '2', equipmentId: drawer?.item?.id },
@@ -1941,7 +1941,7 @@ function Model(props) {
                 <InitForm
                   fields={fields[activeTab]}
                   onFinish={async (vals) => {
-                    console.log(vals);
+                    //console.log(vals);
                     let res = await doFetch({
                       url: urlParams_resume.save,
                       params: { ...vals, type: '3', equipmentId: drawer?.item?.id },
@@ -1966,7 +1966,7 @@ function Model(props) {
                 <InitForm
                   fields={fields[activeTab]}
                   onFinish={async (vals) => {
-                    console.log(vals);
+                    //console.log(vals);
                     let res = await doFetch({
                       url: urlParams_resume.save,
                       params: { ...vals, type: '4', equipmentId: drawer?.item?.id },
@@ -1991,7 +1991,7 @@ function Model(props) {
                 <InitForm
                   fields={fields[activeTab]}
                   onFinish={async (vals) => {
-                    console.log(vals);
+                    //console.log(vals);
                     let res = await doFetch({
                       url: urlParams_resume.save,
                       params: { ...vals, type: '5', equipmentId: drawer?.item?.id },
@@ -2089,7 +2089,7 @@ function Model(props) {
                 id: drawer?.title == '编辑' ? drawer?.item?.id : '',
                 equipmentCharReqList,
               };
-              console.log(params, '!!!!');
+              //console.log(params, '!!!!');
               let res = await doFetch({
                 url: urlParams.save,
                 params,
@@ -2150,7 +2150,7 @@ function Model(props) {
                     val: 'only',
                     type: 'add',
                     // onFinish: async (vals) => {
-                    //   console.log(vals);
+                    //   //console.log(vals);
                     //   let params = {
                     //     ...vals,
                     //   };

src/pages/device/model/index.jsx

@@ -65,7 +65,7 @@ function Model(props) {
               detailpath: urlParams.detail,
               params: { id: row.id },
               onFinish: async (vals) => {
-                console.log(1);
+                //console.log(1);
                 let params = {
                   ...vals,
                   id: row.id,
@@ -154,8 +154,8 @@ function Model(props) {
                 title: '新增',
                 val: 'add',
                 onFinish: async (vals) => {
-                  // console.log(1);
-                  console.log(drawer);
+                  // //console.log(1);
+                  //console.log(drawer);
                   let params = {
                     ...vals,
                   };

src/pages/device/supplier/columns.js

@@ -109,7 +109,7 @@ function getcolumns(setdrawer) {
             unCheckedChildren="禁用"
             defaultChecked={row.status == 1}
             onChange={(flag) => {
-              // console.log(e);
+              // //console.log(e);
               if (flag) {
                 doFetch({
                   url: '/asset/equipmentSupplier/update/status',

src/pages/device/supplier/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-12-01 17:13:05
+ * @Last Modified time: 2022-12-08 15:09:50
  */
 
 import * as React from 'react';
@@ -48,7 +48,7 @@ function Supplier(props) {
               type: 'add',
               onFinish: async (vals) => {
                 let equipmentSupplierCharReqList = [];
-                console.log('id:', row.id);
+                //console.log('id:', row.id);
                 for (let i in vals) {
                   if (!isNaN(Number(i))) {
                     equipmentSupplierCharReqList.push({
@@ -213,15 +213,15 @@ function Supplier(props) {
             url: urlParams.detail,
             params: { id: drawer?.item?.id },
           });
-          console.log(res?.data?.data);
+          //console.log(res?.data?.data);
           let obj = {};
           res?.data?.data['equipmentSupplierCharReqList']?.forEach((it) => {
             obj[it?.fieldId] = it?.fieldRealValue;
           });
-          console.log('drawerpro:', {
-            ...(res?.data?.data ?? {}),
-            ...obj,
-          });
+          // console.log('drawerpro:', {
+          //   ...(res?.data?.data ?? {}),
+          //   ...obj,
+          // });
           setrequest(
             {
               ...(res?.data?.data ?? {}),

src/pages/device/type/index.jsx

@@ -65,7 +65,7 @@ function Type(props) {
               title: '编辑',
               val: 'edit',
               onFinish: async (vals) => {
-                console.log(1);
+                //console.log(1);
                 let params = {
                   ...vals,
                   id: row.key,
@@ -73,7 +73,7 @@ function Type(props) {
                   equipmentTypeName: vals.title,
                 };
                 delete params.title;
-                console.log(params);
+                //console.log(params);
                 let res = await doFetch({
                   url: urlParams.save,
                   params,
@@ -88,7 +88,7 @@ function Type(props) {
                 }
               },
             }));
-            console.log(row);
+            //console.log(row);
           },
         }}
       >
@@ -113,7 +113,7 @@ function Type(props) {
               title: '新增子级',
               val: 'addChild',
               onFinish: async (vals) => {
-                console.log(1);
+                //console.log(1);
                 let params = {
                   ...vals,
                   parentId: row.key,
@@ -135,7 +135,7 @@ function Type(props) {
                 }
               },
             }));
-            console.log(drawer.item);
+            //console.log(drawer.item);
           },
         }}
       >
@@ -217,7 +217,7 @@ function Type(props) {
                 params: {},
                 val: 'add',
                 onFinish: async (vals) => {
-                  console.log(drawer);
+                  //console.log(drawer);
                   let params = {
                     ...vals,
                     parentId: 0,

src/pages/repair/fault/index.jsx

@@ -2,7 +2,7 @@
  * @Author: Li Hanlin
  * @Date: 2022-12-07 11:19:30
  * @Last Modified by: Li Hanlin
- * @Last Modified time: 2022-12-07 15:12:48
+ * @Last Modified time: 2022-12-08 15:48:49
  */
 
 import * as React from 'react';
@@ -34,7 +34,9 @@ function Fault(props) {
   const [drawer, setdrawer] = useState({
     open: false,
   });
-
+  const [drawergz, setdrawergz] = useState({
+    open: false,
+  });
   const { run, loading } = useRequest(doFetch, {
     manual: true,
     onSuccess: (res, params) => {
@@ -131,11 +133,34 @@ function Fault(props) {
     }
   }, [drawer?.type]);
 
-  const FaultName = () => {
+  const FaultName = (props) => {
     const [request, setrequest] = useState();
-    const [drawergz, setdrawergz] = useState({
-      open: false,
-    });
+    const gzmcref = useRef();
+    const columns = useMemo(() => {
+      return [
+        {
+          title: '故障名称',
+          dataIndex: 'faultDetailName',
+          key: 'faultDetailName',
+        },
+        {
+          title: '故障代码',
+          dataIndex: 'faultDetailCode',
+          key: 'faultDetailCode',
+        },
+        {
+          title: '故障描述',
+          dataIndex: 'faultPhenomenon',
+          key: 'faultPhenomenon',
+        },
+        {
+          title: '解决方案',
+          dataIndex: 'faultSolution',
+          key: 'faultSolution',
+          search: false,
+        },
+      ];
+    }, []);
     useEffect(() => {
       const fn = async () => {
         let params = { id: drawer?.item?.id };
@@ -148,29 +173,7 @@ function Fault(props) {
       <>
         <ProDescriptions dataSource={request} columns={columns} />
         <AutoTable
-          columns={[
-            {
-              title: '故障名称',
-              dataIndex: 'faultDetailName',
-              key: 'faultDetailName',
-            },
-            {
-              title: '故障代码',
-              dataIndex: 'faultDetailCode',
-              key: 'faultDetailCode',
-            },
-            {
-              title: '故障描述',
-              dataIndex: 'faultPhenomenon',
-              key: 'faultPhenomenon',
-            },
-            {
-              title: '解决方案',
-              dataIndex: 'faultSolution',
-              key: 'faultSolution',
-              search: false,
-            },
-          ]}
+          columns={columns}
           path="/repair/umFaultSettingDetail/queryById"
           params={{ id: drawer?.item.id }}
           pageextra={'add'}
@@ -194,6 +197,23 @@ function Fault(props) {
             },
           }}
         />
+        <DrawerPro
+          placement="right"
+          fields={columns}
+          actionRef={gzmcref}
+          style={{ transform: 'translateX(180px)' }}
+          width={'100%'}
+          defaultFormValue={drawergz?.item}
+          onClose={() => {
+            setdrawergz((s) => ({
+              ...s,
+              open: false,
+              type: null,
+              item: null,
+            }));
+          }}
+          {...drawergz}
+        />
       </>
     );
   };

src/pages/repair/order/index.jsx

@@ -2,7 +2,7 @@
  * @Author: Li Hanlin
  * @Date: 2022-12-02 11:41:03
  * @Last Modified by: Li Hanlin
- * @Last Modified time: 2022-12-06 13:28:43
+ * @Last Modified time: 2022-12-08 09:02:50
  */
 
 import * as React from 'react';
@@ -119,7 +119,7 @@ function Failure(props) {
                     val: 'only',
                     title: '编辑子设备',
                     // onFinish: async (vals) => {
-                    //   console.log(1);
+                    //   //console.log(1);
                     //   let params = {
                     //     ...vals,
                     //     id: row.id,
@@ -159,7 +159,7 @@ function Failure(props) {
                     val: 'only',
                     title: '履历登记',
                     // onFinish: async (vals) => {
-                    //   console.log(1);
+                    //   //console.log(1);
                     //   let params = {
                     //     ...vals,
                     //     id: row.id,
@@ -256,8 +256,9 @@ function Failure(props) {
         break;
     }
   };
+  const containderef = useRef();
   return (
-    <div style={{ position: 'relative' }}>
+    <div style={{ position: 'relative' }} ref={containderef}>
       <AutoTable
         pagetitle={<h3 className="page-title">维修工单</h3>}
         columns={columns}

src/pages/repair/outsourcing/index.jsx

@@ -2,7 +2,7 @@
  * @Author: Li Hanlin
  * @Date: 2022-12-02 11:41:03
  * @Last Modified by: Li Hanlin
- * @Last Modified time: 2022-12-06 19:43:22
+ * @Last Modified time: 2022-12-08 14:35:09
  */
 
 import * as React from 'react';
@@ -142,10 +142,10 @@ function Failure(props) {
           fields={[
             {
               title: '最新外协人员',
-              dataIndex: 'causeFailure',
-              valueType: 'textarea',
+              dataIndex: 'newRepairUserName',
               formItemProps: { rules: [{ required: true, message: '此项为必填项' }] },
-              key: 'causeFailure',
+              fieldProps: { disabled: true },
+              key: 'newRepairUserName',
             },
             {
               title: '外协人员',
@@ -155,13 +155,13 @@ function Failure(props) {
               valueType: 'select',
               options: {
                 path: '/repair/umOtherUnitsOrder/selectionAgain',
-                params: { otherUnitsOrderId: drawer?.item.id },
+                params: { id: drawer?.item.id },
               },
             },
           ]}
           onFinish={async (vals) => {
             let params = {
-              otherUnitsFinish: vals,
+              otherUnitsAssistList: vals?.otherUnitsAssistList.map((it) => ({ assistUserId: it })),
               id: drawer?.item?.id,
             };
             let res = await doFetch({
@@ -182,6 +182,45 @@ function Failure(props) {
     );
   };
 
+  // 外协派单
+  const Wxpd = () => {
+    const columns = [
+      {
+        title: '外协人员',
+        dataIndex: 'otherUnitsAssistList',
+        key: 'otherUnitsAssistList',
+        valueType: 'select',
+        options: { path: '/repair/umOtherUnitsOrder/selection', params: { id: drawer?.item.id } },
+        formItemProps: { rules: [{ required: true, message: '此项为必填项' }] },
+      },
+    ];
+    return (
+      <>
+        <InitForm
+          fields={columns}
+          onFinish={async (vals) => {
+            let params = {
+              otherUnitsAssistList: [{ assistUserId: vals?.otherUnitsAssistList }],
+              id: drawer?.item.id,
+            };
+            let res = await doFetch({
+              url: '/repair/umOtherUnitsOrder/dispatchById',
+              params,
+            });
+            if (res.code === '0000') {
+              message.success('派单成功！');
+              setdrawer((s) => ({
+                ...s,
+                open: false,
+              }));
+              actionRef.current.reload();
+            }
+          }}
+        />
+      </>
+    );
+  };
+
   const remove = (text, row, _, action) => {
     return (
       <PremButton
@@ -235,21 +274,14 @@ function Failure(props) {
               ) : (
                 <a
                   onClick={async () => {
-                    let params = {
-                      id: row?.id,
-                    };
-                    let res = await doFetch({
-                      url: '/repair/umOtherUnitsOrder/dispatchById',
-                      params,
-                    });
-                    if (res.code === '0000') {
-                      message.success('派单成功！');
-                      setdrawer((s) => ({
-                        ...s,
-                        open: false,
-                      }));
-                      actionRef.current.reload();
-                    }
+                    setdrawer((s) => ({
+                      ...s,
+                      open: true,
+                      type: 'wxpd',
+                      item: row,
+                      val: 'only',
+                      title: '派单',
+                    }));
                   }}
                 >
                   派单
@@ -295,7 +327,7 @@ function Failure(props) {
   };
   // 未完成按钮
   const unfinishBtn = (text, row, _, action) => {
-    if (row?.status == 1) {
+    if (row?.status == 1 || row?.status == 2) {
       return (
         <PremButton
           pop={{
@@ -314,19 +346,23 @@ function Failure(props) {
           删除
         </PremButton>
       );
-    } else if (row?.status == 2) {
+    } else {
       return (
         <PremButton
-          onClick={() => {
-            setdrawer((s) => ({
-              ...s,
-              item: row,
-              type: 'Reassig',
-              open: true,
-            }));
-          }}
           btn={{
             size: 'small',
+            onClick: () => {
+              setdrawer((s) => ({
+                ...s,
+                item: {
+                  ...row,
+                  trackAssistList: row?.trackAssistList ? row?.trackAssistList : [],
+                },
+                title: '重新指派',
+                type: 'Reassig',
+                open: true,
+              }));
+            },
           }}
         >
           重新指派
@@ -337,7 +373,7 @@ function Failure(props) {
 
   const columns = useMemo(() => {
     let defcolumn = getcolumns(setdrawer).filter((it) => it.key == activeTabKey)[0]?.columns;
-    console.log(defcolumn);
+    //console.log(defcolumn);
     let defpath = getcolumns(setdrawer).filter((it) => it.key == activeTabKey)[0]?.pathconfig ?? {};
 
     if (activeTabKey == '1') {
@@ -371,11 +407,19 @@ function Failure(props) {
   const selectType = (type) => {
     switch (type) {
       case 'add':
-        return <Addform />;
+        return (
+          <Addform
+            url={'/repair/umOtherUnitsOrder/save'}
+            setdrawer={setdrawer}
+            actionRef={actionRef}
+          />
+        );
       case 'comouts':
         return <CompleteOuts />;
       case 'Reassig':
         return <Reassig />;
+      case 'wxpd':
+        return <Wxpd />;
       default:
         break;
     }

src/pages/repair/platform/RepairOrderHandle.jsx

@@ -2,16 +2,16 @@
  * @Author: Li Hanlin
  * @Date: 2022-12-05 11:13:26
  * @Last Modified by: Li Hanlin
- * @Last Modified time: 2022-12-05 16:31:25
+ * @Last Modified time: 2022-12-08 15:07:19
  */
 
 import React, { useState, useEffect } from 'react';
 import InitForm from '@/components/InitForm';
 import { doFetch } from '@/utils/doFetch';
+import { message } from 'antd';
 const App = ({ type, id, actionRef, url, setdrawer }) => {
-  let columns = [];
-  if (type == 'wxjd') {
-    columns = [
+  const columns = {
+    wxjd: [
       {
         title: '协助维修人员',
         dataIndex: 'repairAssistList',
@@ -24,21 +24,20 @@ const App = ({ type, id, actionRef, url, setdrawer }) => {
           mode: 'multiple',
         },
       },
-    ];
-  } else if (type == 'wxpd') {
-    columns = [
+    ],
+    wxpd: [
       {
         title: '维修人员',
-        dataIndex: 'faultDescription',
-        key: 'faultDescription',
+        dataIndex: 'repairId',
+        key: 'repairId',
         valueType: 'select',
         options: { path: '/auth/sysUser/selection' },
         formItemProps: { rules: [{ required: true, message: '此项为必填项' }] },
       },
       {
         title: '协助维修人员',
-        dataIndex: 'faultDescription',
-        key: 'faultDescription',
+        dataIndex: 'repairAssistList',
+        key: 'repairAssistList',
         valueType: 'select',
         options: { path: '/repair/umRepairOrder/selection', params: { id } },
         fieldProps: {
@@ -47,9 +46,8 @@ const App = ({ type, id, actionRef, url, setdrawer }) => {
           mode: 'multiple',
         },
       },
-    ];
-  } else if (type == 'zzpd') {
-    columns = [
+    ],
+    zzpd: [
       {
         title: '追踪人员',
         dataIndex: 'trackAssistList',
@@ -58,48 +56,108 @@ const App = ({ type, id, actionRef, url, setdrawer }) => {
         options: { path: '/auth/sysUser/selection' },
         formItemProps: { rules: [{ required: true, message: '此项为必填项' }] },
       },
-    ];
-  } else if (type == 'wpd') {
-    columns = [
+    ],
+    wpd: [
       {
         title: '外协人员',
         dataIndex: 'otherUnitsAssistList',
         key: 'otherUnitsAssistList',
         valueType: 'select',
-        options: { path: '/auth/sysUser/selection' },
+        options: { path: '/repair/umOtherUnitsOrder/selection' },
         formItemProps: { rules: [{ required: true, message: '此项为必填项' }] },
       },
-    ];
-  }
+    ],
+  };
+  const finishHandle = {
+    wxjd: async (vals) => {
+      //console.log(vals);
+      vals.repairAssistList = vals?.repairAssistList.map((it) => ({
+        assistUserId: it,
+      }));
+      let params = {
+        ...vals,
+        id,
+      };
+      let res = await doFetch({
+        url,
+        params,
+      });
+      if (res.code === '0000') {
+        message.success('操作成功！');
+        setdrawer((s) => ({
+          ...s,
+          open: false,
+        }));
+        actionRef.current.reload();
+      }
+    },
+    wxpd: async (vals) => {
+      //console.log(vals);
+      vals.repairAssistList = vals?.repairAssistList.map((it) => {
+        return {
+          assistUserId: it,
+        };
+      });
+      let params = {
+        ...vals,
+        id,
+      };
+      let res = await doFetch({
+        url,
+        params,
+      });
+      if (res.code === '0000') {
+        message.success('操作成功！');
+        setdrawer((s) => ({
+          ...s,
+          open: false,
+        }));
+        actionRef.current.reload();
+      }
+    },
+    zzpd: async (vals) => {
+      //console.log(vals);
+      let params = {
+        trackAssistList: [{ assistUserId: vals?.trackAssistList }],
+        id,
+      };
+      //console.log(params);
+      let res = await doFetch({
+        url,
+        params,
+      });
+      if (res.code === '0000') {
+        message.success('操作成功！');
+        setdrawer((s) => ({
+          ...s,
+          open: false,
+        }));
+        actionRef.current.reload();
+      }
+    },
+    wpd: async (vals) => {
+      let params = {
+        otherUnitsAssistList: [{ assistUserId: vals?.otherUnitsAssistList }],
+        id,
+      };
+      let res = await doFetch({
+        url,
+        params,
+      });
+      if (res.code === '0000') {
+        message.success('操作成功！');
+        setdrawer((s) => ({
+          ...s,
+          open: false,
+        }));
+        actionRef.current.reload();
+      }
+    },
+  };
+
   return (
     <>
-      <InitForm
-        fields={columns}
-        onFinish={async (vals) => {
-          console.log(vals);
-          vals.repairAssistList = vals?.repairAssistList.map((it) => {
-            return {
-              assistUserId: it,
-            };
-          });
-          let params = {
-            ...vals,
-            id,
-          };
-          let res = await doFetch({
-            url,
-            params,
-          });
-          if (res.code === '0000') {
-            message.success('操作成功！');
-            setdrawer((s) => ({
-              ...s,
-              visible: false,
-            }));
-            actionRef.current.reload();
-          }
-        }}
-      />
+      <InitForm fields={columns[type]} onFinish={finishHandle[type]} />
     </>
   );
 };

src/pages/repair/platform/columns.js

 function getcolumns(setdrawer) {
-    
-      return [
- {
-  "tab": "维修工单",
-  "key": "1",
-  "columns": [
-   {
-    "title": "维修单号",
-    "dataIndex": "repairOrderNo",
-    "key": "repairOrderNo"
-   },
-   {
-    "title": "设备编号",
-    "dataIndex": "equipmentNo",
-    "key": "equipmentNo"
-   },
-   {
-    "title": "设备名称",
-    "dataIndex": "equipmentName",
-    "key": "equipmentName"
-   },
-   {
-    "title": "故障描述",
-    "dataIndex": "faultDescription",
-    "key": "faultDescription"
-   },
-   {
-    "title": "报修人员",
-    "dataIndex": "repairUserName",
-    "key": "repairUserName"
-   },
-   {
-    "title": "报修时间",
-    "dataIndex": "repairTime",
-    "key": "repairTimeList",
-    "valueType": "dateTimeRange"
-   },
-   {
-    "title": "报修单号",
-    "dataIndex": "repairNo",
-    "key": "repairNo"
-   },
-   {
-    "title": "工单状态",
-    "dataIndex": "statusName",
-    "key": "statusName"
-   }
-  ],
-  "pathconfig": {
-   "enableadd": false,
-   "enableedit": false,
-   "enabledelete": false,
-   "enabledetail": false,
-   "add": "",
-   "edit": "",
-   "list": "/repair/umRepairOrder/queryRepairOrderList",
-   "delete": "",
-   "detail": ""
-  }
- },
- {
-  "tab": "追踪工单",
-  "key": "2",
-  "columns": [
-   {
-    "title": "追踪单号",
-    "dataIndex": "taskOrderNo",
-    "key": "taskOrderNo"
-   },
-   {
-    "title": "设备编号",
-    "dataIndex": "equipmentNo",
-    "key": "equipmentNo"
-   },
-   {
-    "title": "设备名称",
-    "dataIndex": "equipmentName",
-    "key": "equipmentName"
-   },
-   {
-    "title": "故障描述",
-    "dataIndex": "faultDescription",
-    "key": "faultDescription"
-   },
-   {
-    "title": "创建时间",
-    "dataIndex": "createTime",
-    "key": "createTime"
-   },
-   {
-    "title": "创建人员",
-    "dataIndex": "createUserName",
-    "key": "createUserName"
-   },
-   {
-    "title": "来源单号",
-    "dataIndex": "dataSourcesNo",
-    "key": "dataSourcesNo"
-   },
-   {
-    "title": "工单状态",
-    "dataIndex": "statusName",
-    "key": "statusName"
-   }
-  ],
-  "pathconfig": {
-   "enableadd": false,
-   "enableedit": false,
-   "enabledelete": false,
-   "enabledetail": false,
-   "add": "",
-   "edit": "",
-   "list": "/repair/umTrackOrder/queryTrackOrderList",
-   "delete": "",
-   "detail": ""
-  }
- },
- {
-  "tab": "外协工单",
-  "key": "3",
-  "columns": [
-   {
-    "title": "维修单号",
-    "dataIndex": "repairOrderNo",
-    "key": "repairOrderNo"
-   },
-   {
-    "title": "设备编号",
-    "dataIndex": "equipmentNo",
-    "key": "equipmentNo"
-   },
-   {
-    "title": "设备名称",
-    "dataIndex": "equipmentName",
-    "key": "equipmentName"
-   },
-   {
-    "title": "故障描述",
-    "dataIndex": "faultDescription",
-    "key": "faultDescription"
-   },
-   {
-    "title": "报修人员",
-    "dataIndex": "repairUserName",
-    "key": "repairUserName"
-   },
-   {
-    "title": "报修时间",
-    "dataIndex": "repairTime",
-    "key": "repairTimeList",
-    "valueType": "dateTimeRange"
-   },
-   {
-    "title": "报修单号",
-    "dataIndex": "repairNo",
-    "key": "repairNo"
-   },
-   {
-    "title": "工单状态",
-    "dataIndex": "statusName",
-    "key": "statusName"
-   }
-  ],
-  "pathconfig": {
-   "enableadd": true,
-   "enableedit": true,
-   "enabledelete": true,
-   "enabledetail": true,
-   "add": "",
-   "edit": "",
-   "list": "",
-   "delete": "",
-   "detail": ""
-  }
- }
-];
-    }
-    export default getcolumns;
-    
+  return [
+    {
+      tab: '维修工单',
+      key: '1',
+      columns: [
+        {
+          title: '维修单号',
+          dataIndex: 'repairOrderNo',
+          key: 'repairOrderNo',
+        },
+        {
+          title: '设备编号',
+          dataIndex: 'equipmentNo',
+          key: 'equipmentNo',
+        },
+        {
+          title: '设备名称',
+          dataIndex: 'equipmentName',
+          key: 'equipmentName',
+        },
+        {
+          title: '故障描述',
+          dataIndex: 'faultDescription',
+          key: 'faultDescription',
+        },
+        {
+          title: '报修人员',
+          dataIndex: 'repairUserName',
+          key: 'repairUserName',
+        },
+        {
+          title: '报修时间',
+          dataIndex: 'repairTime',
+          key: 'repairTimeList',
+          valueType: 'dateTimeRange',
+        },
+        {
+          title: '报修单号',
+          dataIndex: 'repairNo',
+          key: 'repairNo',
+        },
+        {
+          title: '工单状态',
+          dataIndex: 'statusName',
+          key: 'statusName',
+        },
+      ],
+      pathconfig: {
+        enableadd: false,
+        enableedit: false,
+        enabledelete: false,
+        enabledetail: false,
+        add: '',
+        edit: '',
+        list: '/repair/umRepairOrder/queryRepairOrderList',
+        delete: '',
+        detail: '',
+      },
+    },
+    {
+      tab: '追踪工单',
+      key: '2',
+      columns: [
+        {
+          title: '追踪单号',
+          dataIndex: 'taskOrderNo',
+          key: 'taskOrderNo',
+        },
+        {
+          title: '设备编号',
+          dataIndex: 'equipmentNo',
+          key: 'equipmentNo',
+        },
+        {
+          title: '设备名称',
+          dataIndex: 'equipmentName',
+          key: 'equipmentName',
+        },
+        {
+          title: '故障描述',
+          dataIndex: 'faultDescription',
+          key: 'faultDescription',
+        },
+        {
+          title: '创建时间',
+          dataIndex: 'createTime',
+          key: 'createTime',
+        },
+        {
+          title: '创建人员',
+          dataIndex: 'createUserName',
+          key: 'createUserName',
+        },
+        {
+          title: '来源单号',
+          dataIndex: 'dataSourcesNo',
+          key: 'dataSourcesNo',
+        },
+        {
+          title: '工单状态',
+          dataIndex: 'statusName',
+          key: 'statusName',
+        },
+      ],
+      pathconfig: {
+        enableadd: false,
+        enableedit: false,
+        enabledelete: false,
+        enabledetail: false,
+        add: '',
+        edit: '',
+        list: '/repair/umTrackOrder/queryTrackOrderList',
+        delete: '',
+        detail: '',
+      },
+    },
+    {
+      tab: '外协工单',
+      key: '3',
+      columns: [
+        {
+          title: '维修单号',
+          dataIndex: 'repairOrderNo',
+          key: 'repairOrderNo',
+        },
+        {
+          title: '设备编号',
+          dataIndex: 'equipmentNo',
+          key: 'equipmentNo',
+        },
+        {
+          title: '设备名称',
+          dataIndex: 'equipmentName',
+          key: 'equipmentName',
+        },
+        {
+          title: '故障描述',
+          dataIndex: 'faultDescription',
+          key: 'faultDescription',
+        },
+        {
+          title: '报修人员',
+          dataIndex: 'repairUserName',
+          key: 'repairUserName',
+        },
+        {
+          title: '报修时间',
+          dataIndex: 'repairTime',
+          key: 'repairTimeList',
+          valueType: 'dateTimeRange',
+        },
+        {
+          title: '报修单号',
+          dataIndex: 'repairNo',
+          key: 'repairNo',
+        },
+        {
+          title: '工单状态',
+          dataIndex: 'statusName',
+          key: 'statusName',
+        },
+      ],
+      pathconfig: {
+        enableadd: true,
+        enableedit: true,
+        enabledelete: true,
+        enabledetail: true,
+        add: '',
+        edit: '',
+        list: '/repair/umOtherUnitsOrder/queryOtherUnitsOrderList',
+        delete: '',
+        detail: '',
+      },
+    },
+  ];
+}
+export default getcolumns;
\ No newline at end of file

src/pages/repair/platform/index.jsx

@@ -2,7 +2,7 @@
  * @Author: Li Hanlin
  * @Date: 2022-12-05 10:13:42
  * @Last Modified by: Li Hanlin
- * @Last Modified time: 2022-12-06 16:41:48
+ * @Last Modified time: 2022-12-08 13:47:55
  */
 
 import * as React from 'react';
@@ -14,6 +14,7 @@ import getcolumns from './columns';
 import { useRequest } from 'ahooks';
 import { doFetch } from '@/utils/doFetch';
 import OrderHandle from './RepairOrderHandle';
+import { message } from 'antd';
 
 function Platform(props) {
   const actionRef = useRef(),
@@ -75,7 +76,7 @@ function Platform(props) {
                 //   ...s,
                 //   type: null,
                 // }));
-                console.log('zzjd');
+                //console.log('zzjd');
                 let params = {
                   id: row?.id,
                 };
@@ -87,14 +88,14 @@ function Platform(props) {
                   message.success('操作成功！');
                   setdrawer((s) => ({
                     ...s,
-                    visible: false,
+                    open: false,
                   }));
                   actionRef.current.reload();
                 }
               },
             }}
           >
-            接单2
+            接单
           </PremButton>
         );
       } else if (activeTab == '3') {
@@ -116,14 +117,14 @@ function Platform(props) {
                   message.success('操作成功！');
                   setdrawer((s) => ({
                     ...s,
-                    visible: false,
+                    open: false,
                   }));
                   actionRef.current.reload();
                 }
               },
             }}
           >
-            接单3
+            接单
           </PremButton>
         );
       } else if (activeTab == '1') {
@@ -145,7 +146,7 @@ function Platform(props) {
               },
             }}
           >
-            接单1
+            接单
           </PremButton>
         );
       }

src/pages/repair/track/index.jsx

@@ -2,7 +2,7 @@
  * @Author: Li Hanlin
  * @Date: 2022-12-02 11:41:03
  * @Last Modified by: Li Hanlin
- * @Last Modified time: 2022-12-07 19:10:04
+ * @Last Modified time: 2022-12-08 14:03:22
  */
 
 import * as React from 'react';
@@ -109,6 +109,7 @@ function Failure(props) {
               actionRef.current.reload();
             }
           }}
+          defaultFormValue={drawer?.item}
           {...drawer}
         />
       </>
@@ -125,9 +126,8 @@ function Failure(props) {
               title: '计划追踪日期',
               dataIndex: 'planTrackTime',
               formItemProps: { rules: [{ required: false, message: '此项为必填项' }] },
-              key: 'planTrackTime',
+              key: 'nextTrackDate',
               fieldProps: {
-                placeholder: '请选择',
                 disabled: true,
               },
             },
@@ -172,7 +172,6 @@ function Failure(props) {
               dataIndex: 'trackCycle',
               key: 'trackCycle',
               fieldProps: {
-                placeholder: '请选择',
                 disabled: true,
               },
             },
@@ -186,9 +185,12 @@ function Failure(props) {
           ]}
           onFinish={async (vals) => {
             let params = {
-              trackTraceinfo: vals,
+              trackTraceinfo: { ...vals, planTrackTime: vals.nextTrackDate },
               id: drawer?.item?.id,
             };
+            delete params.trackTraceinfo.nextTrackDate;
+            //console.log(params);
+
             let res = await doFetch({
               url: '/repair/umTrackOrder/trackById',
               params,
@@ -203,6 +205,7 @@ function Failure(props) {
             }
           }}
           {...drawer}
+          defaultFormValue={drawer?.item}
         />
       </>
     );
@@ -217,7 +220,7 @@ function Failure(props) {
             {
               title: '追踪人员',
               dataIndex: 'trackerName',
-              formItemProps: { rules: [{ required: true, message: '此项为必填项' }] },
+              formItemProps: { rules: [{ required: false, message: '此项为必填项' }] },
               key: 'trackerName',
               fieldProps: {
                 placeholder: '请选择',
@@ -306,6 +309,7 @@ function Failure(props) {
               actionRef.current.reload();
             }
           }}
+          defaultFormValue={drawer?.item}
           {...drawer}
         />
       </>
@@ -396,11 +400,9 @@ function Failure(props) {
                     ...s,
                     open: true,
                     type: 'track',
-                    item: {
-                      id: row.id,
-                    },
-                    detailpath: '/repair/umTrackTraceinfo/queryByTrackOrderId',
-                    params: { trackOrderId: row?.id },
+                    item: { ...row, trackCycle: String(row?.trackCycle) },
+                    // detailpath: '/repair/umTrackTraceinfo/queryByTrackOrderId',
+                    // params: { trackOrderId: row?.id },
                     val: 'only',
                     title: '追踪信息',
                   }));
@@ -420,6 +422,7 @@ function Failure(props) {
                     open: true,
                     val: 'only',
                     title: '验证',
+                    item: row,
                     detailpath: '/repair/umTrackTraceinfo/queryByTrackOrderId',
                     params: { trackOrderId: row?.id },
                     type: 'check',
@@ -474,12 +477,15 @@ function Failure(props) {
             onClick: () => {
               setdrawer((s) => ({
                 ...s,
-                item: row,
+                item: {
+                  ...row,
+                  trackAssistList: row?.trackAssistList ? row?.trackAssistList : [],
+                },
                 type: 'Reassig',
                 open: true,
                 val: 'only',
               }));
-              console.log(drawer);
+              //console.log(drawer);
             },
           }}
         >
@@ -491,7 +497,7 @@ function Failure(props) {
 
   const columns = useMemo(() => {
     let defcolumn = getcolumns(setdrawer).filter((it) => it.key == activeTabKey)[0]?.columns;
-    console.log(defcolumn);
+    //console.log(defcolumn);
     let defpath = getcolumns(setdrawer).filter((it) => it.key == activeTabKey)[0]?.pathconfig ?? {};
 
     if (activeTabKey == '1') {

src/pages/setting/factory/index.jsx

@@ -64,7 +64,7 @@ function Factory(props) {
               title: '编辑',
               val: 'edit',
               onFinish: async (vals) => {
-                console.log(1);
+                //console.log(1);
                 let params = {
                   ...vals,
                   id: row.id,
@@ -153,7 +153,7 @@ function Factory(props) {
                 title: '新增',
                 val: 'add',
                 onFinish: async (vals) => {
-                  console.log(1);
+                  //console.log(1);
                   let params = {
                     ...vals,
                   };

src/pages/setting/organization/index.jsx

@@ -68,14 +68,14 @@ function Type(props) {
               title: '编辑',
               val: 'edit',
               onFinish: async (vals) => {
-                console.log(vals);
+                //console.log(vals);
                 let params = {
                   ...vals,
                   id: row.key,
                   parentId: row.parentKey,
                   departmentType: row.departmentType,
                 };
-                console.log(params);
+                //console.log(params);
                 delete params.title;
                 let res = await doFetch({
                   url: urlParams.save,

src/pages/setting/role/index.jsx

@@ -135,19 +135,19 @@ function Role(props) {
             //   url: '/sysRolePermission/queryAll',
             //   params: { roleId: row.id },
             // });
-            // console.log(data);
-            console.log(row);
+            // //console.log(data);
+            //console.log(row);
             setdrawer((s) => ({
               ...s,
               authorityOpen: true,
               item: row,
               onFinish: async (vals) => {
-                console.log(vals);
+                //console.log(vals);
                 let res = await doFetch({
                   url: '/sysEnterprise/save',
                   params: { ...vals },
                 });
-                console.log(res);
+                //console.log(res);
                 if (res.code === '0000') {
                   message.success('修改成功！');
                   setdrawer((s) => ({
@@ -266,7 +266,7 @@ function Role(props) {
                 title: '新增',
                 val: 'add',
                 onFinish: async (vals) => {
-                  console.log(1);
+                  //console.log(1);
                   let params = {
                     ...vals,
                   };

src/pages/setting/users/columns.js

@@ -133,7 +133,7 @@ function getcolumns(setdrawer) {
             //       });
             //     });
             //     newfieldscolumns = fieldscolumns.concat(column);
-            //     console.log('fieldscolumns', newfieldscolumns);
+            //     //console.log('fieldscolumns', newfieldscolumns);
             //   }
             //   setdrawer((s) => ({
             //     ...s,

src/pages/setting/users/index.jsx

@@ -68,7 +68,7 @@ function User(props) {
               val: 'only',
               // onFinish: async (vals) => {
               //   let userCharReqList = [];
-              //   console.log('id:', row.id);
+              //   //console.log('id:', row.id);
               //   for (let i in vals) {
               //     if (!isNaN(Number(i))) {
               //       userCharReqList.push({
@@ -174,7 +174,7 @@ function User(props) {
                 userCharReqList,
               };
               delete params.shopId;
-              console.log(params, '!!!!');
+              //console.log(params, '!!!!');
               let res = await doFetch({
                 url: urlParams.save,
                 params,
@@ -221,7 +221,7 @@ function User(props) {
                 userCharReqList,
               };
               delete params.shopId;
-              console.log(params, '!!!!');
+              //console.log(params, '!!!!');
               let res = await doFetch({
                 url: urlParams.save,
                 params,

src/pages/system/dictionary/index.jsx

@@ -57,7 +57,7 @@ function Type(props) {
           size: 'small',
           disabled: row?.dataType == 1 ? true : false,
           onClick: () => {
-            console.log(row);
+            //console.log(row);
             setDrawer((s) => ({
               ...s,
               visible: true,
@@ -69,13 +69,13 @@ function Type(props) {
               title: '编辑',
               val: 'edit',
               onFinish: async (vals) => {
-                console.log(vals);
+                //console.log(vals);
                 let params = {
                   ...vals,
                   id: row.key,
                   parentId: row.parentKey,
                 };
-                console.log(params);
+                //console.log(params);
                 delete params.title;
                 delete params.dataType;
                 let res = await doFetch({
@@ -117,7 +117,7 @@ function Type(props) {
               title: '新增数据',
               val: 'addChild',
               onFinish: async (vals) => {
-                console.log(vals);
+                //console.log(vals);
                 let params = {
                   ...vals,
                   parentId: row.key,

src/pages/system/field/index.jsx

@@ -41,7 +41,7 @@ function Field(props) {
         url: urlParams.formList,
         params: {},
       });
-      console.log(result);
+      //console.log(result);
       if (!result?.data?.dataList.length == 0) {
         setitems(
           result?.data?.dataList.map((it, index) => {
@@ -81,7 +81,7 @@ function Field(props) {
                 formId: drawer?.formId,
               },
               onFinish: async (vals) => {
-                console.log(vals);
+                //console.log(vals);
                 let params = {
                   ...vals,
                   id: row.id,
@@ -174,7 +174,7 @@ function Field(props) {
             </h3>
             <Menu
               onClick={async (e) => {
-                // console.log(e);
+                // //console.log(e);
                 setextraparams({
                   formId: e?.key,
                 });
@@ -208,7 +208,7 @@ function Field(props) {
                 disabled: false,
                 type: 'primary',
                 onClick: () => {
-                  console.log(drawer);
+                  //console.log(drawer);
                   setDrawer((s) => ({
                     ...s,
                     visible: true,
@@ -220,7 +220,7 @@ function Field(props) {
                     title: '新增',
                     val: 'add',
                     onFinish: async (vals) => {
-                      console.log(vals);
+                      //console.log(vals);
                       let params = {
                         ...vals,
                         formId: drawer?.formId,

src/pages/system/rules/index.jsx

@@ -65,7 +65,7 @@ function Rules(props) {
               title: '编辑',
               val: 'edit',
               onFinish: async (vals) => {
-                console.log(1);
+                //console.log(1);
                 let params = {
                   ...vals,
                   id: row.id,
@@ -158,7 +158,7 @@ function Rules(props) {
                   let params = {
                     ...vals,
                   };
-                  console.log('vals:', vals);
+                  //console.log('vals:', vals);
                   // for (let i in vals) {
                   //   if (i == 'nrList') {
                   //     let reshow = {
@@ -170,7 +170,7 @@ function Rules(props) {
                   //     });
                   //     reshow.other.sort =
                   //       reshow.other.sort == 1 ? reshow.other.sort : reshow.other.sort - 1;
-                  //     console.log('reshow', reshow);
+                  //     //console.log('reshow', reshow);
                   //   }
                   // }
                   params.nrList = [];
@@ -188,7 +188,7 @@ function Rules(props) {
                     message.warning('请选择顺序递增规则的位置！');
                     return;
                   }
-                  console.log('11111', params);
+                  //console.log('11111', params);
                   let res = await doFetch({
                     url: urlParams.save,
                     params,

src/utils/fieldsDetail.js

@@ -62,7 +62,7 @@ export default async (fieldscolumns, setdrawer, row, formId, detailpath) => {
       });
     });
     newfieldscolumns = fieldscolumns.concat(column);
-    console.log('fieldscolumns', newfieldscolumns);
+    //console.log('fieldscolumns', newfieldscolumns);
   }
   setdrawer((s) => ({
     ...s,

tests/run-tests.js

@@ -16,21 +16,21 @@ const startServer = spawn(/^win/.test(process.platform) ? 'npm.cmd' : 'npm', ['r
 
 startServer.stderr.on('data', (data) => {
   // eslint-disable-next-line
-  console.log(data.toString());
+  //console.log(data.toString());
 });
 
 startServer.on('exit', () => {
   kill(process.env.PORT || 8000);
 });
 
-console.log('Starting development server for e2e tests...');
+//console.log('Starting development server for e2e tests...');
 startServer.stdout.on('data', (data) => {
-  console.log(data.toString());
+  //console.log(data.toString());
   // hack code , wait umi
   if (!once && data.toString().indexOf('Serving your umi project!') >= 0) {
     // eslint-disable-next-line
     once = true;
-    console.log('Development server is started, ready to run tests.');
+    //console.log('Development server is started, ready to run tests.');
     const testCmd = spawn(
       /^win/.test(process.platform) ? 'npm.cmd' : 'npm',
       ['run', 'playwright'],
@@ -39,7 +39,7 @@ startServer.stdout.on('data', (data) => {
       },
     );
     testCmd.on('exit', (code) => {
-      console.log('服务已经退出，退出码：', code);
+      //console.log('服务已经退出，退出码：', code);
       startServer.kill();
       process.exit(code);
     });