Merge remote-tracking branch 'origin/master' into todo_f

张志伟
2 parents e3624a85 03416d33
Showing 29 changed files with 1117 additions and 295 deletions
config/routers/crm_new.ts
config/routers/finance.ts
src/pages/admin/Role/components/RoleFilter.tsx
src/pages/admin/Role/components/RoleList.tsx
src/pages/admin/RoleManagementGroup/components/Modal.tsx
src/pages/contract/BearCostSetting/components/BearModal/index.tsx
src/pages/crm_new/Settings/index.tsx
src/pages/crm_new/Settings/subpages/CloseClue/api.ts
src/pages/crm_new/Settings/subpages/CloseClue/index.tsx
src/pages/crm_new/Settings/subpages/CloseClue/style.less
src/pages/finance/CompanyRelationAuth/api.ts
src/pages/finance/CompanyRelationAuth/components/Filter.tsx
src/pages/finance/CompanyRelationAuth/index.tsx
src/pages/finance/CompanyRelationCreate/api.ts
src/pages/finance/CompanyRelationCreate/components/EditTagList.tsx
src/pages/finance/CompanyRelationCreate/components/Filter.tsx
src/pages/finance/CompanyRelationCreate/components/RelationshipSettings.tsx
src/pages/finance/CompanyRelationAuth/components/SelectModal.tsx → src/pages/finance/CompanyRelationCreate/components/SelectCorrespondenceUnits.tsx
src/pages/finance/CompanyRelationCreate/entity.ts
src/pages/finance/CompanyRelationCreate/index.tsx
@@ -77,4 +77,8 @@ export default [
     path: '/crm/threePartyPlatformClue', // 三方平台线索配置
     component: './crm_new/ThreePartyPlatformClue',
   },
+    {
+    path: '/crm/closeClue', // 暂停区域线索站岗分配
+    component: './crm_new/Settings/subpages/CloseClue',
+  },
 ];
 \ No newline at end of file
@@ -24,6 +24,10 @@ export default [
     component: "finance/CompanyRelationAuth",
   },
   {
+    path: "/finance2/companyRelationAuth/create", //往来单位关系设置==》新增
+    component: "finance/CompanyRelationCreate",
+  },
+  {
     path: "/finance2/specialAccountSetting/deductAccount", //划扣专用账户
     component: "./finance/SpecialAccount/DeductAccount",
   },
@@ -24,7 +24,14 @@ export default function RoleFilter() {
         <RadioButton value={0}>禁用</RadioButton>
         {/* <RadioButton value={-1}>已删除</RadioButton> */}
       </RadioGroup>
-      <Select allowClear placeholder="请选择系统" style={{ width: 200, marginRight: 10, marginBottom: 10 }} onChange={sysId => setParams({ ...innerParams, sysId, current: 1 }, true)}>
+      <Select
+        allowClear
+        showSearch
+        optionFilterProp="children"
+        placeholder="请选择系统"
+        style={{ width: 200, marginRight: 10, marginBottom: 10 }}
+        onChange={sysId => setParams({ ...innerParams, sysId, current: 1 }, true)}
+      >
         {(systems || []).map((i: Privilege.SystemListVO) => (<Option value={i.id || 0} key={i.id}>{i.sysName || '--'}</Option>))}
       </Select>
       <Search
@@ -37,8 +37,7 @@ export default function RoleList() {
       message.success(record.status ? "禁用成功" : "启用成功")
       const tempList = list.map((item: any) => {
         if (item.id === record.id) {
-          item.status = record.status === 0 ? 1 : 0
-          return item;
+          return { ...item, status: record.status === 0 ? 1 : 0 };
         }
         return item;
       });
@@ -2,7 +2,7 @@
  * @Author: wangqiang@feewee.cn
  * @Date: 2022-06-29 10:44:56
  * @LastEditors: wangqiang@feewee.cn
- * @LastEditTime: 2022-07-01 16:13:26
+ * @LastEditTime: 2022-11-30 14:34:02
  */
 import {
   Button,
@@ -139,12 +139,7 @@ export default function RoleManagementGrooupModal() {
             />
           </Form.Item>
           <Divider orientation="left">管理组</Divider>
-          <Form.List
-            name="roleList"
-            rules={[
-              { validator: groupValidator },
-            ]}
-          >
+          <Form.List name="roleList" rules={[{ validator: groupValidator }]}>
             {(fields, { add, remove }, { errors }) => (
               <>
                 {fields.map((field, index) => {
@@ -152,11 +147,17 @@ export default function RoleManagementGrooupModal() {
                     <Form.Item
                       {...field}
                       style={{ flex: 1 }}
-                      label={`${number2text(index + 1)}级管理组`}
+                      label={
+                        index > 0 ? `${number2text(index)}级管理` : "基础角色组"
+                      }
                       rules={[
                         {
                           required: true,
-                          message: `请选择${number2text(index + 1)}级管理组`,
+                          message: `请选择${
+                            index > 0
+                              ? `${number2text(index)}级管理`
+                              : "基础角色组"
+                          }`,
                         },
                       ]}
                     >
@@ -221,7 +222,9 @@ function SelectRoleGroup({
         optionFilterProp="label"
         mode={index === 0 ? "multiple" : undefined}
         style={{ flex: 1 }}
-        placeholder={`请选择${number2text(index + 1)}级管理组`}
+        placeholder={`请选择${
+          index > 0 ? `${number2text(index)}级管理` : "基础角色组"
+        }`}
         onBlur={() => {
           formatRoleList(form.getFieldValue("roleList") || []);
         }}
@@ -35,7 +35,7 @@ const BearModal = ({visible, onCancel, item = {} as BearCostSetting.Item}:Props)
             rowKey={(item) => `${item.id}`}
           >
             <Column title="门店/往来单位名称" dataIndex="name" render={(t) => t || "-"} />
-            <Column title="分摊比例" dataIndex="shareRate" render={(t) => (t && `${t*100}%`) || "-"} />
+            <Column title="分摊比例" dataIndex="shareRate" render={(t) => (t && `${(t*100).toFixed(2)}%`) || "-"} />
  
           </Table>
         </Skeleton>
@@ -111,6 +111,9 @@ export default function Settings() {
  
             {/* 龚昆修改整合：集客跟进，潜客跟进到一个新的页面 */}
             <div style={{ width: '100%', height: 40 }} />
+            <List.Item actions={[<a onClick={() => history.push('/crm/closeClue')}>查看</a>]}>
+              <List.Item.Meta title="暂停区域线索站岗分配资格设置" />
+            </List.Item>
             <List.Item actions={[<a onClick={() => history.push('/crm/followUpSettings')}>查看</a>]}>
               <List.Item.Meta title="跟进设置" />
             </List.Item>
+import request from '@/utils/request';
+import { CRM_HOST } from '@/utils/host';
+
+export interface Result {
+  onlineSaleShopAssignClue?: boolean // 网销门店是否参与区域站岗线索分配
+  exclusiveClueConvertRate?: number // 专属线索转化率(示例:90.50%)
+  stageMinAssignCount?: number // 下阶段每日最低分配线索数量
+  dailyMinAssignCount?: number // 每日最低分配线索数量 从20个线索起，当天区域站岗分配线索跟进数每增加10个，低于“判断标准”，暂停当天资格
+  increaseCount?: number // 每增加多少个当天区域站岗分配线索跟进数每增加10个，低于“判断标准”，暂停当天资格；
+}
+/** 查询停止区域线索分配资格设置 */
+export function getInfoApi() {
+  return request.get<Result>(`${CRM_HOST}/erp/config/find/stop/area/clue/assign/setting`);
+}
+
+/** 新增/修改停止区域线索分配资格设置 */
+export function saveInfoApi(params: Result) {
+  return request.post(`${CRM_HOST}/erp/config/edit/stop/area/clue/assign/setting`, params);
+}
 \ No newline at end of file
+import React, { useEffect, useState } from 'react';
+import { Button, Card, ConfigProvider, Form, InputNumber, message, Row, Switch, Space } from 'antd';
+import zhCN from 'antd/lib/locale-provider/zh_CN';
+import { PageHeaderWrapper } from '@ant-design/pro-layout';
+import { getInfoApi, saveInfoApi, Result } from './api';
+import './style.less';
+import { history } from 'umi';
+import { debounce } from 'lodash';
+
+export default function CollectionFollowSetting() {
+  const [edit, setEdit] = useState(false);
+  const [loading, setLoading] = useState<boolean>(true);
+  const [confirmLoading, setConfirmLoading]= useState<boolean>(false);
+  const [form] = Form.useForm();
+  const [stageMinAssignCount, setStageMinAssignCount] = useState<number>(0);
+  const [dailyMinAssignCount, setDailyMinAssignCount] = useState<number>(0);
+  const [increaseCount, setIncreaseCount] = useState<number>(0);
+  const [checked, setChecked] = useState<boolean>(false);
+
+  useEffect(() => {
+    getInfo();
+  }, []);
+
+  const getInfo = () => {
+    getInfoApi().then(res => {
+      if (res.data) {
+        form.setFieldsValue({...res.data});
+        setDailyMinAssignCount(res.data?.dailyMinAssignCount || 0);
+        setStageMinAssignCount(res.data?.stageMinAssignCount || 0);
+        setIncreaseCount(res.data?.increaseCount || 0);
+        setChecked(res.data.onlineSaleShopAssignClue || false);
+      }
+      setLoading(false);
+    }).catch(error => {
+      message.error(error.message);
+      setLoading(false);
+    });
+  };
+
+  const onCancle = () => {
+    getInfo();
+    setEdit(false);
+  };
+
+  const onOk = async () => {
+    const params: any = await form.validateFields();
+    const _params: Result = {
+      exclusiveClueConvertRate: params.exclusiveClueConvertRate,
+      stageMinAssignCount,
+      dailyMinAssignCount,
+      increaseCount,
+      onlineSaleShopAssignClue: checked,
+    };
+    setConfirmLoading(true);
+    saveInfoApi(_params).then(res => {
+      message.success(res.result);
+      setEdit(false);
+      setConfirmLoading(false);
+      history.goBack();
+    }).catch(error => {
+      message.error(error.message);
+      setConfirmLoading(false);
+    });
+  };
+
+  return (
+    <PageHeaderWrapper title="暂停区域线索站岗分配资格">
+      <ConfigProvider locale={zhCN}>
+        <Card style={{paddingLeft: "60px", justifyContent: 'center'}} bordered={false} loading={loading}>
+          {/* <Spin> */}
+          <Form
+            labelCol={{ span: 2 }}
+            wrapperCol={{ span: 18 }} 
+            form={form}
+          >
+            <Form.Item labelCol={{offset: 0}} label="区域站岗分配线索转化率标准" name="exclusiveClueConvertRate" labelAlign="right" rules={[{ required: true, message: '请输入' }]}>
+              <InputNumber
+                style={{width: '100%'}}
+                controls={false}
+                min={0}
+                max={100}
+                formatter={value => `${value}%`}
+                precision={2}
+                disabled={!edit}
+                parser={value => value?.replace('%', '')}
+              />
+            </Form.Item>
+
+            <Form.Item labelCol={{offset: 2}} label=" " name="stageMinAssignCount" colon={false} labelAlign="right">
+              <span>{`(1)每阶段滚动判定，低于"区域站岗分配线索转化率标准"，下一阶段线索每日仅分配`}</span>
+              <InputNumber
+                controls={false}
+                min={0}
+                disabled={!edit}
+                value={stageMinAssignCount}
+                onChange={(e) => setStageMinAssignCount(e || 0)}
+                formatter={value => `${value}个`}
+                precision={0}
+                parser={value => value?.replace('个', '')}
+              />
+              <br />
+              <span style={{color: "#F4333C"}}>（最低要求）；阶段：1～10号；11～20号；21～月末</span>
+            </Form.Item>
+
+            <Form.Item labelCol={{offset: 2}} className="feewee-settings-form-closeClue" label=" " colon={false}>
+              <Form.Item colon={false} name="dailyMinAssignCount">
+                <span>(2)从</span>
+                <InputNumber
+                  controls={false}
+                  value={dailyMinAssignCount}
+                  onChange={(e) => setDailyMinAssignCount(e || 0)}
+                  min={0}
+                  disabled={!edit}
+                  formatter={value => `${value}个`}
+                  precision={0}
+                  parser={value => value?.replace('个', '')}
+                />
+                <span>线索起，当天区域站岗分配线索跟进数每增加</span>
+              </Form.Item>
+              <Form.Item colon={false} name="increaseCount">
+                <InputNumber
+                  controls={false}
+                  min={0}
+                  value={increaseCount}
+                  onChange={(e) => setIncreaseCount(e || 0)}
+                  formatter={value => `${value}个`}
+                  precision={0}
+                  disabled={!edit}
+                  parser={value => value?.replace('个', '')}
+                />
+                <span>，低于{`"区域站岗分配线索转化率标准"`}，暂停当天资格；</span>
+              </Form.Item>
+            </Form.Item>
+            <Form.Item labelCol={{offset: 0}} label="网销门店是否参与区域线索站岗分配" name="onlineSaleShopAssignClue" labelAlign="right">
+              <Switch
+                disabled={!edit}
+                checked={checked}
+                checkedChildren="是"
+                unCheckedChildren="否"
+                size="default"
+                onChange={(e) => setChecked(e)}
+              />
+            </Form.Item>
+ 
+          </Form>
+          <Row justify="space-around" align="middle">
+            <Space>
+              {
+                !edit ? <Button disabled={confirmLoading} type="default" onClick={() => setEdit(true)}>编辑</Button> : <Button disabled={confirmLoading} type="default" onClick={onCancle}>取消</Button>
+              }
+              <Button disabled={confirmLoading} loading={confirmLoading} type="primary" onClick={debounce(onOk, 380)}>确认</Button>
+              <Button disabled={confirmLoading} type="link" onClick={() => { history.goBack(); }}>返回上一级</Button>
+            </Space>
+          </Row>
+          {/* </Spin> */}
+        </Card>
+      </ConfigProvider>
+    </PageHeaderWrapper>
+  );
+}
 \ No newline at end of file
+.feewee-settings-form-closeClue {
+  .ant-form-item-control-input-content {
+    display: flex;
+    justify-content: start;
+    align-items: center;
+    flex-wrap: wrap;
+  }
+}
 \ No newline at end of file
@@ -19,6 +19,10 @@ export interface CompanyRelationListVO {
   compShortName?: string; //简称
   compType?: number[]; //类型
   compTypeName?: number; //类型
+  beforeReimburse?: boolean; //是否报销前提供发票
+  billAmountRatio?: number; //发票要求金额比例（已扩大100倍，前端直接拼接百分号展示）
+  settleMethodNames?: string; // 支持结算方式
+  accountCheckPeriod?: number; //对账周期，每月多少号
 }
  
 /**
@@ -3,7 +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 { deleteCompanyRelationApi } from "@/pages/finance/CompanyRelationAuth/api";
+import { history } from "umi";
  
 const Search = Input.Search;
 const { Option } = Select;
@@ -50,8 +51,9 @@ export default function Filter() {
     setDisabled(false);
   }
  
+  // 新增
   function onAdd() {
-    setVisible(true);
+    history.push({ pathname: "/finance2/companyRelationAuth/create", state: companyParams });
   }
   /**
    * @param compId
@@ -59,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);
@@ -140,25 +142,15 @@ export default function Filter() {
         </Col>
       </Row>
       <div style={{ display: "flex", flexDirection: "row-reverse" }}>
-        {/* <Button hidden={disabled} type="primary" onClick={onAdd}> */}
         <Button type="primary" onClick={onAdd}>
           新增
         </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>
-        {/* <Button hidden={disabled} type="link" onClick={onSubmit}>
-          保存
-        </Button>
-        <Popconfirm title="确定取消？取消将重置数据" onConfirm={onCancel}>
-          <Button hidden={disabled} danger type="text">
-            取消
-          </Button>
-        </Popconfirm>
-        */}
       </div>
     </div>
   );
@@ -3,7 +3,6 @@ import { Card, Table } from &quot;antd&quot;;
 import { PageHeaderWrapper } from "@ant-design/pro-layout";
 import { createStore } from "@/hooks/moz";
 import store from "./useStore";
-import SelectModal from "./components/SelectModal";
 import Filter from "./components/Filter";
 import { CompanyRelationListVO } from "@/pages/finance/CompanyRelationAuth/api";
  
@@ -15,7 +14,6 @@ function CompanyRelationAuth() {
   const {
     selected,
     loading,
-
     setSelectedRelation,
   } = useStore();
  
@@ -25,10 +23,10 @@ function CompanyRelationAuth() {
       setSelectedRelation([...selectedRows]);
     },
     getCheckboxProps: (record: CompanyRelationListVO) => ({
-      // disabled: record.name === "Disabled User", // Column configuration not to be checked
       name: String(record.compId),
     }),
   };
+
   return (
     <PageHeaderWrapper title="往来单位关系设置">
       <Card>
@@ -46,20 +44,12 @@ function CompanyRelationAuth() {
           <Column title="单位名称" dataIndex="compName" />
           <Column title="简称" dataIndex="compShortName" />
           <Column title="类型" dataIndex="compTypeName" />
-          {/* <Column
-            title="操作"
-            dataIndex="compId"
-            render={(key) => (
-              <Popconfirm title="是否删除" onConfirm={() => onDelete(key)} okText="确定" cancelText="取消">
-                <Button type="link" danger loading={submitLoading}>
-                  删除
-                </Button>
-              </Popconfirm>
-            )}
-          /> */}
+          <Column title="发票要求" dataIndex="beforeReimburse" render={(before) => `支付${before ? "前" : "后"}`} />
+          <Column title="发票金额要求比例" dataIndex="billAmountRatio" render={(ratio) => `${ratio}%`} />
+          <Column title="支持结算方式" dataIndex="settleMethodNames" render={(way) => way || "--"} />
+          <Column title="对账周期" dataIndex="accountCheckPeriod" render={(date) => (date ? `${date}日` : "--")} />
         </Table>
       </Card>
-      <SelectModal />
     </PageHeaderWrapper>
   );
 }
+import { http } from "@/typing/http";
+import request from "@/utils/request";
+import { FINANCE2_HOST } from "@/utils/host";
+
+type PrRes<T> = http.PromiseResp<T>;
+
+export interface CompanyRelationParams {
+  dealerId: number;
+  compCategory: number;
+  keywords?: string;
+  current?: number;
+  pageSize?: number;
+  companyType?: number;
+}
+
+export interface CompanyRelationListVO {
+  compId?: number;
+  compName?: string;
+  compShortName?: string; //简称
+  compType?: number[]; //类型
+  compTypeName?: number; //类型
+  beforeReimburse?: boolean; //是否报销前提供发票
+  billAmountRatio?: number; //发票要求金额比例（已扩大100倍，前端直接拼接百分号展示）
+  settleMethodNames?: string; // 支持结算方式
+  accountCheckPeriod?: number; //对账周期，每月多少号
+}
+
+/**
+ * 查询往来单位关系列表
+ */
+export function getCompanyByDealerApi(params: CompanyRelationParams): PrRes<CompanyRelationListVO[]> {
+  return request.get(`${FINANCE2_HOST}/trade/company/relation/list`, { params });
+}
+
+interface SaveParams {
+  compIdList: number[]; //单位id集合
+  dealerId: number; //商家id，必填
+  compCategory: number; //单位类别，必填
+}
+
+/**
+ * 新增往来单位关系
+ */
+export function saveCompanyRelationApi(params: SaveParams): PrRes<void> {
+  return request.post(`${FINANCE2_HOST}/trade/company/relation/save`, params);
+}
+
+/**
+* 删除往来单位关系
+  /trade/company/relation/delete
+ */
+export function deleteCompanyRelationApi(params: SaveParams): PrRes<void> {
+  return request.post(`${FINANCE2_HOST}/trade/company/relation/delete`, params);
+}
+import * as React from "react";
+import { Tag, Input, Tooltip } from "antd";
+import { PlusOutlined } from "@ant-design/icons";
+import { isArray } from "lodash";
+// import "./EditTagList.less";
+
+interface Props {
+  value?: string[];
+  onChange?: (value: string[]) => any;
+}
+
+const colorArr = ["magenta", "geekblue", "cyan", "orange", "green", "lime", "gold", "volcano", "purple", "red"];
+
+export default ({ value = [], onChange }: Props) => {
+  function handleClose(tag: string) {
+    const tags = value.filter((item) => item !== tag);
+    onChange && onChange(tags);
+  }
+  return (
+    <>
+      <div style={{ borderStyle: "solid", borderColor: "#eee", padding: 5, borderWidth: 1 }}>
+        {isArray(value) &&
+          value.map((tag, index) => {
+            const isLongTag = tag.length > 20;
+            const tagElem = (
+              <Tag
+                className="edit-tag"
+                key={tag}
+                closable={value.length > 1}
+                color={colorArr[index % 10]}
+                onClose={() => handleClose(tag)}
+              >
+                <span>{isLongTag ? `${tag.slice(0, 20)}...` : tag}</span>
+              </Tag>
+            );
+            return isLongTag ? (
+              <Tooltip title={tag} key={tag}>
+                {tagElem}
+              </Tooltip>
+            ) : (
+              tagElem
+            );
+          })}
+      </div>
+    </>
+  );
+};
+import React from "react";
+import { Button, Col, Popconfirm, Row, Select, Input, message } from "antd";
+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';
+
+const Search = Input.Search;
+const { Option } = Select;
+
+export default function Filter() {
+  const {
+    setVisible,
+    dealerList,
+    setCompanyParams,
+    dealerLoading,
+    disabled,
+    setDisabled,
+    setSelected,
+    companyList,
+    comBussinessList,
+    selectedRelation,
+    submitLoading,
+    setSubmitLoading,
+    companyParams,
+    setLoading,
+  } = useStore();
+  const searchDealer = (dealerId: number) => {
+    setCompanyParams({ ...companyParams, dealerId }, true);
+  };
+
+  function searchType(compCategory: number) {
+    setCompanyParams({ ...companyParams, compCategory }, true);
+  }
+
+  function searchCompanyType(companyType: number) {
+    setCompanyParams({ ...companyParams, companyType }, true);
+  }
+
+  const fetchListByName = debounce((value) => {
+    setCompanyParams({ ...companyParams, keywords: value }, true);
+  }, 500);
+
+  function onCancel() {
+    setDisabled(true);
+    setSelected([...companyList]);
+  }
+
+  function onEdit() {
+    setDisabled(false);
+  }
+
+  // 新增
+  function onAdd() {
+    history.push("/finance2/companyRelationAuth/create");
+  }
+  /**
+   * @param compId
+   */
+  async function onDelete() {
+    const compIdList = selectedRelation.map((item) => item.compId);
+    try {
+      const pa = { ...companyParams, compIdList};
+      setSubmitLoading(true);
+      const { success, result } = await deleteCompanyRelationApi(pa);
+      setSubmitLoading(false);
+
+      if (!success) {
+        return message.error(result);
+      } else {
+        message.success(result);
+        setLoading(true);
+      }
+    } catch (e) {
+      setSubmitLoading(false);
+      message.error(e.message);
+    }
+  }
+
+  return (
+    <div
+      style={{
+        display: "flex",
+        flexDirection: "row",
+        justifyContent: "space-between",
+        alignItems: "center",
+        marginBottom: 20,
+      }}
+    >
+      <Row style={{ display: "flex", flex: 1 }}>
+        <Col span={9}>
+          <Select
+            placeholder="请选择商家"
+            showSearch
+            loading={dealerLoading}
+            disabled={!disabled}
+            optionFilterProp="children"
+            onChange={searchDealer}
+            value={companyParams.dealerId}
+            style={{ width: "80%" }}
+          >
+            {dealerList.map((dealer) => (
+              <Option value={dealer.id} key={dealer.id}>
+                {dealer.name}
+              </Option>
+            ))}
+          </Select>
+        </Col>
+        <Col span={5}>
+          <Search
+            allowClear
+            disabled={!disabled}
+            placeholder="搜索单位名称"
+            onChange={(e) => fetchListByName(e.target.value || undefined)}
+            style={{ width: 200 }}
+          />
+        </Col>
+        <Col span={3}>
+          <Select
+            placeholder="搜索单位类别"
+            disabled={!disabled}
+            onChange={searchType}
+            value={companyParams.compCategory}
+            style={{ width: 100 }}
+          >
+            {[1, 2].map((i) => (
+              <Option value={i} key={i}>
+                {CompanyCategoryTypeEnum[i]}
+              </Option>
+            ))}
+          </Select>
+        </Col>
+        <Col>
+          <Select placeholder="搜索类型" disabled={!disabled} onChange={searchCompanyType} style={{ width: 150 }}>
+            {comBussinessList.map((item) => (
+              <Option key={item.id} value={item.id}>
+                {item.name}
+              </Option>
+            ))}
+          </Select>
+        </Col>
+      </Row>
+      <div style={{ display: "flex", flexDirection: "row-reverse" }}>
+        <Button type="primary" onClick={onAdd}>
+          新增
+        </Button>
+
+        <Popconfirm title="确定删除？" onConfirm={onDelete}>
+          <Button style={{marginRight:10}} hidden={!selectedRelation.length} danger  loading={submitLoading}>
+            删除
+          </Button>
+        </Popconfirm>
+      </div>
+    </div>
+  );
+}
+import React, { useState, useEffect, memo } from "react";
+import { Select, message, Form, Divider, Button, InputNumber } from "antd";
+import { useStore } from "../index";
+import { saveCompanyRelationApi } from "@/pages/finance/CompanyRelationAuth/api";
+import EditTagList from "./EditTagList";
+import { invoiceRequirements, payWay, RequirementsTypeEnum } from "@/pages/finance/CompanyRelationCreate/entity";
+
+const { Option } = Select;
+
+interface Props {
+  onPrevious?: () => void;
+}
+
+function SelectModal({ onPrevious }: Props) {
+  const [form] = Form.useForm();
+  const {
+    // visible,
+    // selected,
+    // setVisible,
+    companyParams,
+    // comBussinessList,
+    // comBussinessLoading,
+    setDisabled,
+    selectData,
+    setSelectData,
+  } = useStore();
+  const [submitLoading, setSubmitLoading] = useState(false);
+
+  useEffect(() => {
+    const formDate = transFormData(selectData);
+    form.setFieldsValue({ ...formDate });
+  }, [selectData]);
+
+  function transFormData(originData: TradeCompany.ComList[]) {
+    let res = {};
+    const comp = originData.map((it) => it.compName);
+    res.comp = comp;
+    return res;
+  }
+
+  function onCancel() {
+    setSelectData([]);
+    history.back();
+  }
+
+  // 保存
+  function _onOk(formData: any) {
+    const pa = transformDTO(formData);
+    setSubmitLoading(true);
+    saveCompanyRelationApi(pa)
+      .then((res) => {
+        message.success("保存成功");
+        setSubmitLoading(false);
+        setDisabled(true);
+        onCancel();
+      })
+      .catch((e) => {
+        setSubmitLoading(false);
+        message.error(e.message);
+      });
+  }
+
+  function transformDTO(formData: any) {
+    const { beforeReimburse, comp = [] } = formData;
+    const compList = selectData.filter((item) => comp.find((y) => y === item.compName));
+    const relationCompanyList = compList.map((item) => ({
+      ...formData,
+      comp: undefined,
+      compId: item.id,
+      beforeReimburse: beforeReimburse === RequirementsTypeEnum["支付前"],
+    }));
+    const pa = {
+      ...companyParams,
+      relationCompanyList,
+    };
+    return pa;
+  }
+
+  return (
+    <>
+      <Form
+        form={form}
+        labelCol={{
+          xs: { span: 24 },
+          sm: { span: 8 },
+          md: { span: 6 },
+        }}
+        wrapperCol={{
+          xs: { span: 24 },
+          sm: { span: 10 },
+          md: { span: 15 },
+        }}
+        onFinish={_onOk}
+      >
+        <Form.Item label="往来单位" name="comp">
+          <EditTagList />
+        </Form.Item>
+        <Form.Item label="发票要求" name="beforeReimburse" rules={[{ required: true, message: "请选择发票要求" }]}>
+          <Select placeholder="请选择发票要求">
+            {invoiceRequirements.map((item) => (
+              <Option key={item.value} value={item.value}>
+                {item.label}
+              </Option>
+            ))}
+          </Select>
+        </Form.Item>
+        <Form.Item
+          label="发票金额要求比例"
+          name="billAmountRatio"
+          rules={[
+            { required: true, message: "请输入发票金额要求比例" },
+            { pattern: /^(100)$|^((\d|[1-9]\d)(\.\d{1,2})?)$/, message: "请输入0-100之间的数字(保留两位小数)" },
+          ]}
+        >
+          <InputNumber
+            min={0}
+            max={100}
+            style={{ width: "100%" }}
+            formatter={(value) => `${value}%`}
+            parser={(value) => value!.replace("%", "")}
+          />
+        </Form.Item>
+        <Form.Item label="支持结算方式" name="settleMethods" rules={[{ required: true, message: "请选择结算方式" }]}>
+          <Select placeholder="请选择结算方式" mode="multiple">
+            {payWay.map((item) => (
+              <Option key={item.value} value={item.value}>
+                {item.label}
+              </Option>
+            ))}
+          </Select>
+        </Form.Item>
+        <Form.Item label="对账周期" name="accountCheckPeriod" rules={[{ required: true, message: "请输入对账周期" }]}>
+          <InputNumber
+            addonBefore="每月"
+            placeholder="请输入"
+            min={1}
+            precision={0}
+            max={31}
+            addonAfter="日"
+            style={{ width: "100%" }}
+          />
+        </Form.Item>
+      </Form>
+      <div style={{ width: "100%", textAlign: "center", marginTop: 30 }}>
+        <Button type="primary" style={{ marginBottom: 10 }} onClick={() => history.back()}>
+          返回列表
+        </Button>
+        <Divider type="vertical" />
+        <Button
+          type="primary"
+          style={{ marginBottom: 10 }}
+          onClick={() => {
+            const comp = form.getFieldValue("comp");
+            const _selectData = selectData.filter((item) => comp.find((it) => it === item.compName));
+
+            setSelectData(_selectData);
+            onPrevious && onPrevious();
+          }}
+        >
+          返回上一步
+        </Button>
+        <Divider type="vertical" />
+        <Button type="primary" style={{ marginBottom: 10 }} onClick={() => form.submit()} loading={submitLoading}>
+          保存
+        </Button>
+      </div>
+    </>
+  );
+}
+
+export default memo(SelectModal);
 import React, { useState, useEffect, memo } from "react";
-import { Modal, Table, Select, Input, message, Spin } from "antd";
+import { Modal, Table, Select, Input, message, Spin, Button, Divider } from "antd";
 import Column from "antd/lib/table/Column";
 import { RecordStateEnum } from "@/pages/finance/entitys";
 import usePagination from "@/hooks/usePagination";
 import { getCompAccountApi } from "@/pages/finance/TradeCompany/api";
 import { useStore } from "../index";
 import { debounce } from "lodash";
-import { saveCompanyRelationApi } from '@/pages/finance/CompanyRelationAuth/api';
  
-function SelectModal() {
+interface Props {
+  onNext?: () => void;
+}
+
+function SelectModal({ onNext }: Props) {
   const {
     visible,
     selected,
@@ -17,155 +20,126 @@ function SelectModal() {
     comBussinessList,
     comBussinessLoading,
     setDisabled,
-    setLoading,
+    selectData,
+    setSelectData,
   } = useStore();
-  const [submitLoading, setSubmitLoading] = useState(false);
  
   const [delay, setDelay] = useState<boolean>(true);
-  const [selectData, setSelectData] = useState<TradeCompany.ComList[]>([]);
+
   const {
     list: compList,
     loading,
     paginationConfig,
     setParams,
     innerParams,
-  } = usePagination<TradeCompany.ComList>(getCompAccountApi, { recordState: RecordStateEnum["已备案"] }, { delay });
-
-  const fetchListByName = debounce((value) => {
-    setParams({ ...innerParams, keywords: value }, true);
-  }, 500);
-
-  function searchType(compTypes: number) {
-    setParams({ compTypes }, true);
-  }
+  } = usePagination<TradeCompany.ComList>(
+    getCompAccountApi,
+    {
+      compCategory: companyParams.compCategory,
+      excludeDealerId: companyParams.dealerId,
+      recordState: RecordStateEnum["已备案"],
+    },
+    { delay }
+  );
  
   useEffect(() => {
-    if (visible) {
+    if (companyParams.dealerId !== -1) {
       setDelay(false);
       setParams({ compCategory: companyParams.compCategory, excludeDealerId: companyParams.dealerId }, true);
-      // setSelectData(selected.map((row) => ({ id: row.compId, compName: row.compName })));
     }
-  }, [visible, companyParams, selected]);
-
-  function handSave() {
-    console.log("已选：", selectData);
+  }, [companyParams]);
  
-    const res = onSubmit(selectData);
-    console.log("res", res);
-
-    if (res) {
-      onCancel();
-    }
-
-    // setSelected(
-    //   selectData.map((item) => ({
-    //     compId: item.id,
-    //     compName: item.compName,
-    //     compShortName: item.compShortName,
-    //     compType: item.compType,
-    //   }))
-    // );
-  }
+  const fetchListByName = debounce((value) => {
+    setParams({ ...innerParams, keywords: value }, true);
+  }, 500);
  
-   function onSubmit(selectedData: any[]) {
-     if (!selectedData.length) {
-       return message.info("请先选择往来单位");
-     }
-     setSubmitLoading(true);
-     saveCompanyRelationApi({
-       dealerId: companyParams.dealerId,
-       compCategory: companyParams.compCategory,
-       compIdList: selectedData.map((item) => item.id!),
-     })
-       .then((res) => {
-         message.success("保存成功");
-         setLoading(true);
-         setSubmitLoading(false);
-         setDisabled(true);
-         onCancel();
-       })
-       .catch((e) => {
-         setSubmitLoading(false);
-         message.error(e.message);
-       });
-   }
-  function onCancel() {
-    setVisible(false);
-    setSelectData([]);
+  function searchType(compTypes: number) {
+    setParams({ compTypes }, true);
   }
  
   return (
-    <Modal
-      width={700}
-      visible={visible}
-      title="选择往来单位"
-      onCancel={onCancel}
-      onOk={handSave}
-      bodyStyle={{ maxHeight: 600, overflowY: "auto" }}
-    >
-      <Spin tip="保存中" spinning={submitLoading}>
-        <div style={{ display: "flex", flexDirection: "row", marginBottom: 20 }}>
-          <Input.Search
-            allowClear
-            placeholder="搜索单位名称/社会信用代码"
-            onChange={(e) => fetchListByName(e.target.value || undefined)}
-            style={{ width: 250, marginRight: 10 }}
-          />
-          <Select
-            placeholder="搜索业务类型"
-            showSearch
-            allowClear
-            optionFilterProp="children"
-            loading={comBussinessLoading}
-            onChange={searchType}
-            style={{ width: 200 }}
-          >
-            {comBussinessList.map((item) => (
-              <Select.Option key={item.id} value={item.id}>
-                {item.name}
-              </Select.Option>
-            ))}
-          </Select>
-        </div>
-
-        <Table
-          loading={loading}
-          dataSource={compList}
-          pagination={{ ...paginationConfig, showSizeChanger: false }}
-          rowKey="id"
-          rowSelection={{
-            type: "checkbox",
-            selectedRowKeys: selectData.map((row) => row.id as number),
-            onSelect: (row: any, _selected: boolean) => {
-              const index = selectData.findIndex((_row) => _row.id == row.id);
-              if (_selected) {
-                selectData.unshift(row);
-              } else if (index > -1) {
-                selectData.splice(index, 1);
-              }
-              setSelectData([...selectData]);
-            },
-            onSelectAll: (selected, selectedRows, changeRows) => {
-              const changedKeys = changeRows.map((row) => row.id);
-              let newData = [];
-              // 全选
-              if (selected) {
-                // 过滤掉已选的
-                newData = selectData.concat(changeRows.filter((row) => !selectData.some((item) => item == row.id)));
-              } else {
-                // 全不选 - 去掉已选的
-                newData = selectData.filter((row) => !changedKeys.find((y) => y === row.id));
-              }
-              setSelectData(newData);
-            },
-          }}
+    <>
+      <div style={{ display: "flex", flexDirection: "row", marginBottom: 20 }}>
+        <Input.Search
+          allowClear
+          placeholder="搜索单位名称/社会信用代码"
+          onChange={(e) => fetchListByName(e.target.value || undefined)}
+          style={{ width: 250, marginRight: 10 }}
+        />
+        <Select
+          placeholder="搜索业务类型"
+          showSearch
+          allowClear
+          optionFilterProp="children"
+          loading={comBussinessLoading}
+          onChange={searchType}
+          style={{ width: 200 }}
         >
-          <Column title="账户名称" dataIndex="compName" />
-          <Column title="业务类型" dataIndex="compTypeName" />
-          <Column title="社会信用代码" dataIndex="creditCode" width="15%" />
-        </Table>
-      </Spin>
-    </Modal>
+          {comBussinessList.map((item) => (
+            <Select.Option key={item.id} value={item.id}>
+              {item.name}
+            </Select.Option>
+          ))}
+        </Select>
+      </div>
+
+      <Table
+        loading={loading}
+        dataSource={compList}
+        pagination={{ ...paginationConfig, showSizeChanger: false }}
+        rowKey="id"
+        rowSelection={{
+          type: "checkbox",
+          selectedRowKeys: selectData.map((row) => row.id as number),
+          onSelect: (row: any, _selected: boolean) => {
+            const index = selectData.findIndex((_row) => _row.id == row.id);
+            if (_selected) {
+              selectData.unshift(row);
+            } else if (index > -1) {
+              selectData.splice(index, 1);
+            }
+            setSelectData([...selectData]);
+          },
+          onSelectAll: (selected, selectedRows, changeRows) => {
+            const changedKeys = changeRows.map((row) => row.id);
+            let newData = [];
+            // 全选
+            if (selected) {
+              // 过滤掉已选的
+              newData = selectData.concat(changeRows.filter((row) => !selectData.some((item) => item == row.id)));
+            } else {
+              // 全不选 - 去掉已选的
+              newData = selectData.filter((row) => !changedKeys.find((y) => y === row.id));
+            }
+            setSelectData(newData);
+          },
+        }}
+      >
+        <Column title="账户名称" dataIndex="compName" />
+        <Column title="业务类型" dataIndex="compTypeName" />
+        <Column title="社会信用代码" dataIndex="creditCode" width="15%" />
+      </Table>
+      <div style={{ width: "100%", textAlign: "center", marginTop: 30 }}>
+        <Button type="primary" style={{ marginBottom: 10 }} onClick={() => history.back()}>
+          返回列表
+        </Button>
+
+        {!!selectData.length && (
+          <>
+            <Divider type="vertical" />
+            <Button
+              type="primary"
+              style={{ marginBottom: 10 }}
+              onClick={() => {
+                onNext && onNext();
+              }}
+            >
+              下一步
+            </Button>
+          </>
+        )}
+      </div>
+    </>
   );
 }
  
+// 发票要求 1：支付前 2：支付后
+export const invoiceRequirements = [
+  {
+    label: "支付前",
+    value: 1,
+  },
+  {
+    label: "支付后",
+    value: 2,
+  },
+];
+
+export enum RequirementsTypeEnum {
+  "支付前" = 1,
+  "支付后",
+}
+
+// 往来单位支付方式
+export const payWay = [
+  { label: "即时支付", value: 1 },
+  { label: "周期支付", value: 2 },
+  { label: "员工垫付", value: 3 },
+];
+
+ export enum PayWayEnum {
+   "即时支付" = 1,
+   "周期支付",
+   "员工垫付",
+ }
+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";
+import store from "./useStore";
+import SelectCorrespondenceUnits from "./components/SelectCorrespondenceUnits";
+import RelationshipSettings from "./components/RelationshipSettings";
+import { CompanyRelationListVO } from "@/pages/finance/CompanyRelationAuth/api";
+
+const { Column } = Table;
+const { TabPane } = Tabs;
+
+export const { Provider, useStore } = createStore(store);
+
+function CompanyRelationCreate(props) {
+  const pathParams = props.location.state || {};
+  const { Step } = Steps;
+  const [current, setCurrent] = useState<number>(0);
+  const {
+    selected,
+    // loading,
+    selectedRelation,
+    setSelectedRelation,
+    submitLoading,
+    setSubmitLoading,
+    // setLoading,
+    companyParams,
+    setCompanyParams,
+  } = useStore();
+
+  useEffect(() => {
+    setCompanyParams({ ...pathParams });
+  }, []);
+
+  const rowSelection = {
+    onChange: (selectedRowKeys: React.Key[], selectedRows: CompanyRelationListVO[]) => {
+      setSelectedRelation([...selectedRows]);
+    },
+    getCheckboxProps: (record: CompanyRelationListVO) => ({
+      name: String(record.compId),
+    }),
+  };
+
+  return (
+    <PageHeaderWrapper title="往来单位关系设置">
+      <Card>
+        <Steps type="navigation" current={current} className="site-navigation-steps">
+          <Step title="选择往来单位" />
+          <Step title="关系设置" />
+        </Steps>
+        <Tabs
+          style={{ marginTop: 40 }}
+          activeKey={String(current)}
+          tabBarStyle={{ display: "hidden" }}
+          renderTabBar={() => <div />}
+        >
+          <TabPane key="0">
+            <SelectCorrespondenceUnits onNext={() => setCurrent(current + 1)} />
+          </TabPane>
+          <TabPane key="1">
+            <RelationshipSettings onPrevious={() => setCurrent(0)} />
+          </TabPane>
+        </Tabs>
+      </Card>
+    </PageHeaderWrapper>
+  );
+}
+
+export default (props) => (
+  <Provider>
+    <CompanyRelationCreate {...props} />
+  </Provider>
+);
+import { useState} from "react";
+import useInitial from "@/hooks/useInitail";
+import { CompanyRelationListVO } from "./api";
+import { getCompanyBusinessTypesApi } from "@/pages/finance/TradeCompany/api";
+
+export default function useStore() {
+  const [disabled, setDisabled] = useState<boolean>(true);
+  const [visible, setVisible] = useState(false);
+  const [submitLoading, setSubmitLoading] = useState(false);
+  const [selectData, setSelectData] = useState<TradeCompany.ComList[]>([]);
+  // 存储已选关系，用于批量删除
+  const [selectedRelation, setSelectedRelation] = useState<CompanyRelationListVO[]>([]);
+  // 存储新增时选择条件
+  const [companyParams, setCompanyParams] = useState({ dealerId: -1 });
+ 
+  // 往来单位业务类型列表
+  const { data: comBussinessList, loading: comBussinessLoading } = useInitial(getCompanyBusinessTypesApi, [], null);
+
+  const [selected, setSelected] = useState<CompanyRelationListVO[]>([]);
+
+  return {
+    selectData,
+    setSelectData,
+    visible,
+    setVisible,
+   
+    disabled,
+    setDisabled,
+    selected,
+    setSelected,
+    submitLoading,
+    setSubmitLoading,
+    comBussinessList,
+    comBussinessLoading,
+    selectedRelation,
+    setSelectedRelation,
+    companyParams,
+    setCompanyParams,
+  };
+}
@@ -14,7 +14,6 @@ export default function CreateModal() {
   const [form] = Form.useForm();
  
   const [saveLoading, setSaveLoading] = useState<boolean>(false);
-  console.log("current", current);
   useEffect(() => {
     if (visible) {
       form.setFieldsValue({
@@ -77,8 +76,6 @@ export default function CreateModal() {
   }
  
   function submit(fieldValue: any) {
-    // console.log("表单参数：", fieldValue);
-    // return;
     const param = {
       dealerId,
       ...fieldValue,
@@ -100,13 +97,11 @@ export default function CreateModal() {
       loan: !!fieldValue.loan,
     };
     setSaveLoading(true);
-
     savePlatformMobile(param)
       .then((res) => {
         message.success("保存成功");
         setVisible(false);
         setLoading(true);
-        // setSaveLoading(false);
       })
       .catch((err) => {
         message.error(err.message);
@@ -199,7 +194,6 @@ export default function CreateModal() {
             ))}
           </Select>
         </FormItem>
-
         <FormItem name="account" label="一般账户" rules={[{ required: true, message: "请选择一般账户" }]}>
           <Select labelInValue placeholder="请选择一般账户">
             {accountList.map((item) => (
@@ -275,6 +269,18 @@ export default function CreateModal() {
             formatter={(value) => `${value} %`}
           />
         </FormItem>
+        {/* 清票划扣账户类型：1 一般户；2 保证金户；3 一般户，保证金户(See: 清票划扣账户类型) */}
+        <FormItem
+          name="deductAccountType"
+          label="清票划扣账户"
+          rules={[{ required: true, message: "请选择清票划扣账户" }]}
+        >
+          <Radio.Group>
+            <Radio value={1}>一般户</Radio>
+            <Radio value={2}>保证金户</Radio>
+            <Radio value={3}>一般户，保证金户</Radio>
+          </Radio.Group>
+        </FormItem>
         <FormItem name="billLimitDates" label="票据期限" rules={[{ required: true, message: "请输入票据期限" }]}>
           <InputNumber style={{ width: "100%" }} placeholder="请输入票据期限" formatter={(value) => `${value} 个月`} />
         </FormItem>
@@ -285,14 +291,12 @@ export default function CreateModal() {
         >
           <InputNumber style={{ width: "100%" }} placeholder="请输入提前天数" formatter={(value) => `${value} 天`} />
         </FormItem>
-
         <FormItem name="toLoan" label="是否支持票转贷" rules={[{ required: true, message: "请选择是否支持票转贷" }]}>
           <Radio.Group>
             <Radio value={1}>是</Radio>
             <Radio value={0}>否</Radio>
           </Radio.Group>
         </FormItem>
-
         <FormItem noStyle shouldUpdate={(prevValues, currentValues) => prevValues.toLoan != currentValues.toLoan}>
           {({ getFieldValue }): any => {
             const category = getFieldValue("toLoan");
@@ -353,7 +357,6 @@ export default function CreateModal() {
             ) : null;
           }}
         </FormItem>
-
         <FormItem name="loan" label="是否支持贷款启票" rules={[{ required: true, message: "请选择是否支持贷款启票" }]}>
           <Radio.Group>
             <Radio value={1}>是</Radio>
+import React, { useEffect, useState } from "react";
+import { Modal, Form, Select, Input, Radio } from "antd";
+import PositionSelector from "@/components/PositionSelector";
+import ShopSelect from "@/components/ShopSelect";
+import * as API from "@/common/api";
+import useInitial from "@/hooks/useInitail";
+import { FormInstance } from "antd/es/form/Form";
+
+const FormItem = Form.Item;
+
+interface Props {
+
+  form: FormInstance;
+}
+
+function AdressSelect(props: Props) {
+  const {form } = props;
+  const [hiddern, setHidden] = useState(true); //控制地图选择
+  const [own, setOwn] = useState(1); //配置控制
+
+  const _onChange = (e: any) => {
+    form.setFieldsValue({
+      addrslng: undefined,
+      addrslat: undefined,
+    });
+    if (e.target.value === 1) {
+      setHidden(true);
+      setOwn(e.target.value);
+    } else {
+      setHidden(false);
+      setOwn(e.target.value);
+    }
+  };
+
+  const onAd = (e: any) => {
+    form.setFieldsValue({
+      addrslng: e.point.lng,
+      addrslat: e.point.lat,
+    });
+  };
+
+  return (
+    <>
+      <FormItem label="地理位置" rules={[{ required: true, message: "请配置地址" }]}>
+        <Radio.Group onChange={(e: any) => _onChange(e)} value={own}>
+          <Radio value={1}>地图配置</Radio>
+          <Radio value={2}>自定义配置</Radio>
+        </Radio.Group>
+      </FormItem>
+      {hiddern && (
+        <FormItem name="location" label="地址" rules={[{ required: true, message: "必填" }]}>
+          <PositionSelector style={{ width: "100%" }} onChange={(e: any) => onAd(e)} />
+        </FormItem>
+      )}
+      <div
+        style={{
+          display: "flex",
+          justifyContent: "space-between",
+          width: "80%",
+          marginLeft: "15%",
+        }}
+      >
+        <FormItem name="longitude" label="经度" style={{ width: "45%" }} rules={[{ required: true, message: "必填" }]}>
+          <Input style={{ width: "100%" }} disabled={own === 1} />
+        </FormItem>
+        <FormItem name="latitude" label="纬度" style={{ width: "45%" }} rules={[{ required: true, message: "必填" }]}>
+          <Input style={{ width: "100%" }} disabled={own === 1} />
+        </FormItem>
+      </div>
+    </>
+  );
+}
+
+export default AdressSelect;
@@ -6,6 +6,7 @@ import PositionSelector from &quot;@/components/PositionSelector&quot;;
 import Contact from "./ContactsInput";
 import Account from "./AccountsInput";
 import { createCompanyApi, updateCompanyApi, getDetailComAccountApi } from "../api";
+import AdressSelect from "@/pages/finance/TradeCompany/components/AdressSelect";
  
 const FormItem = Form.Item;
 const { Option } = Select;
@@ -31,6 +32,7 @@ export default function CreateModal() {
         item = data;
       }
       form.setFieldsValue({
+        ...item,
         compName: item.compName,
         compShortName: item.compShortName,
         subjectType: item.subjectType,
@@ -41,7 +43,9 @@ export default function CreateModal() {
         brandId: item.brandId,
         location: item.compAddress
           ? {
-              address: "",
+              // address: "",
+              //@ts-ignored;
+              address: item.lonLatAddress||"",
               point: {
                 lng: item.longitude,
                 lat: item.latitude,
@@ -61,8 +65,9 @@ export default function CreateModal() {
     const param = {
       id: current.id,
       ...item,
-      longitude: (item.location?.point || {}).lng,
-      latitude: (item.location?.point || {}).lat,
+      longitude: Number(item.longitude),
+      latitude: Number(item.latitude),
+      lonLatAddress: item.location? item.location.address : "",
     };
     setSavelLoading(true);
     const saveApi = current.id ? updateCompanyApi : createCompanyApi;
@@ -104,7 +109,7 @@ export default function CreateModal() {
       }}
       width="60%"
     >
-      <Form form={form} onFinish={submit} labelCol={{ span: 6 }} wrapperCol={{ span: 15 }}>
+      <Form form={form} onFinish={submit} labelCol={{ span: 4 }} wrapperCol={{ span: 18 }}>
         <FormItem name="compName" label="往来单位名称" rules={[{ required: true, message: "请填入往来单位名称" }]}>
           <Input placeholder="请填入往来单位名称" maxLength={64} />
         </FormItem>
@@ -151,16 +156,16 @@ export default function CreateModal() {
             const _compType = getFieldValue("compType");
             return _compType?.includes(CompanyBusinessTypeEnum["新车采购（主机厂）"]) ||
               _compType?.includes(CompanyBusinessTypeEnum["配件采购"]) ? (
-                <FormItem name="brandId" label="品牌" rules={[{ required: true, message: "请选择品牌" }]}>
-                  <Select placeholder="请选择品牌" showSearch optionFilterProp="children">
-                    {brandList?.map((item) => (
-                      <Option key={item.id} value={item.id}>
-                        {item.name}
-                      </Option>
-                    ))}
-                  </Select>
-                </FormItem>
-              ) : null;
+              <FormItem name="brandId" label="品牌" rules={[{ required: true, message: "请选择品牌" }]}>
+                <Select placeholder="请选择品牌" showSearch optionFilterProp="children">
+                  {brandList?.map((item) => (
+                    <Option key={item.id} value={item.id}>
+                      {item.name}
+                    </Option>
+                  ))}
+                </Select>
+              </FormItem>
+            ) : null;
           }}
         </FormItem>
         <FormItem
@@ -173,13 +178,14 @@ export default function CreateModal() {
         <FormItem name="compAddress" label="通信地址" rules={[{ required: true, message: "请输入地址" }]}>
           <Input placeholder="请输入通信地址" />
         </FormItem>
-        <FormItem name="location" label="地理位置">
-          <PositionSelector style={{ width: "100%" }} />
-        </FormItem>
+        {/* <FormItem name="location" label="地理位置" rules={[{ required: true, message: "请配置地址" }]}> */}
+        {/* <PositionSelector style={{ width: "100%" }} /> */}
+        <AdressSelect form={form} />
+        {/* </FormItem> */}
         <FormItem name="contacts" label="联系方式" rules={[{ required: true }]}>
           <Contact />
         </FormItem>
-        <FormItem name="accounts" label="账户信息" rules={[{ required: true }]}>
+        <FormItem name="accounts" label="账户信息" c rules={[{ required: true }]}>
           <Account />
         </FormItem>
       </Form>
 /*
  * @Date: 2021-08-10 10:05:18
  * @LastEditors: wangqiang@feewee.cn
- * @LastEditTime: 2022-11-02 16:18:14
+ * @LastEditTime: 2022-12-09 14:21:58
  */
  
 import useInitial from "@/hooks/useInitail";
@@ -9,40 +9,6 @@ import usePagination from &quot;@/hooks/usePagination&quot;;
 import { useMemo, useState } from "react";
 import * as api from "./api";
  
-export default function useStore() {
-  const [listType, setListType] = useState<"列表" | "草稿">("列表");
-  const listPagination = usePagination(api.getPublicListApi);
-  const draftPagination = usePagination(api.getDraftListApi);
-  const { data: TypeList } = useInitial(api.getFileTypeListApi, [], null);
-  const { data: Way } = useInitial(api.getPublicWayListApi, [], null);
-  const [visible, setVisible] = useState(false);
-  const [current, setCurrent] = useState<PublicNotice.ListVO>();
-  const [isView, setIsView] = useState(false); // 是否查看
-  const [isChangeDetail, setIsChangeDetial] = useState(false); // 是否查看变更记录
-  const [fileChangeId, setFileChangeId] = useState<number>(); // 变更记录ID，用于查询变更记录详情使用
-  const [rangeDetailVisible, setRangeDetailVisible] = useState(false); // 是否打开执行范围详情
-  const [isChange, setIsChange] = useState(false); // 是否变更执行文件
-  const [approvalProgressModalInfo, setApprovalProgressModalInfo] =
-    useState<PublicNotice.ApprovalProgressModalInfo>({ visible: false });
-  const [fidModal, setFidModal] = useState<{
-    visible: boolean;
-    title?: string;
-    fidList?: string[];
-  }>({ visible: false });
-
-  const [fileProgressModal, setFileProgressModal] = useState<{
-    visible: boolean;
-    id?: number; // 执行文件ID
-    title?: string; // 执行文件名
-    loading?: boolean;
-    data?: CommonProgress.Item[];
-  }>({ visible: false });
-
-  const pagination = useMemo(
-    () => (listType === "列表" ? listPagination : draftPagination),
-    [listType, listPagination, draftPagination]
-  );
-
   enum RangeType {
     "全集团" = 1,
     "部分人员",
@@ -114,6 +80,40 @@ export default function useStore() {
     "#F4333C",
   }
  
+export default function useStore() {
+  const [listType, setListType] = useState<"列表" | "草稿">("列表");
+  const listPagination = usePagination(api.getPublicListApi, { fileStatus: FileStatus.执行中 });
+  const draftPagination = usePagination(api.getDraftListApi);
+  const { data: TypeList } = useInitial(api.getFileTypeListApi, [], null);
+  const { data: Way } = useInitial(api.getPublicWayListApi, [], null);
+  const [visible, setVisible] = useState(false);
+  const [current, setCurrent] = useState<PublicNotice.ListVO>();
+  const [isView, setIsView] = useState(false); // 是否查看
+  const [isChangeDetail, setIsChangeDetial] = useState(false); // 是否查看变更记录
+  const [fileChangeId, setFileChangeId] = useState<number>(); // 变更记录ID，用于查询变更记录详情使用
+  const [rangeDetailVisible, setRangeDetailVisible] = useState(false); // 是否打开执行范围详情
+  const [isChange, setIsChange] = useState(false); // 是否变更执行文件
+  const [approvalProgressModalInfo, setApprovalProgressModalInfo] =
+    useState<PublicNotice.ApprovalProgressModalInfo>({ visible: false });
+  const [fidModal, setFidModal] = useState<{
+    visible: boolean;
+    title?: string;
+    fidList?: string[];
+  }>({ visible: false });
+
+  const [fileProgressModal, setFileProgressModal] = useState<{
+    visible: boolean;
+    id?: number; // 执行文件ID
+    title?: string; // 执行文件名
+    loading?: boolean;
+    data?: CommonProgress.Item[];
+  }>({ visible: false });
+
+  const pagination = useMemo(
+    () => (listType === "列表" ? listPagination : draftPagination),
+    [listType, listPagination, draftPagination]
+  );
+
   const gotoDraftList = (item: PublicNotice.ListVO) => {
     draftPagination.setParams({ fileId: item.id, fileName: item.title });
     setTimeout(() => {
@@ -8,7 +8,7 @@ interface Props {
 }
 export default function Index({length}: Props) {
   const { bntLoading, getStep2, current, setCurrent, getSummary, submit, summarySupplier, brandId, parts } = useStore();
-  const flag = _.flattenDeep(summarySupplier.map(it => it.parts || [])).length == parts.length;
+  // const flag = _.flattenDeep(summarySupplier.map(it => it.parts || [])).length == parts.length;
   const next = _.throttle(() => {
     if (current == 1) {
       getStep2();
@@ -40,7 +40,7 @@ export default function Index({length}: Props) {
       {current == length && (
         <Button
           type="primary"
-          disabled={!brandId || summarySupplier.length == 0 || !flag}
+          disabled={!brandId || summarySupplier.length == 0 }
           loading={bntLoading}
           onClick={onSubmit}
         >
@@ -2,18 +2,27 @@ import React, { useState } from &#39;react&#39;;
 import { InboxOutlined } from '@ant-design/icons';
 import { Button, Modal, Upload, message, Switch } from 'antd';
 import { useStore } from "@/pages/pms/storage/partShop";
+import {importStockFix, shopImport} from './api';
+import _ from 'lodash';
+import type { UploadFile, UploadProps } from 'antd/es/upload/interface';
  
 interface Props{
   stock?:boolean
 }
+const apiObj: {[key: number]: any} = {
+  1: importStockFix,
+  2: shopImport
+};
 const Dragger = Upload.Dragger;
 export default function UploadExcel(props: Props) {
   const { importVisible, setImportVisible, override, setOverride } = useStore();
-  const [fileList, setFileList] = useState<any[]>([]);
+  const [fileList, setFileList] = useState<UploadFile[]>([]);
   const [uploadResult, setUploadResult] = useState<any>();
+  const [confirmLoading, setConfirmLoading] = useState(false);
   const {stock} = props;
  
   function beforeUpload(file: any) {
+    setFileList([...fileList, file]);
     if (override == null) {
       message.error('请选择是否覆盖数据');
       return false;
@@ -23,37 +32,36 @@ export default function UploadExcel(props: Props) {
       message.error('文件不能超过20MB!');
       return false;
     }
-    return isLt2M;
+    return false;
   }
  
-  function handleChange(info: any) {
-    const { file: { status, response }, fileList } = info;
-    if (status !== 'uploading' && response) {
-      const { success, result, data } = response;
-      if (status === 'done' && success) {
-        message.success(`${info.file.name} 上传成功`);
-        // 调用上传接口
-        setUploadResult(data);
-      } else if (response && !success) {
-        message.error(`${info.file.name} 上传失败: ${result}`);
-      }
-    }
-    setFileList(fileList.splice(-1));
-  }
-  function handleChangeStock(info: any) {
-    const { file: { status, response }, fileList } = info;
-    if (status !== 'uploading' && response) {
-      const { success, result, data } = response;
-      if (status === 'done' && success) {
-        message.success(`${info.file.name} 上传成功`);
-        // 调用上传接口
-        setUploadResult(data);
-      } else if (response && !success) {
-        message.error(`${info.file.name} 上传失败: ${result}`);
-      }
+  function submit() {
+    if (override == null) {
+      message.error('请选择是否覆盖数据');
+      return;
     }
-    setFileList(fileList.splice(-1));
+    setConfirmLoading(true);
+    const type = stock ? 1 : 2;
+    apiObj[type]({file: fileList[0], override}).then((res) => {
+      setConfirmLoading(false);
+      setUploadResult(res.data)
+      message.success('导入成功');
+    }).catch((e: any) => {
+      setConfirmLoading(false);
+      message.error(e.message);
+    });
   }
+  const uploadProps: UploadProps = {
+    onRemove: (file) => {
+      const index = fileList.indexOf(file);
+      const newFileList = fileList.slice();
+      newFileList.splice(index, 1);
+      setFileList(newFileList);
+    },
+    beforeUpload,
+    fileList,
+  };
+
   return (
     <Modal
       visible={importVisible}
@@ -62,13 +70,16 @@ export default function UploadExcel(props: Props) {
       onCancel={() => { setImportVisible(false); setUploadResult(null); }}
       footer={
         <div>
-          <Button onClick={() => {
-            setImportVisible(false);
-            setUploadResult(null);
-          }}
+          <Button
+            loading={confirmLoading}
+            onClick={() => {
+              setImportVisible(false);
+              setUploadResult(null);
+            }}
           >
             取消
           </Button>
+          <Button type="primary" onClick={_.throttle(submit, 3000)} disabled={!fileList.length} loading={confirmLoading}>确定</Button>
         </div>
       }
     >
@@ -79,36 +90,14 @@ export default function UploadExcel(props: Props) {
             <Switch defaultChecked={override} onChange={(checked) => setOverride(checked)} />
           </div>
           {stock ? (
-            <Dragger
-              accept=".xlsx"
-              action="api/pms/erp/part/shop/import/stock/fix"
-              data={{
-              override,
-            }}
-              fileList={fileList}
-              onChange={handleChangeStock}
-              beforeUpload={beforeUpload}
-              showUploadList={false}
-              multiple
-            >
+            <Dragger {...uploadProps}>
               <p className="ant-upload-drag-icon">
                 <InboxOutlined />
               </p>
               <p className="ant-upload-text">将文件拖到此处上传</p>
             </Dragger>
           ) : (
-            <Dragger
-              accept=".xlsx"
-              action="api/pms/erp/part/shop/import"
-              data={{
-              override,
-            }}
-              fileList={fileList}
-              onChange={handleChange}
-              beforeUpload={beforeUpload}
-              showUploadList={false}
-              multiple
-            >
+            <Dragger {...uploadProps}>
               <p className="ant-upload-drag-icon">
                 <InboxOutlined />
               </p>
 import request from '@/utils/request';
 import { PMS_HOST } from '@/utils/host';
+import {http} from "@/typing/http";
  
 export function getList(params?: number) {
   return request.get(`${PMS_HOST}/erp/part/shop/get/stock/cnt`, {params: {storageId: params}});
 }
+
+// 导入
+export function importStockFix(params: {override: boolean, file: any}): http.PromiseResp<string> {
+  return request.post(`${PMS_HOST}/erp/part/shop/import/stock/fix`, params, { contentType: "form-data" });
+}
+
+// 导入
+export function shopImport(params: {override: boolean, file: any}): http.PromiseResp<string> {
+  return request.post(`${PMS_HOST}/erp/part/shop/import`, params, { contentType: "form-data" });
+}
@@ -277,6 +277,7 @@ export default function CreateModal(props: Props) {
         rebateId: Number(rebateId),
         orderIds,
         subsidyType: currentItem.subsidyType,
+        promotionId: currentItem.promotionId
       });
       message.success(result || "操作成功");
     } catch (error: any) {