Commit cb540380 authored by TZW's avatar TZW

去除 log

parent fee786c5
...@@ -43,7 +43,6 @@ const Mtable = (props) => { ...@@ -43,7 +43,6 @@ const Mtable = (props) => {
resizeable = false, resizeable = false,
dataSource, dataSource,
} = props; } = props;
console.log(dataSource);
const actionRefs = actionRef ?? useRef(), const actionRefs = actionRef ?? useRef(),
formRefs = formRef ?? useRef(), formRefs = formRef ?? useRef(),
ifspagination = pagination == 'false' || pagination === false, ifspagination = pagination == 'false' || pagination === false,
......
...@@ -8,7 +8,6 @@ import DetailNode from './detailnode'; ...@@ -8,7 +8,6 @@ import DetailNode from './detailnode';
import AutoTable from '../AutoTable/mtable'; import AutoTable from '../AutoTable/mtable';
const Detail = (props) => { const Detail = (props) => {
console.log(props);
const { path, params, titleColumns, detailKey, columns } = props; const { path, params, titleColumns, detailKey, columns } = props;
let [firstcolumns, ...mescolumns] = titleColumns; let [firstcolumns, ...mescolumns] = titleColumns;
// columns?.forEach((it) => { // columns?.forEach((it) => {
...@@ -23,7 +22,6 @@ const Detail = (props) => { ...@@ -23,7 +22,6 @@ const Detail = (props) => {
return res?.data?.dataList; return res?.data?.dataList;
}); });
console.log(columns);
return ( return (
<> <>
...@@ -34,7 +32,6 @@ const Detail = (props) => { ...@@ -34,7 +32,6 @@ const Detail = (props) => {
<Divider /> <Divider />
<div> <div>
{detailData?.data?.map((it, index) => { {detailData?.data?.map((it, index) => {
console.log(it);
const detailColumns = [], const detailColumns = [],
tableColumns = []; tableColumns = [];
columns[it?.operationType]?.forEach((it) => { columns[it?.operationType]?.forEach((it) => {
......
...@@ -34,7 +34,6 @@ let Diyrule = (props) => { ...@@ -34,7 +34,6 @@ let Diyrule = (props) => {
useEffect(() => { useEffect(() => {
onChange(defval); onChange(defval);
}); });
console.log('other.sort :', other?.sort);
let { data, loading } = useRequest(() => { let { data, loading } = useRequest(() => {
return doFetch({ url: '/base/bmNoRule/querySelect', params: {} }); return doFetch({ url: '/base/bmNoRule/querySelect', params: {} });
}); });
......
...@@ -904,7 +904,6 @@ function LinkRadio({ item, colProps, formRef, name, curindex }) { ...@@ -904,7 +904,6 @@ function LinkRadio({ item, colProps, formRef, name, curindex }) {
let curoption = item.options ?? null, let curoption = item.options ?? null,
curlinkparams = curoption?.linkParams ?? {}, //获取linkParams下声明的key curlinkparams = curoption?.linkParams ?? {}, //获取linkParams下声明的key
extraParams = curoption?.extraParams ?? {}; extraParams = curoption?.extraParams ?? {};
console.log(extraParams);
return ( return (
<> <>
<ProFormDependency name={Object.keys(curlinkparams)}> <ProFormDependency name={Object.keys(curlinkparams)}>
......
...@@ -129,9 +129,9 @@ const AvatarDropdown = ({ menu }) => { ...@@ -129,9 +129,9 @@ const AvatarDropdown = ({ menu }) => {
if (!currentUser || !currentUser.username) { if (!currentUser || !currentUser.username) {
return loadings; return loadings;
} }
console.log( // console.log(
getUserApp?.data?.dataList?.filter((it) => it?.appId == getUserApp?.data?.appId)[0]?.value, // getUserApp?.data?.dataList?.filter((it) => it?.appId == getUserApp?.data?.appId)[0]?.value,
); // );
let saveData = (values) => { let saveData = (values) => {
let newfields = JSON.parse(JSON.stringify(values)); let newfields = JSON.parse(JSON.stringify(values));
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* @Author: Li Hanlin * @Author: Li Hanlin
* @Date: 2022-11-10 09:39:56 * @Date: 2022-11-10 09:39:56
* @Last Modified by: Li Hanlin * @Last Modified by: Li Hanlin
* @Last Modified time: 2023-01-13 09:46:11 * @Last Modified time: 2023-01-19 09:42:58
*/ */
import * as React from 'react'; import * as React from 'react';
...@@ -709,7 +709,6 @@ function Model(props) { ...@@ -709,7 +709,6 @@ function Model(props) {
const [request, setrequest] = useState(); const [request, setrequest] = useState();
useEffect(() => { useEffect(() => {
const fn = async () => { const fn = async () => {
console.log('d');
let res = await doFetch({ let res = await doFetch({
url: '/base/paFormField/queryList', url: '/base/paFormField/queryList',
......
...@@ -2,12 +2,12 @@ ...@@ -2,12 +2,12 @@
* @Author: Li Hanlin * @Author: Li Hanlin
* @Date: 2023-01-16 15:35:00 * @Date: 2023-01-16 15:35:00
* @Last Modified by: Li Hanlin * @Last Modified by: Li Hanlin
* @Last Modified time: 2023-01-18 16:36:26 * @Last Modified time: 2023-01-19 09:41:53
*/ */
import * as React from 'react'; import * as React from 'react';
import { useState, useMemo, useRef } from 'react'; import { useState, useMemo, useRef } from 'react';
import { Switch, Popconfirm } from 'antd'; import { Switch, Popconfirm, message } from 'antd';
import DrawerPro from '@/components/DrawerPro'; import DrawerPro from '@/components/DrawerPro';
import AutoTable from '@/components/AutoTable'; import AutoTable from '@/components/AutoTable';
import AutoTables from '@/components/AutoTable/mtable'; import AutoTables from '@/components/AutoTable/mtable';
...@@ -597,6 +597,11 @@ function Plan(props) { ...@@ -597,6 +597,11 @@ function Plan(props) {
}} }}
{...drawer} {...drawer}
onFinish={async (vals) => { onFinish={async (vals) => {
let flag = vals.paramList?.some((it) => !it.nextMaintainDate);
if (flag) {
message.warning('下次保养日期必填!');
return;
}
let params = JSON.parse(JSON.stringify(vals)); let params = JSON.parse(JSON.stringify(vals));
params.equipmentList = vals?.paramList?.map((it) => { params.equipmentList = vals?.paramList?.map((it) => {
return { return {
...@@ -605,11 +610,7 @@ function Plan(props) { ...@@ -605,11 +610,7 @@ function Plan(props) {
}; };
}); });
delete params.paramList; delete params.paramList;
let flag = params.equipmentList?.some((it) => !it.nextMaintainDate);
if (flag) {
message.warning('下次保养日期必填!');
return;
}
if (drawer?.val == 'add') { if (drawer?.val == 'add') {
await runAsync({ url: pathconfig?.add || '/add', params: { ...params } }); await runAsync({ url: pathconfig?.add || '/add', params: { ...params } });
} else if (drawer?.val == 'edit') { } else if (drawer?.val == 'edit') {
......
...@@ -387,7 +387,6 @@ function WorkOrder(props) { ...@@ -387,7 +387,6 @@ function WorkOrder(props) {
url: '/maintain/umMaintainTask/queryById', url: '/maintain/umMaintainTask/queryById',
params: { id: row.id }, params: { id: row.id },
}).then((res) => { }).then((res) => {
console.log(res);
if (res.code == '0000') { if (res.code == '0000') {
setdrawer((s) => ({ setdrawer((s) => ({
...s, ...s,
...@@ -441,7 +440,6 @@ function WorkOrder(props) { ...@@ -441,7 +440,6 @@ function WorkOrder(props) {
url: '/maintain/umMaintainTask/queryById', url: '/maintain/umMaintainTask/queryById',
params: { id: row.id }, params: { id: row.id },
}).then((res) => { }).then((res) => {
console.log(res);
if (res.code == '0000') { if (res.code == '0000') {
setdrawer((s) => ({ setdrawer((s) => ({
...s, ...s,
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* @Author: Li Hanlin * @Author: Li Hanlin
* @Date: 2022-12-05 11:13:26 * @Date: 2022-12-05 11:13:26
* @Last Modified by: Li Hanlin * @Last Modified by: Li Hanlin
* @Last Modified time: 2023-01-18 17:39:50 * @Last Modified time: 2023-01-19 09:43:15
*/ */
import React, { useState, useEffect } from 'react'; import React, { useState, useEffect } from 'react';
...@@ -94,9 +94,7 @@ const App = ({ type, id, actionRef, url, setdrawer }) => { ...@@ -94,9 +94,7 @@ const App = ({ type, id, actionRef, url, setdrawer }) => {
} }
}, },
wxpd: async (vals) => { wxpd: async (vals) => {
console.log(vals, url);
let params = {}; let params = {};
console.log(params);
if (vals.repairAssistList) { if (vals.repairAssistList) {
params.repairAssistList = vals?.repairAssistList.map((it) => { params.repairAssistList = vals?.repairAssistList.map((it) => {
return { return {
...@@ -104,7 +102,6 @@ const App = ({ type, id, actionRef, url, setdrawer }) => { ...@@ -104,7 +102,6 @@ const App = ({ type, id, actionRef, url, setdrawer }) => {
}; };
}); });
} }
console.log(params);
let res = await doFetch({ let res = await doFetch({
url, url,
params: { ...params, id }, params: { ...params, id },
......
...@@ -65,7 +65,6 @@ function Field(props) { ...@@ -65,7 +65,6 @@ function Field(props) {
btn={{ btn={{
size: 'small', size: 'small',
onClick: () => { onClick: () => {
console.log(drawer);
setDrawer((s) => ({ setDrawer((s) => ({
...s, ...s,
visible: true, visible: true,
...@@ -81,14 +80,12 @@ function Field(props) { ...@@ -81,14 +80,12 @@ function Field(props) {
// detailpath: urlParams.detail, // detailpath: urlParams.detail,
// params: { id: row.id }, // params: { id: row.id },
onFinish: async (vals) => { onFinish: async (vals) => {
console.log(vals);
let params = { let params = {
...vals, ...vals,
id: row?.id, id: row?.id,
formId: drawer?.formId, formId: drawer?.formId,
}; };
delete params.formName; delete params.formName;
console.log(params);
let res = await doFetch({ let res = await doFetch({
url: urlParams.save, url: urlParams.save,
params, params,
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* @Author: Li Hanlin * @Author: Li Hanlin
* @Date: 2022-11-09 14:44:44 * @Date: 2022-11-09 14:44:44
* @Last Modified by: Li Hanlin * @Last Modified by: Li Hanlin
* @Last Modified time: 2023-01-17 09:30:00 * @Last Modified time: 2023-01-19 09:43:42
*/ */
import * as React from 'react'; import * as React from 'react';
...@@ -66,7 +66,6 @@ function Rules(props) { ...@@ -66,7 +66,6 @@ function Rules(props) {
title: '编辑', title: '编辑',
val: 'edit', val: 'edit',
onFinish: async (vals) => { onFinish: async (vals) => {
console.log('编辑', vals);
vals.nrList.other = _.pick(vals.nrList.other, [ vals.nrList.other = _.pick(vals.nrList.other, [
'formatType', 'formatType',
'increaseList', 'increaseList',
...@@ -76,7 +75,6 @@ function Rules(props) { ...@@ -76,7 +75,6 @@ function Rules(props) {
vals.nrList.value = vals.nrList.value.map((it) => { vals.nrList.value = vals.nrList.value.map((it) => {
return _.pick(it, ['id', 'noContent', 'noRuleCode', 'sort', 'paramList']); return _.pick(it, ['id', 'noContent', 'noRuleCode', 'sort', 'paramList']);
}); });
console.log('1214', vals);
let params = { ...vals }; let params = { ...vals };
params.nrList = []; params.nrList = [];
params.nrList = params.nrList.concat(vals?.nrList.value); params.nrList = params.nrList.concat(vals?.nrList.value);
...@@ -94,7 +92,6 @@ function Rules(props) { ...@@ -94,7 +92,6 @@ function Rules(props) {
return; return;
} }
params.id = row?.id; params.id = row?.id;
console.log('11111', params);
let res = await doFetch({ let res = await doFetch({
url: urlParams.save, url: urlParams.save,
params, params,
...@@ -180,7 +177,6 @@ function Rules(props) { ...@@ -180,7 +177,6 @@ function Rules(props) {
title: '新增', title: '新增',
val: 'add', val: 'add',
onFinish: async (vals) => { onFinish: async (vals) => {
console.log('新增:', vals);
let params = { ...vals }; let params = { ...vals };
params.nrList = []; params.nrList = [];
params.nrList = params.nrList.concat(vals?.nrList.value); params.nrList = params.nrList.concat(vals?.nrList.value);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment