.

config/proxy.js

@@ -11,11 +11,11 @@ export default {
     // localhost:8000/api/** -> https://preview.pro.ant.design/api/**
     '/api/': {
       // 要代理的地址
-      target: 'http://192.168.89.76:7081',
+      target: 'http://192.168.89.147:7081',
       changeOrigin: true,
       headers: {
-        origin: 'http://192.168.89.76:7081',
-        referer: 'http://192.168.89.76:7081',
+        origin: 'http://192.168.89.147:7081',
+        referer: 'http://192.168.89.147:7081',
       },
     },
   },

src/components/PageTable/index.jsx

@@ -6,7 +6,7 @@ import { queryTable } from '@/utils/request';
 import useExport from '@/utils/hooks/useExport';
 
 export default (props) => {
-  const { formRef, request, expfunc, params = {}, toolBarRender, beforeSearchSubmit, ...leftProps } = props;
+  const { formRef, request, expfunc,invoiceId, params = {}, toolBarRender, beforeSearchSubmit, ...leftProps } = props;
 
   // 如果 formRef 未设置, 则使用 fmRef 去代理
   const fmRef = useRef();
@@ -15,6 +15,7 @@ export default (props) => {
   // 导出函数需要使用的 params
   const exportParams = useRef()
   const handleBeforSearch = (params) => {
+    params.invoiceId=invoiceId||''
     if (typeof beforeSearchSubmit === 'function') {
       exportParams.current = beforeSearchSubmit(params);
     } else {

src/components/Upload/UploadExcel.jsx

@@ -1,12 +1,12 @@
 import React, { useState } from 'react';
 import { LoadingOutlined, UploadOutlined } from '@ant-design/icons';
-import { Button, message } from 'antd';
-import Upload from './Upload';
+import { Button, message, Upload } from 'antd';
+import { saveImportPerson } from '@/services/invoicePerson'
 
 function beforeUpload(file) {
-  const isExcel = file.type === 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet' || file.type === 'application/vnd.ms-excel';
+  const isExcel = file.type === 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet';
   if (!isExcel) {
-    message.error('请上传 excel表格!');
+    message.error('请上传excle表格（务必通过模板下载修改）');
   }
   const isLt10M = file.size / 1024 / 1024 < 10;
   if (!isLt10M) {
@@ -16,18 +16,20 @@ function beforeUpload(file) {
   return isExcel && isLt10M;
 }
 
+
 export default (props) => {
-  const { onChange } = props;
+  const { onChange, id ,refrash } = props;
 
   const [loading, setLoading] = useState(false);
 
   const handleChange = info => {
     if (info.file.status === 'uploading') {
-      setLoading(true);
+      setLoading(true); 
       return;
     }
     if (info.file.status === 'error') {
       setLoading(false);
+      refrash()
       return;
     }
 
@@ -36,15 +38,27 @@ export default (props) => {
       onChange(info.file.response);
     }
   };
+  function uploadFile({ file, onSuccess, onError }) {
+    const formData = new FormData();
+    formData.append('file', file);
+    saveImportPerson(formData, id).then((url) => {
+      onSuccess(url, file)
+    }).catch((e) => {
+      onError(e)
+    });
 
+    return {
+      abort: () => { },
+    };
+  }
   return (
     <Upload
-      // listType="picture"
+      customRequest={uploadFile}
       showUploadList={false}
       beforeUpload={beforeUpload}
       onChange={handleChange}
     >
-       <Button type="primary" disabled={loading} icon={loading ? <LoadingOutlined /> : <UploadOutlined />}>上传</Button>
+      <Button type="primary" disabled={loading} icon={loading ? <LoadingOutlined /> : <UploadOutlined />}>上传</Button>
     </Upload>
   );
 }

src/pages/invoiceFill/components/BasicInfo.jsx

@@ -2,7 +2,7 @@ import React, { useState, useRef, useEffect } from 'react';
 import { Form, Input, Popconfirm, Select, Button, Modal, InputNumber, message, Col, Row, Card } from 'antd';
 import { PlusOutlined } from '@ant-design/icons';
 import { saveInvoiceFill, updateInvoiceFill, getInvoiceFillDetail } from '@/services/invoiceFill'
-import { saveInvoiceItemTpl, updateInvoiceItemTpl, getInvoiceItemTplDetail, getInvoiceItemTplList, deleteInvoiceItemTpl } from '@/services/invoiceItemTpl'
+import { saveInvoiceItemTpl, getInvoiceItemTplList, deleteInvoiceItemTpl } from '@/services/invoiceItemTpl'
 import { history } from 'umi';
 import PageTable from '@/components/PageTable';
 
@@ -19,7 +19,6 @@ export default (props) => {
   const [formModel] = Form.useForm();
   const [editModal, setEditModal] = useState(false);
   const [modelLoading, setModelLoading] = useState(false);
-  const [invoiceItem, setinvoiceItem] = useState();
   const actionRef = useRef();
 
   //保存班级
@@ -54,46 +53,24 @@ export default (props) => {
   //报销项目弹窗保存
   const Submit = (val) => {
     setModelLoading(true);
-    if (invoiceItem) {
-      updateInvoiceItemTpl(invoiceItem.invoiceItemTplId, { ...invoiceItem, ...val, invoiceId: invoiceId }).then((res) => {
-        message.success('修改成功')
-        setModelLoading(false)
-        actionRef.current.reload()
-        onCancel()
-      }).catch((err) => {
-        setModelLoading(false);
-        message.error(err.message || err);
-      });
-    } else {
-      saveInvoiceItemTpl({ ...val, invoiceId: invoiceId }).then(res => {
-        message.success('添加成功')
-        setModelLoading(false)
-        actionRef.current.reload()
-        onCancel();
-      }).catch((err) => {
-        setModelLoading(false);
-        message.error(err.message || err);
-      });
-    }
+    saveInvoiceItemTpl(val, invoiceId).then(res => {
+      message.success('添加成功')
+      setModelLoading(false)
+      actionRef.current.reload()
+      onCancel();
+    }).catch((err) => {
+      setModelLoading(false);
+      message.error(err.message || err);
+    });
   }
   // 弹窗关闭
   const onCancel = () => {
     setEditModal(false);
-    setinvoiceItem()
+    formModel.resetFields()
   }
   //弹起弹窗
-  const showModel = (id) => {
-    if (id) {
-      getInvoiceItemTplDetail(id).then((res) => {
-        formModel.setFieldsValue(res)
-        setinvoiceItem(res)
-        setEditModal(true);
-      }).catch((err) => {
-        message.error(err.message || err);
-      });
-    } else {
-      setEditModal(true);
-    }
+  const showModel = () => {
+    setEditModal(true);
   }
   //删除报销项目
   const handleDelete = (invoiceItemTplId) => {
@@ -105,7 +82,7 @@ export default (props) => {
     });
   }
   const actions = () => [
-    <Button key="add" type="primary" icon={<PlusOutlined />} onClick={() => showModel()}>
+    <Button key="add" type="primary" icon={<PlusOutlined />} onClick={showModel}>
       新增报销项目
     </Button>,
   ];
@@ -133,14 +110,6 @@ export default (props) => {
       title: '操作',
       valueType: 'option',
       render: (_, record) => [
-        <Button
-          style={{ padding: 0 }}
-          type="link"
-          key={1}
-          onClick={() => showModel(record.invoiceItemTplId)}
-        >
-          编辑
-        </Button>,
         <Popconfirm
           key={2}
           title="您是否确认删除 ?"
@@ -199,7 +168,7 @@ export default (props) => {
 
       <Modal
         forceRender
-        title={invoiceItem ? '报销项目编辑' : '报销项目新增'}
+        title='报销项目新增'
         visible={editModal}
         onCancel={onCancel}
         keyboard={false}

src/pages/invoiceFill/components/InvoiceDetail.jsx

@@ -1,23 +1,24 @@
-import React, { useState, useRef,useImperativeHandle,forwardRef } from 'react';
-import { Form, Input, Button, Modal, message } from 'antd';
+import React, { useState, useRef, useImperativeHandle, forwardRef } from 'react';
+import { Form, Input, Button, Modal, message, Popconfirm } from 'antd';
 import { PlusOutlined } from '@ant-design/icons';
-import { getInvoiceDetailList,getInvoiceDetailDetail,updateInvoiceDetail } from '@/services/invoiceDetail'
+import { getInvoiceDetailList, updateInvoiceDetail,deleteInvoiceDetail } from '@/services/invoiceDetail'
+import {getExport} from '@/services/invoiceFill'
 import PageTable from '@/components/PageTable';
 
 const FormItem = Form.Item;
 const formItemLayout = { labelCol: { span: 6 }, wrapperCol: { span: 14 } };
 
-export default forwardRef((props,ref) => {
+export default forwardRef((props, ref) => {
   const { invoiceId } = props
-  const [formModel] = Form.useForm();
+  const [form] = Form.useForm();
   const [editModal, setEditModal] = useState(false);
   const [modelLoading, setModelLoading] = useState(false);
-  const [invoiceDetail,setInvoiceDetail]=useState()
+  const [invoiceDetail, setInvoiceDetail] = useState()
   const actionRef = useRef();
 
   //弹窗保存
-  const Submit = () => {
-    updateInvoiceDetail(invoiceDetail.itemId,{...invoiceDetail,...val,invoiceId:invoiceId}).then((res)=>{
+  const Submit = (val) => {
+    updateInvoiceDetail(invoiceDetail.detailId,invoiceId, { ...invoiceDetail, ...val }).then((res) => {
       message.success('修改成功')
       setModelLoading(false)
       refrash()
@@ -31,49 +32,49 @@ export default forwardRef((props,ref) => {
   const onCancel = () => {
     setEditModal(false);
     setInvoiceDetail()
+    form.resetFields()
   }
 
-  const showModel = (id) => {
-    getInvoiceDetailDetail(id).then((res) => {
-      formModel.setFieldsValue(res)
-      setInvoiceDetail(res)
-      setEditModal(true);
-    }).catch((err) => {
-      message.error(err.message || err);
-    });
+  const showModel = (value) => {
+    form.setFieldsValue(value)
+    setInvoiceDetail(value)
+    setEditModal(true);
   }
-  const refrash=()=>{
+  const refrash = () => {
     actionRef.current.reload()
   }
   useImperativeHandle(ref, () => ({
     refrash
   }))
-  const actions = () => [
-    <Button key="add" type="primary" icon={<PlusOutlined />} onClick={showModel}>
-      导出
-    </Button>,
-  ];
+  const handleDelete = (id) => {
+    deleteInvoiceDetail(id).then(res => {
+      message.success('删除成功')
+      refrash()
+    }).catch((err) => {
+      message.error(err.message || err);
+    });
+  }
   const columns = [
     {
       title: '姓名',
-      dataIndex: 'person_name',
-      key: 'person_name',
+      dataIndex: 'personName',
+      key: 'personName',
     },
     {
       title: '开票单位',
-      dataIndex: 'org_name',
-      key: 'org_name',
+      dataIndex: 'orgName',
+      key: 'orgName',
     },
     {
       title: '纳税识别号',
-      dataIndex: 'tax_no',
-      key: 'tax_no',
+      dataIndex: 'taxNo',
+      key: 'taxNo',
     },
     {
       title: '地址',
       dataIndex: 'address',
       key: 'address',
-      search:false
+      search: false
     },
     {
       title: '电话',
@@ -82,36 +83,36 @@ export default forwardRef((props,ref) => {
     },
     {
       title: '开户银行',
-      dataIndex: 'bank_name',
-      key: 'bank_name',
-    },    
+      dataIndex: 'bankName',
+      key: 'bankName',
+    },
     {
       title: '开户行账户',
-      dataIndex: 'card_no',
-      key: 'card_no',
+      dataIndex: 'cardNo',
+      key: 'cardNo',
     },
     {
       title: '项目',
-      dataIndex: 'item_name',
-      key: 'item_name',
+      dataIndex: 'itemName',
+      key: 'itemName',
     },
     {
       title: '开票金额',
       dataIndex: 'charge',
       key: 'charge',
-      search:false
+      search: false
     },
     {
       title: '是否合开',
-      dataIndex: 'merge_remark',
-      key: 'merge_remark',
-      search:false
+      dataIndex: 'mergeRemark',
+      key: 'mergeRemark',
+      search: false
     },
     {
       title: '住宿清单',
-      dataIndex: 'stay_remark',
-      key: 'stay_remark',
-      search:false
+      dataIndex: 'stayRemark',
+      key: 'stayRemark',
+      search: false
     },
     {
       title: '操作',
@@ -121,10 +122,21 @@ export default forwardRef((props,ref) => {
           style={{ padding: 0 }}
           type="link"
           key={1}
-          onClick={() => showModel(record.detailId)}
+          onClick={() => showModel(record)}
         >
           编辑
         </Button>,
+        <Popconfirm
+          key={2}
+          title="您是否确认删除 ?"
+          onConfirm={() => handleDelete(record.detailId)}
+          okText="确定"
+          cancelText="取消"
+        >
+          <Button style={{ padding: 0 }} type="link">
+            删除
+          </Button>
+        </Popconfirm>,
       ],
     },
   ];
@@ -132,13 +144,14 @@ export default forwardRef((props,ref) => {
     <>
       <PageTable
         request={getInvoiceDetailList}
-        toolBarRender={actions}
         actionRef={actionRef}
         columns={columns}
         rowKey="detailId"
+        expfunc={getExport}
+        invoiceId={invoiceId}
         options={false}
         scroll={{ x: 2000 }}
-        params={{invoiceId}}
+        params={{ invoiceId }}
       />
 
       <Modal
@@ -151,14 +164,14 @@ export default forwardRef((props,ref) => {
         destroyOnClose={true}
         footer={null}
       >
-        <Form {...formItemLayout} onFinish={Submit} form={formModel}>
-          <FormItem label="姓名" name="person_name" rules={[{ required: true, message: '请输入' }]}>
+        <Form {...formItemLayout} onFinish={Submit} form={form}>
+          <FormItem label="姓名" name="personName" rules={[{ required: true, message: '请输入' }]}>
             <Input placeholder="请输入" />
           </FormItem>
           <FormItem label="开票（单位全称）" name="orgName" rules={[{ required: true, message: '请输入' }]}>
             <Input placeholder="请输入" />
           </FormItem>
-          <FormItem label="纳税识别号" name="tax_no" rules={[{ required: true, message: '请输入' }]}>
+          <FormItem label="纳税识别号" name="taxNo" rules={[{ required: true, message: '请输入' }]}>
             <Input placeholder="请输入" />
           </FormItem>
           <FormItem label="地址" name="address" rules={[{ required: true, message: '请输入' }]}>
@@ -167,19 +180,22 @@ export default forwardRef((props,ref) => {
           <FormItem label="电话" name="phone" rules={[{ required: true, message: '请输入' }]}>
             <Input placeholder="请输入" />
           </FormItem>
-          <FormItem label="开户银行" name="bank_name" rules={[{ required: true, message: '请输入' }]}>
+          <FormItem label="开户银行" name="bankName" rules={[{ required: true, message: '请输入' }]}>
+            <Input placeholder="请输入" />
+          </FormItem>
+          <FormItem label="开户行账户" name="cardNo" rules={[{ required: true, message: '请输入' }]}>
             <Input placeholder="请输入" />
           </FormItem>
-          <FormItem label="开户行账户" name="card_no" rules={[{ required: true, message: '请输入' }]}>
+          <FormItem label="项目" name="itemName" rules={[{ required: true, message: '请输入' }]}>
             <Input placeholder="请输入" />
           </FormItem>
           <FormItem label="开票金额" name="charge" rules={[{ required: true, message: '请输入' }]}>
             <Input placeholder="请输入" />
           </FormItem>
-          <FormItem label="是否合开" name="merge_remark" rules={[{ required: true, message: '请输入' }]}>
+          <FormItem label="是否合开" name="mergeRemark" rules={[{ required: true, message: '请输入' }]}>
             <Input placeholder="请输入" />
           </FormItem>
-          <FormItem label="住宿清单" name="stay_remark" rules={[{ required: true, message: '请输入' }]}>
+          <FormItem label="住宿清单" name="stayRemark" rules={[{ required: true, message: '请输入' }]}>
             <Input placeholder="请输入" />
           </FormItem>
           <FormItem label=" " colon={false}>

src/pages/invoiceFill/components/ReimbursementPerson.jsx

@@ -1,7 +1,7 @@
 import React, { useState, useRef } from 'react';
-import { Form, Input, Popconfirm, Select, Button, Modal, Upload, message } from 'antd';
-import { PlusOutlined,DownloadOutlined } from '@ant-design/icons';
-import { getInvoicePersonList,getInvoicePersonDetail,saveInvoicePerson,updateInvoicePerson,deleteInvoicePerson } from '@/services/invoicePerson'
+import { Form, Input, Popconfirm, Button, Modal, message } from 'antd';
+import { PlusOutlined, DownloadOutlined } from '@ant-design/icons';
+import { getInvoicePersonList, saveInvoicePerson, deleteInvoicePerson } from '@/services/invoicePerson'
 import PageTable from '@/components/PageTable';
 import { UploadExcel } from '@/components/Upload';
 
@@ -10,62 +10,42 @@ const formItemLayout = { labelCol: { span: 6 }, wrapperCol: { span: 14 } };
 
 export default (props) => {
   const { invoiceId } = props
-  const [formModel] = Form.useForm();
+  const [form] = Form.useForm();
   const [editModal, setEditModal] = useState(false);
   const [modelLoading, setModelLoading] = useState(false);
-  const [person,setPerson]=useState()
   const actionRef = useRef();
 
   //弹窗保存
   const Submit = (val) => {
     setModelLoading(true);
-    if (person) {
-      updateInvoicePerson(person.invoicePersonId,{...person,...val,invoiceId:invoiceId}).then((res)=>{
-        message.success('修改成功')
-        setModelLoading(false)
-        actionRef.current.reload()
-        onCancel()
-      }).catch((err) => {
-        setModelLoading(false);
-        message.error(err.message || err);
-      });
-    } else{
-      saveInvoicePerson({...val,invoiceId:invoiceId}).then(res=>{
-        message.success('添加成功')
-        setModelLoading(false)
-        actionRef.current.reload()
-        onCancel();
-      }).catch((err) => {
-        setModelLoading(false);
-        message.error(err.message || err);
-      });
-    }
+    saveInvoicePerson(val, invoiceId).then(res => {
+      message.success('添加成功')
+      setModelLoading(false)
+      refrash()
+      onCancel();
+    }).catch((err) => {
+      setModelLoading(false);
+      message.error(err.message || err);
+    });
   }
   // 弹窗关闭
   const onCancel = () => {
     setEditModal(false);
-    setPerson();
+    form.resetFields();
   }
 
-  const showModel = (id) => {
-    console.info('------------------',id)
-    if (id) {
-      getInvoicePersonDetail(id).then((res) => {
-        formModel.setFieldsValue(res)
-        setPerson(res)
-        setEditModal(true);
-      }).catch((err) => {
-        message.error(err.message || err);
-      });
-    } else {
-      setEditModal(true);
-    }
+  const showModel = () => {
+    setEditModal(true);
+  }
+  const refrash=()=>{
+    console.log(666);
+    actionRef.current.reload()
   }
   //删除人员
   const handleDelete = (id) => {
-    deleteInvoicePerson(id).then(res=>{
+    deleteInvoicePerson(id).then(res => {
       message.success('删除成功')
-      actionRef.current.reload()
+      refrash()
     }).catch((err) => {
       message.error(err.message || err);
     });
@@ -74,8 +54,8 @@ export default (props) => {
     <Button key="dowload" icon={<DownloadOutlined />} >
       下载模板
     </Button>,
-    <UploadExcel key='upload' />,
-    <Button key="add" icon={<PlusOutlined />} onClick={()=>showModel()}>
+    <UploadExcel key='upload' id={invoiceId} refrash={refrash}/>,
+    <Button key="add" icon={<PlusOutlined />} onClick={showModel}>
       新增报销人员
     </Button>,
   ];
@@ -94,14 +74,6 @@ export default (props) => {
       title: '操作',
       valueType: 'option',
       render: (_, record) => [
-        <Button
-          style={{ padding: 0 }}
-          type="link"
-          key={1}
-          onClick={() => showModel(record.invoicePersonId)}
-        >
-          编辑
-        </Button>,
         <Popconfirm
           key={2}
           title="您是否确认删除 ?"
@@ -126,11 +98,11 @@ export default (props) => {
         rowKey="invoicePersonId"
         options={false}
         search={false}
-        params={{invoiceId}}
+        params={{ invoiceId }}
       />
       <Modal
         forceRender
-        title={person ? '报销人员编辑' : '报销人员新增'}
+        title='报销人员新增'
         visible={editModal}
         onCancel={onCancel}
         keyboard={false}
@@ -138,7 +110,7 @@ export default (props) => {
         destroyOnClose={true}
         footer={null}
       >
-        <Form {...formItemLayout} onFinish={Submit} form={formModel}>
+        <Form {...formItemLayout} onFinish={Submit} form={form}>
           <FormItem label="所属公司" name="orgName" rules={[{ required: true, message: '请输入' }]}>
             <Input placeholder="请输入" />
           </FormItem>

src/pages/invoiceFill/edit.jsx

@@ -3,18 +3,48 @@ import { PageHeaderWrapper } from '@ant-design/pro-layout';
 import BasicInfo from './components/BasicInfo.jsx';
 import ReimbursementPerson from './components/ReimbursementPerson';
 import InvoiceDetail from './components/InvoiceDetail.jsx';
-import { Button } from 'antd';
+import { Button, message } from 'antd';
 import { useRef } from 'react';
+import { saveInvoiceDetail } from '@/services/invoiceDetail'
+import { getInvoicePersonList } from '@/services/invoicePerson'
+import { getInvoiceItemTplList } from '@/services/invoiceItemTpl'
 
 export default (props) => {
   const { location } = props;
   const { id } = location.query;
   const detailRef = useRef();
   const addDetail = () => {
-    detailRef.current.refrash();
+    getInvoiceItemTplList({ invoiceId: id }).then(res => {
+      if (res.records.length == 0) {
+        message.info('清先添加报销项目信息')
+        return
+      } else {
+        getInvoicePersonList({ invoiceId: id }).then(personRes => {
+          if (personRes.records.length == 0) {
+            message.info('清先添加报销人员信息')
+            return
+          } else {
+            saveInvoiceDetail(id).then(detail => {
+              message.success('生成成功')
+              detailRef.current.refrash();
+            }).catch(err => {
+              message.info(err);
+              console.log(err);
+            })
+          }
+        }).catch(err => {
+          message.info(err);
+          console.log(err);
+        })
+      }
+    }).catch(err => {
+      message.info(err);
+      console.log(err);
+    })
+
   }
   return (
-    <PageHeaderWrapper extra={[id&&<Button key='addDetail' onClick={addDetail}>生成明细</Button>]}>
+    <PageHeaderWrapper extra={[id && <Button key='addDetail' type='primary' onClick={addDetail}>生成明细</Button>]}>
       <ProCard tabs={{ type: 'card' }} style={{ minHeight: '700px' }}>
         <ProCard.TabPane key={1} tab="基本信息">
           <BasicInfo invoiceId={id} />

src/services/invoiceDetail.js

@@ -1,20 +1,21 @@
 import request from '@/utils/request';
 
 // 获取列表
-export const getInvoiceDetailList = (params) => request('/taInvoiceDetail', { params });
+export const getInvoiceDetailList = (params) =>
+  request(`/invoice/${params.invoiceId}/detail`, { params });
 
-// 获取详情
-export const getInvoiceDetailDetail = (id) => request(`/taInvoiceDetail/${id}`);
-
-// 新增保存
-export const saveInvoiceDetail = (data) => request('/taInvoiceDetail', { data, method: 'post' });
+// 生成明细
+export const saveInvoiceDetail = (invoiceId) =>
+  request(`/invoice/${invoiceId}/detail`, { method: 'post' });
 
 // 更新信息
-export const updateInvoiceDetail = (id, data) => request(`/taInvoiceDetail/${id}`, { data, method: 'put' });
+export const updateInvoiceDetail = (id, invoiceId, data) =>
+  request(`/invoice/${invoiceId}/detail/${id}`, { data, method: 'put' });
 
 /**
  * 删除报销明细
  * @param {*} data
  * @returns
  */
- export const deleteInvoiceDetail = (id) => request(`/taInvoiceDetail/${id}`, { method: 'delete' });
+export const deleteInvoiceDetail = (id) =>
+  request(`/invoice/detail/${id}`, { method: 'delete' });

src/services/invoiceFill.js

@@ -1,20 +1,23 @@
 import request from '@/utils/request';
 
 // 获取列表
-export const getInvoiceFillList = (params) => request('/taInvoiceFill', { params });
+export const getInvoiceFillList = (params) => request('/invoice', { params });
 
 // 获取详情
-export const getInvoiceFillDetail = (id) => request(`/taInvoiceFill/${id}`);
+export const getInvoiceFillDetail = (id) => request(`/invoice/${id}`);
 
 // 新增保存
-export const saveInvoiceFill = (data) => request('/taInvoiceFill', { data, method: 'post' });
+export const saveInvoiceFill = (data) => request('/invoice', { data, method: 'post' });
 
 // 更新信息
-export const updateInvoiceFill = (id, data) => request(`/taInvoiceFill/${id}`, { data, method: 'put' });
+export const updateInvoiceFill = (id, data) => request(`/invoice/${id}`, { data, method: 'put' });
 
 /**
  * 删除班级
  * @param {*} data
  * @returns
  */
- export const deleteInvoiceFill = (id) => request(`/taInvoiceFill/${id}`, { method: 'delete' });
+ export const deleteInvoiceFill = (id) => request(`/invoice/${id}`, { method: 'delete' });
+
+ // 导出
+export const getExport = (params) => request(`/invoice/${params.invoiceId}/export`, { params, method: 'post' });

src/services/invoiceItemTpl.js

@@ -1,20 +1,17 @@
 import request from '@/utils/request';
 
 // 获取列表
-export const getInvoiceItemTplList = (params) => request('/taInvoiceItemTpl', { params });
-
-// 获取详情
-export const getInvoiceItemTplDetail = (id) => request(`/taInvoiceItemTpl/${id}`);
+export const getInvoiceItemTplList = (params) =>
+  request(`/invoice/${params.invoiceId}/item`, { params });
 
 // 新增保存
-export const saveInvoiceItemTpl = (data) => request('/taInvoiceItemTpl', { data, method: 'post' });
-
-// 更新信息
-export const updateInvoiceItemTpl = (id, data) => request(`/taInvoiceItemTpl/${id}`, { data, method: 'put' });
+export const saveInvoiceItemTpl = (data, invoiceId) =>
+  request(`/invoice/${invoiceId}/item`, { data, method: 'post' });
 
 /**
  * 删除报销项目
  * @param {*} data
  * @returns
  */
- export const deleteInvoiceItemTpl = (id) => request(`/taInvoiceItemTpl/${id}`, { method: 'delete' });
+export const deleteInvoiceItemTpl = (id, invoiceId) =>
+  request(`/invoice/${invoiceId}/item/${id}`, { method: 'delete' });

src/services/invoicePerson.js

@@ -1,20 +1,21 @@
 import request from '@/utils/request';
 
 // 获取列表
-export const getInvoicePersonList = (params) => request('/taInvoicePerson', { params });
-
-// 获取详情
-export const getInvoicePersonDetail = (id) => request(`/taInvoicePerson/${id}`);
+export const getInvoicePersonList = (params) =>
+  request(`/invoice/${params.invoiceId}/person`, { params });
 
 // 新增保存
-export const saveInvoicePerson = (data) => request('/taInvoicePerson', { data, method: 'post' });
-
-// 更新信息
-export const updateInvoicePerson = (id, data) => request(`/taInvoicePerson/${id}`, { data, method: 'put' });
+export const saveInvoicePerson = (data, invoiceId) =>
+  request(`/invoice/${invoiceId}/person`, { data, method: 'post' });
 
 /**
- * 删除报销项目
+ * 删除报销人员
  * @param {*} data
  * @returns
  */
- export const deleteInvoicePerson = (id) => request(`/taInvoicePerson/${id}`, { method: 'delete' });
+export const deleteInvoicePerson = (id, invoiceId) =>
+  request(`/invoice/${invoiceId}/person/${id}`, { method: 'delete' });
+
+// 批量新增保存
+export const saveImportPerson = (data, invoiceId) =>
+request(`/invoice/${invoiceId}/person/import`, { data, method: 'post' });

src/utils/request.js

@@ -25,11 +25,15 @@ function requestInterceptor(url, options) {
     : {};
 
   const prefix = `${API_BASE}/api/admin`;
-
+  let requestType='json'
+  if (options.data instanceof FormData) {
+    requestType='form'
+  }
   return {
     url: `${prefix}${url}`,
     options: {
       ...options,
+      requestType,
       headers: {
         ...headers,
         ...token,
@@ -65,7 +69,7 @@ export const requestConfig = {
         // 可能是 excel 导出
         return {
           success: true,
-        }
+        };
       }
 
       const showError = ctx.req.options?.showType;