Merge branch 'cas' into 'master'

Cas add See merge request !194

Merge branch 'cas' into 'master'
Cas add See merge request !194
张志伟
2 parents c5627a8e bef418e5
Showing 28 changed files with 790 additions and 108 deletions
config/routers/pms.ts
src/pages/pms/partPlan/PlanManage/api.ts
src/pages/pms/partPlan/PlanManage/index.tsx
src/pages/pms/partPlan/PlanManage/subpages/Apply/api.ts
src/pages/pms/partPlan/PlanManage/subpages/Apply/components/DealerModal.tsx
src/pages/pms/partPlan/PlanManage/subpages/Apply/index.tsx
src/pages/pms/partPlan/PlanManage/subpages/Detail/api.ts
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
src/pages/pms/storage/partShop/api.ts
src/pages/pms/storage/partShop/components/Filter.tsx
src/pages/pms/storage/partShop/components/List.tsx
@@ -163,4 +163,8 @@ export default [
     path: '/pms/transfer/storageOverStock', // 可调出配件
     component: './pms/transfer/StorageOverStock'
   },
+  {
+    path: '/pms/transfer/huolalaSetting', // 货拉拉账户配置
+    component: './pms/transfer/HuolalaSetting'
+  },
 ];
@@ -26,7 +26,7 @@ export interface ListVO {
   planDate?: string; // 计划日期
   approvalOrderNo?: string; // 审核单号
   userName?: string; // 计划人员
-  status?: string; // 计划状态 1:待审核2:已通过9:已拒绝
+  status?: number; // 计划状态 1:待审核2:已通过9:已拒绝
   settleShopId?: string; // 结算门店门店id
   settleShopName?: string; // 结算门店名称
   prepayToken?: string; // 预付token
@@ -13,6 +13,7 @@ import DetailModal from &quot;@/pages/pms/partPlan/PlanManage/components/DetailModal&quot;
 // 计划状态 1:待审核2:已通过3待付款4已付款9:已拒绝
 const statusName: {[key: number]: string} = {
+  0: '草稿',
   1: '待审核',
   2: '已通过',
   3: '待付款',
@@ -69,6 +70,7 @@ export default function Index() {
                 onChange={v => setParams({status: v }, true)}
                 optionFilterProp="children"
               >
+                <Select.Option value={0} key={0}>草稿</Select.Option>
                 <Select.Option value={1} key={1}>待审核</Select.Option>
                 <Select.Option value={2} key={2}>已通过</Select.Option>
                 <Select.Option value={9} key={9}>已拒绝</Select.Option>
@@ -95,9 +97,16 @@ export default function Index() {
               fixed="right"
               render={(text, _item: ListVO) => (
                 <>
-                  <a onClick={() => history.push(`/pms/partPlan/planManage/detail/${_item.planId}`)}>
-                    查看
-                  </a>
+                  {[0, 9].includes(_item.status || 0) ? (
+                    <a onClick={() => history.push(`/pms/partPlan/planManage/apply?planId=${_item.planId}`)}>
+                      编辑
+                    </a>
+                )
+                  : (
+                    <a onClick={() => history.push(`/pms/partPlan/planManage/detail/${_item.planId}`)}>
+                      查看
+                    </a>
+                )}
                   <Divider type="vertical" />
                   <a onClick={() => {
                       setItem(_item);
@@ -16,3 +16,9 @@ export interface SaveParams {
 export function saveApi(params?: SaveParams): http.PromiseResp<void> {
   return request.post(`${PMS_HOST}/erp/plan/pool/save/plan`, params);
 }
+/**
+ * 草稿
+ */
+export function draftApi(params?: SaveParams): http.PromiseResp<void> {
+  return request.post(`${PMS_HOST}/erp/plan/pool/save/draft`, params);
+}
@@ -11,9 +11,9 @@ interface Props {
 }
 const {Option} = Select;
 export default function Index({ onCancel, visible, onOk, dealerList = [] }: Props) {
-  const [dealer, setDealer] = useState<any>({dealerId: null, dealerName: null});
+  const [dealer, setDealer] = useState<any>({ settleDealerId: null, settleDealerName: null});
   const { data: dealers } = useInitail<CommonApi.OptionVO[], CommonApi.DealerParam>(getDealerApi, [], {});
-  const suIds = dealerList.map(it => it.dealerId);
+  const suIds = dealerList.map(it => it.settleDealerId);
   useEffect(() => {
     if (!visible) {
@@ -22,7 +22,7 @@ export default function Index({ onCancel, visible, onOk, dealerList = [] }: Prop
   }, [visible]);
   const handSave = () => {
-    if (!dealer.dealerId) {
+    if (!dealer.settleDealerId) {
       message.error('请选择采购商家');
       return;
     }
@@ -40,7 +40,7 @@ export default function Index({ onCancel, visible, onOk, dealerList = [] }: Prop
         <Button key="cancel" onClick={onCancel}>取消</Button>,
         <Button
           key="submit"
-          disabled={!dealer.dealerId}
+          disabled={!dealer.settleDealerId}
           onClick={handSave}
           type="primary"
           htmlType="submit"
@@ -52,14 +52,14 @@ export default function Index({ onCancel, visible, onOk, dealerList = [] }: Prop
       <div style={{display: 'flex', flexDirection: 'row', alignItems: 'center', marginBottom: 10}}>
         <span>商家：</span>
         <Select
-          value={dealer.dealerId}
+          value={dealer.settleDealerId}
           style={{ width: 250 }}
           placeholder="请选择商家"
           showSearch
           optionFilterProp="children"
-          onChange={(dealerId) => {
-            const d = dealers.find(it => it.id == dealerId) || {};
-            setDealer({dealerId, dealerName: d.name});
+          onChange={(settleDealerId) => {
+            const d = dealers.find(it => it.id == settleDealerId) || {};
+            setDealer({ settleDealerId, settleDealerName: d.name});
           }}
         >
           {dealers.filter(it => !suIds.includes(it.id)).map((b) => (
@@ -8,16 +8,24 @@ import {throttle, sum} from &#39;lodash&#39;;
 import useInitial from "@/hooks/useInitail";
 import * as API from "@/common/api";
 import {getList, Params, ListVO} from "@/pages/pms/partPlan/PlanPool/api";
-import {saveApi} from './api';
+import {saveApi, draftApi} 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";
 import PartModal from "@/pages/pms/partPlan/PlanManage/subpages/Apply/components/PartModal";
 import {groupBys, flattenDeep} from '@/pages/pms/entity';
 import {PartDetail} from '../../api';
+import { history } from 'umi';
+import { getDetail, DetailVO, Params as detailParams } from '../Detail/api';
 const { Option } = Select;
+const apiObj: { [key: number]: any } = {
+  1: saveApi,
+  2: draftApi
+};
 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 [delay, setDelay] = useState<boolean>(true);
   const [loading, setLoading] = useState<boolean>(false);
   const { data: brands } = useInitial(API.getBrandFilterApi, [], {});
@@ -32,9 +40,25 @@ export default function Index() {
   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);
+  useEffect(() => {
+    if (planId?.planId) {
+      setDetaildelay(false);
+      detailsetParams({ ...planId }, true);
+    }
+  }, []);
+ 
+  useEffect(() => {
+    if (data.length) {
+      setDfParams({brandId: data[0].brandId});
+      setParams({}, true);
+      setDelay(false);
+      setDealerList(data);
+    }
+  }, [data.length]);
+
   function onOk(parts: ListVO[] = []) {
     setDealerList(dealerList.map(it => {
-      if (it.dealerId == dealer.dealerId) {
+      if (it.settleDealerId == dealer.settleDealerId) {
         return {
           ...it,
           suppliers: (it.suppliers || []).map((su: any) => {
@@ -64,7 +88,7 @@ export default function Index() {
   function onOkSupplier(supplier: any = {}) {
     setDealerList(dealerList.map(it => {
-      if (it.dealerId == dealer.dealerId) {
+      if (it.settleDealerId == dealer.settleDealerId) {
         return {
           ...it,
           suppliers: [...(it.suppliers || []), supplier]
@@ -76,7 +100,7 @@ export default function Index() {
   function deleteSupplier(dealer: any = {}, supplier: any = {}) {
     setDealerList(dealerList.map(it => {
-      if (it.dealerId == dealer.dealerId) {
+      if (it.settleDealerId == dealer.settleDealerId) {
         return {
           ...it,
           suppliers: (it.suppliers || []).filter((su: any) => su.supplierId != supplier.supplierId)
@@ -88,7 +112,7 @@ export default function Index() {
   function deletePart(dealer: any = {}, supplier: any = {}, storage: any = {}, part: any = {}) {
     setDealerList(dealerList.map(it => {
-      if (it.dealerId == dealer.dealerId) {
+      if (it.settleDealerId == dealer.settleDealerId) {
         return {
           ...it,
           suppliers: (it.suppliers || []).map((su: any) => {
@@ -116,7 +140,7 @@ export default function Index() {
   function deleteStorage(dealer: any = {}, supplier: any = {}, storage: any = {}) {
     setDealerList(dealerList.map(it => {
-      if (it.dealerId == dealer.dealerId) {
+      if (it.settleDealerId == dealer.settleDealerId) {
         return {
           ...it,
           suppliers: (it.suppliers || []).map((su: any) => {
@@ -134,31 +158,33 @@ export default function Index() {
     }));
   }
-  // useEffect(() => {
-  //   if (dfParams.brandId) {
-  //     setParams(dfParams, true);
-  //     setDelay(false);
-  //   }
-  // }, [dfParams.brandId]);
-
-  const onSubmit = throttle(() => {
+  const onSubmit = throttle((isSave) => {
     setLoading(true);
     let suppliers = flattenDeep(dealerList.map(de => (de.suppliers || []).map((su: any) => ({...de, ...su}))));
     suppliers = suppliers.map(su => ({
       ...su,
-      settleDealerId: su.dealerId,
+      settleDealerId: su.settleDealerId,
       storages: (su.storages || []).map((st: any) => ({
         storageId: st.storageId,
         poolIds: (st.parts || []).map((pa: any) => pa.poolId)
       }))
     }));
-    saveApi({
+    const type = isSave ? 1 : 2;
+    apiObj[type]({
+      planId: Number(planId?.planId),
       ...dfParams,
       suppliers
+      // suppliers: suppliers.map(i => ({ 
+      //   settleDealerId: i.settleDealerId,
+      //   settleDealerName: i.settleDealerName,
+      //   supplierId: i.supplierId,
+      //   supplierName: i.supplierName,
+      //   storages: i.storages
+      // }))
     }).then(() => {
       setLoading(false);
-      history.back();
-    }).catch(e => {
+      history.goBack();
+    }).catch((e: any) => {
       setLoading(false);
       message.error(e.message);
     });
@@ -204,15 +230,15 @@ export default function Index() {
               </a>
             </div>
             {dealerList.map((dealer: any = {}) => (
-              <div key={`dealer${dealer.dealerId}`} style={{ marginTop: 10 }}>
+              <div key={`dealer${dealer.settleDealerId}`} style={{ marginTop: 10 }}>
                 <div style={{ display: 'flex', flexDirection: 'row', alignItems: 'center'}}>
-                  <div style={{ fontWeight: "bold" }}>{`商家: ${dealer.dealerName || ''}`}</div>
+                  <div style={{ fontWeight: "bold" }}>{`商家: ${dealer.settleDealerName || ''}`}</div>
                   <a style={{marginLeft: 40}} onClick={() => { setVisibleSupplier(true); setDealer(dealer); }}>
                     添加指定供应商
                   </a>
                   <Popconfirm
                     title="是否删除"
-                    onConfirm={() => setDealerList(dealerList.filter(it => it.dealerId!=dealer.dealerId))}
+                    onConfirm={() => setDealerList(dealerList.filter(it => it.settleDealerId!=dealer.settleDealerId))}
                     okText="确定"
                     cancelText="取消"
                     style={{marginLeft: 20}}
@@ -224,8 +250,6 @@ export default function Index() {
                 </div>
                 {(dealer.suppliers || []).map((supplier: any = {}) => {
                   const paList: any[] = flattenDeep((supplier.storages || []).map((st: any) => (st.parts || [])));
-                  // const paList: any[] = pas.length > 0 ? pas[0] : [];
-                  console.log('pas', paList);
                   return (
                     <div key={`supplier${supplier.supplierId}`} style={{ marginTop: 10, marginLeft: 40 }}>
                       <div style={{ display: 'flex', flexDirection: 'row', alignItems: 'center'}}>
@@ -247,7 +271,7 @@ export default function Index() {
                       </div>
                       <div style={{display: 'flex', marginLeft: 40, marginTop: 10}}>
                         <div style={{marginRight: 20}}>
-                          {`总金额: ${sum(paList.map((it: any) => (it.price || 0) * (it.count || 0))).toFixed(2)}元`}
+                          {`总金额: ${sum(paList.map((it: any) => (it.price || 0) * (it.count || it.partCnt || 0))).toFixed(2)}元`}
                         </div>
                         <div>{`品种数: ${[...new Set((paList || []).map((i: PartDetail) => i.partCode))].length}种`}</div>
                       </div>
@@ -255,7 +279,7 @@ export default function Index() {
                         <div key={`storage${storage.storageId}`} style={{ marginTop: 10, marginLeft: 60 }}>
                           <div style={{ display: 'flex', flexDirection: 'row', alignItems: 'center'}}>
                             <div style={{ fontWeight: "bold" }}>{`发运库房: ${storage.storageName || ''}`}</div>
-                            <div style={{marginLeft: 20}}>{`总金额: ${sum((storage.parts || []).map((it: any) => (it.price || 0) * (it.count || 0))).toFixed(2)}元`}</div>
+                            <div style={{marginLeft: 20}}>{`总金额: ${sum((storage.parts || []).map((it: any) => (it.price || 0) * (it.count || it.partCnt || 0))).toFixed(2)}元`}</div>
                             <div style={{marginLeft: 20}}>{`品种数: ${[...new Set((storage.parts || []).map((i: PartDetail) => i.partCode))].length}种`}</div>
                             <a style={{marginLeft: 20}} onClick={() => { setVisiblePartDetail(true); setDealer({dealer, supplier, storage }); }}>
                               查看配件
@@ -308,11 +332,34 @@ export default function Index() {
               deletePart={deletePart}
             />
           </div>
-          <StepBnt
-            disable={loading}
-            bntLoading={loading}
-            submit={onSubmit}
-          />
+          <div style={{display: 'flex', justifyContent: 'center'}}>
+            <Button
+              disabled={loading}
+              loading={loading}
+              style={{marginRight: 20}}
+              onClick={() => history.goBack()}
+            >
+              取消
+            </Button>
+            <Button
+              disabled={loading}
+              loading={loading}
+              onClick={() => onSubmit(false)}
+              type="primary"
+              style={{marginRight: 20}}
+            >
+              暂存为草稿
+            </Button>
+            <Button
+              disabled={loading}
+              loading={loading}
+              onClick={() => onSubmit(true)}
+              type="primary"
+            >
+              确认并提交
+            </Button>
+          </div>
+          
         </Card>
       </ConfigProvider>
     </PageHeaderWrapper>
@@ -7,6 +7,7 @@ import { PMS_HOST } from &#39;@/utils/host&#39;;
  */
 export interface DetailVO {
   brandName?: string; // 品牌名称
+  brandId?: number; // 品牌ID
   settleDealerName?: string; // 结算商家
   settleShopName?: string; // 结算门店
   suppliers?: SupplierVO[]; // 配件集合
 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 => (r.buyCnt ? <a onClick={() => { setCustVisible(true); setItem(r); }}>{r.buyCnt}</a> : r.buyCnt)} />
         <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 => (r.outStockCnt ? <a onClick={() => { setOutVisible(true); setItem(r); }}>{r.outStockCnt}</a> : r.outStockCnt)} />
         {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 => (r.buyCnt ? <a onClick={() => { setCustVisible(true); setItem(r); }}>{r.buyCnt}</a> : r.buyCnt)} />
         <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 => (r.outStockCnt ? <a onClick={() => { setOutVisible(true); setItem(r); }}>{r.outStockCnt}</a> : r.outStockCnt)} />
         {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 => (r.buyCnt ? <a onClick={() => { setCustVisible(true); setItem(r); }}>{r.buyCnt}</a> : r.buyCnt)} />
         <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 => (r.outStockCnt ? <a onClick={() => { setOutVisible(true); setItem(r); }}>{r.outStockCnt}</a> : r.outStockCnt)} />
         {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 => (r.buyCnt ? <a onClick={() => { setCustVisible(true); setItem(r); }}>{r.buyCnt}</a> : r.buyCnt)} />
         <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 => (r.outStockCnt ? <a onClick={() => { setOutVisible(true); setItem(r); }}>{r.outStockCnt}</a> : r.outStockCnt)} />
       </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 => (r.buyCnt ? <a onClick={() => { setCustVisible(true); setItem(r); }}>{r.buyCnt}</a> : r.buyCnt)} />
         <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 => (r.outStockCnt ? <a onClick={() => { setOutVisible(true); setItem(r); }}>{r.outStockCnt}</a> : r.outStockCnt)} />
         {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,
   };
 }
@@ -42,6 +42,12 @@ export function getLockDetail(params?: PmsStoragePartShop.LockParams): http.Prom
 export function getFlowDetail(params?: PmsStoragePartShop.FlowParams): http.PromisePageResp<PmsStoragePartShop.FlowVO> {
   return request.get(`${PMS_HOST}/erp/part/shop/get/record`, { params });
 }
+/**
+ * 查询门店备件锁库流水明细列表
+ */
+export function getLockFlowDetail(params?: PmsStoragePartShop.FlowParams): http.PromisePageResp<PmsStoragePartShop.FlowVO> {
+  return request.get(`${PMS_HOST}/erp/part/shop/get/lock/record`, { params });
+}
 // 释放库存
 export function unLock(params: PmsStoragePartShop.unLock): http.PromiseResp<string> {
   return request.post(`${PMS_HOST}/erp/part/shop/cancel/lock`, { ...params }, { contentType: "form-urlencoded" });
@@ -32,14 +32,14 @@ export default function Filter() {
   return (
     <div>
       <Search
-        style={{ width: 200, marginRight: 10 }}
+        style={{ width: 180, marginRight: 10, marginBottom: 10 }}
         allowClear
         enterButton
         placeholder="配件编码|名称"
         onSearch={v => handleChangeKeywords(v)}
       />
       <PmsSelect
-        style={{ width: 180, marginRight: 10}}
+        style={{ width: 180, marginRight: 10, marginBottom: 10 }}
         allowClear
         value={innerParams.shopId}
         onChange={value => {
@@ -52,7 +52,7 @@ export default function Filter() {
         .map((item: PmsStoragePartShop.Option) => ({value: item.id, label: item.name}))}
       />
       <PmsSelect
-        style={{ width: 150, marginRight: 10}}
+        style={{ width: 180, marginRight: 10, marginBottom: 10 }}
         allowClear
         value={innerParams.storageId}
         onChange={value => {
@@ -66,7 +66,7 @@ export default function Filter() {
       />
       <PmsSelect
         allowClear
-        style={{ width: 150, marginRight: 10}}
+        style={{ width: 180, marginRight: 10, marginBottom: 10 }}
         onChange={(type) => {
           setParams({ ...innerParams, current: 1, type }, true);
         }}
@@ -77,7 +77,7 @@ export default function Filter() {
         allowClear
         placeholder="有无库存筛选"
         onChange={v => isStock(v)}
-        style={{ width: 150, marginRight: 10 }}
+        style={{ width: 180, marginRight: 10, marginBottom: 10 }}
         options={[
           {value: 1, label: "有库存"},
           {value: 0, label: "无库存"},
@@ -87,7 +87,7 @@ export default function Filter() {
         placeholder="排序方式"
         defaultValue={18}
         onChange={v => isSorter(v)}
-        style={{ width: 150 }}
+        style={{ width: 180 }}
         options={[
           {value: 18, label: "总库存降序"},
           {value: 21, label: "锁定库存降序"},
@@ -4,6 +4,7 @@ import { useStore } from &#39;../index&#39;;
 import LockDetailModal from './LockDetailModal';
 import FlowDetailModal from './FlowDetailModal';
 import PartShopModal from './PartShopModal';
+import LockFlowModal from './LockFlowModal';
 const { Column } = Table;
@@ -11,6 +12,7 @@ export default function Filter() {
   const { setParams, loading, paginationConfig, list, setVisible, setItem, item, fw, setIsprice} = useStore();
   const [visibleLockDetail, setVisibleLockDetail] = useState(false);
   const [visibleFlowDetail, setVisibleFlowDetail] = useState(false);
+  const [visibleLockFlow, setVisibleLockFlow] = useState(false);
   return (
     <div>
@@ -43,6 +45,14 @@ export default function Filter() {
           title="入库流水"
           render={(t, it: PartRepertorySpace.Item) => <a onClick={() => { setVisibleFlowDetail(true); setItem({...it, isOut: false}); }}>查看</a>}
         />
+        <Column
+          title="锁库流水"
+          render={(t, it: PartRepertorySpace.Item) => <a onClick={() => { setVisibleLockFlow(true); setItem({...it, isLock: true}); }}>查看</a>}
+        />
+        <Column
+          title="释放流水"
+          render={(t, it: PartRepertorySpace.Item) => <a onClick={() => { setVisibleLockFlow(true); setItem({...it, isLock: false}); }}>查看</a>}
+        />
         {fw ? (
           <Column
             title="操作"
@@ -65,6 +75,7 @@ export default function Filter() {
       </Table>
       <LockDetailModal item={item} visible={visibleLockDetail} onCancel={() => setVisibleLockDetail(false)} />
       <FlowDetailModal item={item} visible={visibleFlowDetail} onCancel={() => setVisibleFlowDetail(false)} />
+      <LockFlowModal item={item} visible={visibleLockFlow} onCancel={() => setVisibleLockFlow(false)} />
       <PartShopModal />
     </div>
   );
+import React, {useEffect, useState} from 'react';
+import {Modal, Table, Button} from 'antd';
+import { getLockFlowDetail } from '@/pages/pms/storage/partShop/api';
+import usePagination from '@/hooks/usePagination';
+
+interface Props {
+  item?: any
+  visible: boolean
+  onCancel: () => any
+}
+const {Column} = Table;
+export default function Index(props: Props) {
+  const {item, visible, onCancel} = props;
+  const [delay, setDelay] = useState(true);
+  const { list, loading, setParams, paginationConfig, setList } = usePagination<PmsStoragePartShop.FlowVO>(getLockFlowDetail, {}, { delay });
+
+  useEffect(() => {
+    if (item.shopId && item.partId && visible) {
+      setParams({ partId: item.partId, shopId: item.shopId, isLock: item.isLock }, true);
+      setDelay(false);
+    } else {
+      setList([]);
+    }
+  }, [visible, item.partId]);
+
+  return (
+    <Modal
+      title={`${item.isLock ? '锁定库存' : '释放库存'}流水`}
+      width={1000}
+      visible={visible}
+      maskClosable={false}
+      onCancel={onCancel}
+      footer={[
+        <Button key="1" onClick={onCancel}>取消</Button>,
+      ]}
+    >
+      <Table 
+        loading={loading}
+        dataSource={list}
+        rowKey={(v: PmsStoragePartShop.FlowVO) => `${v.type}_${v.typeId}`}
+        pagination={paginationConfig}
+      >
+        <Column title="配件数量" dataIndex="partCnt" />
+        <Column title="单号" dataIndex="remark" render={t => t || "--"} />
+        <Column 
+          title="详情" 
+          dataIndex="text" 
+          width={350}
+          render={(t: string, it: PmsStoragePartShop.FlowVO) => {
+            const obj = JSON.parse(t || '{}');
+            return (
+              <div>
+                {!!obj.type && <div>{`类型: ${obj.type}`}</div>}
+                {!!obj.serviceCatName && <div>{`进站类型: ${obj.serviceCatName}`}</div>}
+                {!!obj.exclusiveAdviser && <div>{`专属顾问: ${obj.exclusiveAdviser}`}</div>}
+                {!!obj.shopLinkmanName && <div>{`服务顾问: ${obj.shopLinkmanName}`}</div>}
+                {!!obj.receiverName && <div>{`服务顾问: ${obj.receiverName}`}</div>}
+                {!!obj.plateNo && <div>{`车牌号: ${obj.plateNo}`}</div>}
+                {!!obj.ownerName && <div>{`车主: ${obj.ownerName}`}</div>}
+                {!!obj.vin && <div>{`VIN: ${obj.vin}`}</div>}
+                {!!obj.userName && <div>{`操作账号: ${obj.userName}`}</div>}
+                {!!obj.fixRemark && <div>{`备注: ${obj.fixRemark}`}</div>}
+              </div>
+            );
+          }}
+        />
+        <Column title={`${item.isLock ? '锁库' : '释放'}时间`} dataIndex="recordTime" />
+      </Table>
+    </Modal>
+  );
+}
 \ No newline at end of file
 import React, {useState} from 'react';
-import { PlusOutlined, VerticalAlignBottomOutlined } from '@ant-design/icons';
+import { PlusOutlined, DownloadOutlined, UploadOutlined } from '@ant-design/icons';
 import { Card, Button } from 'antd';
 import { PageHeaderWrapper } from '@ant-design/pro-layout';
 import Filter from './components/Filter';
@@ -20,53 +20,51 @@ function PartShop() {
   return (
     <PageHeaderWrapper title={`服务站配件${fw ? '(霏微)': ''}`}>
       <Card>
-        <div style={{ display: 'flex', flexDirection: 'row', justifyContent: 'space-between', alignItems: 'center', marginBottom: 20 }}>
+        <div style={{ display: 'flex', flexDirection: 'row', justifyContent: 'space-between', alignItems: 'flex-start', marginBottom: 20 }}>
           <Filter />
-          <div style={{display: 'flex', flexDirection: 'row', justifyContent: 'space-between', alignItems: 'center'}}>
+          <div style={{ display: 'flex', alignItems: 'center'}}>
+            <Button
+              type="primary"
+              icon={<PlusOutlined />}
+              onClick={() => { setVisible(true); setIsadd(true); }}
+            >
+              新增
+            </Button>
             {fw && (
-              <>
-                <Button
-                  icon={(<PlusOutlined />)}
-                  type="primary"
-                  onClick={() => setImportVisible(true)}
-                >
-                  导入
-                </Button>
-                <Button
-                  icon={(<PlusOutlined />)}
-                  type="primary"
-                  onClick={() => { setImportVisible(true); setStock(true); }}
-                  style={{marginLeft: 10}}
-                >
-                  调运库存导入
-                </Button>
-              </>
-          )}
-            {/* {!fw && ( */}
             <Button
+              icon={<UploadOutlined />}
               type="primary"
-              icon={<VerticalAlignBottomOutlined />}
-              onClick={() => { setMore(true); setIslock(true); }}
+              onClick={() => setImportVisible(true)}
+              style={{ marginLeft: 10 }}
+            >
+              导入
+            </Button>
+              )}
+            {fw && (
+            <Button
+              icon={<UploadOutlined />}
+              type="primary"
+              onClick={() => { setImportVisible(true); setStock(true); }}
               style={{marginLeft: 10}}
             >
-              锁件批量导出
+              调运库存导入
             </Button>
-            {/* )} */}
+              )}
             <Button
               type="primary"
-              icon={<VerticalAlignBottomOutlined />}
-              onClick={() => setMore(true)}
+              icon={<DownloadOutlined />}
+              onClick={() => { setMore(true); setIslock(true); }}
               style={{marginLeft: 10}}
             >
-              库存批量导出
+              锁件批量导出
             </Button>
             <Button
               type="primary"
-              icon={<PlusOutlined />}
-              onClick={() => { setVisible(true); setIsadd(true); }}
-              style={{ marginLeft: 10}}
+              icon={<DownloadOutlined />}
+              onClick={() => setMore(true)}
+              style={{marginLeft: 10}}
             >
-              新增
+              库存批量导出
             </Button>
           </div>
         </div>
@@ -21,7 +21,8 @@ declare namespace PmsStoragePartShop {
     actualStock?: number,
     shopId?: number, // 服务站ID
     shopName?: string // 服务站名称
-    isOut?: boolean
+    isOut?: boolean,
+    isLock?:boolean
   }
   interface Params {
@@ -77,6 +78,7 @@ declare namespace PmsStoragePartShop {
     isOut?: boolean, // 	出入库
     current?: number
     pageSize?:number
+    isLock?:boolean // 锁库 ？释放
   }
   /**
+import { http } from '@/typing/http';
+import request from '@/utils/request';
+import { PMS_HOST, HOST } from '@/utils/host';
+
+export interface ListVO{
+  /**
+     * 财务账户信息id
+     */
+    id?:number
+    /**
+     * 往来单位id
+     */
+    supplierId?:number
+    /**
+     * 往来单位名称
+     */
+    supplierName?:string
+    /**
+     * 签约门店id
+     */
+    shopId?:number
+    /**
+     * 签约门店名称
+     */
+    shopName?:string;
+    /**
+     * 当前余额
+     */
+    amount?:number;
+    /**
+     * 待到账金额
+     */
+    awaitAmount?:number;
+    /**
+     * 低余额推待办
+     */
+    minAmount?:number;
+    /**
+     * 推待办角色编码
+     */
+    roleCode?:string;
+    /**
+     * 推待办角色名称
+     */
+    roleName?:string;
+    /**
+     * 发单账号
+     */
+    account?:string;
+    /**
+     * 集团id
+     */
+    groupId?:number;
+    /**
+     * 创建时间
+     */
+    time?:string;
+}
+interface Params{
+  current?:number,
+  pageSize?:number
+}
+export interface saveParams{
+    //财务账户信息id
+    id?:number;
+    /**
+     * 往来单位id
+     */
+    supplierId?:number;
+    /**
+     * 往来单位名称
+     */
+    supplierName?:string;
+    /**
+     * 签约门店id
+     */
+    shopId?:number;
+    /**
+     * 低余额推待办
+     */
+    minAmount?:number;
+    /**
+     * 推待办角色编码
+     */
+    roleCode?:string;
+    /**
+     * 推待办角色名称
+     */
+    roleName?:string;
+    /**
+     * 发单账号
+     */
+    // @NotBlank(message = "发单账号不能为空")
+    account?:string;
+}
+interface queryList {
+  current?:number
+  pageSize?:number
+  sysId?:number
+}
+// 查询财务账户信息列表
+export function getList(params: Params):http.PromisePageResp<ListVO> {
+  return request.get(`${PMS_HOST}/erp/finance/account/get/page`, {params});
+}
+// 新增/编辑API
+export function saveApi(params: saveParams) {
+  return request.post(`${PMS_HOST}/erp/finance/account/exit`, {...params});
+}
+// 推待办角色列表
+export function roleListApi(params: queryList): http.PromisePageResp<Role.Info> {
+  return request.get(`${HOST}/role/list`, { params });
+}
+// 删除API
+export function deleteApi(params: {id: number}) {
+  return request.post(`${PMS_HOST}/erp/finance/account/delete`, {...params});
+}
 \ No newline at end of file
+import React, { useEffect, useState } from 'react';
+import {Form, Button, InputNumber, Modal, message, Input } from 'antd';
+import PmsSelect from '@/pages/pms/comonents/PmsSelect';
+import { ListVO, saveApi, roleListApi } from '../api';
+import { getPageListApi, Item as item } from "@/pages/pms/partPlan/PlanSupplier/api";
+import {getShopApi} from '@/pages/pms/storage/partShop/api';
+import usePagination from '@/hooks/usePagination';
+import useInitail from '@/hooks/useInitail';
+
+const Item = Form.Item;
+
+interface Props{
+  visible?:boolean,
+  onCancel: Function,
+  item?:ListVO
+}
+
+export default function Index(props:Props) {
+  const { list: suppliers } = usePagination<item>(getPageListApi, { supplierType: 40, pageSize: 500 });
+  const { data: shops } = useInitail<PmsStoragePartShop.Option[], {}>(getShopApi, [], {});
+  const { list } = usePagination<Role.Info>(roleListApi, { pageSize: 500, sysId: 229 });
+  const [loading, setLoading] = useState(false);
+  const { visible, onCancel, item } = props;
+  const [form] = Form.useForm();
+
+  useEffect(() => {
+    if (visible && item?.id) {
+      form.setFieldsValue({
+        supplierId: item.supplierId,
+        shopId: item.shopId,
+        minAmount: item.minAmount,
+        roleCode: item.roleCode,
+        account: item.account
+      });
+    }
+    if (!visible) {
+      form.resetFields();
+    }
+  }, [visible]);
+
+  const onSave = () => {
+    form.validateFields().then(files => {
+      const params = {
+        id: item?.id,
+        supplierId: files.supplierId, 
+        supplierName: suppliers.find(i => i.supplierId == files.supplierId)?.supplierName,
+        shopId: files.shopId,
+        minAmount: files.minAmount,
+        roleCode: files.roleCode,
+        roleName: list.find(i => i.roleCode == files.roleCode)?.roleName,
+        account: files.account
+      };
+      setLoading(true);
+      saveApi(params).then(res => {
+        message.success("保存成功");
+        setLoading(false);
+        onCancel();
+      }).catch(e => {
+        message.error(e.message);
+        setLoading(false);
+      });
+    });
+  };
+ 
+  return (
+    <Modal 
+      title={item?.id ? "编辑货拉拉账户配置" : "新增货拉拉账户配置"}
+      visible={visible}
+      maskClosable={false}
+      onCancel={() => onCancel()}
+      footer={[
+        <Button loading={loading} onClick={() => onCancel()}>取消</Button>,
+        <Button loading={loading} type="primary" htmlType="submit" onClick={() => onSave()}>保存</Button>
+      ]}
+    >
+      <Form
+        form={form}
+        labelCol={{span: 5}}
+        wrapperCol={{span: 12}}
+      >
+        <Item label="往来单位" name="supplierId" rules={[{required: true, message: "请选择往来单位"}]}>
+          <PmsSelect
+            placeholder="选择往来单位"
+            options={suppliers.filter((item, index, self) => {
+              return self.findIndex(el => el.supplierId == item.supplierId) === index;
+            }).map((item) => ({ value: item.supplierId, label: item.supplierName }))} 
+          />
+        </Item>
+        <Item label="签约门店" name="shopId" rules={[{ required: true, message: "请选择签约门店" }]}>
+          <PmsSelect 
+            placeholder="选择签约门店"
+            options={shops.map((item: PmsStoragePartShop.Option) => ({ value: item.id, label: item.name }))}
+          />
+        </Item>
+        <Item label="推待办余额" name="minAmount" rules={[{ required: true, message: "请填写金额" }]}>
+          <InputNumber style={{width: '100%'}} addonAfter="元" />
+        </Item>
+        <Item label="推待办角色" name="roleCode" rules={[{ required: true, message: "请选择推办角色" }]}>
+          <PmsSelect
+            placeholder="选择待办角色"
+            options={list.map(item => ({value: item.roleCode, label: item.roleName}))}
+          />
+        </Item>
+        <Item label="发单账号" name="account" rules={[{ required: true, message: "请填写发单账号" }]}>
+          <Input />
+        </Item>
+      </Form>
+    </Modal>
+  );
+}
+import React from 'react';
+import { Form, Button, InputNumber, Modal } from 'antd';
+import PmsSelect from '@/pages/pms/comonents/PmsSelect';
+
+const Item = Form.Item;
+
+interface Props {
+  visible?: boolean,
+  onCancel: Function,
+  item?: any
+}
+export default function Index(props: Props) {
+  const { visible, onCancel, item } = props;
+  const [form] = Form.useForm();
+
+  const onSave = () => {
+    const params = {id: item.id};
+    console.log(params);
+  };
+
+  return (
+    <Modal
+      title="预付款充值申请"
+      visible={visible}
+      maskClosable={false}
+      onCancel={() => onCancel()}
+      footer={[
+        <Button onClick={() => onCancel()}>取消</Button>,
+        <Button type="primary" htmlType="submit" onClick={() => onSave()}>提交申请</Button>
+      ]}
+    >
+      <Form
+        form={form}
+        labelCol={{ span: 7 }}
+        wrapperCol={{ span: 12 }}
+      >
+        <Item label="往来单位" name="supplierName" rules={[{ required: true, message: "请选择往来单位" }]}>
+          <PmsSelect />
+        </Item>
+        <Item label="往来单位类型" name="shopName" rules={[{ required: true, message: "请选择签约门店" }]}>
+          <PmsSelect />
+        </Item>
+        <Item label="账户余额" name="amount" rules={[{ required: true, message: "请填写金额" }]}>
+          <InputNumber style={{ width: '100%' }} addonAfter="元" disabled />
+        </Item>
+        <Item label="充值金额" name="awaitAmount" rules={[{ required: true, message: "请填写金额" }]}>
+          <InputNumber style={{ width: '100%' }} addonAfter="元" />
+        </Item>
+        <Item label="账户到账金额" name="awaitAmount" rules={[{ required: true, message: "请填写金额" }]}>
+          <InputNumber style={{ width: '100%' }} addonAfter="元" disabled />
+        </Item>
+        <Item label="结算门店" name="shopName" rules={[{ required: true, message: "请选择推办角色" }]}>
+          <PmsSelect />
+        </Item>
+        <Item label="发票金额要求比例" name="role" rules={[{ required: true, message: "请选择推办角色" }]}>
+          <PmsSelect />
+        </Item>
+        <Item label="结算方式" name="role" rules={[{ required: true, message: "请选择推办角色" }]}>
+          <PmsSelect />
+        </Item>
+        <Item label="附件" name="files">
+          <PmsSelect />
+        </Item>
+      </Form>
+    </Modal>
+  );
+}
+import React, { useState } from 'react';
+import { Card, Button, Table, Divider, Popconfirm, message } from 'antd';
+import { PageHeaderWrapper } from '@ant-design/pro-layout';
+import AddModal from './components/AddModal';
+import ChargeModal from './components/ChargeModal';
+import {getList, ListVO, deleteApi} from './api';
+import usePagination from '@/hooks/usePagination';
+
+const Column = Table.Column;
+export default function Index() {
+  const {list, loading, paginationConfig, setParams} = usePagination<ListVO>(getList, [], {});
+  const [current, setCurrent] = useState<{ visible: boolean, item: ListVO }>({visible: false, item: {}});
+  const [chargeInfo, setChargeInfo] = useState<{ visible: boolean, item: ListVO }>({visible: false, item: {}});
+  const data = [{id: 1, supplierName: "货拉拉", shopName: "不过承诺书可能单纯迪士尼才", amount: 3000, minAmount: 1500, roleName: "计划制定员", account: "15725173,16638183"}];
+  return (
+    <PageHeaderWrapper title="货拉拉账户配置">
+      <Card 
+        extra={<Button type="primary" onClick={() => setCurrent({visible: true, item: {}})}>新增</Button>}
+      >
+        <Table dataSource={data} rowKey="id" loading={loading} pagination={paginationConfig}>
+          <Column title="往来单位" dataIndex="supplierName" />
+          <Column title="签约门店" dataIndex="shopName" />
+          <Column title="当前余额(元)" dataIndex="amount" />
+          <Column title="低余额推待办(元)" dataIndex="minAmount" />
+          <Column title="推待办角色" dataIndex="roleName" />
+          <Column title="发单账号" dataIndex="account" />
+          <Column 
+            title="操作" 
+            render={r => (
+              <div style={{display: 'flex', flexWrap: 'wrap', alignItems: 'center'}}>
+                <a onClick={() => setChargeInfo({visible: true, item: r})}>预付款充值申请</a>
+                <Divider type="vertical" />
+                <a onClick={() => setCurrent({visible: true, item: r})}>编辑</a>
+                <Divider type="vertical" />
+                <Popconfirm
+                  title="确认删除"
+                  onConfirm={() => {
+                    deleteApi({id: r.id}).then(res => {
+                      message.success('操作成功');
+                      setParams({}, true);
+                    }).catch(e => message.error(e.message));
+                  }}
+                >
+                  <a>删除</a>
+                </Popconfirm>
+              </div>
+            )}
+          />
+        </Table>
+        <AddModal visible={current.visible} item={current.item} onCancel={() => setCurrent({ visible: false, item: {} })} />
+        <ChargeModal visible={chargeInfo.visible} item={chargeInfo.item} onCancel={() => setChargeInfo({ visible: false, item: {} })} />
+      </Card>
+    </PageHeaderWrapper>
+  );
+}
@@ -26,9 +26,9 @@ export default function Index() {
       <Input.Search 
         allowClear
         enterButton
-        placeholder="输入关键词进行搜索"
+        placeholder="输入关键词搜索"
         onSearch={(value, event) => setParams({keywords: value}, true)}
-        style={{ width: 220, marginRight: 10 }}
+        style={{ width: 200, marginRight: 10, marginBottom: 10 }}
       />
       <PmsSelect
         style={{width: 200, marginRight: 10}}