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

曾柯
2 parents 18220776 49e9d82b
Showing 34 changed files with 1885 additions and 171 deletions
config/config.ts
config/routers/finance.ts
src/pages/approval/ApprovalSetting/api.ts
src/pages/approval/ApprovalSetting/subpages/components/Selectors/ContractTypeSelector.tsx
src/pages/attendance/Attend/subpages/SpecialFestivals/components/SaveModal.tsx
src/pages/capital/Maintenance/StockQuery/components/Inventory.tsx
src/pages/capital/Maintenance/StockQuery/index.tsx
src/pages/capital/ReceiveRules/subPages/GoodsDimension/components/PageAuthEdit/index.tsx
src/pages/contract/BearCostSetting/components/SaveModal/index.tsx
src/pages/contract/BearCostSetting/components/ShareRateItemlist/index.tsx
src/pages/finance/ViewCompanyRelationAuth/api.ts
src/pages/finance/ViewCompanyRelationAuth/components/Filter.tsx
src/pages/finance/ViewCompanyRelationAuth/index.tsx
src/pages/finance/ViewCompanyRelationAuth/useStore.ts
src/pages/finance/ViewTradeCompany/api.ts
src/pages/finance/ViewTradeCompany/components/AccountsInput/CreateModal.tsx
src/pages/finance/ViewTradeCompany/components/AccountsInput/index.tsx
src/pages/finance/ViewTradeCompany/components/AdressSelect.tsx
src/pages/finance/ViewTradeCompany/components/CancelModal.tsx
src/pages/finance/ViewTradeCompany/components/ContactsInput/CreateModal.tsx
@@ -38,6 +38,16 @@ export default defineConfig({
   manifest: {
     basePath: '/',
   },
+  headScripts:
+    (REACT_APP_ENV || 'dev') === 'prod' && process.env.NODE_ENV == 'production'
+      ? [
+          `(function(c,l,a,r,i,t,y){
+    c[a]=c[a]||function(){(c[a].q=c[a].q||[]).push(arguments)};
+    t=l.createElement(r);t.async=1;t.src="https://www.clarity.ms/tag/"+i;
+    y=l.getElementsByTagName(r)[0];y.parentNode.insertBefore(t,y);
+    })(window, document, "clarity", "script", "lc90bxidj2");`,
+        ]
+      : [],
   base: '/',
   hash: process.env.NODE_ENV != 'development',
   history: {
@@ -23,6 +23,20 @@ export default [
     path: '/finance2/companyRelationAuth', //往来单位关系设置
     component: 'finance/CompanyRelationAuth',
   },
+  /**
+   * 往来单位设置，往来单位关系设置增加只读菜单
+   */
+  {
+    path: '/finance2/ViewTradeCompany', // 查询往来单位设置
+    component: 'finance/ViewTradeCompany',
+  },
+  {
+    path: '/finance2/ViewCompanyRelationAuth', //查询往来单位关系设置
+    component: 'finance/ViewCompanyRelationAuth',
+  },
+
+
+
   {
     path: '/finance2/companyRelationAuth/create', //往来单位关系设置==》新增
     component: 'finance/CompanyRelationCreate',
 import request from '@/utils/request';
 import type { http } from '@/typing/http';
 import { Approval_HOST, OA_HOST, OFFICE } from '@/utils/host';
+import type { Pagination } from '@/typing/common';
  
 /**
  * 审批配置分页列表
@@ -69,6 +70,6 @@ export function getOfficeWordTypes(): http.PromiseResp&lt;CommonApi.ShopRpTypeVO[]&gt;
 /**
  * 查询所有合同类型列表
  */
-export function getContractTypes(): http.PromisePageResp<CommonApi.ShopRpTypeVO> {
-  return request.get(`${OA_HOST}/contract/erp/contract/type/page`);
+export function getContractTypes(params: Pagination): http.PromisePageResp<CommonApi.ShopRpTypeVO> {
+  return request.get(`${OA_HOST}/contract/erp/contract/type/page`, { params });
 }
@@ -22,7 +22,7 @@ export const ContractTypeSelector = ({ visible, index, item, readOnly, onChange 
   useEffect(() => {
     if (visible) {
       setDelay(false);
-      setParams({ pageSize: 1000, canEditName: true }, true);
+      setParams({ pageSize: 1000 }, true);
     }
   }, [visible]);
  
 import React, { useState, useEffect, useRef } from 'react';
 import { Button, message, Modal, Select, Form, Input, DatePicker, Radio } from 'antd';
+import type { RadioChangeEvent } from 'antd';
 import { saveApi, getNationality, fetchPostList } from '../api';
 import useInitail from '@/hooks/useInitail';
 import { TimeTypeData, StaffRangeData, SexRangeData, TimeTypeEnum } from '@/pages/attendance/entity';
@@ -44,6 +45,7 @@ export default function SaveModal(props: Props) {
     if (visible) {
       form.setFieldsValue({
         ...item,
+        type: 1,
       });
     } else {
       form.resetFields();
@@ -84,7 +86,6 @@ export default function SaveModal(props: Props) {
       setParams({ pageSize: page.current }, true);
     }
   };
-
   return (
     <Modal
       title={`${item.id ? '编辑' : '新增'}特殊节日`}
@@ -111,53 +112,78 @@ export default function SaveModal(props: Props) {
         <Item name="type" label="特殊日类型" rules={[{ required: true, message: '请选择特殊日类型' }]}>
           <Radio.Group>
             {/* <Radio value={20}>上班日</Radio> */}
-            <Radio value={60}>休息日</Radio>
+            <Radio value={1} key={1}>休息日</Radio>
+            <Radio value={2} key={2}>固定日任选半天</Radio>
+            <Radio value={3} key={3}>月中任选半天</Radio>
           </Radio.Group>
         </Item>
-        <div style={{ display: 'flex', flexDirection: 'row', justifyContent: 'flex-end', paddingRight: 92 }}>
-          <Item label="开始时间" name="startTime" required rules={[{ required: true, message: '请选择' }]}>
-            <DatePicker
-              format={format}
-              style={{ width: 197 }}
-              placeholder="请选择"
-              onChange={(value) => setStartTime((value && moment(moment(value).format(format))) || null)}
-              disabledDate={(current) => !!current && current < moment().add(1, 'day').startOf('day')}
-            />
-          </Item>
-          <Item name="startTimeType" required rules={[{ required: true, message: '请选择' }]}>
-            <Select placeholder="请选择" style={{ width: 145, marginLeft: 5 }} onChange={(value: number) => setStartTimeType(value)}>
-              {TimeTypeData.map((i) => (
-                <Option value={i.value || 0} key={i.value || 0}>
-                  {i.label || '--'}
-                </Option>
-              ))}
-            </Select>
-          </Item>
-        </div>
-        <div style={{ display: 'flex', flexDirection: 'row', justifyContent: 'flex-end', paddingRight: 92 }}>
-          <Item label="结束时间" name="endTime" required rules={[{ required: true, message: '请选择' }]}>
-            <DatePicker
-              format={format}
-              style={{ width: 197 }}
-              onChange={(value) => setEndTime((value && moment(moment(value).format(format))) || null)}
-              disabledDate={(current) => !!current && current < (startTime || moment().add(1, 'day').startOf('day'))}
-              placeholder="请选择"
-            />
-          </Item>
-          <Item name="endTimeType" required rules={[{ required: true, message: '请选择' }]}>
-            <Select placeholder="请选择" style={{ width: 145, marginLeft: 5 }}>
-              {TimeTypeData.filter((i) =>
-                startTime && endTime && startTime.valueOf() == endTime.valueOf() && startTimeType == TimeTypeEnum.AFTERNOON
-                  ? i.value != TimeTypeEnum.MORNING
-                  : true,
-              ).map((i) => (
-                <Option value={i.value || 0} key={i.value || 0}>
-                  {i.label || '--'}
-                </Option>
-              ))}
-            </Select>
-          </Item>
-        </div>
+        <Item
+          noStyle
+          shouldUpdate={(prew, cur) => prew.type !== cur.type}>
+          {({ getFieldValue }) => {
+            const type = getFieldValue('type');
+            return (
+              <>
+                <div style={{ display: 'flex', flexDirection: 'row', justifyContent: 'flex-start', paddingRight: 92 }}>
+                  <Item label={[1].includes(type) ? "开始时间" : "时间"} name="startTime" required rules={[{ required: true, message: '请选择' }]}>
+                    <DatePicker
+                      picker={[1, 2].includes(type) ? "date" : "month"}
+                      format={[1, 2].includes(type) ? format : "YYYY-MM"}
+                      style={{ width: 197 }}
+                      placeholder="请选择"
+                      onChange={(value) => setStartTime((value && moment(moment(value).format(format))) || null)}
+                      disabledDate={(current) => !!current && current < moment().add(1, 'day').startOf('day')}
+                    />
+                  </Item>
+                  {
+                    [1].includes(type) &&
+                    <Item name="startTimeType" required rules={[{ required: true, message: '请选择' }]}>
+                      <Select placeholder="请选择" style={{ width: 145, marginLeft: 5 }} onChange={(value: number) => setStartTimeType(value)}>
+                        {TimeTypeData.map((i) => (
+                          <Option value={i.value || 0} key={i.value || 0}>
+                            {i.label || '--'}
+                          </Option>
+                        ))}
+                      </Select>
+                    </Item>
+                  }
+                </div>
+                {
+                  [1].includes(type) &&
+                  <div style={{ display: 'flex', flexDirection: 'row', justifyContent: 'flex-start', paddingRight: 92 }}>
+                    <Item label="结束时间" name="endTime" required rules={[{ required: true, message: '请选择' }]}>
+                      <DatePicker
+                        format={format}
+                        style={{ width: 197 }}
+                        onChange={(value) => setEndTime((value && moment(moment(value).format(format))) || null)}
+                        disabledDate={(current) => !!current && current < (startTime || moment().add(1, 'day').startOf('day'))}
+                        placeholder="请选择"
+                      />
+                    </Item>
+                    <Item name="endTimeType" required rules={[{ required: true, message: '请选择' }]}>
+                      <Select placeholder="请选择" style={{ width: 145, marginLeft: 5 }}>
+                        {TimeTypeData.filter((i) =>
+                          startTime && endTime && startTime.valueOf() == endTime.valueOf() && startTimeType == TimeTypeEnum.AFTERNOON
+                            ? i.value != TimeTypeEnum.MORNING
+                            : true,
+                        ).map((i) => (
+                          <Option value={i.value || 0} key={i.value || 0}>
+                            {i.label || '--'}
+                          </Option>
+                        ))}
+                      </Select>
+                    </Item>
+                  </div>
+                }
+              </>
+
+
+            );
+          }}
+        </Item>
+
+
+
         <Item {...formItemLayout} label="员工范围" name="staffRange" required rules={[{ required: true, message: '请选择' }]}>
           <Select
             placeholder="请选择"
@@ -26,6 +26,7 @@ export default function SpecConfig({ standardId }: Props) {
         <Column title="资产归属门店" dataIndex="assetShopName" />
         <Column title="使用门店" dataIndex="useShopName" />
         <Column title="是否代管" dataIndex="agent" render={(t) => (t ? '是' : '否')} />
+        <Column title="单价(元)" dataIndex="unitPrice" />
         <Column title="库存数量" dataIndex="storageNum" render={(t, record: api.ListItems) => `${t || 0}${record.unit}`} />
         <Column title="管理员工" dataIndex="staffName" />
         <Column title="入库时间" dataIndex="storageTime" render={(t) => (t && moment(t).format('YYYY-MM-DD HH:mm')) || '--'} />
@@ -38,6 +38,7 @@ export default function SpecConfig() {
               render={(text, record) => <RenderGoodsSpec specList={text && JSON.parse(text)} />}
             />
             <Column title="物品类型" dataIndex="type" render={(value) => <span>{AssetTypeEnum[value]}</span>} />
+            <Column title="单价(元)" dataIndex="unitPrice" />
             <Column title="库存数量" dataIndex="num" render={(t, record: api.ListItems) => `${t || 0}${record.unit}`} />
             <Column
               title="详情"
@@ -187,6 +187,7 @@ export default function SpecConfig(props: Props) {
           <Column title="门店" dataIndex="shopName" />
           <Column title="岗位" dataIndex="postName" />
           <Column title="型号规格" dataIndex="specList" render={(text, record) => <RenderGoodsSpec specList={text} />} />
+          <Column title="单价(元)" dataIndex="unitPrice" />
           <Column
             title="最大免费领用数量"
             dataIndex="maxNum"
@@ -56,7 +56,7 @@ const SaveModal = ({ item, visible, onCancel, onRefresh }: Props) =&gt; {
         shareRateItemList,
         ...rest
       } = item;
-      const newShares = shareRateItemList?.map((item) => ({ ...item, shareRate: item.shareRate * 100 }));
+      const newShares = shareRateItemList?.map((item) => ({ ...item, key: item.id, shareRate: Number((item.shareRate * 100).toFixed(2)) }));
       const initialData = {
         ...rest,
         id,
@@ -19,7 +19,7 @@ const ShareRateItemlist = ({ onChange, value = [] }: Props) =&gt; {
   ];
   const [form] = Form.useForm();
   const [data, setData] = useState<BearCostSetting.Data>({});
-  const [item, setItem] = useState<BearCostSetting.Item>({});
+  const [title, setTitle] = useState('');
   const [compsList, setCompsList] = useState<BearCostSetting.Comp[]>([] as BearCostSetting.Comp[]);
   const [shoplist, setShoplist] = useState<BearCostSetting.Shop[]>([]);
   const [visible, setVisible] = useState(false);
@@ -112,6 +112,7 @@ const ShareRateItemlist = ({ onChange, value = [] }: Props) =&gt; {
           type="primary"
           icon={<PlusOutlined />}
           onClick={() => {
+            setTitle('新增分摊比例');
             setVisible(true);
           }}
         >
@@ -129,7 +130,7 @@ const ShareRateItemlist = ({ onChange, value = [] }: Props) =&gt; {
             <span>
               <a
                 onClick={() => {
-                  console.log('index', index);
+                  setTitle('编辑分摊比例');
                   edit(row);
                   setVisible(true);
                 }}
@@ -152,7 +153,7 @@ const ShareRateItemlist = ({ onChange, value = [] }: Props) =&gt; {
         />
       </Table>
  
-      <Modal title="新增分摊比例" visible={visible} onCancel={closeModal} onOk={form.submit}>
+      <Modal title={title} open={visible} onCancel={closeModal} onOk={form.submit}>
         <Form form={form} labelCol={{ span: '4' }} onFinish={handleItemSave}>
           <Form.Item label="对象类型:" name="type" rules={[{ required: true, message: '请选择缴费方式' }]}>
             <Select
+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);
+}
+
+interface UpdataParams{
+id?: number;
+compId?: number;//往来单位id
+dealerId?: number;//商家id
+compCategory?: number;//单位类别(See: 往来单位类别)
+beforeReimburse?: boolean;//是否报销前提供发票
+billAmountRatio?: number;//发票要求金额比例
+settleMethods?: string;//支持结算方式，多个英文逗号分隔
+accountCheckPeriod?: number;//对账周期，每月多少号
+}
+/**
+ * 修改往来单位关系
+ * /trade/company/relation/update
+ */
+export function updateCompanyRelationApi(params: UpdataParams): PrRes<void> {
+  return request.post(`${FINANCE2_HOST}/trade/company/relation/update`, params);
+}
+/*
+ * @Author: zhaofeng 1272190090@qq.com
+ * @Date: 2024-02-19 15:52:37
+ * @LastEditors: zhaofeng 1272190090@qq.com
+ * @LastEditTime: 2024-02-29 15:34:38
+ * @FilePath: \fw-cms\src\pages\finance\CompanyRelationAuth\components\Filter.tsx
+ * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
+ */
+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({ pathname: '/finance2/companyRelationAuth/create', state: companyParams });
+  }
+  /**
+   * @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: any) {
+      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={4}> */}
+          <Select
+            placeholder="请选择商家"
+            showSearch
+            loading={dealerLoading}
+            // disabled={!disabled}
+            optionFilterProp="children"
+            onChange={searchDealer}
+            value={companyParams.dealerId}
+            style={{ width: 250 }}
+          >
+            {dealerList.map((dealer) => (
+              <Option value={dealer.id} key={dealer.id}>
+                {dealer.name}
+              </Option>
+            ))}
+          </Select>
+        {/* </Col> */}
+        {/* <Col span={4}> */}
+          <Search
+            allowClear
+            // disabled={!disabled}
+            placeholder="搜索单位名称"
+            onChange={(e) => fetchListByName(e.target.value || undefined)}
+            style={{ width: 200,marginLeft: 10  }}
+          />
+          <Select
+            placeholder="选择单位类别"
+            // disabled={!disabled}
+            optionFilterProp="children"
+            showSearch
+            onChange={searchType}
+            value={companyParams.compCategory}
+            style={{ width: 160, marginLeft: 10 }}
+          >
+            {[1, 2, 3].map((i) => (
+              <Option value={i} key={i}>
+                {CompanyCategoryTypeEnum[i]}
+              </Option>
+            ))}
+          </Select>
+          <Select
+            placeholder="选择往来单位业务类型"
+            showSearch
+            optionFilterProp="children"
+            // disabled={!disabled}
+            allowClear
+            onChange={searchCompanyType}
+            style={{ width: 190,marginLeft: 10}}
+          >
+            {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>
+  );
+}
+/*
+ * @Author: zhaofeng 1272190090@qq.com
+ * @Date: 2023-05-26 00:02:50
+ * @LastEditors: zhaofeng 1272190090@qq.com
+ * @LastEditTime: 2024-03-06 15:06:04
+ * @FilePath: \fw-cms\src\pages\finance\CompanyRelationAuth\index.tsx
+ * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
+ */
+import React, { useState } from "react";
+import { Button, Card, Table } from "antd";
+import { PageHeaderWrapper } from "@ant-design/pro-layout";
+import { createStore } from "@/hooks/moz";
+import store from "./useStore";
+import Filter from "./components/Filter";
+import { CompanyRelationListVO } from "@/pages/finance/CompanyRelationAuth/api";
+import { history } from "umi";
+
+const { Column } = Table;
+
+export const { Provider, useStore } = createStore(store);
+
+function CompanyRelationAuth() {
+  const { selected, loading, setSelectedRelation, companyParams } = useStore();
+  const rowSelection = {
+    onChange: (selectedRowKeys: React.Key[], selectedRows: CompanyRelationListVO[]) => {
+      console.log(`selectedRowKeys: ${selectedRowKeys}`, "selectedRows: ", selectedRows);
+      setSelectedRelation([...selectedRows]);
+    },
+    getCheckboxProps: (record: CompanyRelationListVO) => ({
+      name: String(record.compId),
+    }),
+  };
+
+  // 编辑
+
+  // function onEdit(record: CompanyRelationListVO) {
+  //   history.push({ pathname: "/finance2/companyRelationAuth/edit", state: { ...companyParams, current: record } });
+  // }
+  return (
+    <PageHeaderWrapper title="查询往来单位关系设置">
+      <Card>
+        <Filter />
+        <Table
+          rowKey="compId"
+          dataSource={selected}
+          pagination={{ pageSize: 10, total: selected.length }}
+          loading={loading}
+          // rowSelection={{
+          //   type: "checkbox",
+          //   ...rowSelection,
+          // }}
+        >
+          <Column title="单位名称" dataIndex="compName" />
+          <Column title="简称" dataIndex="compShortName" />
+          <Column title="往来单位业务类型" dataIndex="compTypeName" />
+          <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}日` : "--")} />
+          {/* <Column
+            title="操作"
+            align="center"
+            render={(text, record: TradeCompany.ComList) => (
+              <>
+                <Button type="link" onClick={() => onEdit(record)}>
+                  编辑
+                </Button>
+              </>
+            )}
+          /> */}
+        </Table>
+      </Card>
+    </PageHeaderWrapper>
+  );
+}
+
+export default () => (
+  <Provider>
+    <CompanyRelationAuth />
+  </Provider>
+);
+import { useState, useEffect } from "react";
+import useInitial from "@/hooks/useInitail";
+import { getDealerApi } from "@/common/api";
+import { getCompanyByDealerApi, CompanyRelationParams, CompanyRelationListVO, saveCompanyRelationApi } from "./api";
+import { CompanyCategoryTypeEnum } from "@/pages/finance/entitys";
+import { message } from "antd";
+import { getCompanyBusinessTypesApi } from "@/pages/finance/TradeCompany/api";
+
+export default function useStore() {
+  const [delay, setDelay] = useState<boolean>(true);
+  // const [disabled, setDisabled] = useState<boolean>(true);
+  const [visible, setVisible] = useState(false);
+  const [submitLoading, setSubmitLoading] = useState(false);
+  // 存储已选关系，用于批量删除
+  const [selectedRelation, setSelectedRelation] = useState<CompanyRelationListVO[]>([]);
+
+  /** 商家下往来单位列表 */
+  const {
+    data: companyList,
+    setParams: setCompanyParams,
+    setLoading,
+    loading,
+    params: companyParams,
+  } = useInitial<CompanyRelationListVO[], CompanyRelationParams>(
+    getCompanyByDealerApi,
+    [],
+    {dealerId: -1 },// 取消默认查询往来单位关系设置列表，需要有单位类别
+    // { compCategory: CompanyCategoryTypeEnum["供应商"], dealerId: -1 },
+    delay
+  );
+  // 商家的列表
+  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(() => {
+    setSelected([...companyList]);
+  }, [companyList]);
+
+  return {
+    companyList,
+    visible,
+    setVisible,
+    setCompanyParams,
+    companyParams,
+    dealerList,
+    setLoading,
+    loading,
+    dealerLoading,
+    // disabled,
+    // setDisabled,
+    selected,
+    setSelected,
+    submitLoading,
+    setSubmitLoading,
+    comBussinessList,
+    comBussinessLoading,
+    selectedRelation,
+    setSelectedRelation,
+  };
+}
+import { http } from '@/typing/http';
+import request from '@/utils/request';
+import { FINANCE2_HOST } from '@/utils/host';
+
+type PrRes<T> = http.PromiseResp<T>;
+type PrPageRes<T> = http.PromisePageResp<T>;
+
+/**
+ * 获取往来单位列表
+ */
+export function getCompAccountApi(params: TradeCompany.CompListParams): PrPageRes<TradeCompany.ComList> {
+  return request.get(`${FINANCE2_HOST}/trade/company/list`, { params });
+}
+
+/**
+ * 查询往来单位详情
+ */
+export function getDetailComAccountApi(id: number): PrRes<TradeCompany.CompDetailVO> {
+  return request.get(`${FINANCE2_HOST}/trade/company/detail`, { params: { id } });
+}
+
+/**
+ * 新增往来单位
+ */
+export function createCompanyApi(params: TradeCompany.CompDetailVO): PrRes<void> {
+  return request.post(`${FINANCE2_HOST}/trade/company/add`, params);
+}
+
+/**
+ * 编辑往来单位
+ */
+export function updateCompanyApi(params: TradeCompany.CompDetailVO): PrRes<void> {
+  return request.post(`${FINANCE2_HOST}/trade/company/update`, params);
+}
+
+interface paramsId {
+  id: number
+  remark?: string
+}
+
+/**
+ * 注销往来单位
+ */
+export function CancelApitalAccountApi(params: paramsId): PrRes<void> {
+  return request.post(`${FINANCE2_HOST}/trade/company/cancel`, params);
+}
+
+/*银行选择器*/
+export function SelectBank(keywords?: string): any {
+  return request.get(`${FINANCE2_HOST}/selector/banks?kewords=${keywords}`);
+}
+
+/*类型选择器*/
+export function getCompanyBusinessTypesApi(): PrRes<TradeCompany.CompanyBusinessVO[]> {
+  return request.get(`${FINANCE2_HOST}/selector/company/type`);
+}
 \ No newline at end of file
+import useInitial from '@/hooks/useInitail';
+import { FinanceBankAccountTypeEnum } from '@/pages/finance/entitys';
+import { Form, Input, Modal, Select } from 'antd';
+import React, { memo, useEffect, useRef } from 'react';
+import { SelectBank } from '../../api';
+
+const FormItem = Form.Item;
+const { Option } = Select;
+
+interface Bank {
+  code: string;
+  name: string;
+}
+
+interface Props {
+  visible: boolean;
+  onCancel: () => any;
+  onOk: (data: TradeCompany.Accounts) => any;
+  row: TradeCompany.Accounts;
+  value: TradeCompany.Accounts[];
+}
+
+function SelectModal({ onCancel, onOk, row = {}, visible, value = [] }: Props) {
+  const { data } = useInitial<Bank[], any>(SelectBank, [], '0');
+  const [form] = Form.useForm();
+  /** 用于判断账户重复添加 */
+  const listRef = useRef<any[]>([]);
+
+  useEffect(() => {
+    if (visible) {
+      form.setFieldsValue({
+        bankInfo: row.bank ? { value: row.bank, label: row.bankName } : undefined,
+        accountName: row.accountName,
+        accountType: row.accountType,
+        accountNo: row.accountNo,
+        depositBank: row.depositBank,
+      });
+      listRef.current = value.map((val) => val.accountNo);
+    }
+  }, [visible]);
+
+  function handSave(feilds: any) {
+    const newRow = {
+      key: row.key || value.length + 1,
+      bankName: feilds.bankInfo.label,
+      bank: feilds.bankInfo.value,
+      accountName: feilds.accountName,
+      accountNo: feilds.accountNo.trim(),
+      depositBank: feilds.depositBank,
+      accountType: feilds.accountType,
+    };
+    onOk && onOk(newRow);
+    onCancel && onCancel();
+  }
+
+  /** 校验账号 */
+  function validatorNo(rules: any, _val: string) {
+    const _pattern = /^[0-9]\d*$/;
+    if (!_val) {
+      return Promise.reject(new Error('请输入账号'));
+    }
+    if (_val != row.accountNo && listRef.current.includes(_val)) {
+      return Promise.reject(new Error('该账号已添加，请勿重复添加'));
+    }
+    if (_val && (!_pattern.test(_val))) {
+      return Promise.reject(new Error('请输入正确的数字卡号'));
+    }
+    return Promise.resolve();
+  }
+
+  return (
+    <Modal width={700} open={visible} title="账户信息" onCancel={onCancel} onOk={form.submit}>
+      <Form form={form} onFinish={handSave} wrapperCol={{ span: 15 }} labelCol={{ span: 6 }}>
+        <FormItem name="bankInfo" label="开户银行" rules={[{ required: true, message: '请填写开户银行' }]}>
+          <Select placeholder="请选择" labelInValue showSearch optionFilterProp="children">
+            {data.map((item) => (
+              <Option key={item.code} value={item.code}>
+                {item.name}
+              </Option>
+            ))}
+          </Select>
+        </FormItem>
+        <FormItem name="depositBank" label="开户行名称" rules={[{ required: true, message: '请填写开户银行支行' }]}>
+          <Input width="100%" placeholder="请填入开户银行支行" />
+        </FormItem>
+        <FormItem label="账户类型" name="accountType" rules={[{ required: true, message: '请选择账户类型' }]}>
+          <Select placeholder="请选择账户类型">
+            {[10, 20, 50].map((item) => (
+              <Option value={item} key={item}>
+                {FinanceBankAccountTypeEnum[item]}
+              </Option>
+            ))}
+          </Select>
+        </FormItem>
+        <FormItem label="户名" rules={[{ required: true, message: '请填写户名' }]} name="accountName">
+          <Input maxLength={64} style={{ width: '100%' }} placeholder="请输入户名" />
+        </FormItem>
+        <FormItem label="账号" name="accountNo" required rules={[{ validator: validatorNo }]}>
+          <Input maxLength={32} style={{ width: '100%' }} placeholder="请输入账号" />
+        </FormItem>
+      </Form>
+    </Modal>
+  );
+}
+
+export default memo(SelectModal);
+import React, { useCallback, useState, memo, Ref, forwardRef } from 'react';
+import { Card, Button, Table, Divider, Popconfirm, Tooltip } from 'antd';
+import { PlusOutlined } from '@ant-design/icons';
+import CreateModal from './CreateModal';
+import { FinanceBankAccountTypeEnum } from '@/pages/finance/entitys';
+
+const { Column } = Table;
+
+interface Props {
+  value?: TradeCompany.Accounts[],
+  onChange?: (newValue: TradeCompany.Accounts[]) => any,
+  disabled?: boolean
+}
+
+function AccountsInput({ value = [], onChange, disabled }: Props, ref: Ref<any>) {
+  const [visiData, setVisiData] = useState<{ visible: boolean, row: TradeCompany.Accounts }>({ visible: false, row: {} });
+
+  function onDelete(key: number) {
+    const newValue = value.filter(val => val.key != key);
+    onChange && onChange(newValue);
+  }
+
+  const onOk = useCallback((newRow: TradeCompany.Accounts) => {
+    const newValue = [...value];
+    const index = newValue.findIndex(val => val.key == newRow.key);
+    if (index > -1) {
+      newValue.splice(index, 1, newRow);
+    } else {
+      newValue.push(newRow);
+    }
+    onChange && onChange(newValue);
+  }, [value]);
+
+  /** 切换弹窗显示 */
+  const triggerModal = useCallback((row: TradeCompany.Accounts = {}, visible: boolean = false) => {
+    setVisiData({ visible, row });
+  }, []);
+
+  return (
+    <Card
+      extra={
+        !disabled && (
+          <div
+            style={{
+              flex: 1,
+              display: "flex",
+              justifyContent: "space-between",
+              flexDirection: "row",
+            }}
+          >
+            <Button
+              type="primary"
+              icon={<PlusOutlined />}
+              onClick={() => triggerModal({}, true)}
+            >
+              新增
+            </Button>
+          </div>
+        )
+      }
+    >
+      <Table
+        rowKey="accountNo"
+        dataSource={value}
+        pagination={false}
+        bordered
+        size="small"
+      >
+        <Column
+          title="开户银行"
+          dataIndex="bankName"
+          width="20%"
+          ellipsis
+          render={(text: any, record: any) => (record.bankName ? (
+            <Tooltip title={record.bankName}>
+              <span>{record.bankName}</span>
+            </Tooltip>
+            ) : (
+              <Tooltip title={record.bank.label}>
+                <span>{record.bank.label}</span>
+              </Tooltip>
+            ))}
+        />
+        <Column
+          title="开户行名称"
+          dataIndex="depositBank"
+          width="20%"
+          ellipsis
+          render={(accountNo: string) => (
+            <Tooltip title={accountNo}>
+              <span>{accountNo}</span>
+            </Tooltip>
+          )}
+        />
+        <Column
+          title="户名"
+          dataIndex="accountName"
+          ellipsis
+          render={(accountNo: string) => (
+            <Tooltip title={accountNo}>
+              <span>{accountNo}</span>
+            </Tooltip>
+          )}
+        />
+        <Column
+          title="账户类型"
+          dataIndex="accountType"
+          width="20%"
+          render={(type) => FinanceBankAccountTypeEnum[type]}
+        />
+        <Column
+          title="账号"
+          dataIndex="accountNo"
+          ellipsis
+          render={(accountNo: string) => (
+            <Tooltip title={accountNo}>
+              <span>{accountNo}</span>
+            </Tooltip>
+          )}
+        />
+        {!disabled && (
+          <Column
+            title="操作"
+            align="center"
+            width="20%"
+            dataIndex="accountNo"
+            render={(no, row: TradeCompany.Accounts, i) => (
+              <>
+                <a
+                  onClick={(e) => {
+                    e.preventDefault();
+                    triggerModal(row, true);
+                  }}
+                >
+                  编辑
+                </a>
+                <Divider type="vertical" />
+                <Popconfirm
+                  title={`是否删除${row.bankName}?`}
+                  onConfirm={() => onDelete(i+1)}
+                  okText="确定"
+                  cancelText="取消"
+                >
+                  <a onClick={(e) => e.preventDefault()}>删除</a>
+                </Popconfirm>
+              </>
+            )}
+          />
+        )}
+      </Table>
+      <CreateModal
+        row={visiData.row}
+        visible={visiData.visible}
+        onCancel={triggerModal}
+        onOk={onOk}
+        value={value}
+      />
+    </Card>
+  );
+}
+
+export default memo(forwardRef(AccountsInput));
+/*
+ * @Author: zhaofeng 1272190090@qq.com
+ * @Date: 2023-12-01 17:17:04
+ * @LastEditors: zhaofeng 1272190090@qq.com
+ * @LastEditTime: 2023-12-01 17:24:30
+ * @FilePath: \fw-cms\src\pages\finance\TradeCompany\components\AdressSelect.tsx
+ * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
+ */
+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;
+  required?: boolean;
+}
+
+function AdressSelect(props: Props) {
+  const { form ,required} = 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="地理位置" >
+      {/* <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: "必填" }]}>
+        <FormItem name="location" label="地址" >
+          <PositionSelector style={{ width: "100%" }} onChange={(e: any) => onAd(e)} />
+        </FormItem>
+      )}
+      <div
+        style={{
+          display: "flex",
+          justifyContent: "space-between",
+          width: "80%",
+          marginLeft: "15%",
+        }}
+      >
+        {/* <FormItem name="addrslng" label="经度" style={{ width: "45%" }} rules={[{ required: true, message: "必填" }]}> */}
+        <FormItem name="addrslng" label="经度" style={{ width: "45%" }}>
+          <Input style={{ width: "100%" }} disabled={own === 1} />
+        </FormItem>
+        {/* <FormItem name="addrslat" label="纬度" style={{ width: "45%" }} rules={[{ required: true, message: "必填" }]}> */}
+        <FormItem name="addrslat" label="纬度" style={{ width: "45%" }}>
+          <Input style={{ width: "100%" }} disabled={own === 1} />
+        </FormItem>
+      </div>
+    </>
+  );
+}
+
+export default AdressSelect;
+import React, { useState } from 'react';
+import { Modal, Input, message } from 'antd';
+import { useStore } from '../index';
+import { CancelApitalAccountApi } from '../api';
+
+const TextArea = Input.TextArea;
+
+export default function CreateModal() {
+  const { setCancelVisible, cancelVisible, current, setLoading } = useStore();
+  const [remark, setRemark] = useState<string>('');
+  const [saveLoading, setSaveLoading] = useState(false);
+
+  function changeRemark(e: any) {
+    const value = e.target.value;
+    setRemark(value);
+  }
+
+  function handleSave() {
+    if (!remark || !current.id) return;
+    const param = {
+      id: current.id,
+      remark,
+    };
+    setSaveLoading(true);
+    CancelApitalAccountApi(param)
+      .then((res) => {
+        message.success('注销成功');
+        setSaveLoading(false);
+        setLoading(true);
+        setCancelVisible(false);
+        setRemark('');
+      })
+      .catch((err) => {
+        message.error(err.message);
+        setSaveLoading(false);
+      });
+  }
+
+  return (
+    <Modal
+      open={cancelVisible}
+      title="填写注销的原因"
+      onCancel={() => setCancelVisible(false)}
+      maskClosable={false}
+      onOk={handleSave}
+      confirmLoading={saveLoading}
+    >
+      <TextArea placeholder="请输入注销的原因" value={remark} onChange={changeRemark} rows={6} />
+    </Modal>
+  );
+}
+import React, { useEffect, memo, useRef } from 'react';
+import { Modal, Input, Form } from 'antd';
+import { isIdCardNo } from '@/utils/validate';
+
+const FormItem = Form.Item;
+
+interface Props {
+  visible: boolean,
+  onCancel: () => any,
+  onOk: (data: TradeCompany.Contacts) => any,
+  row: TradeCompany.Contacts,
+  value: TradeCompany.Contacts[]
+}
+
+function SelectModal({ onCancel, onOk, row = {}, visible, value = [] }: Props) {
+  const [form] = Form.useForm();
+  /** 用于判断身份证重复添加 */
+  const listRef = useRef<any[]>([]);
+
+  useEffect(() => {
+    if (visible) {
+      form.setFieldsValue({
+        contactName: row.contactName,
+        contactMobile: row.contactMobile,
+        idCard: row.idCard
+      });
+      listRef.current = value.map(val => val.contactMobile);
+    }
+  }, [visible]);
+
+  function handSave(feilds: TradeCompany.Contacts) {
+    console.log('row', row);
+    const newRow = {
+      ...feilds,
+      // key: row.key || value.length + 1,
+    };
+    onOk && onOk(newRow);
+    onCancel && onCancel();
+  }
+
+  /** 校验身份证号 */
+  const validatorIdCardNo = (rules: any, value: string) => {
+    if (!value) {
+      return Promise.resolve();
+    }
+    if (value && listRef.current.includes(value)) {
+      return Promise.reject("该身份证已添加，请勿重复添加");
+    }
+    const result = isIdCardNo(value);
+    if (result.success) return Promise.resolve();
+    else return Promise.reject(result.msg);
+  };
+
+  /** 校验电话号码 */
+  function validatorMobile(rules: any, value: string) {
+    if (!value) {
+      return Promise.reject("请输入联系方式");
+    }
+    if (value != row.contactMobile && listRef.current.includes(value)) {
+      return Promise.reject("该联系方式已添加，请勿重复添加");
+    }
+    return Promise.resolve();
+  }
+
+  return (
+    <Modal
+      width={700}
+      visible={visible}
+      title="联系人信息"
+      onCancel={onCancel}
+      onOk={form.submit}
+    >
+      <Form form={form} onFinish={handSave} wrapperCol={{ span: 15 }} labelCol={{ span: 6 }}>
+        <FormItem label="联系人姓名" name="contactName" rules={[{ required: true, message: '请输入姓名' }]}>
+          <Input placeholder="请输入姓名" style={{ width: "100%" }} maxLength={30} />
+        </FormItem>
+        <FormItem label="联系方式" required rules={[{ validator: validatorMobile }]} name="contactMobile">
+          <Input maxLength={24} style={{ width: "100%" }} placeholder="请输入联系方式" />
+        </FormItem>
+        <FormItem label="身份证号码" name="idCard" rules={[{ validator: validatorIdCardNo }]}>
+          <Input maxLength={20} style={{ width: "100%" }} placeholder="请输入身份证" />
+        </FormItem>
+      </Form>
+    </Modal>
+  );
+}
+
+export default memo(SelectModal);
+import React, { useCallback, useState, memo, Ref, forwardRef } from 'react';
+import { Card, Button, Table, Divider, Popconfirm, Tooltip } from 'antd';
+import { PlusOutlined } from '@ant-design/icons';
+import CreateModal from './CreateModal';
+
+const { Column } = Table;
+
+interface Props {
+  value?: TradeCompany.Contacts[],
+  onChange?: (newValue: TradeCompany.Contacts[]) => any,
+  disabled?: boolean
+}
+
+function ContactsInput({ value = [], onChange, disabled }: Props, ref: Ref<any>) {
+  const [visiData, setVisiData] = useState<{ visible: boolean, row: TradeCompany.Contacts }>({ visible: false, row: {} });
+
+  function onDelete(key: number) {
+    const newValue = value.filter(val => val.key != key);
+    onChange && onChange(newValue);
+  }
+
+  const onOk = useCallback((newRow: TradeCompany.Contacts) => {
+    const newValue = [...value];
+    const index = newValue.findIndex(val => val.key == newRow.key);
+    if (index> -1) {
+      newValue.splice(index, 1, newRow);
+    } else {
+      newValue.push(newRow);
+    }
+    onChange && onChange(newValue);
+  }, [value]);
+
+  /** 切换弹窗显示 */
+  const triggerModal = useCallback((row: TradeCompany.Contacts = {}, visible: boolean = false) => {
+    console.log('row--->', row);
+    setVisiData({ visible, row });
+  }, []);
+
+  return (
+    <Card
+      extra={!disabled && (
+        <div style={{ flex: 1, display: 'flex', justifyContent: "space-between", flexDirection: 'row' }}>
+          <Button type="primary" icon={<PlusOutlined />} onClick={() => triggerModal({}, true)}>新增</Button>
+        </div>
+      )}
+    >
+      <Table
+        rowKey="contactMobile"
+        dataSource={value}
+        pagination={false}
+        bordered
+        size="small"
+      >
+        <Column title="姓名" dataIndex="contactName" width="20%" />
+        <Column title="联系方式" dataIndex="contactMobile" width="35%" render={no => no || "-"} />
+        <Column 
+          title="身份证号码" 
+          dataIndex="idCard" 
+          ellipsis
+          render={(idCard: string) => (
+            <Tooltip title={idCard}>
+              <span>{idCard}</span>
+            </Tooltip>
+          )}
+        />
+        {!disabled && (
+          <Column
+            title="操作"
+            dataIndex="contactMobile"
+            align="center"
+            width="20%"
+            render={(moblie, row: TradeCompany.Contacts, i) => (
+              <>
+                <a onClick={(e) => { e.preventDefault(); triggerModal(row, true); }}>编辑</a>
+                <Divider type="vertical" />
+                <Popconfirm
+                  title={`是否删除${row.contactName}?`}
+                  onConfirm={() => onDelete(i+1)}
+                  okText="确定"
+                  cancelText="取消"
+                >
+                  <a onClick={(e) => e.preventDefault()}>删除</a>
+                </Popconfirm>
+              </>
+            )}
+          />
+        )}
+      </Table>
+      <CreateModal
+        row={visiData.row}
+        visible={visiData.visible}
+        onCancel={triggerModal}
+        onOk={onOk}
+        value={value}
+      />
+    </Card>
+  );
+}
+
+export default memo(forwardRef(ContactsInput));
+/*
+ * @Author: zhaofeng 1272190090@qq.com
+ * @Date: 2023-09-16 15:14:15
+ * @LastEditors: zhaofeng 1272190090@qq.com
+ * @LastEditTime: 2024-01-02 15:53:12
+ * @FilePath: \fw-cms\src\pages\finance\TradeCompany\components\CreateModal.tsx
+ * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
+ */
+import React, { useState, useEffect } from 'react';
+import { Modal, Form, Input, Select, message, Radio, Spin } from 'antd';
+import { useStore } from '../index';
+import { CompanyBusinessTypeEnum, CompanyCategoryTypeEnum, SubjectTypeEnum } from '@/pages/finance/entitys';
+import Contact from './ContactsInput';
+import Account from './AccountsInput';
+import { createCompanyApi, updateCompanyApi, getDetailComAccountApi } from '../api';
+import AdressSelect from '@/pages/finance/TradeCompany/components/AdressSelect';
+import { LabeledValue } from 'antd/lib/select';
+
+const FormItem = Form.Item;
+const { Option } = Select;
+
+export default function CreateModal() {
+  const { visible, setVisible, current, setCurrent, setLoading, comBussinessList, comBussinessLoading, brandList } = useStore();
+  const [form] = Form.useForm();
+  const [savelLoading, setSavelLoading] = useState(false);
+  const [detailLoading, setDetailLoading] = useState(false);
+  const [creditCodeDesc, setCreditCodeDesc] = useState<string>('社会信用代码');
+  const [required, setRequired] = useState(true);
+  /**
+   * 账户信息是否必填，默认都是必填
+   * 新增、编辑单位类别为”服务商“时账户信息非必填
+   *  */
+  const [accountInfoRequired, setaccountInfoRequired] = useState(true);
+
+  useEffect(() => {
+    if (visible && current.id) {
+      initData(current.id);
+    }
+  }, [visible, current.id]);
+
+  async function initData(rowId?: number) {
+    try {
+      let item: TradeCompany.CompDetailVO = {};
+      if (rowId) {
+        setDetailLoading(true);
+        const { data = {} } = await getDetailComAccountApi(rowId);
+        item = data;
+        setDetailLoading(false);
+      }
+      form.setFieldsValue({
+        ...item,
+        compName: item.compName,
+        compShortName: item.compShortName,
+        subjectType: item.subjectType,
+        compType: item.compType || [],
+        compCategory: item.compCategory || CompanyCategoryTypeEnum['供应商'],
+        compAddress: item.compAddress,
+        creditCode: item.creditCode,
+        brands: (item.brands || []).map((it) => ({ label: it.brandName, value: it.brandId })),
+        location: item.compAddress
+          ? {
+            // address: "",
+            //@ts-ignored;
+            address: item.lonLatAddress || '',
+            point: {
+              lng: item.longitude,
+              lat: item.latitude,
+            },
+          }
+          : undefined,
+        addrslng: Number(item.longitude),
+        addrslat: Number(item.latitude),
+        contacts: (item.contacts || []).map((it, i) => ({ ...it, key: i + 1 })),
+        accounts: (item.accounts || []).map((it, i) => ({ ...it, key: i + 1 })),
+      });
+      if (item.subjectType == 1) {
+        setRequired(false);
+      } else {
+        setRequired(true);
+      }
+      if (item.compCategory == 2) {//单位类别为服务商，账户信息非必填
+        setaccountInfoRequired(false);
+      } else {
+        setaccountInfoRequired(true);
+      }
+    } catch (e: any) {
+      message.error(e.message);
+      setVisible(false);
+    }
+  }
+
+  function submit(item: any) {
+    const param = {
+      id: current.id,
+      ...item,
+      brands: (item.brands || []).map((item: LabeledValue) => ({ brandId: item.value, brandName: item.label })),
+      longitude: Number(item.addrslng),
+      latitude: Number(item.addrslat),
+      lonLatAddress: item.location ? item.location.address : '',
+    };
+    setSavelLoading(true);
+    const saveApi = current.id ? updateCompanyApi : createCompanyApi;
+    saveApi(param)
+      .then((res) => {
+        message.success('保存成功');
+        setLoading(true);
+        setVisible(false);
+        setSavelLoading(false);
+      })
+      .catch((err) => {
+        message.error(err.message);
+        setSavelLoading(false);
+      });
+  }
+
+  function onCancel() {
+    setVisible(false);
+  }
+
+  function changeSubjectType(value: number) {
+    if (value === 1) {
+      setCreditCodeDesc('身份证号码');
+      setRequired(false);
+    } else {
+      setCreditCodeDesc('社会信用代码');
+      setRequired(true);
+    }
+  }
+
+  return (
+    <Modal
+      title={`${current.id ? '编辑' : '新增'}往来单位`}
+      open={visible}
+      onOk={form.submit}
+      onCancel={onCancel}
+      maskClosable={false}
+      confirmLoading={savelLoading || detailLoading}
+      afterClose={() => {
+        setCurrent({});
+        form.resetFields();
+      }}
+      width="60%"
+    >
+      <Spin spinning={detailLoading}>
+        <Form form={form} onFinish={submit} labelCol={{ span: 4 }} wrapperCol={{ span: 18 }}>
+          <FormItem name="compName" label="往来单位名称" rules={[{ required: true, message: '请填入往来单位名称' }]}>
+            <Input placeholder="请填入往来单位名称" maxLength={64} />
+          </FormItem>
+          <FormItem name="compShortName" label="往来单位简称" rules={[{ required: true, message: '请填入往来单位简称' }]}>
+            <Input placeholder="请填入往来单位简称" maxLength={64} />
+          </FormItem>
+          <FormItem name="subjectType" label="单位主体类型" rules={[{ required: true, message: '请选择主体类型' }]}>
+            <Select placeholder="请选择主体类型" showSearch onChange={changeSubjectType}>
+              {[SubjectTypeEnum['个人'], SubjectTypeEnum['公司'], SubjectTypeEnum['个体工商户'], SubjectTypeEnum['公共组织']].map((i) => (
+                <Option key={i} value={i}>
+                  {SubjectTypeEnum[i]}
+                </Option>
+              ))}
+            </Select>
+          </FormItem>
+          <FormItem name="compCategory" label="单位类别" rules={[{ required: true, message: '请选择类别' }]}
+          >
+            <Radio.Group onChange={(e) => {
+              const _value = e.target.value;
+              if (_value === 2) {
+                setaccountInfoRequired(false);
+              } else {
+                setaccountInfoRequired(true);
+              }
+            }}>
+              <Radio value={CompanyCategoryTypeEnum['供应商']}>供应商</Radio>
+              <Radio value={CompanyCategoryTypeEnum['服务商']}>服务商</Radio>
+              <Radio value={CompanyCategoryTypeEnum['供应商与服务商']}>供应商与服务商</Radio>
+            </Radio.Group>
+          </FormItem>
+          <FormItem name="compType" label="往来单位业务类型" rules={[{ required: true, message: '请选项往来单位业务类型' }]}>
+            <Select placeholder="请选项往来单位业务类型" mode="multiple" showSearch optionFilterProp="children" loading={comBussinessLoading}>
+              {comBussinessList.map((item) => (
+                <Option key={item.id} value={item.id}>
+                  {item.name}
+                </Option>
+              ))}
+            </Select>
+          </FormItem>
+          <FormItem noStyle shouldUpdate={(prevValues, currentValues) => prevValues.compType != currentValues.compType}>
+            {({ getFieldValue }): any => {
+              const _compType = getFieldValue('compType');
+              return _compType?.includes(CompanyBusinessTypeEnum['新车采购（主机厂）']) ||
+                _compType?.includes(CompanyBusinessTypeEnum['配件采购']) ? (
+                <FormItem name="brands" label="品牌" rules={[{ required: true, message: '请选择品牌' }]}>
+                  <Select placeholder="请选择品牌" labelInValue showSearch optionFilterProp="children" mode="multiple">
+                    {brandList?.map((item) => (
+                      <Option key={item.id} value={item.id}>
+                        {item.name}
+                      </Option>
+                    ))}
+                  </Select>
+                </FormItem>
+              ) : null;
+            }}
+          </FormItem>
+          {/* <FormItem name="creditCode" label={creditCodeDesc} rules={[{ required: true, message: '请输入' + creditCodeDesc }]}> */}
+          <FormItem name="creditCode" label={creditCodeDesc} rules={[{ required: required, message: '请输入' + creditCodeDesc }]}>
+            <Input placeholder={`请输入${creditCodeDesc}`} maxLength={30} />
+          </FormItem>
+          {/* <FormItem name="compAddress" label="通信地址" rules={[{ required: true, message: '请输入地址' }]}> */}
+          <FormItem name="compAddress" label="通信地址" rules={[{ required: required, message: '请输入地址' }]}>
+            <Input placeholder="请输入通信地址" />
+          </FormItem>
+          <AdressSelect form={form} required={required} />
+          <FormItem name="contacts" label="联系方式" rules={[{ required: true }]}>
+            <Contact />
+          </FormItem>
+          <FormItem name="accounts" label="账户信息" rules={[{ required: accountInfoRequired }]}>
+            <Account />
+          </FormItem>
+        </Form>
+      </Spin>
+    </Modal>
+  );
+}
+/*
+ * @Author: zhaofeng 1272190090@qq.com
+ * @Date: 2023-12-13 09:15:08
+ * @LastEditors: zhaofeng 1272190090@qq.com
+ * @LastEditTime: 2023-12-20 17:50:50
+ * @FilePath: \fw-cms\src\pages\finance\TradeCompany\components\Filter.tsx
+ * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
+ */
+import React from 'react';
+import { Button, Row, Select, Col, Input } from 'antd';
+import { useStore } from '../index';
+import { debounce } from 'lodash';
+import { SubjectTypeEnum } from '@/pages/finance/entitys';
+
+const { Option } = Select;
+const Search = Input.Search;
+
+export default function AccountList() {
+  const { setVisible, setParams, innerParams, comBussinessList, comBussinessLoading } = useStore();
+
+  function searchTypes(compTypes: number) {
+    setParams({ compTypes }, true);
+  }
+
+  const fetchListByName = debounce(value => {
+    setParams({ ...innerParams, keywords: value }, true);
+  }, 500);
+
+  /** 查找单位主体类型 未返回subjectType */
+  function searchSubjectType(subjectType: number) {
+    setParams({ subjectType }, true);
+  }
+
+  return (
+    <div
+      style={{
+        display: "flex",
+        flexDirection: "row",
+        justifyContent: "space-between",
+        alignItems: "center",
+        marginBottom: 20,
+      }}
+    >
+      <Row style={{ display: "flex", flex: 1 }}>
+        <Col span={6}>
+          <Select
+            placeholder="搜索往来单位业务类型"
+            showSearch
+            allowClear
+            optionFilterProp="children"
+            value={innerParams.compTypes}
+            loading={comBussinessLoading}
+            style={{ width: 200 }}
+            onChange={searchTypes}
+          >
+            {comBussinessList.map((item) => (
+              <Option key={item.id} value={item.id}>
+                {item.name}
+              </Option>
+            ))}
+          </Select>
+        </Col>
+        <Col span={7}>
+          <Search
+            allowClear
+            placeholder="搜索单位名称/社会信用代码"
+            onChange={(e) => fetchListByName(e.target.value || undefined)}
+            style={{ width: 250, marginLeft: 10 }}
+          />
+        </Col>
+        <Col span={5}>
+          <Select
+            placeholder="搜索单位主体类型"
+            showSearch
+            allowClear
+            optionFilterProp="children"
+            value={innerParams.subjectType}
+            loading={comBussinessLoading}
+            style={{ width: 200 }}
+            onChange={searchSubjectType}
+          >
+            {[
+              SubjectTypeEnum["个人"],
+              SubjectTypeEnum["公司"],
+              SubjectTypeEnum["个体工商户"],
+              SubjectTypeEnum["公共组织"],
+            ].map((i) => (
+              <Option key={i} value={i}>
+                {SubjectTypeEnum[i]}
+              </Option>
+            ))}
+          </Select>
+        </Col>
+      </Row>
+      {/* <Button type="primary" onClick={() => setVisible(true)}>
+        新增
+      </Button> */}
+    </div>
+  );
+}
+import React, { useRef } from 'react';
+import { Table, Modal, Button, message } from 'antd';
+import { useStore } from '../index';
+import { CompanyCategoryTypeEnum, RecordAuditTypeEnum, RecordStateEnum } from '../../entitys';
+import { getDetailComAccountApi } from '../api';
+import Contacts from './ContactsInput';
+import Accounts from './AccountsInput';
+import ApprovalProgressModal, { ApprovalProgressModalRef } from '@/components/ApprovalProgressModal';
+
+const { Column } = Table;
+
+export default function AccountList() {
+  const approvalProgressRef = useRef<ApprovalProgressModalRef | null>(null);
+  const { setCurrent, setVisible, comAccountList, loading, paginationConfig, setCancelVisible, innerParams } = useStore();
+
+  function getApprovalProgress(item: TradeCompany.CompDetailVO) {
+    approvalProgressRef.current?.setApprovalProgressModalInfo({
+      visible: true,
+      orderNo: item.approvalNo,
+    });
+  }
+
+  function viewDetail(row: TradeCompany.ComList) {
+    message.loading('查询中...');
+    row.id &&
+      getDetailComAccountApi(row.id)
+        .then((res) => {
+          const data = res.data || {};
+          message.destroy();
+          Modal.info({
+            title: data.compName,
+            width: 800,
+            content: (
+              <div>
+                <p style={{ marginTop: 10 }}>{`单位简称：${data.compShortName || '-'}`}</p>
+                <p style={{ marginTop: 10 }}>{`${data.subjectTypeName === '个人' ? '身份证号码' : '社会信用代码'}：${data.creditCode || '-'}`}</p>
+                <p style={{ marginTop: 10 }}>{`单位主体类型：${data.subjectTypeName || '-'}`}</p>
+                <p style={{ marginTop: 10 }}>{`单位类别：${CompanyCategoryTypeEnum[data.compCategory!]}`}</p>
+                <p style={{ marginTop: 10 }}>{`往来单位业务类型：${data.compTypeName}`}</p>
+                {/* {data.brandName ? <p style={{ marginTop: 10 }}>{`品牌：${data.brandName}`}</p> : null} */}
+                {data.brands?.length ? <p style={{ marginTop: 10 }}>{`品牌：${data.brands.map((it) => it.brandName).join(',')}`}</p> : null}
+                <p style={{ marginTop: 10 }}>{`公司地址：${data.compAddress || '-'}`}</p>
+                <p style={{ marginTop: 10 }}>联系人信息：</p>
+                <Contacts value={data.contacts} disabled />
+                <p style={{ marginTop: 10 }}>账户信息：</p>
+                <Accounts value={data.accounts} disabled />
+                <p style={{ marginTop: 10 }}>{`审核类型：${RecordAuditTypeEnum[data.recordAuditType!] || ''}`}</p>
+                {data.recordAuditType == RecordAuditTypeEnum['注销'] ? (
+                  <p style={{ marginTop: 10 }}>{`申请原因：${data.cancelReason || '-'}`}</p>
+                ) : null}
+                <p
+                  style={{
+                    color: data.recordState == RecordStateEnum['已驳回'] ? '#FF0000' : '#4189FD',
+                    marginTop: 10,
+                    cursor: 'pointer',
+                  }}
+                  onClick={() => getApprovalProgress(data)}
+                >
+                  {`审核状态：${RecordStateEnum[data.recordState || 0]}`}
+                </p>
+                {data.recordState == RecordStateEnum['已驳回'] ? <p style={{ marginTop: 10 }}>{`驳回原因：${data.rejectReason || '-'}`}</p> : null}
+              </div>
+            ),
+          });
+        })
+        .catch((e) => {
+          message.destroy();
+          message.error(e.message);
+        });
+  }
+
+  return (
+    <>
+      <Table dataSource={comAccountList} pagination={paginationConfig} rowKey="id" loading={loading}>
+        <Column title="名称" dataIndex="compName" width="15%" />
+        {/* <Column title="单位主体类型" dataIndex="subjectType" width="15%" /> */}
+        <Column title="简称" dataIndex="compShortName" width="15%" />
+        <Column title="社会信用代码" dataIndex="creditCode" width="15%" />
+        <Column title="往来单位业务类型" dataIndex="compTypeName" />
+        <Column
+          title="审核状态"
+          dataIndex="recordState"
+          render={(type, row: TradeCompany.ComList) =>
+            <p>
+              <span>
+              { `${RecordStateEnum[type]}${row.recordAuditType ? `(${RecordAuditTypeEnum[row.recordAuditType!] || '-'})` : ''}`}
+              </span>
+              {row.approvalNo ?
+                <span style={{ color: "#4189FD", marginLeft: 5, cursor: 'pointer', }} onClick={() => getApprovalProgress(row)}>
+               {`审批进度>`}
+                </span> :
+                null}
+            </p>
+          }
+        />
+        {/* TODO 
+          查看详情 -> 待审核，已驳回
+          编辑 -> 已驳回，已备案
+          注销 -> 已备案，注销并且被驳回，修改并且被驳回
+       */}
+        <Column
+          title="操作"
+          align="center"
+          render={(text, record: TradeCompany.ComList) => (
+            <>
+              {[RecordStateEnum['待审核'], RecordStateEnum['已驳回']].includes(Number(record.recordState)) && (
+                <Button type="link" onClick={() => viewDetail(record)}>
+                  详情
+                </Button>
+              )}
+              {/* {[RecordStateEnum['已驳回'], RecordStateEnum['已备案']].includes(Number(record.recordState)) && (
+                <Button
+                  type="link"
+                  onClick={() => {
+                    setCurrent(record);
+                    setVisible(true);
+                  }}
+                >
+                  编辑
+                </Button>
+              )} */}
+              {/* {(record.recordState == RecordStateEnum['已备案'] ||
+                (record.recordState == RecordStateEnum['已驳回'] &&
+                  [RecordAuditTypeEnum['注销'], RecordAuditTypeEnum['修改']].includes(record.recordAuditType || 0))) && (
+                  <Button
+                    type="link"
+                    onClick={() => {
+                      setCurrent(record);
+                      setCancelVisible(true);
+                    }}
+                  >
+                    注销
+                  </Button>
+                )} */}
+            </>
+          )}
+        />
+      </Table>
+      <ApprovalProgressModal ref={approvalProgressRef} />
+    </>
+  );
+}
+/*
+ * @Author: zhaofeng 1272190090@qq.com
+ * @Date: 2024-03-06 14:30:32
+ * @LastEditors: zhaofeng 1272190090@qq.com
+ * @LastEditTime: 2024-03-06 14:47:02
+ * @FilePath: \fw-cms\src\pages\finance\ViewTradeCompany\index.tsx
+ * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
+ */
+import React from "react";
+import { Card } from "antd";
+import { PageHeaderWrapper } from "@ant-design/pro-layout";
+import { createStore } from "@/hooks/moz";
+import store from "./useStore";
+import ListAccount from "./components/List";
+import Filter from "./components/Filter";
+import CreateModal from "./components/CreateModal";
+import CancelModal from "./components/CancelModal";
+
+export const { Provider, useStore } = createStore(store);
+
+function ViewTradeCompany() {
+  return (
+    <PageHeaderWrapper title="查询往来单位设置">
+      <Card>
+        <Filter />
+        <ListAccount />
+      </Card>
+      <CancelModal />
+      <CreateModal />
+    </PageHeaderWrapper>
+  );
+}
+
+export default () => (
+  <Provider>
+    <ViewTradeCompany />
+  </Provider>
+);
+declare namespace TradeCompany {
+  interface CompListParams {
+    /** 单位名称 */
+    keywords?: string;
+    /** 单位类型集合 */
+    compTypes?: string;
+    /** 备案状态 */
+    recordState?: string;
+    /** 单位类别 */
+    compCategory?: number;
+    current?: number;
+    pageSize?: number;
+  }
+  interface ComList {
+    /** 单位id */
+    id?: number;
+    // 往来单位名称
+    compName?: string;
+    /** 单位编码 */
+    compNo?: string;
+    /** 社会信用编码 */
+    creditCode?: string;
+    /* 单位主体类型 */
+    subjectType?: number;
+    subjectTypeName?: string;
+    // 业务类型
+    compType?: number[]; // 变成多选
+    compTypeName?: string;
+    brandId?: number;
+    brands?: Brands[]; //品牌列表
+    brandName?: string;
+    /** 状态 */
+    recordState?: number;
+    /** 备案审核状态 */
+    recordAuditType?: number;
+    /** 图片 */
+    compImage?: string;
+    // 通信地址
+    compAddress?: string;
+    // 单位类别
+    compCategory?: number;
+    // 往来单位简称
+    compShortName?: string;
+    // 审批单号
+    approvalNo?: string;
+  }
+  interface Brands {
+    brandId?: number;
+    brandName?: string;
+  }
+
+  interface CompDetailVO extends ComList {
+    // 联系人
+    contacts?: Contacts[];
+    // 账户列表
+    accounts?: Accounts[];
+    /** 经度 */
+    longitude?: number;
+    /** 纬度 */
+    latitude?: number;
+    /** 备案状态 */
+    recordState?: number;
+    /** 备案审核状态 */
+    recordAuditType?: number;
+    /** 注销原因 */
+    cancelReason?: string;
+    /** 驳回原因 */
+    rejectReason?: string;
+    approvalNo?: string;
+  }
+
+  interface Contacts {
+    /** 判断唯一性 */
+    key?: number;
+    // 联系人
+    contactName?: string;
+    // 联系手机
+    contactMobile?: string;
+    // 身份账号
+    idCard?: string;
+  }
+
+  interface Accounts {
+    /** 判断唯一性 */
+    key?: number;
+    //银行code
+    bank?: string;
+    // 银行名称
+    bankName?: string;
+    //账户类型
+    accountType?: number;
+    // 户名
+    accountName?: string;
+    // 账号
+    accountNo?: string;
+    //银行支行
+    depositBank?: string;
+  }
+
+  interface CompanyBusinessVO {
+    id: number;
+    name: string;
+  }
+}
+import { useState } from 'react';
+import { getCompAccountApi, getCompanyBusinessTypesApi } from './api';
+import usePagination from '@/hooks/usePagination';
+import useInitial from '@/hooks/useInitail';
+import { getBrandFilterApi, getDealerApi } from '@/common/api';
+
+export default function useStore() {
+  const [visible, setVisible] = useState(false);
+  // 商家的列表
+  const { data: dealerList, loading: dealerLoading } = useInitial(getDealerApi, [], {});
+  // 往来单位业务类型列表
+  const { data: comBussinessList, loading: comBussinessLoading } = useInitial(getCompanyBusinessTypesApi, [], null);
+  // 获取单位列表
+  const { list: comAccountList, loading, setLoading, paginationConfig, setParams, innerParams } = usePagination<TradeCompany.ComList>(getCompAccountApi, {});
+  // 获取品牌
+  const { data: brandList } = useInitial<CommonApi.OptionVO[], {}>(getBrandFilterApi, [], {});
+  
+  const [current, setCurrent] = useState<TradeCompany.ComList>({});
+  const [addFlag, setAddFlag] = useState<boolean>(true);
+  const [addFlagAccount, setAddFlagAccount] = useState<boolean>(true);
+  const [cancelVisible, setCancelVisible] = useState(false);
+
+  return {
+    visible,
+    setVisible,
+    current,
+    setCurrent,
+    comAccountList,
+    loading,
+    setLoading,
+    addFlag,
+    setAddFlag,
+    addFlagAccount,
+    setAddFlagAccount,
+    paginationConfig,
+    cancelVisible,
+    setCancelVisible,
+    setParams,
+    innerParams,
+    dealerLoading,
+    dealerList,
+    comBussinessList,
+    comBussinessLoading,
+    brandList,
+  };
+}
@@ -55,26 +55,26 @@ export default function ShopModal({ visible, onCancel, onSave, record, dealerLis
   const address =
     record.addr && record.lng && record.lat
       ? {
-          address: record.addr,
-          point: {
-            lat: record.lat,
-            lng: record.lng,
-          },
-        }
+        address: record.addr,
+        point: {
+          lat: record.lat,
+          lng: record.lng,
+        },
+      }
       : {};
  
   const { data: brands } = useInitial(API.queryAllCarBrands, [], { groupId, dealerId });
  
   const list = record.shopLogo
     ? [
-        {
-          uid: '-1',
-          name: 'dealerLogo.png',
-          status: 'done',
-          url: record.shopLogo,
-          thumbUrl: record.shopLogo,
-        },
-      ]
+      {
+        uid: '-1',
+        name: 'dealerLogo.png',
+        status: 'done',
+        url: record.shopLogo,
+        thumbUrl: record.shopLogo,
+      },
+    ]
     : [];
  
   useEffect(() => {
@@ -90,9 +90,9 @@ export default function ShopModal({ visible, onCancel, onSave, record, dealerLis
         brand: { value: record.brandId, label: record.brandName },
         shopMappingList: record.shopMappingList
           ? record.shopMappingList.map((i) => ({
-              value: i.shopId,
-              label: i.shopName,
-            }))
+            value: i.shopId,
+            label: i.shopName,
+          }))
           : undefined,
       });
       fetchShopList();
@@ -392,7 +392,7 @@ export default function ShopModal({ visible, onCancel, onSave, record, dealerLis
                     <Form.Item
                       label="对应线下实体门店"
                       name="shopMappingList"
-                      // rules={[{ required: true, message: "请选择实体门店" }]}
+                    // rules={[{ required: true, message: "请选择实体门店" }]}
                     >
                       <Select mode="multiple" labelInValue optionFilterProp="children">
                         {data.map((item: any) => {
@@ -456,7 +456,7 @@ export default function ShopModal({ visible, onCancel, onSave, record, dealerLis
                     </FormItem>
                   )}
                   <Form.Item label="映射的门店" name="shopMappingList">
-                    <Select optionFilterProp="children" showSearch mode="multiple" labelInValue placeholder="选择对应的销售门店(可多选)">
+                    <Select optionFilterProp="children" showSearch mode="multiple" labelInValue placeholder="选择映射门店(可多选)">
                       {saleShops.map((item: any) => {
                         return (
                           <Option key={item.id} value={item.id}>
-import { http } from '@/typing/http';
+import type { http } from '@/typing/http';
 import request from '@/utils/request';
 import { FVM_HOST, OOP_HOST } from '@/utils/host';
  
 /**
- * 门店授权门店授权车辆基础信息列表
- */
-export function getPageListApi(params?: Product.QuerryList): http.PromisePageResp<Product.List> {
-  return request.get(`${OOP_HOST}/select/shop/car/base/page`, { params });
-}
-
-/**
  * 调价申请
  */
 export function saveApi(params?: Product.ChangeParams): http.PromiseResp<void> {
-  return request.post(`${FVM_HOST}/erp/vehicle/info/save/adjust`, params, {contentType: 'json'});
+  return request.post(`${FVM_HOST}/erp/vehicle/info/save/adjust`, params, { contentType: 'json' });
 }
 \ No newline at end of file
-import { http } from '@/typing/http';
+import type { http } from '@/typing/http';
 import request from '@/utils/request';
 import { FVM_HOST, OOP_HOST } from '@/utils/host';
  
@@ -15,13 +15,6 @@ interface DtoList {
 }
  
 /**
- * 门店授权门店授权车辆基础信息列表
- */
-export function getPageListApi(params?: Product.QuerryList): http.PromisePageResp<Product.List> {
-  return request.get(`${OOP_HOST}/select/shop/car/base/page`, { params });
-}
-
-/**
  * 批量调价申请
  */
 export function saveApi(params?: ApplyChangeParams): http.PromiseResp<void> {
@@ -169,8 +169,7 @@ function ProductSetting() {
                       setRecord(record);
                     }}
                   >
-                    {' '}
-                    设置上架门店{' '}
+                    设置上架门店
                   </Button>
                 </div>
                 <div>
 import { MCAR_HOST, OOP_HOST } from '@/utils/host';
-import { http } from '@/typing/http';
+import type { http } from '@/typing/http';
 import request from '@/utils/request';
-import { CarShop } from './interface.d';
+import type { CarShop } from './interface.d';
  
 type PrRes<T> = http.PromiseResp<T>;
 type PrResArr<T> = http.PromiseResp<T[]>;
@@ -48,14 +48,10 @@ export function getAuthListApi(params: CarShop.QueryCarListParams): PrResArr&lt;Car
 export function getSeriesreeApi(groupId?: number): PrResArr<CarShop.CarSeries> {
   return request.get(getUrl('/select/brand/series', OOP_HOST), { params: { groupId } });
 }
-/** 保存门店授权车系信息 */
+/** 保存门店授权车系信息 (已弃用) */
 export function authCarApi(params: CarShop.authCar): PrRes<void> {
   return request.post(getUrl('/erp/shop/auth/series'), { ...params });
 }
-/** 取消门店车辆授权 */
-export function cancelAuthApi(id: number): PrRes<void> {
-  return request.get(getUrl('/erp/shop/sale/cancel'), { params: { id } });
-}
  
 /** 根据当前登录人信息获取品牌列表 */
 export function getBrandApi(): PrResArr<CarShop.optionItem> {
 import React, { useState, useEffect } from 'react';
-import { Cascader, message, Row, Col } from 'antd';
-import { CascaderOptionType } from 'antd/lib/cascader';
+import { Cascader, message, Row, Col, Select } from 'antd';
+import type { CascaderOptionType } from 'antd/lib/cascader';
 import { getBrandApi, getSeriesApi } from '../api';
+import useInitail from '@/hooks/useInitail';
+import { getShopApi } from '@/common/api';
  
 interface FilterProps {
-  shopValue: any[],
-  shopOption: any[],
-  onChangeShop: any,
   onFilter: any
- }
+}
  
 export default function Filter(props: FilterProps) {
-  const { shopOption, shopValue, onChangeShop, onFilter } = props;
+  const { onFilter } = props;
+  const { data: shops } = useInitail<CommonApi.OptionVO[], CommonApi.ShopParam>(getShopApi, [], { bizType: 1 });
   const [specOptions, setSpecOptions] = useState<any[]>([]);
-  
+
   useEffect(() => {
     getBrandApi().then(res => {
-      const { data=[] } = res;
+      const { data = [] } = res;
       const brandList = data.map(brand => ({ ...brand, isLeaf: false }));
       setSpecOptions(brandList);
     }).catch(e => {
@@ -30,7 +30,7 @@ export default function Filter(props: FilterProps) {
     targetOption.loading = true;
     if (length === 1) {
       getSeriesApi(targetOption.id).then(res => {
-        const { data=[] } = res;
+        const { data = [] } = res;
         targetOption.loading = false;
         targetOption.children = [];
         data.forEach((list, index) => {
@@ -65,26 +65,24 @@ export default function Filter(props: FilterProps) {
  
   function filterByCar(value) {
     const carFilter = {
-      brandId: value[0],
-      seriesId: value[1],
-      // specId: value[2],
+      brandId: value ? value[0] : undefined,
+      seriesId: value ? value[1] : undefined,
     };
     onFilter(carFilter);
   }
  
-  function filterByShop(value) {
+  function filterByShop(value: number) {
     const carFilter = {
-      shopId: value[1]
+      shopId: value
     };
-    onChangeShop(value);
     onFilter(carFilter);
   }
  
   return (
     <div>
-      <Row style={{ marginBottom: 10 }}>
-        <span style={{ color: "red", margin: 5 }}>*</span>商家/门店：
-        <Cascader
+      <Row style={{ marginBottom: 10, alignItems: 'center' }}>
+        <span style={{ color: "red" }}>*</span>门店：
+        {/* <Cascader
           allowClear={false}
           value={shopValue}
           expandTrigger="hover"
@@ -93,21 +91,35 @@ export default function Filter(props: FilterProps) {
           onChange={filterByShop}
           notFoundContent="暂无数据"
           style={{ width: 415 }}
-        />
-      </Row>
-      <Row>
-        品牌/车系：
-        <Cascader
+        /> */}
+        <Select
+          style={{ width: 200, marginRight: 20 }}
           allowClear
-          changeOnSelect
-          options={specOptions}
-          placeholder="请选择品牌/车系"
-          loadData={(selectedOptions) => loadData(selectedOptions)}
-          onChange={filterByCar}
-          fieldNames={{ value: 'id', label: 'name', }}
-          notFoundContent="暂无数据"
-          style={{ width: 400, marginRight: 10 }}
-        />
+          placeholder="搜索门店"
+          showSearch
+          filterOption
+          optionFilterProp="children"
+          onChange={filterByShop}
+        >
+          {shops.map((item, i) => (
+            <Select.Option key={item.id} value={item.id}>
+              {item.name}
+            </Select.Option>
+          ))}
+        </Select>
+        <div>
+          品牌/车系：
+          <Cascader
+            allowClear
+            changeOnSelect
+            options={specOptions}
+            placeholder="请选择品牌/车系"
+            loadData={(selectedOptions) => loadData(selectedOptions)}
+            onChange={filterByCar}
+            fieldNames={{ value: 'id', label: 'name', }}
+            notFoundContent="暂无数据"
+          />
+        </div>
       </Row>
     </div>
   );
@@ -4,8 +4,8 @@ import { PlusOutlined } from &#39;@ant-design/icons&#39;;
 import { Button, Card, ConfigProvider, message, Popconfirm, Table } from 'antd';
 import zhCN from 'antd/lib/locale-provider/zh_CN';
 import moment from 'moment';
-import { getListApi, cancelAuthApi, _carList, getDealerTreeApi } from './api';
-import { CarShop } from './interface.d';
+import { getListApi, _carList, getDealerTreeApi } from './api';
+import type { CarShop } from './interface.d';
 import Filter from './components/Filter';
 import AuthModal from './components/AuthModal';
 import usePagination from '@/hooks/usePagination';
@@ -16,13 +16,12 @@ const indexS = require(&#39;./index.less&#39;);
  
 export default function CarShopList() {
   const [shopOptions, setShopOptions] = useState<any[]>([]);
-  const [shopValue, setShopValue] = useState<number[]>([]);
   const [visible, setVisible] = useState<boolean>(false);
   const { list, loading, setLoading, setParams, paginationConfig, } = usePagination(getListApi, {});
  
-  useEffect(() => {
-    fetchshopFlite();
-  }, []);
+  // useEffect(() => {
+  //   fetchshopFlite();
+  // }, []);
  
   async function fetchshopFlite() {
     setLoading(true);
@@ -36,15 +35,6 @@ export default function CarShopList() {
     }
   }
  
-  function cancelAuth(id: number) {
-    cancelAuthApi(id).then(res => {
-      message.success("取消成功");
-      setLoading(true);
-    }).catch(e => {
-      message.error(e.message);
-    });
-  }
-
   async function handleChangePage(_filterValue = {}) {
     setParams({ ..._filterValue, current: 1 }, true)
   }
@@ -53,26 +43,21 @@ export default function CarShopList() {
     <PageHeaderWrapper title="门店授权">
       <Card className={indexS.page}>
         <div style={{ display: 'flex', justifyContent: 'space-between', alignItems: 'center', marginBottom: 20 }}>
-          <Filter
-            shopOption={shopOptions}
-            shopValue={shopValue}
-            onChangeShop={(value: number[]) => setShopValue(value)}
-            onFilter={(value: CarShop.QueryCarListParams) => handleChangePage(value)}
-          />
-          <Button icon={<PlusOutlined />} type="primary" onClick={() => setVisible(true)}>
+          <Filter onFilter={(value: CarShop.QueryCarListParams) => handleChangePage(value)} />
+          {/* <Button icon={<PlusOutlined />} type="primary" onClick={() => setVisible(true)}>
             门店授权
-          </Button>
+          </Button> */}
         </div>
         <ConfigProvider locale={zhCN}>
           <Table
             dataSource={list}
             pagination={paginationConfig}
-            rowKey={(record) => `${record.carId}`}
+            rowKey={(record) => `${record.id}`}
             loading={loading}
             className={indexS.table}
           >
-            <Column title="门店ID" dataIndex="shopId" />
             <Column title="门店名称" dataIndex="shopName" />
+            <Column title="门店ID" dataIndex="shopId" />
             <Column
               title="车辆图片"
               dataIndex="carImg"
@@ -89,21 +74,6 @@ export default function CarShopList() {
               dataIndex="createTime"
               render={text => `${text ? moment(text).format("YYYY-MM-DD") : "-"}`}
             />
-            <Column
-              title="操作"
-              render={(text, record: CarShop.carData) => (
-                <React.Fragment>
-                  <Popconfirm
-                    title="确定取消授权?"
-                    onConfirm={() => cancelAuth(record.id)}
-                    okText="确定"
-                    cancelText="取消"
-                  >
-                    <Button size="small">取消授权</Button>
-                  </Popconfirm>
-                </React.Fragment>
-              )}
-            />
           </Table>
         </ConfigProvider>
         <AuthModal