Merge branch 'bug_fix' into erp

王强
2 parents 1ba40972 6f3d6ded
Showing 32 changed files with 1551 additions and 250 deletions
build/admin.tar.gz
config/routers/cas.ts
src/components/PositionSelector/index.tsx
src/pages/cas/PartGroup/api.ts
src/pages/cas/PartGroup/components/AddModal.tsx
src/pages/cas/PartGroup/components/Filter.tsx
src/pages/cas/PartGroup/components/ItemSelect.tsx
src/pages/cas/PartGroup/components/PartTable.tsx
src/pages/cas/PartGroup/components/api.ts
src/pages/cas/PartGroup/index.tsx
src/pages/cas/afterSaleConfiguration/jobManagement/components/CreateModal.tsx
src/pages/cas/workOrder/base/api.ts
src/pages/cas/workOrder/base/components/WashList.tsx
src/pages/cas/workOrder/base/components/WashModal.tsx
src/pages/cas/workOrder/base/index.tsx
src/pages/cas/workOrder/washCar/api.ts
src/pages/cas/workOrder/washCar/components/Modal.tsx
src/pages/cas/workOrder/washCar/index.tsx
src/pages/contract/Canteen/api.ts
src/pages/contract/Canteen/components/SaveModal.tsx
@@ -105,6 +105,10 @@ export default [
     path: '/cas/Claim/firstInsuranceClaim', // 首保索赔价格配置
     component: './cas/firstInsuranceClaim'
   },
+  {
+    path: '/cas/Claim/PartGroup', // 配件分组
+    component: './cas/PartGroup'
+  },
   // {
   //   path: '/cas/part/BorrowAndExport', //借料出库
   //   component: './cas/borrowExport'
@@ -354,4 +358,15 @@ export default [
     path: '/cas/YwManage/accessoryReplacement',
     component: './cas/AccessoryReplacement'
   },
+  /**
+   * 工单设置
+   */
+  {
+    path: '/cas/workOrder/base',
+    component: './cas/workOrder/base'
+  },
+  {
+    path: '/cas/workOrder/washCar',
+    component: './cas/workOrder/washCar'
+  },
 ];
@@ -32,7 +32,7 @@ export default function PositionSelector({ value = {}, onChange, disabled, style
  
   function confirm(data: ValueParams) {
     setVisible(false);
-    onChange && onChange({...data })
+    onChange && onChange({...data });
   }
  
   return (
@@ -49,7 +49,7 @@ export default function PositionSelector({ value = {}, onChange, disabled, style
       {!disabled && visible && (
         <MapModal
           cancel={() => setVisible(false)}
-          info={(value.point) ? value : defaultAddress}
+          info={(value?.point) ? value : defaultAddress}
           visible={visible}
           ok={confirm}
         />
+import { http } from '@/typing/http';
+import request from '@/utils/request';
+import { CAS_HOST, HOST } from '@/utils/host';
+
+type PromisePageResp<T> = http.PromisePageResp<T>;
+
+interface ListParam {
+  current?: number,
+  pageSize?: number,
+  keyword?: string,
+  vin?: string,
+}
+
+export interface ListVO {
+  /** 工单id */
+  id?: number,
+  /** 工单号 */
+  orderNo?: string,
+  /** 工单状态 */
+  status?: number,
+  /** 工单状态名称 */
+  statusName?: string,
+  /** 车辆名称 */
+  carName?: string,
+  /** 车牌号 */
+  plateNo?: string,
+  /** 接车时间 */
+  receiveTime?: number,
+  /** 服务站 */
+  shopId?: number,
+  shopName?: string,
+  /** 服务顾问 */
+  receiverName?: string,
+  /** 车型代码 */
+  specCode?: string
+  vin?: string,
+}
+
+/** 获取接车列表 */
+export function getListApi(params: ListParam): PromisePageResp<ListVO> {
+  return request.get(`${CAS_HOST}/erp/reception/cancel/notify/list`, { params });
+}
+
+/** 结接车单 */
+export function endApi(vin?: string): http.PromiseResp<string> {
+  return request.get(`${CAS_HOST}/erp/reception/cancel/notify`, { params: {vin} },);
+}
+import React, { useEffect, useState } from "react";
+import { Modal, Form, Select, message, Input, Table, Button } from "antd";
+import ItemSelect from "./ItemSelect";
+import {PartItem} from './api';
+import PartTable from './PartTable';
+
+const FormItem = Form.Item;
+const { Option } = Select;
+
+interface Props {
+  visible: boolean;
+  item: any;
+  setVisible: (value: any) => any;
+  setLoading: (value: boolean) => any;
+  setItem: (value: any) => any;
+}
+
+export default function AddModal(props: Props) {
+  const { visible, item, setVisible, setLoading, setItem } = props;
+  const [form] = Form.useForm();
+
+  useEffect(() => {
+    console.log("item", item);
+    // if (item && item.id) {
+    //   // form.setFieldsValue({});
+    // } else {
+    //   form.resetFields();
+    // }
+  }, [visible]);
+
+  function handleSave(value: any) {
+    const partList = form.getFieldValue("partList");
+    const params = {
+      partList,
+      partGroupName: value.partGroupName,
+      partGroupCode: value.partGroupCode,
+    };
+    console.log("pppp", params);
+  }
+
+  const onClose = () => {
+    setItem({});
+    setVisible(false);
+  };
+
+  return (
+    <Modal
+      visible={visible}
+      onCancel={() => onClose()}
+      width={820}
+      onOk={() => form.submit()}
+      // getContainer={false}
+    >
+      <Form
+        form={form}
+        labelCol={{ span: 5 }}
+        wrapperCol={{ span: 18 }}
+        onFinish={handleSave}
+        onValuesChange={(changeValue, values) => {}}
+      >
+        <FormItem
+          name="partGroupName"
+          label="配件分组名称"
+          rules={[{ required: true, message: "必填" }]}
+        >
+          <Input />
+        </FormItem>
+        <FormItem
+          name="partGroupCode"
+          label="配件分组代码"
+          rules={[{ required: true, message: "必填" }]}
+        >
+          <Input placeholder="大写英文加数字" />
+        </FormItem>
+        <FormItem
+          label="配件清单"
+          rules={[
+            {
+              required: true,
+              min: 1,
+              message: "配件清单不能为空",
+              type: "array",
+            },
+          ]}
+          shouldUpdate
+          name="partList"
+        >
+          <PartTable />
+        </FormItem>
+      </Form>
+    </Modal>
+  );
+}
+import React, { useState } from 'react';
+import { Row, Input, Radio, DatePicker, Select } from 'antd';
+import { debounce } from 'lodash';
+
+interface Props {
+  onChange: (param: {}) => any,
+  innerParams: any
+}
+
+const Search = Input.Search;
+const Option = Select.Option;
+
+export default function Filter({ onChange, innerParams }: Props) {
+  const fetchListByNo = debounce(handleSearchByNo, 500);
+
+  function handleSearchByNo(value: string) {
+    onChange && onChange({
+      vin: value || undefined
+    });
+  }
+
+  return (
+    <Row style={{ width: "100%", marginBottom: 24 }}>
+      <Search
+        enterButton
+        allowClear
+        placeholder="搜索配件分组名称"
+        onChange={(e) => fetchListByNo(e.target.value)}
+        onSearch={handleSearchByNo}
+        style={{ maxWidth: 260 }}
+        defaultValue={innerParams.keyword}
+      />
+    </Row>
+  );
+}
 \ No newline at end of file
+import React, { useState, useEffect } from "react";
+import { Modal, Table, Input, Select } from "antd";
+import * as api from "./api";
+import usePagination from "@/hooks/usePagination";
+import Column from "antd/lib/table/Column";
+import { debounce } from "lodash";
+import { RowSelectionType } from "antd/es/table/interface";
+import { getBrandFilterApi } from "@/common/api";
+import useInitail from "@/hooks/useInitail";
+
+const Search = Input.Search;
+const { Option } = Select;
+
+interface Props {
+  visible: boolean;
+  onCancel: () => any;
+  onOk: (data: any) => any;
+  selected: api.PartItem[]
+  type: RowSelectionType;
+}
+
+export default function ItemSelect(props: Props) {
+  const { visible, onCancel, onOk, type, selected } = props;
+  const { data: brands } = useInitail<CommonApi.OptionVO[], {}>(getBrandFilterApi, [], {});
+  const { list, loading, setParams, paginationConfig } = usePagination(
+    api.getPartItems,
+    { current: 1, pageSize: 10, keywords: "" }
+  );
+  const [selectData, setSelectData] = useState<api.PartItem[]>([]);
+
+  useEffect(() => {
+    if (visible) {
+      setSelectData(
+        selected.map((item:any) => ({
+          ...item,
+          id: item.itemId || item.id,
+        }))
+      );
+    }
+  }, [visible]);
+
+  const _onChange = debounce((value: any) => {
+    setParams({ keywords: value, current: 1 }, true);
+  }, 800);
+
+  function handSave() {
+    if (selectData.length && onOk) {
+      onOk(
+        selectData.map((item) => ({
+          ...item,
+          itemId: item.id,
+        }))
+      );
+    }
+  }
+
+  const handleChangeBrand = debounce((value) => {
+    setParams(value, true);
+  }, 500);
+
+  return (
+    <Modal
+      visible={visible}
+      title="装潢件"
+      width={700}
+      onCancel={() => onCancel()}
+      onOk={handSave}
+    >
+      <Select
+        style={{ width: 150 }}
+        onChange={(value) => {
+          handleChangeBrand({ brandId: value });
+        }}
+        placeholder="请选择品牌"
+        allowClear
+        // defaultValue={28}
+      >
+        {brands.map((item: CommonApi.OptionVO) => (
+          <Option value={item.id} key={item.id}>
+            {item.name}
+          </Option>
+        ))}
+      </Select>
+      <Search
+        allowClear
+        onChange={(e) => _onChange(e.target.value)}
+        onSearch={(keywords) => setParams({ keywords }, true)}
+        style={{ width: 230, marginBottom: 10, marginLeft: 30 }}
+        placeholder="请输入配件名称/编码/件号"
+      />
+      <Table
+        loading={loading}
+        dataSource={list}
+        pagination={{ ...paginationConfig, showSizeChanger: false }}
+        rowKey="id"
+        rowSelection={{
+          type,
+          selectedRowKeys: selectData.map((item) => item.id || -1),
+          onSelect: (row: any, _selected: boolean) => {
+            const index = selectData.findIndex((_row) => _row.id == row.id);
+            if (_selected) {
+              selectData.unshift(row);
+            } else if (index > -1) {
+              selectData.splice(index, 1);
+            }
+            setSelectData([...selectData]);
+          },
+          onSelectAll: (selected, selectedRows, changeRows) => {
+            const changedKeys = changeRows.map((row) => row.id);
+            let newData = [...selectData];
+            // 全选
+            if (selected) {
+              // 过滤掉已选的
+              newData = selectData.concat(
+                changeRows.filter(
+                  (row) => !selectData.some((item) => item.id == row.id)
+                )
+              );
+            } else {
+              // 全不选 - 去掉已选的
+              newData = selectData.filter(
+                (row) => !changedKeys.includes(row.id)
+              );
+            }
+            setSelectData(newData);
+          },
+          // onSelectInvert: () => {},
+          // onSelectMultiple: () => {},
+        }}
+      >
+        <Column title="配件编码" dataIndex="partCode" />
+        <Column title="配件件号" dataIndex="partNo" width={150} />
+        <Column title="配件名称" dataIndex="partName" />
+      </Table>
+    </Modal>
+  );
+}
+import { Button, Form, Table } from 'antd';
+import * as React from 'react';
+import {PartItem} from './api';
+import ItemSelect from './ItemSelect';
+import type { ColumnsType} from "antd/lib/table";
+
+export interface Props {
+  value?:PartItem[]
+  onChange?: (data: PartItem[]) => void
+}
+
+const Index = (props:Props) => {
+  const {value=[], onChange} = props;
+  const [form] = Form.useForm();
+  const [visible, setVisible] = React.useState(false);
+
+  const columns: ColumnsType<PartItem> = [
+    {
+      title: "配件名称",
+      dataIndex: "partName",
+      key: "partName",
+      align: "center",
+    },
+    {
+      title: "配件编码",
+      dataIndex: "partCode",
+      key: "partCode",
+      align: "center",
+    },
+    {
+      title: "操作",
+      render: (text: any, record: PartItem) => (
+        <Button
+          danger
+          onClick={() => {
+            const _list = value;
+            const partList = _list.filter((e) => e.partId != record.partId);
+            onChange && onChange([...partList]);
+          }}
+        >
+          删除
+        </Button>
+      ),
+    },
+  ];
+
+  const onSelect = (data: PartItem[]) => {
+    onChange && onChange(data);
+    setVisible(false);
+  }
+
+  return (
+    <div>
+      <Button
+        type="primary"
+        style={{ marginBottom: 10 }}
+        onClick={() => setVisible(true)}
+      >
+        新增
+      </Button>
+      <Form component={false} form={form}>
+        <Table
+          bordered
+          columns={columns}
+          dataSource={[...value]}
+          rowKey="id"
+        />
+      </Form>
+      <ItemSelect
+        visible={visible}
+        type="checkbox"
+        onOk={onSelect}
+        onCancel={() => setVisible(false)}
+        selected={[...value]}
+      />
+    </div>
+  );
+}
+
+export default Index;
+import { http } from '@/typing/http';
+import request from '@/utils/request';
+import { PMS_HOST } from '@/utils/host';
+
+type PromisePageResp<T> = http.PromisePageResp<T>;
+
+export interface PartItem {
+  id?: number,
+  partId?: number,
+  /**配件编码 */
+  partCode: string,
+  /**配件名称 */
+  partName: string,
+  /**配件号 */
+  partNo?: string,
+  /**配件数量 */
+  partNumber?: number,
+  [key: string]: any
+}
+export interface QueryParams {
+  current?: number, 
+  pageSize?: number, 
+  keywords?: string,
+  brandId?: number
+}
+
+/**查询备件 */
+export function getPartItems(params: QueryParams): PromisePageResp<PartItem> {
+  return request.get(`${PMS_HOST}/erp/part/list`, { params });
+}
+import { PageHeaderWrapper } from '@ant-design/pro-layout';
+import { Button, Card, message, Popconfirm, Table } from 'antd';
+import * as React from 'react';
+import Filter from "./components/Filter";
+import * as api from "./api";
+import usePagination from "@/hooks/usePagination";
+import { PlusOutlined } from "@ant-design/icons";
+import AddModal from './components/AddModal';
+
+const { Column } = Table;
+
+const Index = () => {
+    const {
+      list,
+      errMsg,
+      loading,
+      setLoading,
+      paginationConfig,
+      innerParams,
+      setParams,
+    } = usePagination(api.getListApi);
+
+    const [visible, setVisible] = React.useState(false);
+    const [current, setCurrent] = React.useState({});
+
+    function endOrder(row: api.ListVO) {
+      row.id &&
+        api
+          .endApi(row.vin)
+          .then((res) => {
+            message.success("禁用成功");
+            setLoading(true);
+          })
+          .catch((e) => {
+            message.error(`禁用失败：${e.message}`);
+          });
+    }
+
+    const onFilter = (option: any = {}) => {
+      setParams({ ...innerParams, ...option, current: 1 }, true);
+    };
+  return (
+    <PageHeaderWrapper title="配件分组">
+      <Card>
+        <div
+          style={{
+            display: "flex",
+            flexDirection: "row",
+            justifyContent: "space-between",
+            alignItems: "center",
+            marginBottom: 20,
+          }}
+        >
+          <Filter innerParams={innerParams} onChange={onFilter} />
+          <Button type="primary" icon={<PlusOutlined />} onClick={() => setVisible(true)}>
+            新增
+          </Button>
+        </div>
+        <Table
+          dataSource={list}
+          loading={loading}
+          pagination={paginationConfig}
+          rowKey="id"
+        >
+          <Column title="配件分组名称" dataIndex="vin" align="center" />
+          <Column
+            title="配件分组代码"
+            dataIndex="plateNo"
+            align="center"
+            render={(text) => <span>{text || "--"}</span>}
+          />
+          <Column
+            title="配件自动匹配关键词"
+            dataIndex="status"
+            align="center"
+            render={(text) => <span>{text || "--"}</span>}
+          />
+          <Column
+            title="配件清单"
+            dataIndex="hopeReceiverName"
+            align="center"
+            render={(text) => (
+              <Button type="primary" style={{ marginLeft: 10 }}>
+                查看
+              </Button>
+            )}
+          />
+          <Column
+            title="操作"
+            align="center"
+            render={(t, row: api.ListVO) => (
+              <div>
+                <Button
+                  size="small"
+                  onClick={() => {
+                  setVisible(true);
+                  setCurrent(row);
+                }}
+                >编辑
+                </Button>
+                <Popconfirm title="确认禁用" onConfirm={() => endOrder(row)}>
+                  <Button
+                    danger
+                    type="link"
+                    size="small"
+                    style={{ marginLeft: 10 }}
+                  >
+                    删除
+                  </Button>
+                </Popconfirm>
+              </div>
+            )}
+          />
+        </Table>
+        <AddModal item={current} setItem={setCurrent} visible={visible} setVisible={setVisible} setLoading={setLoading} />
+      </Card>
+    </PageHeaderWrapper>
+  );
+};
+
+export default Index;
 \ No newline at end of file
@@ -211,6 +211,9 @@ export default function SaveModal(props: Props) {
               <Option value={7} key={7}>
                 洗车
               </Option>
+              <Option value={8} key={8}>
+                养护
+              </Option>
             </Select>
           </FormItem>
           <FormItem
+import { http } from "@/typing/http";
+import request from "@/utils/request";
+import { ATTENDANCE_HOST } from '@/utils/host';
+
+type P<T> = http.PromiseResp<T>;
+//type Page<T> = http.PromisePageResp<T>; 
+
+export interface Item {
+  id?: number, //	配置id
+  monthRestCnt?: number, //	每月休息天数
+  scheduleDays?: number, //	下月排班表设置时间（当月倒数后多少天）
+  changeRestCnt?: number, //	主动调休次数
+  exceedChangePunishAmount?: number, //	超过调休次数罚款金额
+  missingCardPunishAmount?: number, //	缺卡罚款金额
+  latePunishAmount?: number, //	迟到罚款金额
+  seriousLatePunishAmount?: number, //	严重迟到罚款金额
+  missingCardCnt?: number, //	缺卡次数
+  lateCnt?: number, //	迟到次数
+  seriousLateCnt?: number, //	严重迟到次数(扣绩效分)
+  missingCardPunishScore?: number, //	缺卡超过N次扣绩效分
+  latePunishScore?: number, //	迟到超过N次扣绩效分
+  seriousLatePunishScore?: number, //	严重迟到超过N次扣绩效分
+  morningShiftPercent?: number, //	早晚班早班占比，百分比
+  absenteeismPunishScore?: number, //	旷工扣绩效分
+  restContinuousCnt?: number, //	排班连续休息最大天数
+  temporaryPunishAmount?: number, //	临时假罚款金额
+  absenteeismPunishAmount?: number, //	旷工罚款金额
+  verifyFaceRatio?: number, //	活体和人脸验证比例（百分比，整数）
+  sickLeavePunishAmount?: number, //	病假扣款标准(/天)
+  personalLeavePunishAmount?: number, // 事假扣款标准(/天)
+  continuousAbsent?: number, // 连续矿工次数（用于触发离职）
+  accumulativeAbsent?: number, // 月累计旷工次数（用于触发离职）
+}
+
+/**查询考勤打卡基础配置*/
+export function fetchDetail(): P<Item> {
+  return request.get(`${ATTENDANCE_HOST}/setting/clock/in/basic/info`);
+}
+
+/**保存考勤打卡基础配置*/
+export function saveApi(params?: Item) {
+  return request.post(`${ATTENDANCE_HOST}/setting/clock/in/basic/save`, params);
+}
+
+export interface WashItem {
+  shopName: string
+  shopId: number
+  isWash: string
+  itemName: string
+  itemId: number
+}
 \ No newline at end of file
+import { Button, Form, Table } from "antd";
+import * as React from "react";
+import { WashItem } from "../api";
+import WashModal from "./WashModal";
+import type { ColumnsType } from "antd/lib/table";
+
+export interface Props {
+  value?: WashItem[];
+  onChange?: (data: WashItem[]) => void;
+  edit?: boolean
+}
+
+const Index = (props: Props) => {
+  const { value = [], onChange, edit } = props;
+  const [form] = Form.useForm();
+  const [visible, setVisible] = React.useState(false);
+  const [current, setCurrent] = React.useState({} as WashItem);
+
+  const columns: ColumnsType<WashItem> = [
+    {
+      title: "适用门店",
+      dataIndex: "shopName",
+      key: "shopName",
+      align: "center",
+    },
+    {
+      title: "是否默认添加洗车项目",
+      dataIndex: "isWash",
+      key: "isWash",
+      align: "center",
+      render: (text: any, record: WashItem) => <div>{record.isWash == '1' ? '是' : '否'}</div>
+    },
+    {
+      title: "洗车项目",
+      dataIndex: "itemName",
+      key: "washName",
+      align: "center",
+    },
+    {
+      title: "操作",
+      align: "center",
+      render: (text: any, record: WashItem) => (
+        <div>
+          <Button
+            onClick={(e) => {
+              setCurrent(record);
+              setVisible(true);
+            }}
+            type="link"
+            disabled={!edit}
+          >
+            编辑
+          </Button>
+          <Button
+            type="link"
+            danger
+            disabled={!edit}
+            style={{ marginLeft: 5 }}
+            onClick={() => {
+              const _list = value;
+              const partList = _list.filter((e) => e.itemId != record.itemId);
+              onChange && onChange([...partList]);
+            }}
+          >
+            删除
+          </Button>
+        </div>
+      ),
+    },
+  ];
+
+  const onSure = (data: WashItem, shopId?: number) => { 
+    if (shopId) {
+      const _index = value.findIndex(e => e.shopId == shopId);
+      value[_index] = data;
+      onChange && onChange([...value]);
+      setVisible(false);
+    } else {
+      value.push(data);
+      onChange && onChange([...value]);
+      setVisible(false);
+    }
+  };
+
+  return (
+    <div>
+      <Button
+        type="primary"
+        style={{ marginBottom: 10 }}
+        disabled={!edit}
+        onClick={() => {
+          setVisible(true);
+          setCurrent({} as WashItem);
+        }}
+      >
+        新增
+      </Button>
+      <Form component={false} form={form}>
+        <Table
+          bordered
+          columns={columns}
+          dataSource={[...value]}
+          rowKey="shopId"
+          style={{ width: 700 }}
+        />
+      </Form>
+      <WashModal
+        value={current}
+        visible={visible}
+        onCancel={() => setVisible(false)}
+        onOk={onSure}
+        data={value}
+      />
+    </div>
+  );
+};
+
+export default Index;
+import React, { useState, useEffect } from "react";
+import { Modal, Table, Input, Select, Form, Radio, message } from 'antd';
+import * as api from "../api";
+import usePagination from "@/hooks/usePagination";
+import Column from "antd/lib/table/Column";
+import { debounce } from "lodash";
+import { RowSelectionType } from "antd/es/table/interface";
+import { getBrandFilterApi } from "@/common/api";
+import useInitail from "@/hooks/useInitail";
+import { getShopList } from "../../../MaintenanceCard/Upsert/api";
+import * as IF from "../../../MaintenanceCard/Upsert/interface";
+
+const Search = Input.Search;
+const { Option } = Select;
+const FormItem = Form.Item;
+
+interface Props {
+  visible: boolean;
+  onCancel: () => any;
+  onOk: (data: api.WashItem, shopId?: number) => any;
+  value: api.WashItem;
+  data: api.WashItem[];
+}
+
+const washData = [
+  {
+    itemId: 1,
+    itemName: "垃圾洗车",
+  },
+  {
+    itemId: 2,
+    itemName: "一般洗车",
+  },
+];
+
+export default function ItemSelect(props: Props) {
+  const { visible, onCancel, onOk, value, data } = props;
+  const {data: shops} = useInitail(getShopList, [], undefined);
+  const [form] = Form.useForm();
+
+  useEffect(() => {
+    if (value.itemId) {
+      form.setFieldsValue(
+        {...value, shop: {value: value.shopId, label: value.shopName}, item: {value: value.itemId, label: value.itemName}}
+      );
+    } else {
+      form.resetFields();
+    }
+  }, [visible]);
+
+function handleSave(_value: any) {
+  console.log("pppp", _value);
+  const _index = data.findIndex(e => e.shopId === _value.shop.value);
+  if (_index > -1 && !value.shopId) {
+    message.error('该门店已有洗车');
+    return;
+  }
+  onOk({
+    isWash: _value.isWash,
+    shopName: _value.shop.label,
+    shopId: _value.shop.value,
+    itemName: _value.item.label,
+    itemId: _value.item.value
+  }, value.shopId);
+}
+
+  return (
+    <Modal
+      visible={visible}
+      title="洗车"
+      width={700}
+      onCancel={() => onCancel()}
+      onOk={() => form.submit()}
+    >
+      <Form
+        form={form}
+        labelCol={{ span: 8 }}
+        wrapperCol={{ span: 18 }}
+        onFinish={handleSave}
+      >
+        <FormItem
+          name="shop"
+          label="适用门店"
+          rules={[{ required: true, message: "必填" }]}
+        >
+          <Select placeholder="请选择门店" labelInValue disabled={!!value.shopId}>
+            {shops.map((r) => (
+              <Select.Option key={r.id} value={r.id}>
+                {r.name || ""}
+              </Select.Option>
+            ))}
+          </Select>
+        </FormItem>
+        <FormItem
+          name="isWash"
+          label="是否默认添加洗车项目"
+          rules={[{ required: true, message: "必填" }]}
+        >
+          <Radio.Group>
+            <Radio value="1">是</Radio>
+            <Radio value="2">否</Radio>
+          </Radio.Group>
+        </FormItem>
+        <FormItem
+          name="item"
+          label="洗车项目"
+          rules={[{ required: true, message: "必填" }]}
+        >
+          <Select placeholder="请选择洗车项目" labelInValue>
+            {washData.map((r) => (
+              <Select.Option key={r.itemId} value={r.itemId}>
+                {r.itemName || ""}
+              </Select.Option>
+            ))}
+          </Select>
+        </FormItem>
+      </Form>
+    </Modal>
+  );
+}
+import useInitial from "@/hooks/useInitail";
+import React, { useEffect, useState } from "react";
+import * as API from "./api";
+import { PageHeaderWrapper } from "@ant-design/pro-layout";
+import {
+  Card,
+  Button,
+  InputNumber,
+  message,
+  Form,
+  Popconfirm,
+  Row,
+  DatePicker,
+} from "antd";
+import WashList from './components/WashList';
+
+const FormItem = Form.Item;
+
+const Basic = () => {
+  const [form] = Form.useForm();
+  const [edit, setEdit] = useState<boolean>(false);
+  const { data } = useInitial(API.fetchDetail, {}, "");
+  const [reset, setReset] = useState<boolean>(false);
+  const [visible, setVisible] = useState<boolean>(false)
+
+  useEffect(() => {
+    form.setFieldsValue({ ...data });
+    setReset(false);
+  }, [data, reset]);
+
+  function handleOk(feildValue: any) {
+    const param = {
+      ...feildValue,
+      id: data.id,
+    };
+    console.log('first', feildValue);
+    setEdit(false);
+    // API.saveApi(param)
+    //   .then((res) => {
+    //     setEdit(false);
+    //     //setConfirmLoading(false);
+    //     //setLoading(true);
+    //     message.success("保存成功");
+    //   })
+    //   .catch((e) => {
+    //     message.error(e.message);
+    //   });
+  }
+
+  function handleEdit() {
+    if (edit) {
+      setEdit(false);
+    } else {
+      setEdit(true);
+    }
+  }
+
+  return (
+    <PageHeaderWrapper title="基础设置">
+      <Card>
+        <Form
+          form={form}
+          onFinish={handleOk}
+          onValuesChange={(changeValue, values) => {}}
+        >
+          <div
+            style={{ display: "flex", flexDirection: "row", flexWrap: "wrap" }}
+          >
+            <h2 style={{ width: "100%" }}>常规设置</h2>
+            <FormItem
+              label="客户订件金额要求"
+              name="morningShiftPercent"
+              rules={[{ required: true, message: "请输入客户订件金额要求" }]}
+              style={{ width: 500 }}
+            >
+              <InputNumber
+                disabled={!edit}
+                min={0}
+                formatter={(value) => `${value}%`}
+                parser={(value: any) => value.replace("%", "")}
+                style={{ width: 200 }}
+              />
+            </FormItem>
+            <FormItem
+              label="每月索赔复核待办起始日"
+              name="time"
+              rules={[
+                {
+                  type: "object" as const,
+                  required: true,
+                  message: "请选择每月索赔复核待办起始日",
+                },
+              ]}
+              style={{ width: 500 }}
+            >
+              <DatePicker disabled={!edit} />
+            </FormItem>
+            <h2 style={{ width: "100%" }}>洗车设置</h2>
+            <FormItem
+              label="洗车列表"
+              rules={[
+                {
+                  required: true,
+                  min: 1,
+                  message: "洗车列表不能为空",
+                  type: "array",
+                },
+              ]}
+              shouldUpdate
+              name="partList"
+            >
+              <WashList edit={edit} />
+            </FormItem>
+            <Row style={{ width: "100%" }} justify="center">
+              {!edit ? (
+                <Button type="primary" onClick={handleEdit}>
+                  编辑
+                </Button>
+              ) : (
+                <div>
+                  <Button type="primary" onClick={form.submit}>
+                    确定
+                  </Button>
+                  <Popconfirm
+                    title="确定取消？取消将重置数据"
+                    onConfirm={() => {
+                      setReset(true);
+                      setEdit(false);
+                    }}
+                  >
+                    <Button style={{ marginLeft: 60 }}>取消</Button>
+                  </Popconfirm>
+                </div>
+              )}
+            </Row>
+          </div>
+        </Form>
+      </Card>
+    </PageHeaderWrapper>
+  );
+};
+
+export default Basic;
+import { http } from '@/typing/http';
+import request from '@/utils/request';
+import { CAS_HOST, OOP_HOST, PMS_HOST } from '@/utils/host';
+
+/** 作业项管理分页数据*/
+export function getWorkControl(params: WorkProject.queryList): http.PromisePageResp<WorkProject.showUpdatedetails> {
+  return request.get(`${CAS_HOST}/erp/work/item/page`, { params });
+}
+import React, { useState, useEffect } from "react";
+import "@ant-design/compatible/assets/index.css";
+import {
+  Input,
+  Select,
+  InputNumber,
+  Modal,
+  Form,
+  Spin,
+} from "antd";
+import * as api from "../api";
+import usePagination from "@/hooks/usePagination";
+
+const FormItem = Form.Item;
+const { Option } = Select;
+const maxFormProps = {
+  labelCol: { span: 5 },
+  wrapperCol: { span: 15 },
+};
+
+interface Props {
+  item: any
+  visible: boolean;
+  setVisible: (value: boolean) => void
+}
+export default function SaveModal(props: Props) {
+  const [form] = Form.useForm();
+  const { item, visible, setVisible } = props;
+  const { loading, list } = usePagination(api.getWorkControl, { workType: 7, pageSize: 100 });
+  const [confirmLoading, setConfirmLoading] = useState<boolean>(false);
+
+  useEffect(() => {
+    if (!item.id) {
+      console.log('item', item)
+    }
+  }, []);
+
+  function save(fieldsValue: any) {
+    setConfirmLoading(true);
+    // const datas = {
+    //   ...fieldsValue,
+    //   id: item.id || undefined,
+    //   brandId,
+    //   stdType: 2,
+    //   seriesId: fieldsValue.series === "2" ? fieldsValue.seriesId : undefined,
+    //   specCodes:
+    //     fieldsValue.vehicleCode === "2"
+    //       ? list.map((e: any) => e.specCode)
+    //       : undefined,
+    // };
+    // api
+    //   .saveWorkProject(datas)
+    //   .then(() => {
+    //     message.success("操作成功！");
+    //     fetchList();
+    //     setConfirmLoading(false);
+    //     onCancel();
+    //   })
+    //   .catch((e) => {
+    //     setConfirmLoading(false);
+    //     message.error(e.message);
+    //   });
+  }
+
+  return (
+    <Modal
+      title={item.id ? "新增" : "编辑"}
+      width={600}
+      visible={visible}
+      confirmLoading={confirmLoading}
+      onOk={() => form.submit()}
+      onCancel={() => {
+        setVisible(false);
+      }}
+      destroyOnClose
+    >
+      <Spin spinning={loading}>
+        <Form
+          form={form}
+          onFinish={save}
+          //onFieldsChange={(changedFields, allFields) => onChangeFile(changedFields, allFields)}
+        >
+          <FormItem
+            label="洗车项目"
+            name="workType"
+            rules={[{ required: true, message: "该选项为必选项" }]}
+            {...maxFormProps}
+          >
+            <Select
+              style={{ width: "100%" }}
+              placeholder="请选择"
+              disabled={!!item.id}
+              maxTagTextLength={20}
+            >
+              {list.map((e) => (
+                <Option key={e.id} value={e.id}>
+                  {`${e.itemName}(${e.itemCode})`}
+                </Option>
+              ))}
+            </Select>
+          </FormItem>
+          <FormItem
+            label="金额"
+            name="money"
+            rules={[{ required: true, message: "该填写金额" }]}
+            {...maxFormProps}
+          >
+            <InputNumber style={{ width: 200 }} placeholder="请输入金额" />
+          </FormItem>
+        </Form>
+      </Spin>
+    </Modal>
+  );
+}
+import React, { useState } from "react";
+import { PageHeaderWrapper } from "@ant-design/pro-layout";
+import { Table, Card, Popconfirm, Divider, Button } from "antd";
+import * as api from "./api";
+import CreateModal from './components/Modal';
+import usePagination from '@/hooks/usePagination';
+
+const Column = Table.Column;
+
+export default function WorkStationIndex() {
+  const [visible, setVisible] = useState(false);
+  const [item, setItem] = useState<any>({});
+
+  const { loading, list, paginationConfig } = usePagination(api.getWorkControl, { workType: 7 });
+
+  function handleDelete(param?: number) {
+    console.log('xxxxx');
+  }
+
+  return (
+    <PageHeaderWrapper title="洗车项目配置">
+      <div
+        style={{
+          display: "flex",
+          flexDirection: "row",
+          justifyContent: "flex-start",
+          alignItems: "center",
+          marginBottom: 20,
+        }}
+      >
+        <Button type="primary" onClick={() => setVisible(true)}>
+          新增
+        </Button>
+      </div>
+      <Card>
+        <Table
+          dataSource={list}
+          pagination={paginationConfig}
+          rowKey="id"
+          loading={loading}
+        >
+          <Column title="洗车项目" dataIndex="name" align="center" />
+          <Column title="价格" dataIndex="money" align="center" />
+          <Column
+            title="操作"
+            align="center"
+            render={(text, record: any) => (
+              <>
+                <a
+                  onClick={(e) => {
+                    e.preventDefault();
+                    setItem(record);
+                    setVisible(true);
+                  }}
+                >
+                  编辑
+                </a>
+                <span>
+                  <Divider type="vertical" />
+                  <Popconfirm
+                    title={`是否删除【${record.itemName}】?`}
+                    onConfirm={() => handleDelete(record.id)}
+                    okText="确定"
+                    cancelText="取消"
+                  >
+                    <a
+                      onClick={(e) => e.preventDefault()}
+                      style={{ color: "red" }}
+                    >
+                      删除
+                    </a>
+                  </Popconfirm>
+                </span>
+              </>
+            )}
+          />
+        </Table>
+      </Card>
+      <CreateModal item={item} visible={visible} setVisible={setVisible} />
+    </PageHeaderWrapper>
+  );
+}
@@ -32,9 +32,9 @@ export function saveApi(params: KtCanteenSpace.Item): http.PromiseResp&lt;void&gt; {
 /**
  * 查询可配置第三方
  */
-export function getThirdPartyApi(): http.PromiseRespA<KtCanteenSpace.ThirdParty> {
-  return request.get(`${CONTRACT_HOST}/erp/canteen/thirdparty/configurable/list`);
-}
+// export function getThirdPartyApi(): http.PromiseRespA<KtCanteenSpace.ThirdParty> {
+//   return request.get(`${CONTRACT_HOST}/erp/canteen/thirdparty/configurable/list`);
+// }
  
 /**
  * 查询可配置服务门店
-import React, { useState, useEffect } from 'react';
+import React, { useState, useEffect } from "react";
 import { Button, message, Modal, Select, Form, Input } from "antd";
-import { saveApi, getServiceShop, getThirdPartyApi } from "../api";
-import {EatMethodData, EatSummaryData, OperationModeData} from '@/pages/contract/entity';
-import PositionSelector from '@/components/PositionSelector';
-import useInitial from "@/hooks/useInitail";
-import ServiceShopModal from './ServiceShopModal';
+import { saveApi, getServiceShop } from "../api";
+import { OperationModeData } from "@/pages/contract/entity";
+import PositionSelector from "@/components/PositionSelector";
+import ServiceShopModal from "./ServiceShopModal";
  
 interface Props {
-  item: KtCanteenSpace.Item,
-  visible: boolean,
-  onCancel: Function,
-  fetchList: () => any
+  item: KtCanteenSpace.Item;
+  visible: boolean;
+  onCancel: Function;
+  fetchList: () => any;
 }
  
 const formItemLayout = {
@@ -27,9 +26,6 @@ const Item = Form.Item;
 const Option = Select.Option;
 export default function SaveModal(props: Props) {
   const { visible, onCancel, fetchList, item = {} } = props;
-  const {data: thirdPartys} = useInitial<KtCanteenSpace.ThirdParty[], object>(getThirdPartyApi, [], {});
-  const [thirdParty, setThirdParty] = useState<KtCanteenSpace.ThirdParty>({});
-  const [stmtShopId, setStmtShopId] = useState<number | undefined>();
   const [serviceShops, setServiceShops] = useState<KtCanteenSpace.Shop[]>([]);
   const [loading, setLoading] = useState(false);
   const [form] = Form.useForm();
@@ -38,31 +34,28 @@ export default function SaveModal(props: Props) {
     if (visible) {
       form.setFieldsValue({
         ...item,
-        stmtShopId: (item.stmtShop || {}).shopId,
         address: {
           address: item.address,
           point: {
             lng: item.addressLng,
-            lat: item.addressLat
-          }
-        }
+            lat: item.addressLat,
+          },
+        },
       });
-      setStmtShopId((item.stmtShop || {}).shopId);
-      setThirdParty(thirdPartys.find(i => i.id == item.thirdpartyId) || {});
-    } else { form.resetFields(); }
+    } else {
+      form.resetFields();
+    }
   }, [visible]);
  
-  console.log('111', item, thirdPartys, thirdParty);
-
   useEffect(() => {
-    if (stmtShopId && thirdParty.id) {
-      getServiceShop({canteenId: item.id, stmtShopId, thirdpartyId: thirdParty.id}).then(res => {
+    getServiceShop({ canteenId: item.id })
+      .then((res) => {
         setServiceShops(res.data || []);
-      }).catch(e => {
+      })
+      .catch((e) => {
         message.error(e.message);
       });
-    }
-  }, [stmtShopId, thirdParty]);
+  }, []);
  
   function submit() {
     form.validateFields().then((fields) => {
@@ -72,20 +65,19 @@ export default function SaveModal(props: Props) {
         address: fields.address.address,
         addressLng: fields.address.point.lng,
         addressLat: fields.address.point.lat,
-        stmtShopId,
-        thirdpartyId: thirdParty.id,
-        thirdpartyName: thirdParty.shortName,
       };
       setLoading(true);
-      saveApi(params).then(() => {
-        message.success('保存成功');
-        setLoading(false);
-        fetchList();
-        onCancel();
-      }).catch((e: any) => {
-        message.error(e.message);
-        setLoading(false);
-      });
+      saveApi(params)
+        .then(() => {
+          message.success("保存成功");
+          setLoading(false);
+          fetchList();
+          onCancel();
+        })
+        .catch((e: any) => {
+          message.error(e.message);
+          setLoading(false);
+        });
     });
   }
  
@@ -97,50 +89,31 @@ export default function SaveModal(props: Props) {
       maskClosable={false}
       onCancel={() => onCancel()}
       footer={[
-        <Button key="1" loading={loading} onClick={() => onCancel()}>取消</Button>,
-        <Button key="2" type="primary" loading={loading} disabled={loading} onClick={() => submit()}>确认</Button>
+        <Button key="1" loading={loading} onClick={() => onCancel()}>
+          取消
+        </Button>,
+        <Button key="2" type="primary" loading={loading} disabled={loading} onClick={() => submit()}>
+          确认
+        </Button>,
       ]}
     >
       <Form form={form} {...formItemLayout}>
-        <Item label="食堂名称" name="name" required rules={[{ required: true, message: '请输入食堂名称' }]}>
+        <Item label="食堂名称" name="name" required rules={[{ required: true, message: "请输入食堂名称" }]}>
           <Input maxLength={10} placeholder="请输入" />
         </Item>
-        <Item label="食堂地理位置" name="address" required rules={[{ required: true, message: '请输入食堂地理位置' }]}>
-          <PositionSelector style={{ width: '100%' }} />
-        </Item>
-        <Item label="第三方" name="thirdpartyId" required rules={[{ required: true, message: '请选择第三方' }]}>
-          <Select
-            disabled={!!item.id}
-            placeholder="请选择"
-            onChange={(v: number) => {
-              const thirdParty = thirdPartys.find(i => i.id == v) || {};
-              setThirdParty(thirdParty);
-            }}
-          >
-            {thirdPartys.map(i => (<Option value={i.id || -1} key={i.id || -1}>{i.shortName || ''}</Option>))}
-          </Select>
+        <Item label="食堂地理位置" name="address" required rules={[{ required: true, message: "请输入食堂地理位置" }]}>
+          <PositionSelector style={{ width: "100%" }} />
         </Item>
-        <Item label="结算门店" name="stmtShopId" required rules={[{ required: true, message: '请选择结算门店' }]}>
-          <Select disabled={!!item.id} placeholder="请选择" onChange={(v: number) => setStmtShopId(v)}>
-            {(thirdParty.stmtShops || []).map(i => (<Option value={i.shopId || -1} key={i.shopId || -1}>{i.shopName || ''}</Option>))}
-          </Select>
-        </Item>
-        <Item label="服务门店" name="serviceShops" required rules={[{ required: true, message: '请选择服务门店' }]}>
+        <Item label="服务门店" name="serviceShops" required rules={[{ required: true, message: "请选择服务门店" }]}>
           <ServiceShopModal serviceShops={serviceShops} />
         </Item>
-        <Item label="就餐方式" name="repastWay" required rules={[{ required: true, message: '请选择食堂就餐方式' }]}>
-          <Select placeholder="请选择">
-            {EatMethodData.map(i => (<Option value={i.value} key={i.value}>{i.label || ''}</Option>))}
-          </Select>
-        </Item>
-        <Item label="就餐统计" name="repastCountWay" required rules={[{ required: true, message: '请选择就餐统计' }]}>
-          <Select placeholder="请选择">
-            {EatSummaryData.map(i => (<Option value={i.value} key={i.value}>{i.label || ''}</Option>))}
-          </Select>
-        </Item>
-        <Item label="运营方式" name="operationWay" required rules={[{ required: true, message: '请选择食堂运营方式' }]}>
+        <Item label="运营方式" name="operationWay" required rules={[{ required: true, message: "请选择食堂运营方式" }]}>
           <Select placeholder="请选择">
-            {OperationModeData.map(i => (<Option value={i.value} key={i.value}>{i.label || ''}</Option>))}
+            {OperationModeData.map((i) => (
+              <Option value={i.value} key={i.value}>
+                {i.label || ""}
+              </Option>
+            ))}
           </Select>
         </Item>
       </Form>
 import React, { useState } from "react";
 import { Button, Card, ConfigProvider, Divider, message, Popconfirm, Table } from "antd";
-import { PageHeaderWrapper } from '@ant-design/pro-layout';
+import { PageHeaderWrapper } from "@ant-design/pro-layout";
 import usePagination from "@/hooks/usePagination";
-import SaveModal from './components/SaveModal';
+import SaveModal from "./components/SaveModal";
 import DetailModal from "./components/DetailModal";
-import { getPageListApi, deleteApi } from './api';
-import st from './style.less';
+import { getPageListApi, deleteApi } from "./api";
+import st from "./style.less";
 import zhCN from "antd/lib/locale-provider/zh_CN";
-import {EatMethod, EatSummary, OperationMode} from '@/pages/contract/entity';
+import { OperationMode } from "@/pages/contract/entity";
 import PriceSaveModal from "./components/PriceSaveModal";
 import PriceTableModal from "./components/PriceTableModal";
  
@@ -22,20 +22,30 @@ export default function Index() {
   const [visiblePriceShop, setVisiblePriceShop] = useState(false);
  
   function _delete(id?: number) {
-    deleteApi(id).then(() => {
-      message.success('操作成功');
-      setParams({ current: 1 }, true);
-    }).catch(e => {
-      message.error(e.message);
-    });
+    deleteApi(id)
+      .then(() => {
+        message.success("操作成功");
+        setParams({ current: 1 }, true);
+      })
+      .catch((e) => {
+        message.error(e.message);
+      });
   }
  
   return (
     <PageHeaderWrapper title="食堂配置">
       <ConfigProvider locale={zhCN}>
         <Card className={st.page}>
-          <div style={{ display: 'flex', flexDirection: 'row', justifyContent: 'flex-end', marginBottom: 20 }}>
-            <Button type="primary" onClick={() => { setVisible(true); setItem({}); }}>新增</Button>
+          <div style={{ display: "flex", flexDirection: "row", justifyContent: "flex-end", marginBottom: 20 }}>
+            <Button
+              type="primary"
+              onClick={() => {
+                setVisible(true);
+                setItem({});
+              }}
+            >
+              新增
+            </Button>
           </div>
           <Table
             size="small"
@@ -45,18 +55,14 @@ export default function Index() {
             rowKey={(item: KtCanteenSpace.Item) => `${item.id}`}
             onChange={(_pagination) => setParams({ ..._pagination }, true)}
           >
-            <Column title="食堂" dataIndex="name" width="10%" align="center" />
-            <Column title="食堂地址" dataIndex="address" width="10%" align="center" />
-            <Column title="第三方" dataIndex="thirdpartyName" width="10%" align="center" />
-            <Column title="就餐方式" dataIndex="repastWay" width="10%" align="center" render={(t, _: KtCanteenSpace.Item) => EatMethod[_.repastWay || 0]} />
-            <Column title="就餐统计" dataIndex="repastCountWay" width="10%" align="center" render={(t, _: KtCanteenSpace.Item) => EatSummary[_.repastCountWay || 0]} />
-            <Column title="运营方式" dataIndex="operationWay" width="10%" align="center" render={(t, _: KtCanteenSpace.Item) => OperationMode[_.operationWay || 0]} />
+            <Column title="食堂" dataIndex="name" width="15%" align="center" />
+            <Column title="食堂地址" dataIndex="address" width="20%" align="center" />
             <Column
-              title="结算门店"
-              dataIndex="stmtShop"
+              title="运营方式"
+              dataIndex="operationWay"
               width="10%"
               align="center"
-              render={(text, _item: KtCanteenSpace.Item) => ((_item.stmtShop || {}).shopName || '')}
+              render={(t, _: KtCanteenSpace.Item) => OperationMode[_.operationWay || 0]}
             />
             <Column
               title="服务门店"
@@ -69,30 +75,68 @@ export default function Index() {
                     setVisibleShop(true);
                     setShops(_item.serviceShops || []);
                   }}
-                  style={{ color: '#4189FD' }}
+                  style={{ color: "#4189FD" }}
                 >
                   查看
                 </a>
               )}
             />
             <Column
-              title="操作"
+              title="下载"
               align="center"
               render={(text, _item: KtCanteenSpace.Item) => (
                 <span>
-                  <a onClick={() => { setVisible(true); setItem(_item); }}>编辑</a>
+                  <a title="点击下载二维码" href={`/api/file/download?fid=${_item.wxQrCodeFid}`}>
+                    客户就餐码
+                  </a>
                   <Divider type="vertical" />
-                  <a onClick={() => { setVisiblePriceShop(true); setItem(_item); }}>查看价格</a>
+                  <a title="点击下载二维码" href={`/api/file/download?fid=${_item.appQrCodeFid}`}>
+                    员工就餐码
+                  </a>
+                </span>
+              )}
+            />
+            <Column
+              title="操作"
+              align="center"
+              render={(text, _item: KtCanteenSpace.Item) => (
+                <span>
+                  <a
+                    onClick={() => {
+                      setVisible(true);
+                      setItem(_item);
+                    }}
+                  >
+                    编辑
+                  </a>
                   <Divider type="vertical" />
-                  <a onClick={() => { setVisiblePrice(true); setItem(_item); }}>调整价格</a>
+                  <a
+                    onClick={() => {
+                      setVisiblePriceShop(true);
+                      setItem(_item);
+                    }}
+                  >
+                    查看价格
+                  </a>
                   <Divider type="vertical" />
-                  <Popconfirm
-                    title="是否删除?"
-                    onConfirm={() => _delete(_item.id)}
-                    okText="确定"
-                    cancelText="取消"
+                  <a
+                    onClick={() => {
+                      setVisiblePrice(true);
+                      setItem(_item);
+                    }}
                   >
-                    <a onClick={(e) => { e.preventDefault(); }} style={{ color: 'red' }}>删除</a>
+                    调整价格
+                  </a>
+                  <Divider type="vertical" />
+                  <Popconfirm title="是否删除?" onConfirm={() => _delete(_item.id)} okText="确定" cancelText="取消">
+                    <a
+                      onClick={(e) => {
+                        e.preventDefault();
+                      }}
+                      style={{ color: "red" }}
+                    >
+                      删除
+                    </a>
                   </Popconfirm>
                 </span>
               )}
@@ -105,22 +149,14 @@ export default function Index() {
           onCancel={() => setVisiblePrice(false)}
           fetchList={() => setParams({ current: 1 }, true)}
         />
-        <PriceTableModal
-          visible={visiblePriceShop}
-          item={item}
-          onCancel={() => setVisiblePriceShop(false)}
-        />
+        <PriceTableModal visible={visiblePriceShop} item={item} onCancel={() => setVisiblePriceShop(false)} />
         <SaveModal
           visible={visible}
           item={item}
           onCancel={() => setVisible(false)}
           fetchList={() => setParams({ current: 1 }, true)}
         />
-        <DetailModal
-          visible={visibleShop}
-          shops={shops}
-          onCancel={() => setVisibleShop(false)}
-        />
+        <DetailModal visible={visibleShop} shops={shops} onCancel={() => setVisibleShop(false)} />
       </ConfigProvider>
     </PageHeaderWrapper>
   );
@@ -14,20 +14,16 @@ declare namespace KtCanteenSpace {
    * 列表项
    */
   interface Item {
-    id?: number, //	食堂id
-    name?: string, //	食堂名称
-    address?: string, //	食堂位置
-    addressLng?: number, // 食堂位置经度
-    addressLat?: number, // 食堂位置纬度
-    thirdpartyId?: number, // 第三方id
-    thirdpartyName?: string, //	第三方名称
-    repastWay?: number, // 就餐方式，1送餐制、2就餐制
-    repastCountWay?: number, // 就餐统计方式，1按员工确认、2按排班表
-    operationWay?: number, // 运营方式，1自营、2承包
-    stmtShop?: Shop, // 结算门店
-    stmtShopId?: number, // 结算门店id，不可编辑
-    serviceShops?: ServiceShop[], //	服务门店
-    canConfigPrice?: boolean, //	是否可配置价格
+    id?: number; //	食堂id
+    name?: string; //	食堂名称
+    address?: string; //	食堂位置
+    addressLng?: number; // 食堂位置经度
+    addressLat?: number; // 食堂位置纬度
+    operationWay?: number; // 运营方式，1自营、2承包
+    serviceShops?: ServiceShop[]; //	服务门店
+    canConfigPrice?: boolean; //	是否可配置价格
+    wxQrCodeFid?: string;
+    appQrCodeFid?: string;
   }
  
   /**
@@ -34,6 +34,8 @@ export default function EditModal({
   );
   const [saveLoading, setSaveLoading] = useState<boolean>(false);
  
+  // 存储平台类型
+  const [platformType, setPlatFormType] = useState<number>(-1);
   useEffect(() => {
     if (visible) {
       form.setFieldsValue({
@@ -48,9 +50,21 @@ export default function EditModal({
           : undefined,
       });
     }
+    return () => {
+      setPlatFormType(-1);
+    };
   }, [visible]);
  
   async function handleSave(values: any) {
+    if (platformType === 1) {
+      let re = /^[a-zA-Z]/;
+      const _account: string = values.account;
+      let myArray = re.test(_account);
+      if (!myArray) {
+        message.error("请输入字母开头的快手号", 3);
+        return;
+      }
+    }
     setSaveLoading(true);
     const _accountParams: AccountDTO = {
       id: record?.id,
@@ -61,7 +75,7 @@ export default function EditModal({
       userId: values?.user?.value,
       userName: values?.user?.label,
       accountType: values.accountType,
-      playbackSearchKey: values.playbackSearchKey,
+      // playbackSearchKey: values.playbackSearchKey,
     };
     try {
       const { result, success } = await saveAccount(_accountParams);
@@ -102,18 +116,11 @@ export default function EditModal({
         wrapperCol={{ span: 15 }}
       >
         <FormItem
-          name="account"
-          label="账号"
-          rules={[{ required: true, message: "请输入账号" }]}
-        >
-          <Input placeholder="请输入账号" disabled={!!record?.affirm} />
-        </FormItem>
-        <FormItem
           name="type"
           label="平台类型"
           rules={[{ required: true, message: "请选择平台类型" }]}
         >
-          <Select placeholder="请选择平台类型">
+          <Select placeholder="请选择平台类型" onChange={(value) => setPlatFormType(value)}>
             {[1, 2, 3, 4].map((type) => (
               <Select.Option value={type} key={type}>
                 {PlatformEnum[type]}
@@ -121,22 +128,16 @@ export default function EditModal({
             ))}
           </Select>
         </FormItem>
-        <Form.Item
-          noStyle
-          shouldUpdate={(prevValues, currentValues) => prevValues.type !== currentValues.type}
+        <FormItem
+          name="account"
+          label="账号"
+          rules={[{ required: true, message: platformType === 1 ? "请输入快手号" : "请输入账号" }, { pattern: platformType === 1 ? /^[a-zA-Z]/ : undefined, message: "请输入字母开头的快手号" }]}
+
         >
-          {({ getFieldValue }) => {
-            //获取输入账号，账号数字开头展示关键词输入框
-            const _account = form.getFieldValue("account");
-            const re = /^[0-9].*/;
-            const _res = re.test(_account);
-            return (getFieldValue('type') === 1 && _res ? (
-              <Form.Item name="playbackSearchKey" label="直播搜索关键词">
-                <Input />
-              </Form.Item>
-            ) : null);
-          }}