往来单位关系设置

zhaofeng
1 parent e93c2e09
Showing 6 changed files with 59 additions and 52 deletions
src/pages/finance/CompanyRelationAuth/components/Filter.tsx
src/pages/finance/CompanyRelationAuth/index.tsx
src/pages/finance/CompanyRelationCreate/components/RelationshipSettings.tsx
src/pages/finance/CompanyRelationCreate/components/SelectCorrespondenceUnits.tsx
src/pages/finance/CompanyRelationCreate/index.tsx
src/pages/finance/CompanyRelationCreate/useStore.ts
@@ -3,8 +3,8 @@ import { Button, Col, Popconfirm, Row, Select, Input, message } from &quot;antd&quot;;
 import { useStore } from "../index";
 import { CompanyCategoryTypeEnum } from "@/pages/finance/entitys";
 import { debounce } from "lodash";
-import { deleteCompanyRelationApi } from '@/pages/finance/CompanyRelationAuth/api';
-import { history } from 'umi';
+import { deleteCompanyRelationApi } from "@/pages/finance/CompanyRelationAuth/api";
+import { history } from "umi";
  
 const Search = Input.Search;
 const { Option } = Select;
@@ -53,7 +53,7 @@ export default function Filter() {
  
   // 新增
   function onAdd() {
-    history.push("/finance2/companyRelationAuth/create");
+    history.push({ pathname: "/finance2/companyRelationAuth/create", state: companyParams });
   }
   /**
    * @param compId
@@ -61,7 +61,7 @@ export default function Filter() {
   async function onDelete() {
     const compIdList = selectedRelation.map((item) => item.compId);
     try {
-      const pa = { ...companyParams, compIdList};
+      const pa = { ...companyParams, compIdList };
       setSubmitLoading(true);
       const { success, result } = await deleteCompanyRelationApi(pa);
       setSubmitLoading(false);
@@ -147,7 +147,7 @@ export default function Filter() {
         </Button>
  
         <Popconfirm title="确定删除？" onConfirm={onDelete}>
-          <Button style={{marginRight:10}} hidden={!selectedRelation.length} danger loading={submitLoading}>
+          <Button style={{ marginRight: 10 }} hidden={!selectedRelation.length} danger loading={submitLoading}>
             删除
           </Button>
         </Popconfirm>
@@ -28,7 +28,7 @@ function CompanyRelationAuth() {
   };
  
   return (
-    <PageHeaderWrapper title="往来单位关系设置">
+    <PageHeaderWrapper title="往来单位关系设置111">
       <Card>
         <Filter />
         <Table
@@ -14,14 +14,13 @@ interface Props {
 function SelectModal({ onPrevious }: Props) {
   const [form] = Form.useForm();
   const {
-    visible,
-    selected,
-    setVisible,
+    // visible,
+    // selected,
+    // setVisible,
     companyParams,
-    comBussinessList,
-    comBussinessLoading,
+    // comBussinessList,
+    // comBussinessLoading,
     setDisabled,
-    setLoading,
     selectData,
     setSelectData,
   } = useStore();
@@ -51,7 +50,6 @@ function SelectModal({ onPrevious }: Props) {
     saveCompanyRelationApi(pa)
       .then((res) => {
         message.success("保存成功");
-        setLoading(true);
         setSubmitLoading(false);
         setDisabled(true);
         onCancel();
@@ -20,7 +20,6 @@ function SelectModal({ onNext }: Props) {
     comBussinessList,
     comBussinessLoading,
     setDisabled,
-    setLoading,
     selectData,
     setSelectData,
   } = useStore();
-import React, { useState } from "react";
+import React, { useEffect, useState } from "react";
 import { Card, Steps, Table, Tabs } from "antd";
 import { PageHeaderWrapper } from "@ant-design/pro-layout";
 import { createStore } from "@/hooks/moz";
@@ -12,20 +12,26 @@ const { TabPane } = Tabs;
  
 export const { Provider, useStore } = createStore(store);
  
-function CompanyRelationAuth() {
+function CompanyRelationCreate(props) {
+  const pathParams = props.location.state || {};
   const { Step } = Steps;
   const [current, setCurrent] = useState<number>(0);
   const {
     selected,
-    loading,
+    // loading,
     selectedRelation,
     setSelectedRelation,
-    companyParams,
     submitLoading,
     setSubmitLoading,
-    setLoading,
+    // setLoading,
+    companyParams,
+    setCompanyParams,
   } = useStore();
  
+  useEffect(() => {
+    setCompanyParams({ ...pathParams });
+  }, []);
+
   const rowSelection = {
     onChange: (selectedRowKeys: React.Key[], selectedRows: CompanyRelationListVO[]) => {
       setSelectedRelation([...selectedRows]);
@@ -60,8 +66,8 @@ function CompanyRelationAuth() {
   );
 }
  
-export default () => (
+export default (props) => (
   <Provider>
-    <CompanyRelationAuth />
+    <CompanyRelationCreate {...props} />
   </Provider>
 );
@@ -14,52 +14,54 @@ export default function useStore() {
   const [selectData, setSelectData] = useState<TradeCompany.ComList[]>([]);
   // 存储已选关系，用于批量删除
   const [selectedRelation, setSelectedRelation] = useState<CompanyRelationListVO[]>([]);
+  // 存储新增时选择条件
+  const [companyParams, setCompanyParams] = useState({ dealerId: -1 });
  
   /** 商家下往来单位列表 */
-  const {
-    data: companyList,
-    setParams: setCompanyParams,
-    setLoading,
-    loading,
-    params: companyParams,
-  } = useInitial<CompanyRelationListVO[], CompanyRelationParams>(
-    getCompanyByDealerApi,
-    [],
-    { compCategory: CompanyCategoryTypeEnum["供应商"], dealerId: -1 },
-    delay
-  );
+  // const {
+  //   data: companyList,
+  //   setParams: setCompanyParams,
+  //   setLoading,
+  //   loading,
+  //   params: companyParams,
+  // } = useInitial<CompanyRelationListVO[], CompanyRelationParams>(
+  //   getCompanyByDealerApi,
+  //   [],
+  //   { compCategory: CompanyCategoryTypeEnum["供应商"], dealerId: -1 },
+  //   delay
+  // );
   // 商家的列表
-  const { data: dealerList, loading: dealerLoading } = useInitial(getDealerApi, [], {});
+  // const { data: dealerList, loading: dealerLoading } = useInitial(getDealerApi, [], {});
   // 往来单位业务类型列表
   const { data: comBussinessList, loading: comBussinessLoading } = useInitial(getCompanyBusinessTypesApi, [], null);
  
   const [selected, setSelected] = useState<CompanyRelationListVO[]>([]);
  
-  useEffect(() => {
-    if (dealerList.length) {
-      setDelay(false);
-      setCompanyParams({ ...companyParams, dealerId: dealerList[0].id }, true); //因为usePagination 未支持 delay变为false后还需手动刷新接口
-    } else {
-      !dealerLoading && message.warning("没有授权商家，无法查看数据");
-    }
-  }, [dealerList, dealerLoading]);
+  // useEffect(() => {
+  //   if (dealerList.length) {
+  //     setDelay(false);
+  //     setCompanyParams({ ...companyParams, dealerId: dealerList[0].id }, true); //因为usePagination 未支持 delay变为false后还需手动刷新接口
+  //   } else {
+  //     !dealerLoading && message.warning("没有授权商家，无法查看数据");
+  //   }
+  // }, [dealerList, dealerLoading]);
  
-  useEffect(() => {
-    setSelected([...companyList]);
-  }, [companyList]);
+  // useEffect(() => {
+  //   setSelected([...companyList]);
+  // }, [companyList]);
  
   return {
     selectData,
     setSelectData,
-    companyList,
+    // companyList,
     visible,
     setVisible,
-    setCompanyParams,
-    companyParams,
-    dealerList,
-    setLoading,
-    loading,
-    dealerLoading,
+    // setCompanyParams,
+    // companyParams,
+    // dealerList,
+    // setLoading,
+    // loading,
+    // dealerLoading,
     disabled,
     setDisabled,
     selected,
@@ -70,5 +72,7 @@ export default function useStore() {
     comBussinessLoading,
     selectedRelation,
     setSelectedRelation,
+    companyParams,
+    setCompanyParams,
   };
 }