配件计划调整

jiangwei
1 parent 0e37f7ac
Showing 12 changed files with 236 additions and 46 deletions
src/pages/pms/partPlan/CustBuyPlan/subpages/First/components/PartModal.tsx
src/pages/pms/partPlan/PlanManage/subpages/Apply/index.tsx
src/pages/pms/partPlan/PlanManage/subpages/Detail/api.ts
src/pages/pms/partPlan/PlanManage/subpages/Detail/index.tsx
src/pages/pms/partPlan/PlanPool/api.ts
src/pages/pms/partPlan/PlanPool/components/AreaTable.tsx
src/pages/pms/partPlan/PlanPool/components/OutFlowDetailModal.tsx
src/pages/pms/partPlan/PlanPool/components/OutFlowModal.tsx
src/pages/pms/partPlan/PlanPool/components/PartTable.tsx
src/pages/pms/partPlan/PlanPool/components/SeriesTable.tsx
src/pages/pms/partPlan/PlanPool/components/StoragePartTable.tsx
src/pages/pms/partPlan/PlanPool/components/StorageTable.tsx
@@ -73,7 +73,7 @@ export default function DetailModal() {
           align="center"
           render={r => (
             <>
-              <Popconfirm
+              {/* <Popconfirm
                 title="确定删除？"
                 onConfirm={() => deletePart(r)}
                 okText="确定"
@@ -81,7 +81,7 @@ export default function DetailModal() {
               >
                 <a>删除</a>
               </Popconfirm>
-              <Divider type="vertical" />
+              <Divider type="vertical" /> */}
               <a onClick={() => onFinish(r)}>完成</a>
             </>
           )}
-import {Card, ConfigProvider, Select, Button, message, Popconfirm} from 'antd';
+import {Card, ConfigProvider, Select, Button, message, Popconfirm, Input} from 'antd';
 import { PageHeaderWrapper } from '@ant-design/pro-layout';
 import React, {useEffect, useState} from "react";
 import DealerModal from './components/DealerModal';
@@ -15,7 +15,8 @@ import PartModal from &quot;@/pages/pms/partPlan/PlanManage/subpages/Apply/components
 import {groupBys, flattenDeep} from '@/pages/pms/entity';
 import {PartDetail} from '../../api';
 import { history } from 'umi';
-import { getDetail, DetailVO, Params as detailParams } from '../Detail/api';
+import { getDetail, Params as detailParams, Item } from '../Detail/api';
+import ImageUpload from '@/pages/decoration/deco/DeoGoodsManagement/components/ImageUpload';
 const { Option } = Select;
 const apiObj: { [key: number]: any } = {
@@ -25,7 +26,7 @@ const apiObj: { [key: number]: any } = {
 export default function Index() {
   const planId = history.location.query;
   const [detaildelay, setDetaildelay] = useState(true);
-  const { data, setParams: detailsetParams } = useInitial<DetailVO[], detailParams>(getDetail, [], { ...planId }, detaildelay);
+  const { data, setParams: detailsetParams } = useInitial<Item, detailParams>(getDetail, {}, { ...planId }, detaildelay);
   const [delay, setDelay] = useState<boolean>(true);
   const [loading, setLoading] = useState<boolean>(false);
   const { data: brands } = useInitial(API.getBrandFilterApi, [], {});
@@ -39,6 +40,8 @@ export default function Index() {
   const [visiblePartDetail, setVisiblePartDetail] = useState(false);
   const partList = flattenDeep(dealerList.map(it => (it.suppliers || []).map((su: any) => (su.storages || []).map((st: any) => (st.parts || [])))));
   const poolIds = partList.map((it: any) => it.poolId);
+  const [imageVisible, setImageVisible] = useState(true);
+  const [info, setInfo] = useState<{ remark?: string, fids?: any }>();
   useEffect(() => {
     if (planId?.planId) {
@@ -48,14 +51,16 @@ export default function Index() {
   }, []);
   useEffect(() => {
-    if (data.length) {
-      setDfParams({brandId: data[0].brandId});
+    if (data.list?.length) {
+      setImageVisible(false);
+      setDfParams({brandId: data.list[0].brandId});
       setParams({}, true);
       setDelay(false);
-      setDealerList(data);
+      setDealerList(data.list);
+      setInfo({ remark: data.remark, fids: data.fids?.split(',').map(i => `/api/file/show?fid=${i}`) });
     }
-  }, [data.length]);
-
+  }, [data.list?.length]);
+  console.log(info, 'info');
   function onOk(parts: ListVO[] = []) {
     setDealerList(dealerList.map(it => {
       if (it.settleDealerId == dealer.settleDealerId) {
@@ -173,7 +178,15 @@ export default function Index() {
     apiObj[type]({
       planId: Number(planId?.planId),
       ...dfParams,
-      suppliers
+      suppliers,
+      remark: info?.remark,
+      fids: info?.fids.map((i: any) => {
+        if (typeof i == 'object') {
+          return i.url.split('=')[1];
+        } else {
+          return i;
+        }
+      }).join()
       // suppliers: suppliers.map(i => ({ 
       //   settleDealerId: i.settleDealerId,
       //   settleDealerName: i.settleDealerName,
@@ -332,12 +345,29 @@ export default function Index() {
               deletePart={deletePart}
             />
           </div>
+          <div style={{display: 'flex', alignItems: 'flex-start', marginBottom: 20}}>
+            <span style={{marginRight: 10}}>备注：</span>
+            <Input.TextArea rows={2} style={{ width: 250 }} value={info?.remark} onChange={e => setInfo({...info, remark: e.target.value})} />
+          </div>
+          <div style={{ display: 'flex', alignItems: 'flex-start' }}>
+            <span style={{ marginRight: 10 }}>附件：</span>
+            <ImageUpload 
+              length={6} 
+              clear={imageVisible} 
+              value={info?.fids} 
+              onChange={v => { 
+                const ids = v.fileList.map(it => it?.response?.data || it);
+                setInfo({ ...info, fids: ids });
+                console.log(ids); 
+            }} 
+            />
+          </div>
           <div style={{display: 'flex', justifyContent: 'center'}}>
             <Button
               disabled={loading}
               loading={loading}
               style={{marginRight: 20}}
-              onClick={() => history.goBack()}
+              onClick={() => { setImageVisible(true); history.goBack(); }}
             >
               取消
             </Button>
@@ -48,9 +48,55 @@ export interface Params {
   planNo?: string;
   no?: string;
 }
+export interface Item {
+  /**
+   * 计划单号
+   */
+  planNo?: string;
+  /**
+   * 品牌ID
+   */
+  brandId?: number;
+  /**
+   * 计划日期
+   */
+  planDate?: string;
+  /**
+   * 审核单号
+   */
+  approvalOrderNo?: string;
+  /**
+   * 计划人员
+   */
+  userName?: string;
+  /**
+   * 库销比
+   */
+  ratio?: number;
+  /**
+   * 计划库销比
+   */
+  planRatio?: number;
+  /**
+   * 计划状态 1:待审核2:已通过9:已拒绝
+   */
+  status?: string;
+  /**
+   * 备注
+   */
+  remark?: string;
+  /**
+   * 附件
+   */
+  fids?: string;
+  /**
+   * 计划列表
+   */
+  list?: DetailVO[];
+}
 /**
  * 查询明细
  */
-export function getDetail(params?: Params): http.PromiseResp<DetailVO[]> {
+export function getDetail(params?: Params): http.PromiseResp<Item> {
   return request.get(`${PMS_HOST}/erp/part/plan/get/plan/group/detail`, { params });
 }
-import {Card, ConfigProvider, Spin} from 'antd';
+import { Card, ConfigProvider, Spin, Upload } from 'antd';
 import { PageHeaderWrapper } from '@ant-design/pro-layout';
 import React, {useState} from "react";
 import useInitial from "@/hooks/useInitail";
-import {getDetail, DetailVO, Params, SupplierVO, StorageVO, PartVO} from "./api";
+import { getDetail, Item, Params, SupplierVO, StorageVO, PartVO, DetailVO } from "./api";
 import zhCN from "antd/lib/locale-provider/zh_CN";
 import st from "@/pages/pms/partPlan/PlanManage/style.less";
 import StepBnt from "@/pages/pms/comonents/StepBnt";
@@ -14,7 +14,7 @@ import PartDetailModal from &#39;./components/PartDetailModal&#39;;
 export default function Index({ match }: common.ConnectProps) {
   const { planId } = match.params;
-  const { data, loading } = useInitial<DetailVO[], Params>(getDetail, [], {planId});
+  const { data, loading } = useInitial<Item, Params>(getDetail, {}, {planId});
   const [visiblePart, setVisiblePart] = useState(false);
   const [parts, setParts] = useState<PartVO[]>([]);
@@ -23,7 +23,7 @@ export default function Index({ match }: common.ConnectProps) {
       <Spin spinning={loading}>
         <ConfigProvider locale={zhCN}>
           <Card className={st.page}>
-            {data.map((dealer: DetailVO = {}) => (
+            {data.list?.map((dealer: DetailVO = {}) => (
               <div key={`dealer${dealer.settleDealerName}`} style={{ marginTop: 10 }}>
                 <div style={{ fontWeight: "bold" }}>{`商家: ${dealer.settleDealerName || ''}`}</div>
                 {(dealer.suppliers || []).map((supplier: SupplierVO = {}) => {
@@ -57,6 +57,26 @@ export default function Index({ match }: common.ConnectProps) {
               })}
               </div>
           ))}
+            <div style={{ display: 'flex', alignItems: 'flex-start', marginBottom: 20 }}>
+              <span style={{ marginRight: 10 }}>备注：{data.remark}</span>
+            </div>
+            <div style={{ display: 'flex', alignItems: 'flex-start' }}>
+              <span style={{ marginRight: 10 }}>附件：</span>
+              <div style={{display: 'flex'}}>
+                {data.fids?.split(',').map(i => (
+                  <Upload
+                    listType="picture-card"
+                    fileList={[{
+                    uid: '-1',
+                    name: i,
+                    status: 'done',
+                    url: `/api/file/show?fid=${i}`,
+                }]}
+                    disabled
+                  />
+                ))}  
+              </div>
+            </div>
             <PartDetailModal visible={visiblePart} onCancel={() => setVisiblePart(false)} parts={parts} />
             <StepBnt
               disable={false}
@@ -118,7 +118,24 @@ outTime?:string;
  */
 typeName?:string;
 }
-
+export interface outListVO {
+  /**
+   * 时间段
+   */
+  date?: string;
+  /**
+   * 出库数量
+   */
+  outCnt?: number;
+  /**
+   * 最小时间
+   */
+  min?: string;
+  /**
+   * 最大时间
+   */
+  max?: string;
+}
 /**
  * 查询计划池列表
  */
@@ -134,10 +151,14 @@ export function editApi(params: { poolId?: number, partCnt?: number}) {
   return request.post(`${PMS_HOST}/erp/plan/pool/update/plan`, {...params});
 }
-export function outFlowApi(params: { poolIds?: any, planId?: number, current?: number, pageSize?:number}):http.PromisePageResp<OutItem> {
+export function outFlowApi(params: { poolIds?: any, planId?: number}):http.PromiseResp<outListVO[]> {
   return request.get(`${PMS_HOST}/erp/storage/out/list`, {params});
 }
+export function outFlowDetailApi(params:any):http.PromiseResp<OutItem[]> {
+  return request.get(`${PMS_HOST}/erp/storage/out/detail`, {params});
+}
+
 export function custBuyApi(params: { planWaitListIds?: any}):http.PromiseResp<PartVO[]> {
   return request.get(`${PMS_HOST}/erp/cus/buy/part/get/buy/part/list`, {params});
 }
@@ -4,6 +4,7 @@ import useInitial from &quot;@/hooks/useInitail&quot;;
 import {getList, ListVO} from "@/pages/pms/partPlan/PlanPool/api";
 import DetailModal from './DetailModal';
 import {useStore} from "@/pages/pms/partPlan/PlanPool";
+import _ from 'lodash';
 const { Column } = Table;
 interface Props {
@@ -33,8 +34,8 @@ export default function Index(props: Props = {}) {
       <Table rowKey={(v: ListVO) => `${v.id}`} scroll={{y: 500, x: 2500}} dataSource={parts || []} pagination={false} loading={loading}>
         <Column title="区域库" dataIndex="name" fixed="left" />
         <Column title="本次计划数量(个)" dataIndex="cnt" fixed="left" />
-        <Column title="计划前库销比" dataIndex="ratio" render={t => (t || 0).toFixed(2)} />
-        <Column title="计划后库销比" dataIndex="planeRatio" render={t => (t || 0).toFixed(2)} />
+        <Column title="计划前库销比" dataIndex="ratio" render={t => (t ? t.toFixed(2) : "--")} />
+        <Column title="计划后库销比" dataIndex="planeRatio" render={t => (t ? t.toFixed(2) : "--")} />
         <Column title="本次计划金额(元)" dataIndex="thisTimeAmount" />
         <Column title="客户订件数量(个)" render={r => (r.buyCnt ? <a onClick={() => { setCustVisible(true); setItem(r); }}>{r.buyCnt}</a> : r.buyCnt)} />
         <Column title="客户订件金额(元)" dataIndex="buyAmount" />
@@ -42,7 +43,7 @@ export default function Index(props: Props = {}) {
         <Column title="在库未锁(个)" dataIndex="storageUnlockCnt" />
         <Column title="在库已锁(个)" dataIndex="storageLockedCnt" />
-        <Column title="滚动90天出库(个)" render={r => (r.outStockCnt ? <a onClick={() => { setOutVisible(true); setItem(r); }}>{r.outStockCnt}</a> : r.outStockCnt)} />
+        <Column title="近90天月均出库(个)" render={r => (r.outStockCnt ? <a onClick={() => { setOutVisible(true); setItem(r); }}>{_.floor(r.outStockCnt/3)}</a> : r.outStockCnt)} />
         {showAnalyse && (
           <>
             <Column
+import React, { useEffect, useState } from 'react';
+import { Button, Modal, Table } from 'antd';
+import { outFlowDetailApi, OutItem } from '../api';
+import useInitial from '@/hooks/useInitail';
+import moment from 'moment';
+
+const { Column } = Table;
+interface Props {
+  visible?:boolean
+  setVisible:Function
+  item?:any
+}
+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);
+      setDelay(false);
+    } else {
+      setVisible();
+    }
+  }, [visible]);
+
+  return (
+    <Modal
+      title="出库详情"
+      width={1000}
+      visible={visible}
+      maskClosable={false}
+      onCancel={() => setVisible()}
+      footer={[
+        <Button onClick={() => setVisible()}>取消</Button>
+      ]}
+    >
+      <Table
+        dataSource={data}
+        loading={loading}
+        rowKey={(v: OutItem) => `${v.partId}`}
+        pagination={false}
+        scroll={{ y: 400 }}
+      >
+        <Column title="配件名称" dataIndex="partName" />
+        <Column title="配件编码" dataIndex="partCode" />
+        <Column title="出库数量" dataIndex="partCnt" />
+        <Column title="出库类型" dataIndex="typeName" />
+        <Column title="服务站名称" dataIndex="shopName" />
+        <Column title="出库时间" render={r => moment(r.outTime).format('YYYY-MM-DD HH:mm:ss')} />
+      </Table>
+    </Modal>
+  );
+}
 \ No newline at end of file
 import React, { useEffect, useState } from 'react';
 import {Button, Modal, Table} from 'antd';
 import {useStore} from '../index';
-import { outFlowApi, OutItem } from '../api';
-import usePagination from '@/hooks/usePagination';
+import { outFlowApi, outListVO } from '../api';
+import useInitial from '@/hooks/useInitail';
+import OutFlowDetailModal from './OutFlowDetailModal';
 const {Column} = Table;
 export default function Index() {
   const {outVisible, setOutVisible, item} = useStore();
   const [delay, setDelay]= useState(true);
-  const { list, setParams, loading, paginationConfig } = usePagination(outFlowApi, [], {delay});
+  const { data, setParams, loading } = useInitial(outFlowApi, [], {}, delay);
+  const [current, setCurrent] = useState<{visible?: boolean, itemData?: any}>();
   useEffect(() => {
     if (outVisible && item?.poolIds) {
@@ -17,6 +19,11 @@ export default function Index() {
       setDelay(false);
     }
   }, [outVisible]);
+  const total = data
+    .map(i => i.outCnt)
+    .reduce((prev, cur) => {
+      return (prev || 0) + (cur || 0);
+    }, 0);
   return (
     <Modal
@@ -29,19 +36,26 @@ export default function Index() {
         <Button onClick={() => setOutVisible(false)}>取消</Button>
       ]}
     >
+      <div style={{marginBottom: 20}}>
+        滚动90天出库数：
+        <span
+          style={{ color: '#0000FF', cursor: 'pointer' }} 
+          onClick={() => setCurrent({ visible: true, itemData: { poolIds: item?.poolIds } })}
+        >
+          {total}
+        </span>
+      </div>
       <Table
-        dataSource={list}
+        dataSource={data}
         loading={loading}
-        pagination={paginationConfig}
-        rowKey={(v: OutItem) => `${v.partId}`}
+        rowKey={(v: outListVO) => `${v.date}`}
+        pagination={false}
+        scroll={{y: 400}}
       >
-        <Column title="配件编码" dataIndex="partCode" />
-        <Column title="配件名称" dataIndex="partName" />
-        <Column title="出库数量" dataIndex="partCnt" />
-        <Column title="出库类型" dataIndex="typeName" />
-        <Column title="服务站名称" dataIndex="shopName" />
-        <Column title="出库时间" dataIndex="outTime" />
+        <Column title="出库日期" dataIndex="date" />
+        <Column title="出库数量" render={r => <a onClick={() => setCurrent({ visible: true, itemData: { ...r, poolIds: item?.poolIds }})}>{r.outCnt}</a>} />
       </Table>
+      <OutFlowDetailModal visible={current?.visible} setVisible={() => setCurrent({visible: false, itemData: undefined})} item={current?.itemData} />
     </Modal>
   );
 }
 \ No newline at end of file
@@ -4,6 +4,7 @@ import useInitial from &quot;@/hooks/useInitail&quot;;
 import {getList, ListVO} from "@/pages/pms/partPlan/PlanPool/api";
 import DetailModal from './DetailModal';
 import {useStore} from "@/pages/pms/partPlan/PlanPool";
+import _ from 'lodash';
 const { Column } = Table;
 interface Props {
@@ -39,8 +40,8 @@ export default function Index(props: Props = {}) {
         <Column title="来源类型" dataIndex="typeName" />
         <Column title="配件类型" dataIndex="partTypeName" />
-        <Column title="计划前库销比" dataIndex="ratio" render={t => (t || 0).toFixed(2)} />
-        <Column title="计划后库销比" dataIndex="planeRatio" render={t => (t || 0).toFixed(2)} />
+        <Column title="计划前库销比" dataIndex="ratio" render={t => (t ? t.toFixed(2) : "--")} />
+        <Column title="计划后库销比" dataIndex="planeRatio" render={t => (t ? t.toFixed(2) : "--")} />
         <Column title="本次计划金额(元)" dataIndex="thisTimeAmount" />
         <Column title="客户订件数量(个)" render={r => (r.buyCnt ? <a onClick={() => { setCustVisible(true); setItem(r); }}>{r.buyCnt}</a> : r.buyCnt)} />
@@ -49,7 +50,7 @@ export default function Index(props: Props = {}) {
         <Column title="在库未锁(个)" dataIndex="storageUnlockCnt" />
         <Column title="在库已锁(个)" dataIndex="storageLockedCnt" />
-        <Column title="滚动90天出库(个)" render={r => (r.outStockCnt ? <a onClick={() => { setOutVisible(true); setItem(r); }}>{r.outStockCnt}</a> : r.outStockCnt)} />
+        <Column title="近90天月均出库(个)" render={r => (r.outStockCnt ? <a onClick={() => { setOutVisible(true); setItem(r); }}>{_.floor(r.outStockCnt/3)}</a> : r.outStockCnt)} />
         {showAnalyse && (
           <>
             <Column
@@ -4,6 +4,7 @@ import useInitial from &quot;@/hooks/useInitail&quot;;
 import {getList, ListVO} from "@/pages/pms/partPlan/PlanPool/api";
 import DetailModal from './DetailModal';
 import {useStore} from "@/pages/pms/partPlan/PlanPool";
+import _ from 'lodash';
 const { Column } = Table;
 interface Props {
@@ -34,8 +35,8 @@ export default function Index(props: Props = {}) {
       <Table rowKey={(v: ListVO) => `${v.id}`} scroll={{y: 500, x: 2500}} dataSource={parts || []} pagination={false} loading={loading}>
         <Column title="车系" dataIndex="name" fixed="left" />
         <Column title="本次计划数量(个)" dataIndex="cnt" fixed="left" />
-        <Column title="计划前库销比" dataIndex="ratio" render={t => (t || 0).toFixed(2)} />
-        <Column title="计划后库销比" dataIndex="planeRatio" render={t => (t || 0).toFixed(2)} />
+        <Column title="计划前库销比" dataIndex="ratio" render={t => (t ? t.toFixed(2) : "--")} />
+        <Column title="计划后库销比" dataIndex="planeRatio" render={t => (t ? t.toFixed(2) : "--")} />
         <Column title="本次计划金额(元)" dataIndex="thisTimeAmount" />
         <Column title="客户订件数量(个)" render={r => (r.buyCnt ? <a onClick={() => { setCustVisible(true); setItem(r); }}>{r.buyCnt}</a> : r.buyCnt)} />
@@ -44,7 +45,7 @@ export default function Index(props: Props = {}) {
         <Column title="在库未锁(个)" dataIndex="storageUnlockCnt" />
         <Column title="在库已锁(个)" dataIndex="storageLockedCnt" />
-        <Column title="滚动90天出库(个)" render={r => (r.outStockCnt ? <a onClick={() => { setOutVisible(true); setItem(r); }}>{r.outStockCnt}</a> : r.outStockCnt)} />
+        <Column title="近90天月均出库(个)" render={r => (r.outStockCnt ? <a onClick={() => { setOutVisible(true); setItem(r); }}>{_.floor(r.outStockCnt/3)}</a> : r.outStockCnt)} />
         {showAnalyse && (
           <>
             <Column
@@ -4,6 +4,7 @@ import useInitial from &quot;@/hooks/useInitail&quot;;
 import {getList, ListVO} from "@/pages/pms/partPlan/PlanPool/api";
 import {useStore} from "@/pages/pms/partPlan/PlanPool";
 import {deleteApi, editApi} from '../api';
+import _ from 'lodash';
 const { Column } = Table;
 const {Item} = Form;
@@ -64,8 +65,8 @@ export default function Index(props: Props = {}) {
         <Column title="来源类型" dataIndex="typeName" />
         <Column title="配件类型" dataIndex="partTypeName" />
-        <Column title="计划前库销比" dataIndex="ratio" render={t => (t || 0).toFixed(2)} />
-        <Column title="计划后库销比" dataIndex="planeRatio" render={t => (t || 0).toFixed(2)} />
+        <Column title="计划前库销比" dataIndex="ratio" render={t => (t ? t.toFixed(2) : "--")} />
+        <Column title="计划后库销比" dataIndex="planeRatio" render={t => (t ? t.toFixed(2) : "--")} />
         <Column title="本次计划金额(元)" dataIndex="thisTimeAmount" />
         <Column title="客户订件数量(个)" render={r => (r.buyCnt ? <a onClick={() => { setCustVisible(true); setItem(r); }}>{r.buyCnt}</a> : r.buyCnt)} />
@@ -73,7 +74,7 @@ export default function Index(props: Props = {}) {
         <Column title="在途未锁(个)" dataIndex="onTheWayUnlockCnt" />
         <Column title="在库未锁(个)" dataIndex="storageUnlockCnt" />
         <Column title="在库已锁(个)" dataIndex="storageLockedCnt" />
-        <Column title="滚动90天出库(个)" render={r => (r.outStockCnt ? <a onClick={() => { setOutVisible(true); setItem(r); }}>{r.outStockCnt}</a> : r.outStockCnt)} />
+        <Column title="近90天月均出库(个)" render={r => (r.outStockCnt ? <a onClick={() => { setOutVisible(true); setItem(r); }}>{_.floor(r.outStockCnt/3)}</a> : r.outStockCnt)} />
       </Table>
       <Modal
@@ -4,6 +4,7 @@ import useInitial from &quot;@/hooks/useInitail&quot;;
 import {getList, ListVO} from "@/pages/pms/partPlan/PlanPool/api";
 import DetailModal from './DetailModal';
 import {useStore} from "@/pages/pms/partPlan/PlanPool";
+import {floor} from 'lodash';
 const { Column } = Table;
 interface Props {
@@ -33,8 +34,8 @@ export default function Index(props: Props = {}) {
       <Table rowKey={(v: ListVO) => `${v.id}`} scroll={{y: 500, x: 2500}} dataSource={parts || []} pagination={false} loading={loading}>
         <Column title="库房" dataIndex="name" fixed="left" />
         <Column title="本次计划数量(个)" dataIndex="cnt" fixed="left" />
-        <Column title="计划前库销比" dataIndex="ratio" render={t => (t || 0).toFixed(2)} />
-        <Column title="计划后库销比" dataIndex="planeRatio" render={t => (t || 0).toFixed(2)} />
+        <Column title="计划前库销比" dataIndex="ratio" render={t => (t ? t.toFixed(2) : "--")} />
+        <Column title="计划后库销比" dataIndex="planeRatio" render={t => (t ? t.toFixed(2) : "--")} />
         <Column title="本次计划金额(元)" dataIndex="thisTimeAmount" />
         <Column title="客户订件数量(个)" render={r => (r.buyCnt ? <a onClick={() => { setCustVisible(true); setItem(r); }}>{r.buyCnt}</a> : r.buyCnt)} />
@@ -42,7 +43,7 @@ export default function Index(props: Props = {}) {
         <Column title="在途未锁(个)" dataIndex="onTheWayUnlockCnt" />
         <Column title="在库未锁(个)" dataIndex="storageUnlockCnt" />
         <Column title="在库已锁(个)" dataIndex="storageLockedCnt" />
-        <Column title="滚动90天出库(个)" render={r => (r.outStockCnt ? <a onClick={() => { setOutVisible(true); setItem(r); }}>{r.outStockCnt}</a> : r.outStockCnt)} />
+        <Column title="近90天月均出库(个)" render={r => (r.outStockCnt ? <a onClick={() => { setOutVisible(true); setItem(r); }}>{floor(r.outStockCnt/3)}</a> : r.outStockCnt)} />
         {showAnalyse && (
           <>
             <Column