From 9c4c170d33847d111fe07ff13eede6203a2383c7 Mon Sep 17 00:00:00 2001 From: jiangwei Date: Wed, 15 Mar 2023 14:27:39 +0800 Subject: [PATCH] fix --- src/pages/pms/partPlan/PlanManage/api.ts | 2 +- src/pages/pms/partPlan/PlanManage/components/DetailModal.tsx | 6 +++--- src/pages/pms/partPlan/PlanManage/subpages/Apply/index.tsx | 11 +---------- src/pages/pms/partPlan/PlanPool/components/OutFlowDetailModal.tsx | 2 +- src/pages/pms/transfer/transferPool/comonents/PartTable.tsx | 2 +- src/pages/pms/transfer/transferPool/comonents/StorageTable.tsx | 2 +- src/pages/pms/transfer/transferPool/comonents/VehicleTable.tsx | 2 +- 7 files changed, 9 insertions(+), 18 deletions(-) diff --git a/src/pages/pms/partPlan/PlanManage/api.ts b/src/pages/pms/partPlan/PlanManage/api.ts index 9c15c09..49b4bd8 100644 --- a/src/pages/pms/partPlan/PlanManage/api.ts +++ b/src/pages/pms/partPlan/PlanManage/api.ts @@ -20,7 +20,7 @@ export interface Params { * 列表项 */ export interface ListVO { - planId?: string; // 计划Id + planId?: number; // 计划Id planNo?: string; // 计划单号 brandId?: string; // 品牌ID planDate?: string; // 计划日期 diff --git a/src/pages/pms/partPlan/PlanManage/components/DetailModal.tsx b/src/pages/pms/partPlan/PlanManage/components/DetailModal.tsx index b330d30..e84e85a 100644 --- a/src/pages/pms/partPlan/PlanManage/components/DetailModal.tsx +++ b/src/pages/pms/partPlan/PlanManage/components/DetailModal.tsx @@ -6,7 +6,7 @@ import ProgressView from "./ProgressView"; import ShippingDetailModal from './ShippingDetailModal'; import PartDetailModal from './PartDetailModal'; import {flattenDeep} from "@/pages/pms/entity"; -import {getDetail, DetailVO} from "@/pages/pms/partPlan/PlanManage/subpages/Detail/api"; +import {getDetail, DetailVO, Item} from "@/pages/pms/partPlan/PlanManage/subpages/Detail/api"; interface Props { visible: boolean, @@ -22,12 +22,12 @@ export default function DetailModal(props: Props) { // @ts-ignore const { data: progresss, setParams: setProgresssParams } = useInitial(getProgressDetail, [], params, delay); // @ts-ignore - const { data, setParams, loading } = useInitial(getDetail, [], params, delay); + const { data, setParams, loading } = useInitial(getDetail, {}, params, delay); const [visibleDetail, setVisibleDetail] = useState(false); const [_item, setItem] = useState({}); const [visiblePartDetail, setVisiblePartDetail] = useState(false); const suppliers = useMemo(() => { - return flattenDeep(data.map((it: DetailVO) => (it.suppliers || []).map(su => ({...it, ...su})))); + return flattenDeep(data.list?.map((it: DetailVO) => (it.suppliers || []).map(su => ({...it, ...su})))); }, [data]); useEffect(() => { diff --git a/src/pages/pms/partPlan/PlanManage/subpages/Apply/index.tsx b/src/pages/pms/partPlan/PlanManage/subpages/Apply/index.tsx index b9c7dc8..1f8701c 100644 --- a/src/pages/pms/partPlan/PlanManage/subpages/Apply/index.tsx +++ b/src/pages/pms/partPlan/PlanManage/subpages/Apply/index.tsx @@ -60,7 +60,7 @@ export default function Index() { setInfo({ remark: data.remark, fids: data.fids?.split(',').map(i => `/api/file/show?fid=${i}`) }); } }, [data.list?.length]); - console.log(info, 'info'); + function onOk(parts: ListVO[] = []) { setDealerList(dealerList.map(it => { if (it.settleDealerId == dealer.settleDealerId) { @@ -187,13 +187,6 @@ export default function Index() { return i; } }).join() - // suppliers: suppliers.map(i => ({ - // settleDealerId: i.settleDealerId, - // settleDealerName: i.settleDealerName, - // supplierId: i.supplierId, - // supplierName: i.supplierName, - // storages: i.storages - // })) }).then(() => { setLoading(false); history.goBack(); @@ -358,7 +351,6 @@ export default function Index() { onChange={v => { const ids = v.fileList.map(it => it?.response?.data || it); setInfo({ ...info, fids: ids }); - console.log(ids); }} /> @@ -389,7 +381,6 @@ export default function Index() { 确认并提交 - diff --git a/src/pages/pms/partPlan/PlanPool/components/OutFlowDetailModal.tsx b/src/pages/pms/partPlan/PlanPool/components/OutFlowDetailModal.tsx index 9c55937..459a451 100644 --- a/src/pages/pms/partPlan/PlanPool/components/OutFlowDetailModal.tsx +++ b/src/pages/pms/partPlan/PlanPool/components/OutFlowDetailModal.tsx @@ -14,7 +14,7 @@ export default function Index(props:Props) { const { visible, setVisible, item } = props; const [delay, setDelay] = useState(true); const { data, setParams, loading } = useInitial(outFlowDetailApi, [], {}, delay); - console.log(item); + useEffect(() => { if (visible && item?.poolIds) { setParams({ min: undefined, max: undefined, date: undefined, outCnt: undefined, ...item }, true); diff --git a/src/pages/pms/transfer/transferPool/comonents/PartTable.tsx b/src/pages/pms/transfer/transferPool/comonents/PartTable.tsx index 53474f9..4013519 100644 --- a/src/pages/pms/transfer/transferPool/comonents/PartTable.tsx +++ b/src/pages/pms/transfer/transferPool/comonents/PartTable.tsx @@ -22,7 +22,7 @@ export default function Index() { > - + (t ? t.toFixed(2) : '--')} /> analysis(r, 6)}>查看} /> analysis(r, 7)}>查看} /> diff --git a/src/pages/pms/transfer/transferPool/comonents/StorageTable.tsx b/src/pages/pms/transfer/transferPool/comonents/StorageTable.tsx index eefdcaf..6f574e6 100644 --- a/src/pages/pms/transfer/transferPool/comonents/StorageTable.tsx +++ b/src/pages/pms/transfer/transferPool/comonents/StorageTable.tsx @@ -23,7 +23,7 @@ export default function Index(props: {out?:boolean}) { scroll={{y: 500}} > - + (t ? t.toFixed(2) : '--')} /> {out ? diff --git a/src/pages/pms/transfer/transferPool/comonents/VehicleTable.tsx b/src/pages/pms/transfer/transferPool/comonents/VehicleTable.tsx index 59ef587..cbaa8a3 100644 --- a/src/pages/pms/transfer/transferPool/comonents/VehicleTable.tsx +++ b/src/pages/pms/transfer/transferPool/comonents/VehicleTable.tsx @@ -22,7 +22,7 @@ export default function Index() { scroll={{y: 500}} > - + (t ? t.toFixed(2) : '--')} /> analysis(r, 6)}>查看} /> -- libgit2 0.22.2