fix

config/proxy.js

@@ -12,7 +12,7 @@ export default {
     '/api/': {
       // 要代理的地址
       //http://192.168.89.147:8087
-      target: 'http://localhost:8087',
+      target: 'http://192.168.89.147:8087',
       // 配置了这个可以从 http 代理到 https
       // 依赖 origin 的功能可能需要这个，比如 cookie
       changeOrigin: true,

config/routes.js

@@ -88,6 +88,51 @@
     // hideInMenu: true,
     component: './guaranteeTask/Edit/index',
   },
+  {
+    path: '/stock/list',
+    name: '库存管理',
+    icon: 'smile',
+    component: './stock/list',
+  },
+  {
+    path: '/stock/add',
+    name: '库存新增',
+    hideInMenu: true,
+    component: './stock/edit',
+  },
+
+  {
+    path: '/stock/edit',
+    name: '库存详细',
+    hideInMenu: true,
+    component: './stock/edit',
+  },
+  {
+    path: '/stock/outAndIn',
+    name: '出入库管理',
+    hideInMenu: true,
+    component: './stock/outAndIn',
+  },
+  {
+    path: '/stockLog/list',
+    name: '库存日志',
+    icon: 'VideoCameraOutlined',
+    component: './stock/stockLog',
+  },
+  {
+    path: '/stockClassification/list',
+    name: '分类管理',
+    icon: 'smile',
+    component: './stockClassification/list',
+  },
+  {
+    path: '/stockClassification/edit',
+    name: '分类管理',
+    icon: 'smile',
+    hideInMenu: true,
+    component: './stockClassification/edit',
+  },
+  
   {
     component: './404',
   },

src/pages/stock/edit/index.jsx

@@ -0,0 +1,104 @@
+import { updataDish } from '@/services/api/dish';
+import { addStore, getStoreTypeList,getStoreById,updataStore } from '@/services/api/stock';
+import { queryDict } from '@/utils/request';
+import { PageContainer, ProForm, ProFormSelect, ProFormText } from '@ant-design/pro-components';
+import { history, useSearchParams } from '@umijs/max';
+import { Card, Col, message, Row, Space } from 'antd';
+import { useEffect, useRef } from 'react';
+
+export default (props) => {
+  const [searchParams, setSearchParams] = useSearchParams();
+  const id = searchParams.get('id');
+  const formRef = useRef();
+  useEffect(() => {
+    if (id) {
+      getStoreById(id).then((res) => {
+        formRef.current.setFieldsValue(res);
+      });
+    }
+  }, [id]);
+
+  const onFinish = async (values) => {
+    console.log(values);
+
+    if (id) {
+      // 修改
+      updataStore(id, { ...values }).then((res) => {
+        message.success('修改成功');
+        history.back();
+      });
+    } else {
+      // 新增
+      addStore({ ...values }).then((res) => {
+        message.success('添加成功');
+        history.back();
+      });
+    }
+
+    return false;
+  };
+
+  return (
+    <PageContainer>
+      <Card>
+        <ProForm
+          formRef={formRef}
+          layout={'horizontal'}
+          labelCol={{ span: 8 }}
+          wrapperCol={{ span: 16 }}
+          onFinish={onFinish}
+          // initialValues={{ type: '1', state: '1' }}
+          submitter={{
+            searchConfig: {
+              resetText: '返回',
+            },
+            onReset: () => history.back(),
+            render: (props, doms) => {
+              return (
+                <Row>
+                  <Col span={8} offset={8}>
+                    <Space>{doms}</Space>
+                  </Col>
+                </Row>
+              );
+            },
+          }}
+        >
+          <ProFormSelect
+            name="typeId"
+            label="分类"
+            placeholder="请选择分类"
+            request={() => queryDict(getStoreTypeList)()}
+            rules={[{ required: true, message: '请选择分类' }]}
+            allowClear={false}
+            width={460}
+          />
+          <ProFormText
+            name="name"
+            label="名称"
+            placeholder="请输入名称"
+            rules={[{ required: true, message: '请输入名称' }]}
+            allowClear={false}
+            width={460}
+          />
+          <ProFormText
+            name="unit"
+            label="单位"
+            placeholder="请输入单位"
+            rules={[{ required: true, message: '请输入单位' }]}
+            allowClear={false}
+            width={460}
+          />
+          <ProFormText
+            name="amount"
+            label="库存"
+            disabled={true}
+            placeholder="请输入库存"
+            allowClear={false}
+            width={460}
+          />
+        </ProForm>
+      </Card>
+    </PageContainer>
+  );
+};

src/pages/stock/list/index.jsx

@@ -0,0 +1,165 @@
+import { deleteStore, getStoreList, getStoreTypeList, storeExport } from '@/services/api/stock';
+import { downloadBlob } from '@/utils/download';
+import { queryDict, queryTable } from '@/utils/request';
+import { PageContainer, ProTable } from '@ant-design/pro-components';
+import { history } from '@umijs/max';
+import { Button, message, Modal, Popconfirm } from 'antd';
+import { useRef, useState } from 'react';
+import OutAndIn from '../outAndIn';
+
+const StockList = (props) => {
+  const [isOpen, setIsOpen] = useState(false);
+  const [modalData, setModalData] = useState({});
+  // const [storeTypeDict, setStoreTypeDict] = useState([]);
+  const actionRef = useRef();
+  const formRef = useRef();
+  
+  // useEffect(() => {
+  //   getStoreTypeList({ pageSize: 9999, pageNum: 1 }).then((res) => {
+  //     setStoreTypeDict(
+  //       res?.records?.map((x) => ({
+  //         label: x.name,
+  //         value: x.id,
+  //       })) || [],
+  //     );
+  //   });
+  // }, []);
+
+  const handleDelete = (id) => {
+    if (id) {
+      deleteStore(id).then((res) => {
+        message.success('删除成功');
+        actionRef.current.reload();
+      });
+    }
+  };
+
+  const onCancel = () => {
+    setIsOpen(false);
+    setModalData({});
+  };
+
+  const onExport = () => {
+    storeExport(formRef.current.getFieldsValue()).then((res) => {
+      downloadBlob(res, '库存列表.xlsx');
+    });
+  };
+
+  const columns = [
+    // {
+    //   title: 'id',
+    //   dataIndex: 'id',
+    //   search: false,
+    // },
+    {
+      title: '名称',
+      dataIndex: 'name',
+    },
+    {
+      title: '单位',
+      dataIndex: 'unit',
+      search: false,
+    },
+    {
+      title: '分类',
+      dataIndex: 'typeId',
+      valueType: 'select',
+      // option: storeTypeDict,
+      request: () => queryDict(getStoreTypeList)(),
+    },
+    {
+      title: '库存',
+      dataIndex: 'amount',
+      search: false,
+    },
+
+    {
+      title: '操作',
+      valueType: 'option',
+      width: 200,
+      render: (_, record) => [
+        <Button
+          key={1}
+          style={{ padding: 0 }}
+          type="link"
+          onClick={() => {
+            console.log(record, 'record');
+            setModalData(record);
+            setIsOpen(true);
+            // history.push(`/stock/outAndIn?id=${record.id}`);
+          }}
+        >
+          出入库
+        </Button>,
+        <Button
+          key={2}
+          style={{ padding: 0 }}
+          type="link"
+          onClick={() => {
+            history.push(`/stock/edit?id=${record.id}`);
+          }}
+        >
+          修改
+        </Button>,
+
+        <Popconfirm
+          key={3}
+          title="您是否确认删除 ?"
+          onConfirm={() => handleDelete(record.id)}
+          okText="确定"
+          cancelText="取消"
+        >
+          {/* manualPush */}
+          <Button style={{ padding: 0 }} type="link">
+            删除
+          </Button>
+        </Popconfirm>,
+      ],
+    },
+  ];
+
+  return (
+    <PageContainer>
+      <ProTable
+        actionRef={actionRef}
+        formRef={formRef}
+        rowKey="id"
+        toolBarRender={() => [
+          <Button
+            key="2"
+            type="primary"
+            onClick={() => {
+              history.push('/stock/add');
+            }}
+          >
+            新增
+          </Button>,
+          <Button
+            key="2"
+            type="primary"
+            onClick={() => {
+              onExport();
+              // history.push('/stock/add');
+            }}
+          >
+            导出
+          </Button>,
+        ]}
+        request={queryTable(getStoreList)}
+        columns={columns}
+      />
+      <Modal open={isOpen} footer={null} onCancel={onCancel}>
+        <OutAndIn
+          data={modalData}
+          onCancel={onCancel}
+          onSuccess={() => {
+            actionRef.current.reload();
+            onCancel();
+          }}
+        />
+      </Modal>
+    </PageContainer>
+  );
+};
+
+export default StockList;

src/pages/stock/outAndIn/components/outAndInForm.jsx

@@ -0,0 +1,73 @@
+import { ProForm, ProFormDigit, ProFormText } from '@ant-design/pro-components';
+import { Col, Row, Space } from 'antd';
+import { useEffect, useRef } from 'react';
+
+export default (props) => {
+  const { data, type, onFinish, storeTypeDict = [], onCancel } = props;
+  const formRef = useRef();
+  useEffect(() => {
+    // formRef.current.resetFields();
+    formRef.current.setFieldsValue({
+      typeId: data.typeName,
+      name: data.name,
+      unit: data.unit,
+      amount: null,
+    });
+  }, [data]);
+
+  return (
+    <ProForm
+      formRef={formRef}
+      layout={'horizontal'}
+      labelCol={{ span: 4 }}
+      wrapperCol={{ span: 18 }}
+      onFinish={onFinish}
+      // initialValues={{ type: '1', state: '1' }}
+      submitter={{
+        searchConfig: {
+          resetText: '返回',
+        },
+        onReset: () => onCancel(),
+        render: (props, doms) => {
+          return (
+            <Row>
+              <Col span={8} offset={8}>
+                <Space>{doms}</Space>
+              </Col>
+            </Row>
+          );
+        },
+      }}
+    >
+      <ProFormText
+        name="typeId"
+        label="分类"
+        disabled={true}
+        placeholder="请选择分类"
+        allowClear={false}
+      />
+      <ProFormText
+        name="name"
+        label="名称"
+        placeholder="请输入名称"
+        disabled={true}
+        allowClear={false}
+      />
+      <ProFormText
+        name="unit"
+        label="单位"
+        placeholder="请输入单位"
+        disabled={true}
+        allowClear={false}
+      />
+      <ProFormDigit
+        name="amount"
+        label="库存"
+        addonBefore={type === 'out' ? '-' : '+'}
+        placeholder="请输入库存"
+        fieldProps={{ precision: 0 }}
+        rules={[{ required: true, message: '请输入库存' }]}
+      />
+    </ProForm>
+  );
+};

src/pages/stock/outAndIn/components/outAndInList.jsx

@@ -0,0 +1,51 @@
+import { ProTable } from '@ant-design/pro-components';
+import {getStoreLogList} from '@/services/api/stock'
+import { queryTable,queryDict } from '@/utils/request';
+import { useRef, useState } from 'react';
+
+const OutAndInList = (props) => {
+  const { id } = props;
+
+  const [showDetail, setShowDetail] = useState(false);
+  const [activeKey, setActiveKey] = useState('');
+  const actionRef = useRef();
+
+  const columns = [
+    {
+      title: '名称',
+      dataIndex: 'name',
+    },
+    {
+      title: '分类',
+      dataIndex: 'type',
+    },
+    {
+      title: '操作',
+      dataIndex: 'optType',
+      search: false,
+    },
+    {
+      title: '操作量',
+      dataIndex: 'amount',
+      search: false,
+    },
+    {
+      title: '操作后库存',
+      dataIndex: 'pre_amount',
+      search: false,
+    },
+  ];
+
+  return (
+    <ProTable
+      actionRef={actionRef}
+      params={{storeId:id}}
+      rowKey="id"
+      // search={false}
+      request={queryTable(getStoreLogList)}
+      columns={columns}
+    />
+  );
+};
+
+export default OutAndInList;

src/pages/stock/outAndIn/index.jsx

@@ -0,0 +1,67 @@
+import { addStoreLog } from '@/services/api/stock';
+import { ProCard } from '@ant-design/pro-components';
+// import { history, useSearchParams } from '@umijs/max';
+import { message } from 'antd';
+import { useState } from 'react';
+import OutAndInForm from './components/outAndInForm';
+
+const OutAndIn = (props) => {
+  const { data, onCancel, onSuccess } = props;
+
+  const [tabKey, setTabKey] = useState('in');
+
+  const onFinish = async (values) => {
+    console.log(data, values);
+
+    if (data.id) {
+      addStoreLog({
+        storeId: Number(data.id),
+        amount: tabKey === 'out' ? -values.amount : values.amount,
+        optType: tabKey,
+      }).then((res) => {
+        message.success('操作成功');
+
+        onSuccess();
+      });
+    }
+  };
+
+  return (
+    <ProCard
+      tabs={{
+        // tabPosition,
+        centered: true,
+        activeKey: tabKey,
+        destroyInactiveTabPane: false,
+        items: [
+          {
+            label: `入库`,
+            key: 'in',
+            children: (
+              <OutAndInForm data={data} type={tabKey} onFinish={onFinish} onCancel={onCancel} />
+            ),
+          },
+          {
+            label: `出库`,
+            key: 'out',
+            children: (
+              <OutAndInForm data={data} type={tabKey} onFinish={onFinish} onCancel={onCancel} />
+            ),
+          },
+          {
+            label: `盘点`,
+            key: 'fix',
+            children: (
+              <OutAndInForm data={data} type={tabKey} onFinish={onFinish} onCancel={onCancel} />
+            ),
+          },
+        ],
+        onChange: (key) => {
+          setTabKey(key);
+        },
+      }}
+    />
+  );
+};
+
+export default OutAndIn;

src/pages/stock/stockLog/index.jsx

@@ -0,0 +1,81 @@
+import { getStoreLogList, getStoreTypeList,storeLogExport } from '@/services/api/stock';
+import { queryDict, queryTable } from '@/utils/request';
+import { downloadBlob } from '@/utils/download';
+import { PageContainer, ProTable } from '@ant-design/pro-components';
+import { Button } from 'antd';
+import { useRef } from 'react';
+
+const StockLog = (props) => {
+  const actionRef = useRef();
+  const formRef = useRef()
+  const onExport = () => {
+    storeLogExport(formRef.current.getFieldsValue()).then((res) => {
+      downloadBlob(res, '库存日志.xlsx');
+    });
+  };
+  const columns = [
+    {
+      title: '名称',
+      dataIndex: 'storeName',
+    },
+    {
+      title: '分类',
+      dataIndex: 'typeId',
+      valueType: 'select',
+      request: () => queryDict(getStoreTypeList)(),
+    },
+    {
+      title: '操作',
+      dataIndex: 'optType',
+      valueEnum: {
+        in: '入库',
+        out: '出库',
+        fix: '盘点',
+      },
+      search: false,
+    },
+    {
+      title: '操作量',
+      dataIndex: 'amount',
+      search: false,
+    },
+    {
+      title: '操作后库存',
+      dataIndex: 'aftAmount',
+      search: false,
+    },
+    {
+      title: '操作时间',
+      dataIndex: 'createDate',
+      valueType: 'dateTime',
+      search: false,
+    },
+  ];
+
+  return (
+    <PageContainer>
+      <ProTable
+        actionRef={actionRef}
+        formRef={formRef}
+        rowKey="id"
+        toolBarRender={() => [
+          <Button
+            key="2"
+            type="primary"
+            onClick={() => {
+              onExport();
+              // history.push('/stock/add');
+            }}
+          >
+            导出
+          </Button>,
+        ]}
+        // search={false}
+        request={queryTable(getStoreLogList)}
+        columns={columns}
+      />
+    </PageContainer>
+  );
+};
+
+export default StockLog;

src/pages/stockClassification/edit/index.jsx

@@ -0,0 +1,89 @@
+import { addStoreType, getStoreTypeById, updataStoreType } from '@/services/api/stock';
+import { PageContainer, ProForm, ProFormSelect, ProFormText } from '@ant-design/pro-components';
+import { history, useSearchParams } from '@umijs/max';
+import { Card, Col, message, Row, Space } from 'antd';
+import { useEffect, useRef } from 'react';
+
+export default (props) => {
+  const [searchParams, setSearchParams] = useSearchParams();
+  const id = searchParams.get('id');
+
+  const formRef = useRef();
+  useEffect(() => {
+    if (id) {
+      getStoreTypeById(id).then((res) => {
+        formRef.current.setFieldsValue(res);
+      });
+    }
+  }, [id]);
+
+  const onFinish = async (values) => {
+    console.log(values);
+
+    if (id) {
+      // 修改
+      updataStoreType(id, { ...values }).then((res) => {
+        message.success('修改成功');
+        history.back();
+      });
+    } else {
+      // 新增;
+      addStoreType({ ...values }).then((res) => {
+        message.success('添加成功');
+        history.back();
+      });
+    }
+
+    return false;
+  };
+
+  return (
+    <PageContainer>
+      <Card>
+        <ProForm
+          formRef={formRef}
+          layout={'horizontal'}
+          labelCol={{ span: 8 }}
+          wrapperCol={{ span: 16 }}
+          onFinish={onFinish}
+          submitter={{
+            searchConfig: {
+              resetText: '返回',
+            },
+            onReset: () => history.back(),
+            render: (props, doms) => {
+              return (
+                <Row>
+                  <Col span={8} offset={8}>
+                    <Space>{doms}</Space>
+                  </Col>
+                </Row>
+              );
+            },
+          }}
+        >
+          <ProFormText
+            name="name"
+            label="名称"
+            placeholder="请输入名称"
+            width={460}
+            allowClear={false}
+            rules={[{ required: true, message: '请输入名称' }]}
+          />
+          <ProFormSelect
+            name="isFood"
+            label="食材"
+            options={[
+              { label: '是', value: 1 },
+              { label: '否', value: 0 },
+            ]}
+            placeholder="请选择"
+            width={460}
+            allowClear={false}
+            rules={[{ required: true, message: '请选择是否食材' }]}
+          />
+        </ProForm>
+      </Card>
+    </PageContainer>
+  );
+};

src/pages/stockClassification/list/index.jsx

@@ -0,0 +1,97 @@
+
+import { getStoreTypeList,deleteStoreType } from '@/services/api/stock';
+import { queryTable } from '@/utils/request';
+import { PageContainer, ProTable } from '@ant-design/pro-components';
+import { history } from '@umijs/max';
+import { Button, message, Popconfirm } from 'antd';
+import { useRef, useState } from 'react';
+
+const StockList = (props) => {
+  const [showDetail, setShowDetail] = useState(false);
+  const [activeKey, setActiveKey] = useState('');
+  const actionRef = useRef();
+
+
+
+  const handleDelete = (id) => {
+    if (id) {
+      deleteStoreType(id).then((res) => {
+        message.success('删除成功');
+        actionRef.current.reload();
+      });
+    }
+  };
+
+  const columns = [
+    {
+      title: '分类名称',
+      dataIndex: 'name',
+    },
+
+    {
+      title: '排序',
+      dataIndex: 'isFood',
+      search: false,
+      valueEnum: {
+        1: '是',
+        0: '否',
+      },
+    },
+
+    {
+      title: '操作',
+      valueType: 'option',
+      width: 200,
+      render: (_, record) => [
+        <Button
+          key={2}
+          style={{ padding: 0 }}
+          type="link"
+          onClick={() => {
+            history.push(`/stockClassification/edit?id=${record.id}`);
+          }}
+        >
+          修改
+        </Button>,
+
+        <Popconfirm
+          key={3}
+          title="您是否确认删除 ?"
+          onConfirm={() => handleDelete(record.id)}
+          okText="确定"
+          cancelText="取消"
+        >
+          {/* manualPush */}
+          <Button style={{ padding: 0 }} type="link">
+            删除
+          </Button>
+        </Popconfirm>,
+      ],
+    },
+  ];
+
+  return (
+    <PageContainer>
+      <ProTable
+        actionRef={actionRef}
+        rowKey="id"
+        toolBarRender={() => [
+          <Button
+            key="2"
+            type="primary"
+            onClick={() => {
+              history.push('/stockClassification/edit');
+            }}
+          >
+            新增
+          </Button>,
+        ]}
+        // search={false}
+        request={queryTable(getStoreTypeList)}
+        columns={columns}
+      />
+    </PageContainer>
+  );
+};
+
+export default StockList;

src/services/api/stock.js

@@ -0,0 +1,107 @@
+import { request } from '@umijs/max';
+
+// 库存
+/**
+ * 查询列表
+ * @param {*} params
+ * @returns
+ */
+export const getStoreList = (params) => request('/store', { params });
+
+/**
+ * 新增
+ * @param {*} data
+ * @returns
+ */
+export const addStore = (data) => request('/store', { method: 'post', data });
+
+/**
+ * 详情
+ * @param {*} id
+ * @returns
+ */
+export const getStoreById = (id) => request(`/store/${id}`);
+
+/**
+ * 编辑
+ *  @param {*} id
+ * @param {*} data
+ * @returns
+ */
+export const updataStore = (id, data) => request(`/store/${id}`, { method: 'put', data });
+
+/**
+ * 删除
+ * @param {*} id
+ * @returns
+ */
+export const deleteStore = (id) => request(`/store/${id}`, { method: 'delete' });
+
+/**
+ * 导出
+ * @param {*} params
+ * @returns
+ */
+export const storeExport = (params) => request('/store/export',  { responseType: 'arraybuffer', params });
+
+
+// 库存分类
+/**
+ * 查询列表
+ * @param {*} params
+ * @returns
+ */
+export const getStoreTypeList = (params) => request('/storeType', { params });
+
+/**
+ * 新增
+ * @param {*} data
+ * @returns
+ */
+export const addStoreType = (data) => request('/storeType', { method: 'post', data });
+
+/**
+ * 详情
+ * @param {*} id
+ * @returns
+ */
+export const getStoreTypeById = (id) => request(`/storeType/${id}`);
+
+/**
+ * 编辑
+ *  @param {*} id
+ * @param {*} data
+ * @returns
+ */
+export const updataStoreType = (id, data) => request(`/storeType/${id}`, { method: 'put', data });
+
+/**
+ * 删除
+ * @param {*} id
+ * @returns
+ */
+export const deleteStoreType = (id) => request(`/storeType/${id}`, { method: 'delete' });
+
+// 库存日志
+
+/**
+ * 查询列表
+ * @param {*} params
+ * @returns
+ */
+export const getStoreLogList = (params) => request('/storeLog', { params });
+
+/**
+ * 新增
+ * @param {*} data
+ * @returns
+ */
+export const addStoreLog = (data) => request('/storeLog', { method: 'post', data });
+
+
+/**
+ * 导出
+ * @param {*} params
+ * @returns
+ */
+ export const storeLogExport = (params) => request('/storeLog/export',  { responseType: 'arraybuffer', params });

src/utils/download.js

@@ -3,7 +3,7 @@ export function fetchBlob(url) {
 }
 
 export function downloadBlob(blob, fileName) {
-  const url = window.URL.createObjectURL(blob);
+  const url = window.URL.createObjectURL(new Blob([blob]));
   const link = document.createElement('a');
   link.href = url;
   link.setAttribute('download', fileName);

src/utils/request.js

@@ -19,7 +19,14 @@ function requestInterceptor(url, options) {
   };
 }
 
-function responseInterceptor(response) {
+async function responseInterceptor(response) {
+  console.log(response, 'responseresponse');
+
+  if (response.headers['content-type'] === 'application/vnd.ms-excel;charset=utf-8') {
+    console.log(response.data, 'data');
+    return response;
+  }
+
   const { data } = response;
   if (data.code === 1000) {
     return data;
@@ -36,12 +43,13 @@ export const requestConfig = {
 
 export function queryTable(apiRequest) {
   return function (params) {
+    const { current, pageSize, ...leftParams } = params;
     return apiRequest({
-      ...params,
+      pageSize,
       pageNum: params.current,
+      ...(leftParams || {}),
     })
       .then((res) => {
-        console.log(res, '--000');
         return {
           data: res.records,
           success: true,
@@ -55,11 +63,26 @@ export function queryTable(apiRequest) {
       });
   };
 }
-// return {
-//   data: msg.result,
-//   // success 请返回 true，
-//   // 不然 table 会停止解析数据，即使有数据
-//   success: boolean,
-//   // 不传会使用 data 的长度，如果是分页一定要传
-//   total: number,
-// };
+
+export function queryDict(apiRequest) {
+  return function (params, labelKey = 'name', valueKey = 'id') {
+    const { current, pageSize, ...leftParams } = params || {};
+    return apiRequest({
+      pageSize: 9999,
+      pageNum: 1,
+      ...(leftParams || {}),
+    })
+      .then((res) => {
+        return res?.records?.map((x) => ({
+          label: x[labelKey],
+          value: x[valueKey],
+          ...x,
+        }));
+      })
+      .catch((err) => {
+        return {
+          success: false,
+        };
+      });
+  };
+}