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

王强
2 parents bf620067 6f86f8a0
Showing 22 changed files with 353 additions and 585 deletions
config/routers/contract.ts
src/components/Condition/BrandToSeries/index.tsx
src/pages/approval/components/ShopSelectByBizType/index.tsx
src/pages/carinsur/LoanClientConfig/api.ts
src/pages/carinsur/LoanClientConfig/components/EditModal.tsx
src/pages/carinsur/LoanClientConfig/components/SpecModal.tsx
src/pages/carinsur/LoanClientConfig/index.tsx
src/pages/carinsur/LoanClientConfig/interface.d.ts
src/pages/carinsur/LoanClientRequires/components/AddModal/index.tsx
src/pages/carinsur/LoanClientRequires/components/AddModal/style.less
src/pages/carinsur/LoanClientRequires/components/BrandSeriesAddModal.tsx
src/pages/carinsur/LoanClientRequires/components/BrandSeriesFormItem.tsx
src/pages/carinsur/LoanClientRequires/components/BrandSeriesModal.tsx
src/pages/carinsur/LoanClientRequires/components/Filter/index.tsx
src/pages/carinsur/LoanClientRequires/components/LoanTypeFormItem.tsx
src/pages/carinsur/LoanClientRequires/index.tsx
src/pages/carinsur/entity.ts
src/pages/contract/ExpressLogisticsArticleSetting/components/UserAddModal.tsx
src/pages/contract/FoodWhiteList/api.ts
src/pages/contract/FoodWhiteList/components/AddModal/index.tsx
@@ -99,4 +99,8 @@ export default [
     path: '/contract/kt/stampmatter', //盖章事项
     component: './contract/StampMatter',
   },
+  {
+    path: '/contract/foodWhiteList', // 就餐白名单
+    component: './contract/FoodWhiteList',
+  },
 ];
@@ -5,47 +5,50 @@ import * as API from &#39;./api&#39;;
  
 interface BrandToSeriesProps extends CascaderProps {
   /** 第一层 品牌列表 */
-  brandList?: API.Brand[] | API.optionItem[],
-  labelInValue?: boolean,
-  value?: any[],
-  onChange?: (value: any, ...other: any) => any,
+  brandList?: API.Brand[] | API.optionItem[];
+  labelInValue?: boolean;
+  value?: any[];
+  onChange?: (value: any, ...other: any) => any;
   /** 是否授权品牌（授权品牌接口是admin，非授权品牌接口是oop） */
-  authBrand?: boolean
+  authBrand?: boolean;
+  placeholder?: string;
 }
  
 /**
  * 基于Cascader封装的品牌车系级联选择框
  */
 export default function BrandToSeries(props: BrandToSeriesProps) {
-  const { value = [], onChange, labelInValue, brandList, placeholder = "请选择品牌/车系", authBrand, ...other } = props;
+  const { value = [], onChange, labelInValue, brandList, placeholder = '请选择品牌/车系', authBrand, ...other } = props;
   const [options, setOptions] = useState<any[]>([]);
   const [selected, setSelected] = useState<any[]>([]);
  
   useEffect(() => {
     if (!brandList) {
       const brandApi: any = authBrand ? API.authBrandsApi : API.brandByOopApi;
-      brandApi().then(res => {
-        const { data = [] } = res;
-        const _data = data.map(brand => ({ id: brand.brandId || brand.id, name: brand.brandName || brand.name, isLeaf: false }));
-        setOptions([..._data]);
-      }).catch(e => {
-        message.error(e.message);
-      });
+      brandApi()
+        .then((res) => {
+          const { data = [] } = res;
+          const _data = data.map((brand) => ({ id: brand.brandId || brand.id, name: brand.brandName || brand.name, isLeaf: false }));
+          setOptions([..._data]);
+        })
+        .catch((e) => {
+          message.error(e.message);
+        });
     } else {
-      setOptions(brandList.map(brand => ({ id: brand.brandId || brand.id, name: brand.brandName || brand.name, isLeaf: false })))
+      setOptions(brandList.map((brand) => ({ id: brand.brandId || brand.id, name: brand.brandName || brand.name, isLeaf: false })));
     }
-  }, [])
+  }, []);
  
   useEffect(() => {
     if (selected.length === 0 && value.length > 0) {
       const valueBrandId = labelInValue ? value[0].id : value[0];
-      loadData(options.filter(item => item.id === valueBrandId));
+      loadData(options.filter((item) => item.id === valueBrandId));
     }
     if (value[1] !== selected[1]) {
-      const _value = labelInValue ? value.map(item => item.id) : value;
+      const _value = labelInValue ? value.map((item) => item.id) : value;
       setSelected(_value);
     }
-  }, [value[1]])
+  }, [value[1]]);
  
   function loadData(selectedOptions?: CascaderOptionType[]) {
     if (selectedOptions && selectedOptions.length > 0) {
@@ -53,23 +56,25 @@ export default function BrandToSeries(props: BrandToSeriesProps) {
       const targetOption = selectedOptions[length - 1];
       targetOption.loading = true;
       if (length === 1) {
-        API.getSeriesApi(targetOption.id).then(res => {
-          const { data = [] } = res;
-          targetOption.loading = false;
-          targetOption.children = data.map((list, index) => ({
-            id: list.id,
-            name: list.name,
-          }));
-          setOptions([...options])
-        }).catch(e => {
-          message.error(e.message);
-        });
+        API.getSeriesApi(targetOption.id)
+          .then((res) => {
+            const { data = [] } = res;
+            targetOption.loading = false;
+            targetOption.children = data.map((list, index) => ({
+              id: list.id,
+              name: list.name,
+            }));
+            setOptions([...options]);
+          })
+          .catch((e) => {
+            message.error(e.message);
+          });
       }
     }
   }
  
   function _onChange(value: string[], selectedOptions: any[] = []) {
-    const _value = labelInValue ? selectedOptions.map(item => ({ id: item.id, name: item.name })) : value;
+    const _value = labelInValue ? selectedOptions.map((item) => ({ id: item.id, name: item.name })) : value;
     setSelected(value || []);
     onChange && onChange(_value || [], selectedOptions);
   }
@@ -82,9 +87,8 @@ export default function BrandToSeries(props: BrandToSeriesProps) {
       loadData={loadData}
       value={selected.length <= 0 ? undefined : selected}
       onChange={_onChange}
-      fieldNames={{ value: 'id', label: 'name', }}
+      fieldNames={{ value: 'id', label: 'name' }}
       notFoundContent="暂无数据"
     />
-
   );
 }
@@ -107,8 +107,8 @@ function ShopSelectByBizType(
           (children || [])
             .filter((child) => !child.disabled)
             .map((shop) => ({
-              label: `${shop.shopName}`,
-              value: shop.shopId,
+              label: shop.title,
+              value: shop.value,
             })),
         );
         if (index === byBizTypeList.length - 1) {
@@ -135,8 +135,8 @@ function ShopSelectByBizType(
         // 将商家下的门店赋值给allValues
         allValues.current = allValues.current.concat(
           (children || []).map((shop) => ({
-            label: shop.shopName,
-            value: shop.shopId,
+            label: shop.title,
+            value: shop.value,
           })),
         );
         if (index === byDealerList.length - 1) {
@@ -220,6 +220,7 @@ function ShopSelectByBizType(
 }
  
 function processingChildrenData(data: ShopItem, showIds?: number[], hiddenIds?: number[], disabledIds?: number[]): DataItem[] | undefined {
+  // todo  hiddenIds 需要拼接 bizType 处理
   let _data: ShopItem[] | undefined, _children: DataItem[] | undefined;
  
   if (showIds?.length) {
-import { http } from '@/typing/http';
-import request from '@/utils/request';
-import { ANGEL_Host, FVM_HOST } from "@/utils/host";
-import * as IF from './interface';
-
-/**
- * 查询列表
- */
-export function getPageListApi(brandId?: IF.QueryParams): http.PromisePageResp<IF.Item> {
-  return request.get(`${ANGEL_Host}/loancusinsureqconfig/page`, { params: brandId });
-}
-/**查询配置授权车型 */
-export function getSpecListApi(additionalId?: number): http.PromiseResp<IF.Option[]> {
-  return request.get(`${FVM_HOST}/erp/subsidy/additional/auth/spec/list`, { params: { additionalId } });
-}
-
-/**
- * 保存
- */
-export function saveApi(params: IF.SaveParams): http.PromiseResp<void> {
-  return request.post(`${ANGEL_Host}/loancusinsureqconfig/save`, params);
-}
-
-// 配置删除
-export function deleteApi(id: number): http.PromiseResp<null> {
-  return request.post(`${ANGEL_Host}/loancusinsureqconfig/delete`, {id});
-}
-import React, { useState, useEffect } from "react";
-import { message, Modal, Select, Form, DatePicker, InputNumber, Spin, Space, Radio } from "antd";
-import { saveApi } from "../api";
-import moment from "moment";
-import { getSeriesApi } from "@/common/api";
-import * as IF from "../interface";
-
-const RangePicker = DatePicker.RangePicker;
-interface Props {
-  visible: boolean;
-  onCancel: Function;
-  item: IF.Item;
-  fetchList: () => any;
-  brandList: CommonApi.OptionVO[];
-}
-
-const formItemLayout = {
-  labelCol: {
-    xs: { span: 24 },
-    sm: { span: 6 },
-    md: { span: 6 },
-  },
-  wrapperCol: {
-    xs: { span: 24 },
-    sm: { span: 15 },
-    md: { span: 15 },
-  },
-};
-
-const Item = Form.Item;
-
-function SaveModal(props: Props) {
-  const { item, onCancel, fetchList, visible, brandList } = props;
-  const [loading, setLoading] = useState(false);
-  const [initLoading, setInitLoading] = useState(false);
-  const [form] = Form.useForm();
-  const [seriesList, setSeriesList] = useState<CommonApi.OptionVO[]>([]);
-  // const [seriesId, setSeriesId] = useState<number>();
-  // const [specData, setSpecData] = useState<IF.Option[]>([]);
-
-  useEffect(() => {
-    if (visible && item.id) {
-      form.setFieldsValue({
-        startDate: [item.startDate && moment(item.startDate), item.endDate && moment(item.endDate)],
-        brandId: { value: item.brandId, label: item.brandName, key: item.brandId },
-        seriesId: item.series?.map((item) => ({ value: item.seriesId, label: item.seriesName, key: item.seriesId })),
-        subsidyType: item.subsidyType,
-        needBuyTci: item.needBuyTci,
-        needBuyVci: item.needBuyVci,
-        vciReqAmount: item.vciReqAmount && item.vciReqAmount,
-      });
-
-       item.brandId && getSeries(item.brandId);
-      //  setInitLoading(true);
-      } else {
-      // setSpecData([]);
-      // setSeriesId(undefined);
-      setSeriesList([]);
-    }
-  }, [visible]);
-
-  function getSeries(brandId: number) {
-    getSeriesApi(brandId)
-      .then((res) => {
-        setSeriesList(res.data || []);
-      })
-      .catch((err) => {
-        message.error(err.message);
-      });
-  }
-
-  function submit() {
-    form.validateFields().then((fields) => {
-      // 车系
-      const series = fields.seriesId.map((item:any) => ({ seriesId: item.key, seriesName: item.label }));
-      const params: IF.SaveParams = {
-        id: item && item.id,
-        ...fields,
-        brandId: fields.brandId.value,
-        brandName: fields.brandId.label,
-        series,
-        startDate: fields.startDate[0].valueOf(),
-        endDate: fields.startDate[1].valueOf(),
-      };
-      setLoading(true);
-      saveApi(params)
-        .then(() => {
-          message.success("保存成功");
-          fetchList();
-          onCancel();
-          setLoading(false);
-        })
-        .catch((e) => {
-          setLoading(false);
-          message.error(e.message);
-        });
-    });
-  }
-
-  return (
-    <Modal title={item.id ? "编辑" : "新增"} width={700} visible={visible} maskClosable={false} afterClose={() => form.resetFields()} onCancel={() => onCancel()} onOk={() => form.submit()} confirmLoading={loading}>
-      <Spin spinning={initLoading}>
-        <Form form={form} {...formItemLayout} onFinish={submit}>
-          <Item label="有效期" name="startDate" rules={[{ required: true, message: "请选择生效时间" }]}>
-            <RangePicker disabledDate={(current) => !!current && current < moment().startOf("day")} style={{ width: "100%" }} format="YYYY-MM-DD" />
-          </Item>
-          <Item label="适用品牌" name="brandId" rules={[{ required: true, message: "请选择品牌" }]}>
-            <Select
-              optionFilterProp="children"
-              placeholder="请选择品牌"
-              labelInValue
-              showSearch
-              onChange={(v: any) => {
-                getSeries(v.value);
-                form.setFieldsValue({ seriesId: undefined, specList: undefined });
-              }}
-            >
-              {brandList.map((i) => (
-                <Select.Option value={i.id} key={i.id}>
-                  {i.name}
-                </Select.Option>
-              ))}
-            </Select>
-          </Item>
-
-          <Item label="适用车系" name="seriesId" rules={[{ required: true, message: "请选择车系" }]}>
-            <Select
-              mode="multiple"
-              optionFilterProp="children"
-              placeholder="请选择车系"
-              notFoundContent="暂无数据"
-              labelInValue
-              showSearch
-              onChange={(v: any) => {
-                // setSeriesId(v.value);
-                // form.setFieldsValue({ specList: undefined });
-              }}
-            >
-              {seriesList.map((i) => (
-                <Select.Option value={i.id} key={i.id}>
-                  {i.name}
-                </Select.Option>
-              ))}
-            </Select>
-          </Item>
-          {/* 交强险 */}
-          <Item name="needBuyTci" label="要求购买交强险" rules={[{ required: true, message: "请选择是否要求购买交强险" }]}>
-            <Radio.Group
-              options={[
-                { label: "是", value: true },
-                { label: "否", value: false },
-              ]}
-            />
-          </Item>
-          {/* 商业险 */}
-          <Item name="needBuyVci" label="要求购买商业险" rules={[{ required: true, message: "请选择是否要求购买交强险" }]}>
-            <Radio.Group
-              options={[
-                { label: "是", value: true },
-                { label: "否", value: false },
-              ]}
-            />
-          </Item>
-
-          <Item noStyle shouldUpdate={(prevValues, curValues) => prevValues.needBuyVci !== curValues.needBuyVci}>
-            {({ getFieldValue }) => {
-              const type = getFieldValue("needBuyVci");
-              return type ? (
-                <Form.Item label="商业险要求金额(>=)">
-                  <Space>
-                    <Item
-                      name="vciReqAmount"
-                      noStyle
-                      rules={[
-                        { required: true, message: "请输入" },
-                        { pattern: /^(?!(0[0-9]{0,}$))[0-9]{1,}[.]{0,}[0-9]{0,}$/, message: "请输入正数" },
-                      ]}
-                    >
-                      <InputNumber style={{ width: "100%" }} placeholder="请输入" precision={2} />
-                    </Item>
-                    <span>元</span>
-                  </Space>
-                </Form.Item>
-              ) : null;
-            }}
-          </Item>
-        </Form>
-      </Spin>
-    </Modal>
-  );
-}
-
-export default SaveModal;
-import React, { useState, useEffect } from "react";
-import "@ant-design/compatible/assets/index.css";
-import { Modal, Button, Table } from "antd";
-
-import * as IF from "../interface";
-
-interface Props {
-  visible: boolean;
-  onCancel: () => any;
-  item: IF.Item;
-}
-
-function SpecModal(props: Props) {
-  const { visible, onCancel, item } = props;
-  const [tableList, setTableList] = useState<IF.SeriesItem[]>([]);
-  useEffect(() => {
-    let list = [];
-    if (item.series) {
-      for (let i = 0; i < item.series.length; i++) {  
-          let obj = { ...item.series[i] };
-        obj.brandName = item.brandName;
-        list.push(obj);
-      }
-      setTableList([...tableList, ...list]);
-    } else {
-      setTableList([]);
-    }
-  }, [item.id]);
-  const columns = [
-    {
-      title: "品牌",
-      dataIndex: "brandName",
-    },
-    {
-      title: "适用车系",
-      dataIndex: "seriesName",
-    },
-  ];
-
-  return (
-    <Modal
-      title="车辆信息"
-      style={{ width: 400 }}
-      maskClosable={false}
-      visible={visible}
-      onCancel={() => onCancel()}
-      footer={
-        <Button type="default" onClick={() => onCancel()}>
-          取消
-        </Button>
-      }
-    >
-      <Table columns={columns} dataSource={tableList} rowKey={record => record.seriesId} />
-    </Modal>
-  );
-}
-
-export default React.memo(SpecModal);
-import React, { useState } from "react";
-import { PlusOutlined } from "@ant-design/icons";
-import { Button, Card, Divider, message, Popconfirm, Table, Select } from "antd";
-import { PageHeaderWrapper } from "@ant-design/pro-layout";
-import usePagination from "@/hooks/usePagination";
-import SaveModal from "./components/EditModal";
-import SpecModal from "./components/SpecModal";
-import { deleteApi, getPageListApi } from "./api";
-import * as IF from "./interface";
-import useInitial from "@/hooks/useInitail";
-import { getBrandFilterApi } from "@/common/api";
-import moment from "moment";
-
-const Column = Table.Column;
-
-export default function StorageList() {
-  const { list, paginationConfig, loading, setLoading, setParams, innerParams } = usePagination<StorageMaintain.Item>(getPageListApi, {});
-  const [specVisible, setSpecVisible] = useState(false);
-  const { data: brandList } = useInitial<CommonApi.OptionVO[], {}>(getBrandFilterApi, [], {});
-  const [visible, setVisible] = useState(false);
-  const [item, setItem] = useState<IF.Item>({});
-
-  /**删除 */
-  function handleDelete(item: IF.Item) {
-    item.id &&
-      deleteApi(item.id)
-        .then((res) => {
-          setLoading(true);
-          message.success("操作成功");
-        })
-        .catch((e) => {
-          message.error(e.message);
-        });
-  }
-
-  return (
-    <PageHeaderWrapper title="贷款客户保险要求配置">
-      <Card>
-        <div style={{ display: "flex", flexDirection: "row", justifyContent: "space-between", marginBottom: 20 }}>
-          <div style={{ display: "flex", flexDirection: "row" }}>
-            <Select style={{ width: 250 }} placeholder="请选择品牌" value={innerParams.brandId} onChange={(v) => setParams({ ...innerParams, brandId: v }, true)} allowClear>
-              {brandList.map((item) => (
-                <Select.Option value={item.id} key={item.id}>
-                  {item.name}
-                </Select.Option>
-              ))}
-            </Select>
-          </div>
-          <Button
-            type="primary"
-            icon={<PlusOutlined />}
-            onClick={() => {
-              setVisible(true);
-              setItem({});
-            }}
-          >
-            新增
-          </Button>
-        </div>
-        <Table size="small" loading={loading} pagination={paginationConfig} rowKey={(item) => String(item.id)} dataSource={list} onChange={(_pagination) => setParams({ ..._pagination }, true)}>
-          <Column title="品牌" width="10%" align="center" dataIndex="brandName" />
-          <Column
-            title="适用车系"
-            width="10%"
-            align="center"
-            render={(text, record: IF.Item) => (
-              <Button
-                type="link"
-                onClick={() => {
-                  setSpecVisible(true);
-                  setItem(record);
-                }}
-              >
-                查看
-              </Button>
-            )}
-          />
-          <Column
-            title="有效期"
-            width="16%"
-            align="center"
-            render={(text, record: IF.Item) => <span>{`${(record.startDate && moment(record.startDate).format("YYYY-MM-DD")) || "——"}~${(record.endDate && moment(record.endDate).format("YYYY-MM-DD")) || "——"}`}</span>}
-          />
-          <Column title="要求购买交强险" dataIndex="needBuyTci" width="10%" align="center" render={(text) => (text ? <span>是</span> : <span>否</span>)} />
-          <Column title="要求购买商业险" dataIndex="needBuyVci" width="10%" align="center" render={(text) => (text ? <span>是</span> : <span>否</span>)} />
-          <Column
-            title="商业险要求金额(>=)"
-            dataIndex="vciReqAmount"
-            width="10%"
-            align="center"
-            render={(text: number) => {
-              return text > 0? <span>{`${text || 0}元`}</span> :"--";
-            }}
-          />
-
-          <Column
-            title="操作"
-            align="center"
-            width="15%"
-            render={(text, record: IF.Item) => (
-              <>
-                <Button
-                  type="link"
-                  style={{ padding: 0 }}
-                  onClick={() => {
-                    setVisible(true);
-                    setItem(record);
-                  }}
-                >
-                  编辑
-                </Button>
-                <Divider type="vertical" />
-                <Popconfirm placement="top" title="确认删除?" onConfirm={() => handleDelete(record)}>
-                  <Button type="link" style={{ padding: 0 }}>
-                    删除
-                  </Button>
-                </Popconfirm>
-              </>
-            )}
-          />
-        </Table>
-      </Card>
-      <SaveModal
-        visible={visible}
-        brandList={brandList}
-        item={item}
-        fetchList={() => setLoading(true)}
-        onCancel={() => {
-          setVisible(false);
-          setItem({});
-        }}
-      />
-      {/* {specModal} */}
-
-      <SpecModal
-        visible={specVisible}
-        item={item}
-        onCancel={() => {
-          setSpecVisible(false);
-          setItem({});
-        }}
-      />
-    </PageHeaderWrapper>
-  );
-}
-/**
- * 查询参数
- */
-export interface QueryParams {
-  brandId?: number,
-  current?: number,
-  pageSize?: number,
-}
-
-// export interface QueryParams {
-//   brandId?: number;
-// }
-/**
- * 列表项
- */
-export interface Item {
-  id?: number;
-  brandId?: number;
-  brandName?: string;
-  seriesName?: string;
-  startDate?: number;
-  endDate?: number;
-  subsidyAmount?: number;
-  subsidyType?: number;
-  needBuyTci?: boolean; //是否要求买交强险
-  needBuyVci?: boolean; //	是否要求买商业险
-  series?: { seriesId: number; seriesName: string; brandName?: string }[];
-  vciReqAmount?: number;
-  name?:string;
-}
-
-export interface SaveParams {
-  id?: number;
-  brandId?: number;
-  brandName?: string;
-  series?: { seriesId: number; seriesName: string }[];
-  startDate?: number;
-  endDate?: number;
-  needBuyTci?: boolean;
-  needBuyVci?: boolean;
-  vciReqAmount?: number; //商业险补贴金额
-  subsidyType?: number; //补贴类型 1增购补贴、2大客户购车补贴、3置换补贴、4最美职业补贴
-  subsidyAmount?: number; //补贴金额
-}
-
-interface SeriesItem {
-  seriesId: number;
-  seriesName: string;
-  brandName?: string;
-}
-
-interface SimilarItem {
-  brandId: number,
-  brandName: string,
-}
-/**
- * 授权参数
- */
-export interface ShopItem {
-  shopId?: number, // 所属门店
-  shopName?: string
-}
-
-export interface SelecSpecParams {
-  seriesId: number, //车系id
-  startTime: number, //	开始时间
-  endTime: number,	//结束时间
-  additionalId?: number, //配置id（编辑使用）
-}
-/**
- * 选项
- */
-export interface CustomerOption {
-  customerType: number,
-  typeName?: string
-}
-
-export interface Option {
-  specId?: number,
-  specName?: string
-}
 \ No newline at end of file
@@ -6,6 +6,7 @@ import BrandSeriesFormItem from &#39;../BrandSeriesFormItem&#39;;
 import ShopSelectorByAll from '../ShopSelectorByAll';
 import LoanTypeFormItem from '../LoanTypeFormItem';
 import type { LabeledValue } from 'antd/lib/select';
+import st from './style.less';
  
 interface Props {
   visible: boolean;
@@ -64,7 +65,7 @@ function AddModal({ visible, row, onCancel, onRefresh }: Props) {
         <Form.Item label="适用品牌车系" name="allBrandSeries" rules={[{ required: true, message: '请选择' }]}>
           <Radio.Group>
             <Radio value={true}>全部品牌全部车系</Radio>
-            <Radio value={false}>部分品牌部分车系</Radio>
+            <Radio value={false}>指定</Radio>
           </Radio.Group>
         </Form.Item>
         <Form.Item
@@ -80,7 +81,7 @@ function AddModal({ visible, row, onCancel, onRefresh }: Props) {
               return null;
             }
             return (
-              <Form.Item label="部分品牌部分车系" name="brandSeries" rules={[{ required: true, message: '请选择' }]}>
+              <Form.Item className={st.hidden} label={<></>} name="brandSeries" rules={[{ required: true, message: '请至少添加一种适应品牌车系' }]}>
                 <BrandSeriesFormItem />
               </Form.Item>
             );
+.hidden {
+    :global {
+        .ant-form-item-required {
+            visibility: hidden;
+        }
+    }
+}
 \ No newline at end of file
@@ -46,7 +46,7 @@ export default function Index({ brands, visible, value, onCancel, onChange }: Pr
   }
  
   return (
-    <Modal title={`${value ? '编辑' : '新增'}品牌车系`} style={{ width: 600 }} open={visible} onCancel={closeModal} onOk={form.submit}>
+    <Modal title={`${value ? '编辑' : '添加'}适用品牌车系`} style={{ width: 600 }} open={visible} onCancel={closeModal} onOk={form.submit}>
       <Form form={form} labelCol={{ span: '6' }} onFinish={handleSave}>
         <FormItem label="品牌" name="brand" rules={[{ required: true, message: '请选择品牌' }]}>
           <Select
@@ -77,7 +77,7 @@ export default function Index({ readOnly = false, value = [], onChange }: Props)
               });
             }}
           >
-            新增
+            添加
           </Button>
         </Row>
       )}
@@ -11,7 +11,7 @@ interface Props {
 export default function Index({ brandSeriesModal, onCancel }: Props) {
   const { visible, brandSeries = [] } = brandSeriesModal;
   return (
-    <Modal title="部分品牌部分车系" open={visible} onCancel={() => onCancel()} footer={null} width={600}>
+    <Modal title="适用品牌车系" open={visible} onCancel={() => onCancel()} footer={null} width={600}>
       <BrandSeriesFormItem value={brandSeries} readOnly />
     </Modal>
   );
-import React from 'react';
+import React, { memo } from 'react';
 import { Row, Select } from 'antd';
 import _ from 'lodash';
 import type { PageParams } from '../../api';
-import { getBrandFilterApi, getSaleSeries, getShopApi } from '@/common/api';
+import { getShopApi } from '@/common/api';
 import useInitial from '@/hooks/useInitail';
+import BrandToSeries from '@/components/Condition/BrandToSeries';
  
 interface Props {
   innerParams?: any;
@@ -11,8 +12,6 @@ interface Props {
 }
  
 function Filter({ innerParams, setParams }: Props) {
-  const { data: brands } = useInitial(getBrandFilterApi, [], {});
-  const { data: series } = useInitial(getSaleSeries, [], {});
   const { data: shops } = useInitial<CommonApi.OptionVO[], undefined>(getShopApi, [], undefined);
  
   const onChange = _.debounce((newParams) => {
@@ -21,35 +20,16 @@ function Filter({ innerParams, setParams }: Props) {
  
   return (
     <Row style={{ display: 'flex', flex: 1 }}>
-      <Select
-        style={{ width: 200 }}
-        showSearch
-        allowClear
-        // optionFilterProp="children"
-        placeholder="筛选品牌"
-        options={brands}
-        fieldNames={{ label: 'name', value: 'id' }}
-        onChange={(value) => {
-          onChange({ brandId: value });
-        }}
-      />
-      <Select
-        style={{ width: 200, marginLeft: 20 }}
-        showSearch
-        allowClear
-        // optionFilterProp="children"
-        placeholder="筛选车系"
-        options={series}
-        fieldNames={{ label: 'name', value: 'id' }}
-        onChange={(value) => {
-          onChange({ seriesId: value });
-        }}
+      <BrandToSeries
+        //@ts-ignore
+        style={{ width: 260 }}
+        placeholder="筛选品牌车系"
+        onChange={(v) => onChange({ brandId: v[0], seriesId: v && v.length === 2 ? v[1] : undefined })}
       />
       <Select
-        style={{ width: 200, marginLeft: 20 }}
+        style={{ width: 260, marginLeft: 20 }}
         showSearch
         allowClear
-        // optionFilterProp="children"
         placeholder="筛选门店"
         options={shops}
         fieldNames={{ label: 'name', value: 'id' }}
@@ -12,14 +12,15 @@ export default function Index({ form, name, label }: Props) {
   return (
     <Form.Item label={label} name={[name, 'type']} rules={[{ required: true, message: '请选择' }]}>
       <Radio.Group>
+        <Radio value={LoanTypeEnum.无要求}>无要求</Radio>
         <Radio value={LoanTypeEnum.购买即可}>购买即可</Radio>
-        <Radio value={LoanTypeEnum.购保要求金额}>
+        <Radio value={LoanTypeEnum.保费有要求}>
           <div style={{ display: 'flex', alignItems: 'center', flexDirection: 'row' }}>
-            <span>购保要求金额</span>
+            <span>保费有要求</span>
             <Form.Item
               noStyle
               shouldUpdate={(prev, curr) => {
-                if (prev[name] && curr[name] && prev[name].type !== curr[name].type && curr[name].type !== LoanTypeEnum.购保要求金额) {
+                if (prev[name] && curr[name] && prev[name].type !== curr[name].type && curr[name].type !== LoanTypeEnum.保费有要求) {
                   form.setFieldValue([name, 'amount'], undefined);
                 }
                 return prev[name] !== curr[name];
@@ -27,7 +28,7 @@ export default function Index({ form, name, label }: Props) {
             >
               {({ getFieldValue }) => {
                 const type = (getFieldValue(name) ?? {}).type;
-                if (type !== LoanTypeEnum.购保要求金额) return null;
+                if (type !== LoanTypeEnum.保费有要求) return null;
                 return (
                   <Form.Item
                     style={{ marginBottom: 0, marginLeft: 10 }}
@@ -35,14 +36,13 @@ export default function Index({ form, name, label }: Props) {
                     required
                     rules={[{ required: true, message: '请填写金额' }]}
                   >
-                    <InputNumber addonBefore="≥" addonAfter="元" style={{ minWidth: 120 }} min={0.01} precision={2} placeholder="请填写金额" />
+                    <InputNumber addonBefore="≥" addonAfter="元" style={{ width: 200 }} min={0.01} precision={2} placeholder="请填写金额" />
                   </Form.Item>
                 );
               }}
             </Form.Item>
           </div>
         </Radio>
-        <Radio value={LoanTypeEnum.无要求}>无要求</Radio>
       </Radio.Group>
     </Form.Item>
   );
@@ -53,7 +53,7 @@ export default function Index() {
   };
  
   const renderLoanTypeEle = (value: API.LoanType) => {
-    return value ? (value.type !== LoanTypeEnum.购保要求金额 ? LoanTypeEnum[value.type] : `保费 ≥ ${value.amount}元`) : '--';
+    return value ? (value.type !== LoanTypeEnum.保费有要求 ? LoanTypeEnum[value.type] : `保费 ≥ ${value.amount}元`) : '--';
   };
  
   return (
@@ -100,7 +100,11 @@ export default function Index() {
                 )
               }
             />
-            <Column title="适用门店" dataIndex="useShopIds" render={(value) => <TextWithMore title="适用门店" dataIndex="shopName" list={value} />} />
+            <Column
+              title="适用门店"
+              dataIndex="useShopIds"
+              render={(value) => <TextWithMore title="适用门店" dataIndex="shopName" list={value} unit="个门店" />}
+            />
             <Column title="新保交强险" dataIndex="newTci" render={renderLoanTypeEle} />
             <Column title="新保商业险" dataIndex="newVci" render={renderLoanTypeEle} />
             <Column title="新保驾意险" dataIndex="newTai" render={renderLoanTypeEle} />
@@ -8,6 +8,6 @@ export interface IdNameOption {
 }
 export enum LoanTypeEnum {
   '购买即可' = 1,
-  '购保要求金额',
+  '保费有要求',
   '无要求',
 }
 \ No newline at end of file
@@ -40,7 +40,7 @@ export default function UserAddModal({ visible, value, onCancel, onChange }: Pro
           name="userName"
           rules={[
             { required: true, message: '请填写姓名' },
-            { max: 20, message: '输入长度应该小于20' },
+            { max: 32, message: '输入长度应该小于32' },
             { whitespace: true, message: '不能输入空白字符' },
           ]}
         >
@@ -55,7 +55,7 @@ export default function UserAddModal({ visible, value, onCancel, onChange }: Pro
               pattern: /^((\+86)|(86))?(13[0-9]|14[579]|15[0-3,5-9]|16[6]|17[0135678]|18[0-9]|19[89])\d{8}$/,
               message: '请输入有效的电话号码',
             },
-            { max: 20, message: '输入长度应该小于20' },
+            { max: 16, message: '输入长度应该小于16' },
             { whitespace: true, message: '不能输入空白字符' },
           ]}
         >
+import type { http } from '@/typing/http';
+import request from '@/utils/request';
+import { OA_HOST } from '@/utils/host';
+import type { Pagination } from '@/typing/common';
+
+export interface Item {
+  id?: number;
+  name: string;
+  mobile: string;
+  remark: string;
+}
+
+export interface PageParams extends Pagination {
+  name?: string;
+  mobile?: string;
+  remark?: string;
+}
+
+/**
+ * 分页查询
+ */
+export function getFoodWhitePage(params?: PageParams): http.PromisePageResp<Item> {
+  return request.get(`${OA_HOST}/contract/erp/repast/white/page`, { params });
+}
+
+/**
+ * 新增/编辑
+ */
+export function addFoodWhite(data?: Item): http.PromiseResp<void> {
+  return request.post(`${OA_HOST}/contract/erp/repast/white/save`, data);
+}
+
+/**
+ * 删除
+ */
+export function delFoodWhite(id: number): http.PromisePageResp<void> {
+  return request.post(`${OA_HOST}/contract/erp/repast/white/delete`, { id });
+}
+import React, { useEffect, memo } from 'react';
+import { Modal, Form, message, Input } from 'antd';
+import * as API from '../../api';
+import { useRequest } from 'umi';
+
+interface Props {
+  visible: boolean;
+  row?: API.Item;
+  onCancel: () => void;
+  onRefresh: () => void;
+}
+
+function AddModal({ visible, row, onCancel, onRefresh }: Props) {
+  const { id } = row ?? {};
+  const [form] = Form.useForm();
+
+  const saveHook = useRequest(API.addFoodWhite, {
+    manual: true,
+    throwOnError: true,
+  });
+
+  useEffect(() => {
+    if (visible) {
+      if (row) {
+        form.setFieldsValue(row);
+      }
+    } else {
+      form.resetFields();
+    }
+  }, [visible, row]);
+
+  const handleSave = (feildValue: any) => {
+    saveHook
+      .run(feildValue)
+      .then(() => {
+        message.success('操作成功');
+        onCancel();
+        onRefresh();
+      })
+      .catch((e) => {
+        message.error(e.message);
+      });
+  };
+
+  return (
+    <Modal title={`${id ? '编辑' : '新增'}`} open={visible} confirmLoading={saveHook.loading} onCancel={onCancel} onOk={form.submit} width={600}>
+      <Form form={form} onFinish={handleSave} labelCol={{ span: 4 }} wrapperCol={{ span: 18 }}>
+        <Form.Item name="id" hidden />
+        <Form.Item
+          label="姓名"
+          name="name"
+          rules={[
+            { required: true, message: '请填写姓名' },
+            { max: 32, message: '输入长度应该小于32' },
+            { whitespace: true, message: '不能输入空白字符' },
+          ]}
+        >
+          <Input placeholder="请填写" />
+        </Form.Item>
+        <Form.Item
+          label="手机号"
+          name="mobile"
+          rules={[
+            { required: true, message: '请填写联系电话' },
+            {
+              pattern: /^((\+86)|(86))?(13[0-9]|14[579]|15[0-3,5-9]|16[6]|17[0135678]|18[0-9]|19[89])\d{8}$/,
+              message: '请输入有效的电话号码',
+            },
+            { max: 16, message: '输入长度应该小于16' },
+            { whitespace: true, message: '不能输入空白字符' },
+          ]}
+        >
+          <Input placeholder="请填写" />
+        </Form.Item>
+        <Form.Item label="备注" name="remark" rules={[{ required: true, message: '请填写' }]}>
+          <Input.TextArea placeholder="请填写" maxLength={64} />
+        </Form.Item>
+      </Form>
+    </Modal>
+  );
+}
+
+export default memo(AddModal);
+import React from 'react';
+import { Input, Row } from 'antd';
+import _ from 'lodash';
+import type { PageParams } from '../../api';
+
+interface Props {
+  innerParams?: any;
+  setParams: (params: PageParams, refreshing: boolean) => void;
+}
+
+function Filter({ innerParams, setParams }: Props) {
+  const onChange = _.debounce((newParams) => {
+    setParams({ ...innerParams, ...newParams }, true);
+  }, 600);
+
+  return (
+    <Row style={{ display: 'flex', flex: 1 }}>
+      <Input
+        style={{ width: 200 }}
+        allowClear
+        placeholder="搜索姓名"
+        onChange={(e) => {
+          onChange({ name: e.target.value });
+        }}
+      />
+      <Input
+        style={{ width: 200, marginLeft: 20 }}
+        allowClear
+        placeholder="搜索手机号"
+        onChange={(e) => {
+          onChange({ mobile: e.target.value });
+        }}
+      />
+    </Row>
+  );
+}
+
+export default Filter;
+import React, { useState } from 'react';
+import { Button, Card, ConfigProvider, Divider, message, Popconfirm, Row, Table } from 'antd';
+import { PageHeaderWrapper } from '@ant-design/pro-layout';
+import zhCN from 'antd/lib/locale-provider/zh_CN';
+import usePagination from '@/hooks/usePagination';
+import { PlusOutlined } from '@ant-design/icons';
+import AddModal from './components/AddModal';
+import Filter from './components/Filter';
+import * as API from './api';
+import _ from 'lodash';
+
+const { Column } = Table;
+
+export default function Index() {
+  // 新增 | 编辑
+  const [addModal, setAddModal] = useState<{
+    visible: boolean;
+    row?: API.Item;
+  }>({
+    visible: false,
+  });
+
+  const { list, paginationConfig, loading, innerParams, setParams } = usePagination<API.Item>(API.getFoodWhitePage);
+
+  const handleDelete = (row: API.Item) => {
+    const { id } = row;
+    API.delFoodWhite(id!)
+      .then((res) => {
+        message.success(res.result);
+        setParams({ ...innerParams }, true);
+      })
+      .catch((e) => {
+        message.error(e.message);
+      });
+  };
+
+  const handleEdit = (row: API.Item) => {
+    setAddModal({
+      visible: true,
+      row,
+    });
+  };
+
+  return (
+    <PageHeaderWrapper title="就餐白名单">
+      <ConfigProvider locale={zhCN}>
+        <Card>
+          <Row align="middle" justify="space-between" style={{ marginBottom: 20 }}>
+            <Filter innerParams={innerParams} setParams={setParams} />
+            <Button
+              type="primary"
+              icon={<PlusOutlined />}
+              onClick={() => {
+                setAddModal({
+                  visible: true,
+                });
+              }}
+            >
+              新增
+            </Button>
+          </Row>
+          <Table
+            loading={loading}
+            dataSource={list}
+            pagination={paginationConfig}
+            rowKey="id"
+            onChange={(_pagination) => setParams({ ..._pagination }, true)}
+          >
+            <Column title="姓名" dataIndex="name" />
+            <Column title="手机号" dataIndex="mobile" />
+            <Column title="备注" dataIndex="remark" />
+            <Column
+              title="操作"
+              dataIndex="btns"
+              render={(text, row: API.Item) => (
+                <span>
+                  <a
+                    onClick={(e) => {
+                      e.preventDefault();
+                      handleEdit(row);
+                    }}
+                  >
+                    编辑
+                  </a>
+                  <Divider type="vertical" />
+                  <Popconfirm title="是否删除?" onConfirm={() => handleDelete(row)}>
+                    <a
+                      onClick={(e) => {
+                        e.preventDefault();
+                      }}
+                      style={{ color: 'red' }}
+                    >
+                      删除
+                    </a>
+                  </Popconfirm>
+                </span>
+              )}
+            />
+          </Table>
+        </Card>
+        <AddModal
+          visible={addModal.visible}
+          row={addModal.row}
+          onCancel={() => {
+            setAddModal({ visible: false });
+          }}
+          onRefresh={() => setParams({ ...innerParams }, true)}
+        />
+      </ConfigProvider>
+    </PageHeaderWrapper>
+  );
+}