配件计划池增加查看90天出库详情和客户订件详情功能

jiangwei
1 parent 79d4a3b6
Showing 11 changed files with 210 additions and 37 deletions
src/pages/pms/partPlan/PlanManage/subpages/Apply/index.tsx
src/pages/pms/partPlan/PlanPool/api.ts
src/pages/pms/partPlan/PlanPool/components/AreaTable.tsx
src/pages/pms/partPlan/PlanPool/components/CustBuyModal.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
src/pages/pms/partPlan/PlanPool/index.tsx
src/pages/pms/partPlan/PlanPool/useStore.ts
@@ -171,7 +171,7 @@ export default function Index() {
     }));
     const type = isSave ? 1 : 2;
     apiObj[type]({
-      planId: planId?.planId,
+      planId: Number(planId?.planId),
       ...dfParams,
       suppliers
       // suppliers: suppliers.map(i => ({ 
@@ -333,20 +333,14 @@ export default function Index() {
             />
           </div>
           <div style={{display: 'flex', justifyContent: 'center'}}>
-            <Popconfirm
-              title="确定取消"
-              onConfirm={() => history.goBack()}
-              okText="确定"
-              cancelText="取消"
+            <Button
+              disabled={loading}
+              loading={loading}
+              style={{marginRight: 20}}
+              onClick={() => history.goBack()}
             >
-              <Button
-                disabled={loading}
-                loading={loading}
-                style={{marginRight: 20}}
-              >
-                取消
-              </Button>
-            </Popconfirm>
+              取消
+            </Button>
             <Button
               disabled={loading}
               loading={loading}
 import { http } from '@/typing/http';
 import request from '@/utils/request';
 import { PMS_HOST } from '@/utils/host';
+import { PartVO } from '@/pages/pms/partPlan/CustBuyPlan/api';
  
 export interface Params {
   brandId?: number, // 品牌ID
@@ -18,6 +19,7 @@ export interface Params {
  
 export interface ListVO {
   poolId: number; // 计划池id
+  poolIds?: string,
   id?: number;
   name?: string; // 名称
   code?: string; // 编码
@@ -61,7 +63,60 @@ export interface ListVO {
   unit?: string; // 采购规格(配件展示)
   splitUnit?: string; // 拆分件规格(配件展示)
   splitCnt?: number; // 拆分件数量(配件展示)
-  partType?:number
+  partType?:number,
+  planWaitListIds?:string
+}
+
+export interface OutItem{
+  /**
+ * 配件ID
+ */
+partId?:number;
+/**
+ * 配件编码
+ */
+partCode?:string;
+/**
+ * 配件名称
+ */
+partName?:string;
+/**
+ * 出库数量
+ */
+partCnt?:number;
+/**
+ * 成本价
+ */
+costPrice?:number;
+/**
+ * 出库类型1工单2装潢
+ */
+type?:number;
+/**
+ * 出库类型ID
+ */
+typeId?:string;
+/**
+ * 服务站id
+ */
+shopId?:number;
+/**
+ * 服务站名称
+ */
+shopName?:string;
+/**
+ * 集团ID
+ */
+groupId?:number;
+/**
+ * 出库时间
+ */
+outTime?:string;
+
+/**
+ * 类型名称
+ */
+typeName?:string;
 }
  
 /**
@@ -74,6 +129,15 @@ export function getList(params: Params): http.PromiseResp&lt;ListVO[]&gt; {
 export function deleteApi(params: {poolId: number}) {
   return request.post(`${PMS_HOST}/erp/plan/pool/delete/plan`, {...params});
 }
+
 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> {
+  return request.get(`${PMS_HOST}/erp/storage/out/list`, {params});
+}
+
+export function custBuyApi(params: { planWaitListIds?: any}):http.PromiseResp<PartVO[]> {
+  return request.get(`${PMS_HOST}/erp/cus/buy/part/get/buy/part/list`, {params});
+}
@@ -14,7 +14,7 @@ interface Props {
   id?: number, // 上一个列表ID
 }
 export default function Index(props: Props = {}) {
-  const { dfParams, key } = useStore();
+  const { dfParams, key, setItem, setOutVisible, setCustVisible } = useStore();
   const {showAnalyse=true} = props;
   const { data: parts, setParams, loading } = useInitial(getList, [], {...dfParams, ...props});
   const [visible, setVisible] = useState(false);
@@ -23,7 +23,6 @@ export default function Index(props: Props = {}) {
   const [id, setId] = useState<number>();
  
   useEffect(() => {
-    console.log('dfParams11', dfParams, key, props);
     if (key == props.type) {
       setParams(dfParams, true);
     }
@@ -37,13 +36,13 @@ export default function Index(props: Props = {}) {
         <Column title="计划前库销比" dataIndex="ratio" render={t => (t || 0).toFixed(2)} />
         <Column title="计划后库销比" dataIndex="planeRatio" render={t => (t || 0).toFixed(2)} />
         <Column title="本次计划金额(元)" dataIndex="thisTimeAmount" />
-        <Column title="客户订件数量(个)" dataIndex="buyCnt" />
+        <Column title="客户订件数量(个)" render={r => <a onClick={() => { setCustVisible(true); setItem(r); }}>{r.buyCnt}</a>} />
         <Column title="客户订件金额(元)" dataIndex="buyAmount" />
         <Column title="在途未锁(个)" dataIndex="onTheWayUnlockCnt" />
  
         <Column title="在库未锁(个)" dataIndex="storageUnlockCnt" />
         <Column title="在库已锁(个)" dataIndex="storageLockedCnt" />
-        <Column title="滚动90天出库(个)" dataIndex="outStockCnt" />
+        <Column title="滚动90天出库(个)" render={r => <a onClick={() => { setOutVisible(true); setItem(r); }}>{r.outStockCnt}</a>} />
         {showAnalyse && (
           <>
             <Column
+import React, { useEffect, useState } from 'react';
+import { Button, Modal, Table } from 'antd';
+import { useStore } from '../index';
+import { custBuyApi } from '../api';
+import { PartVO } from '@/pages/pms/partPlan/CustBuyPlan/api';
+import useInitial from '@/hooks/useInitail';
+
+const { Column } = Table;
+
+export default function Index() {
+  const { custVisible, setCustVisible, item } = useStore();
+  const [delay, setDelay] = useState(true);
+  const { data, setParams, loading } = useInitial(custBuyApi, [], {}, delay);
+
+  useEffect(() => {
+    if (custVisible && item?.planWaitListIds) {
+      setParams({ planWaitListIds: item.planWaitListIds }, true);
+      setDelay(false);
+    }
+  }, [custVisible]);
+
+  return (
+    <Modal
+      title="客户订件详情"
+      width={1100}
+      visible={custVisible}
+      maskClosable={false}
+      onCancel={() => setCustVisible(false)}
+      footer={[
+        <Button onClick={() => setCustVisible(false)}>取消</Button>
+      ]}
+    >
+      <Table
+        rowKey={(v: PartVO) => `${v.waitListIds}`}
+        dataSource={data}
+        pagination={false}
+        loading={loading}
+        scroll={{x: 1400, y: 500}}
+      >
+        <Column title="时间" dataIndex="planTime" />
+        <Column title="VIN" dataIndex="typeId" />
+        <Column title="工单号" dataIndex="remark" />
+        <Column title="车牌号" dataIndex="plateNo" />
+        <Column title="配件编码" dataIndex="partCode" />
+        <Column title="配件名称" dataIndex="partName" />
+        <Column title="接车服务顾问" dataIndex="userName" />
+        <Column title="门店名称" dataIndex="shopName" />
+        <Column title="库房名称" dataIndex="storageName" />
+        <Column title="订件数量" dataIndex="splitCnt" />
+        <Column title="采购单价" dataIndex="price" />
+        <Column title="采购数量" dataIndex="cnt" />
+      </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';
+
+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});
+
+  useEffect(() => {
+    if (outVisible && item?.poolIds) {
+      setParams({poolIds: item.poolIds}, true);
+      setDelay(false);
+    }
+  }, [outVisible]);
+
+  return (
+    <Modal
+      title={`${item?.partName}滚动90天出库流水`}
+      width={1000}
+      visible={outVisible}
+      maskClosable={false}
+      onCancel={() => setOutVisible(false)}
+      footer={[
+        <Button onClick={() => setOutVisible(false)}>取消</Button>
+      ]}
+    >
+      <Table
+        dataSource={list}
+        loading={loading}
+        pagination={paginationConfig}
+        rowKey={(v: OutItem) => `${v.partId}`}
+      >
+        <Column title="配件编码" dataIndex="partCode" />
+        <Column title="配件名称" dataIndex="partName" />
+        <Column title="出库数量" dataIndex="partCnt" />
+        <Column title="出库类型" dataIndex="typeName" />
+        <Column title="服务站名称" dataIndex="shopName" />
+        <Column title="出库时间" dataIndex="outTime" />
+      </Table>
+    </Modal>
+  );
+}
 \ No newline at end of file
@@ -16,7 +16,7 @@ interface Props {
   id?: number, // 上一个列表ID
 }
 export default function Index(props: Props = {}) {
-  const { dfParams, key } = useStore();
+  const { dfParams, key, setItem, setOutVisible, setCustVisible } = useStore();
   const {showAnalyse=true} = props;
   const { data: parts, setParams, loading } = useInitial(getList, [], {...dfParams, ...props});
   const [visible, setVisible] = useState(false);
@@ -43,13 +43,13 @@ export default function Index(props: Props = {}) {
         <Column title="计划后库销比" dataIndex="planeRatio" render={t => (t || 0).toFixed(2)} />
  
         <Column title="本次计划金额(元)" dataIndex="thisTimeAmount" />
-        <Column title="客户订件数量(个)" dataIndex="buyCnt" />
+        <Column title="客户订件数量(个)" render={r => <a onClick={() => { setCustVisible(true); setItem(r); }}>{r.buyCnt}</a>} />
         <Column title="客户订件金额(元)" dataIndex="buyAmount" />
         <Column title="在途未锁(个)" dataIndex="onTheWayUnlockCnt" />
  
         <Column title="在库未锁(个)" dataIndex="storageUnlockCnt" />
         <Column title="在库已锁(个)" dataIndex="storageLockedCnt" />
-        <Column title="滚动90天出库(个)" dataIndex="outStockCnt" />
+        <Column title="滚动90天出库(个)" render={r => <a onClick={() => { setOutVisible(true); setItem(r); }}>{r.outStockCnt}</a>} />
         {showAnalyse && (
           <>
             <Column
@@ -15,7 +15,7 @@ interface Props {
   id?: number, // 上一个列表ID
 }
 export default function Index(props: Props = {}) {
-  const { dfParams, key } = useStore();
+  const { dfParams, key, setItem, setOutVisible, setCustVisible } = useStore();
   const {showAnalyse=true} = props;
   const { data: parts, setParams, loading } = useInitial(getList, [], {...dfParams, ...props});
   const [visible, setVisible] = useState(false);
@@ -38,13 +38,13 @@ export default function Index(props: Props = {}) {
         <Column title="计划后库销比" dataIndex="planeRatio" render={t => (t || 0).toFixed(2)} />
  
         <Column title="本次计划金额(元)" dataIndex="thisTimeAmount" />
-        <Column title="客户订件数量(个)" dataIndex="buyCnt" />
+        <Column title="客户订件数量(个)" render={r => <a onClick={() => { setCustVisible(true); setItem(r); }}>{r.buyCnt}</a>} />
         <Column title="客户订件金额(元)" dataIndex="buyAmount" />
         <Column title="在途未锁(个)" dataIndex="onTheWayUnlockCnt" />
  
         <Column title="在库未锁(个)" dataIndex="storageUnlockCnt" />
         <Column title="在库已锁(个)" dataIndex="storageLockedCnt" />
-        <Column title="滚动90天出库(个)" dataIndex="outStockCnt" />
+        <Column title="滚动90天出库(个)" render={r => <a onClick={() => { setOutVisible(true); setItem(r); }}>{r.outStockCnt}</a>} />
         {showAnalyse && (
           <>
             <Column
@@ -12,11 +12,11 @@ interface Props {
   type?: number, // 类型1区域库2库房3车系4车型5配件
 }
 export default function Index(props: Props = {}) {
-  const { dfParams, key } = useStore();
+  const { dfParams, key, setItem, setOutVisible, setCustVisible } = useStore();
   const [form] = Form.useForm();
   const { data: parts, setParams, loading } = useInitial(getList, [], dfParams);
   const [visible, setVisible] = useState(false);
-  const [item, setItem] = useState<ListVO>();
+  const [itemPrice, setItemPrice] = useState<ListVO>();
  
   useEffect(() => {
     if (key == props.type) {
@@ -25,8 +25,8 @@ export default function Index(props: Props = {}) {
   }, [dfParams, key]);
  
   useEffect(() => {
-    if (visible && item?.poolId) {
-      form.setFieldsValue({cnt: item.cnt});
+    if (visible && itemPrice?.poolId) {
+      form.setFieldsValue({ cnt: itemPrice.cnt});
     } else {
       form.resetFields;
     }
@@ -43,7 +43,7 @@ export default function Index(props: Props = {}) {
           fixed="left"
           render={r => (
             <>
-              <a onClick={() => { setVisible(true); setItem(r); }}>编辑</a>
+              <a onClick={() => { setVisible(true); setItemPrice(r); }}>编辑</a>
               <Divider type="vertical" />
               <Popconfirm
                 title="确认删除?"
@@ -68,12 +68,12 @@ export default function Index(props: Props = {}) {
         <Column title="计划后库销比" dataIndex="planeRatio" render={t => (t || 0).toFixed(2)} />
  
         <Column title="本次计划金额(元)" dataIndex="thisTimeAmount" />
-        <Column title="客户订件数量(个)" dataIndex="buyCnt" />
+        <Column title="客户订件数量(个)" render={r => <a onClick={() => { setCustVisible(true); setItem(r); }}>{r.buyCnt}</a>} />
         <Column title="客户订件金额(元)" dataIndex="buyAmount" />
         <Column title="在途未锁(个)" dataIndex="onTheWayUnlockCnt" />
         <Column title="在库未锁(个)" dataIndex="storageUnlockCnt" />
         <Column title="在库已锁(个)" dataIndex="storageLockedCnt" />
-        <Column title="滚动90天出库(个)" dataIndex="outStockCnt" />
+        <Column title="滚动90天出库(个)" render={r => <a onClick={() => { setOutVisible(true); setItem(r); }}>{r.outStockCnt}</a>} />
  
       </Table>
       <Modal
@@ -90,7 +90,7 @@ export default function Index(props: Props = {}) {
             htmlType="submit"
             onClick={() => {
               form.validateFields().then(fields => {
-                editApi({poolId: item?.poolId, partCnt: fields.cnt}).then(res => {
+                editApi({ poolId: itemPrice?.poolId, partCnt: fields.cnt}).then(res => {
                   setVisible(false);
                   message.success("操作成功");
                   setParams({}, true);
@@ -14,7 +14,7 @@ interface Props {
   id?: number, // 上一个列表ID
 }
 export default function Index(props: Props = {}) {
-  const { dfParams, key } = useStore();
+  const { dfParams, key, setItem, setOutVisible, setCustVisible } = useStore();
   const {showAnalyse=true} = props;
   const { data: parts, setParams, loading } = useInitial(getList, [], {...dfParams, ...props});
   const [visible, setVisible] = useState(false);
@@ -37,12 +37,12 @@ export default function Index(props: Props = {}) {
         <Column title="计划后库销比" dataIndex="planeRatio" render={t => (t || 0).toFixed(2)} />
  
         <Column title="本次计划金额(元)" dataIndex="thisTimeAmount" />
-        <Column title="客户订件数量(个)" dataIndex="buyCnt" />
+        <Column title="客户订件数量(个)" render={r => <a onClick={() => { setCustVisible(true); setItem(r); }}>{r.buyCnt}</a>} />
         <Column title="客户订件金额(元)" dataIndex="buyAmount" />
         <Column title="在途未锁(个)" dataIndex="onTheWayUnlockCnt" />
         <Column title="在库未锁(个)" dataIndex="storageUnlockCnt" />
         <Column title="在库已锁(个)" dataIndex="storageLockedCnt" />
-        <Column title="滚动90天出库(个)" dataIndex="outStockCnt" />
+        <Column title="滚动90天出库(个)" render={r => <a onClick={() => { setOutVisible(true); setItem(r); }}>{r.outStockCnt}</a>} />
         {showAnalyse && (
           <>
             <Column
@@ -11,6 +11,8 @@ import st from &quot;@/pages/pms/partPlan/PlanShipping/style.less&quot;;
 import Filter from './components/Filter';
 import {createStore} from "@/hooks/moz";
 import store from "./useStore";
+import OutFlowModal from './components/OutFlowModal';
+import CustBuyModal from './components/CustBuyModal';
  
 export const { Provider, useStore } = createStore(store);
  
@@ -38,6 +40,8 @@ function Index() {
               <StoragePartTable type={6} />
             </Tabs.TabPane>
           </Tabs>
+          <OutFlowModal />
+          <CustBuyModal />
         </Card>
       </ConfigProvider>
     </PageHeaderWrapper>
 import { useState } from 'react';
 import useInitail from "@/hooks/useInitail";
 import { getPartTypeApi } from '@/pages/pms/part/Repertory/api';
+import {ListVO} from './api';
  
 export default function useStore() {
   const [dfParams, setDfParams] = useState<any>({});
   const [key, setKey] = useState<any>('1');
   const { data: partTypeData } = useInitail(getPartTypeApi, [], {});
+  const [outVisible, setOutVisible] = useState(false);
+  const [custVisible, setCustVisible] = useState(false);
+  const [item, setItem] = useState<ListVO>();
  
   return {
     dfParams,
     setDfParams,
     key,
     setKey,
-    partTypeData
+    partTypeData,
+    outVisible,
+    setOutVisible,
+    item,
+    setItem,
+    custVisible,
+    setCustVisible,
   };
 }