diff --git a/src/pages/pms/partPlan/PlanManage/api.ts b/src/pages/pms/partPlan/PlanManage/api.ts
index 3fb2499..9c15c09 100644
--- a/src/pages/pms/partPlan/PlanManage/api.ts
+++ b/src/pages/pms/partPlan/PlanManage/api.ts
@@ -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
diff --git a/src/pages/pms/partPlan/PlanManage/index.tsx b/src/pages/pms/partPlan/PlanManage/index.tsx
index 8c662ee..0c48c61 100644
--- a/src/pages/pms/partPlan/PlanManage/index.tsx
+++ b/src/pages/pms/partPlan/PlanManage/index.tsx
@@ -13,6 +13,7 @@ import DetailModal from "@/pages/pms/partPlan/PlanManage/components/DetailModal"
 
 // 计划状态 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);
diff --git a/src/pages/pms/partPlan/PlanManage/subpages/Apply/api.ts b/src/pages/pms/partPlan/PlanManage/subpages/Apply/api.ts
index 4ec92c3..1c57e01 100644
--- a/src/pages/pms/partPlan/PlanManage/subpages/Apply/api.ts
+++ b/src/pages/pms/partPlan/PlanManage/subpages/Apply/api.ts
@@ -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);
+}
diff --git a/src/pages/pms/partPlan/PlanManage/subpages/Apply/components/DealerModal.tsx b/src/pages/pms/partPlan/PlanManage/subpages/Apply/components/DealerModal.tsx
index a160efe..ffd7427 100644
--- a/src/pages/pms/partPlan/PlanManage/subpages/Apply/components/DealerModal.tsx
+++ b/src/pages/pms/partPlan/PlanManage/subpages/Apply/components/DealerModal.tsx
@@ -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) => (
diff --git a/src/pages/pms/partPlan/PlanManage/subpages/Apply/index.tsx b/src/pages/pms/partPlan/PlanManage/subpages/Apply/index.tsx
index 5ddad07..96bc315 100644
--- a/src/pages/pms/partPlan/PlanManage/subpages/Apply/index.tsx
+++ b/src/pages/pms/partPlan/PlanManage/subpages/Apply/index.tsx
@@ -8,16 +8,24 @@ import {throttle, sum} from 'lodash';
 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: 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,40 @@ export default function Index() {
               deletePart={deletePart}
             />
           </div>
-          <StepBnt
-            disable={loading}
-            bntLoading={loading}
-            submit={onSubmit}
-          />
+          <div style={{display: 'flex', justifyContent: 'center'}}>
+            <Popconfirm
+              title="确定取消"
+              onConfirm={() => history.goBack()}
+              okText="确定"
+              cancelText="取消"
+            >
+              <Button
+                disabled={loading}
+                loading={loading}
+                style={{marginRight: 20}}
+              >
+                取消
+              </Button>
+            </Popconfirm>
+            <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>
diff --git a/src/pages/pms/partPlan/PlanManage/subpages/Detail/api.ts b/src/pages/pms/partPlan/PlanManage/subpages/Detail/api.ts
index 6e780c0..9326739 100644
--- a/src/pages/pms/partPlan/PlanManage/subpages/Detail/api.ts
+++ b/src/pages/pms/partPlan/PlanManage/subpages/Detail/api.ts
@@ -7,6 +7,7 @@ import { PMS_HOST } from '@/utils/host';
  */
 export interface DetailVO {
   brandName?: string; // 品牌名称
+  brandId?: number; // 品牌ID
   settleDealerName?: string; // 结算商家
   settleShopName?: string; // 结算门店
   suppliers?: SupplierVO[]; // 配件集合