.

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, updateInvoiceItemTpl, getInvoiceItemTplDetail, 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 [regionId, setRegionId] = useState();
   const [invoiceItem, setinvoiceItem] = useState();
   const actionRef = useRef();
 
@@ -56,7 +55,7 @@ export default (props) => {
   const Submit = (val) => {
     setModelLoading(true);
     if (invoiceItem) {
-      updateInvoiceItemTpl(invoiceItem.itemId,{...invoiceItem,...val,invoiceId:invoiceId}).then((res)=>{
+      updateInvoiceItemTpl(invoiceItem.invoiceItemTplId, { ...invoiceItem, ...val, invoiceId: invoiceId }).then((res) => {
         message.success('修改成功')
         setModelLoading(false)
         actionRef.current.reload()
@@ -65,8 +64,8 @@ export default (props) => {
         setModelLoading(false);
         message.error(err.message || err);
       });
-    } else{
-      saveInvoiceItemTpl({...val,invoiceId:invoiceId}).then(res=>{
+    } else {
+      saveInvoiceItemTpl({ ...val, invoiceId: invoiceId }).then(res => {
         message.success('添加成功')
         setModelLoading(false)
         actionRef.current.reload()
@@ -98,7 +97,7 @@ export default (props) => {
   }
   //删除报销项目
   const handleDelete = (invoiceItemTplId) => {
-    deleteInvoiceItemTpl(invoiceItemTplId).then(res=>{
+    deleteInvoiceItemTpl(invoiceItemTplId).then(res => {
       message.success('删除成功')
       actionRef.current.reload()
     }).catch((err) => {
@@ -106,7 +105,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>,
   ];
@@ -180,20 +179,24 @@ export default (props) => {
             </FormItem>
           </Form>
         </Col>
-        <Col span={12}>
-          报销项目
-          <PageTable
-            request={getInvoiceItemTplList}
-            toolBarRender={actions}
-            actionRef={actionRef}
-            columns={columns}
-            rowKey="ItemId"
-            options={false}
-            search={false}
-            params={{invoiceId}}
-          />
-        </Col>
+        {
+          invoiceId &&
+          <Col span={12}>
+            报销项目
+            <PageTable
+              request={getInvoiceItemTplList}
+              toolBarRender={actions}
+              actionRef={actionRef}
+              columns={columns}
+              rowKey="invoiceItemTplId"
+              options={false}
+              search={false}
+              params={{ invoiceId }}
+            />
+          </Col>
+        }
       </Row>
+
       <Modal
         forceRender
         title={invoiceItem ? '报销项目编辑' : '报销项目新增'}
@@ -226,6 +229,7 @@ export default (props) => {
           </FormItem>
         </Form>
       </Modal>
+
     </>
   )
 }

src/pages/invoiceFill/components/ReimbursementPerson.jsx

@@ -20,7 +20,7 @@ export default (props) => {
   const Submit = (val) => {
     setModelLoading(true);
     if (person) {
-      updateInvoicePerson(person.itemId,{...person,...val,invoiceId:invoiceId}).then((res)=>{
+      updateInvoicePerson(person.invoicePersonId,{...person,...val,invoiceId:invoiceId}).then((res)=>{
         message.success('修改成功')
         setModelLoading(false)
         actionRef.current.reload()
@@ -123,7 +123,7 @@ export default (props) => {
         toolBarRender={actions}
         actionRef={actionRef}
         columns={columns}
-        rowKey="personId"
+        rowKey="invoicePersonId"
         options={false}
         search={false}
         params={{invoiceId}}

src/pages/invoiceFill/edit.jsx

@@ -9,17 +9,21 @@ import { useRef } from 'react';
 export default (props) => {
   const { location } = props;
   const { id } = location.query;
-  const detailRef=useRef();
-  const addDetail=()=>{
+  const detailRef = useRef();
+  const addDetail = () => {
     detailRef.current.refrash();
   }
   return (
-    <PageHeaderWrapper extra={[<Button key='addDetail' onClick={addDetail}>生成明细</Button>]}>
+    <PageHeaderWrapper extra={[id&&<Button key='addDetail' onClick={addDetail}>生成明细</Button>]}>
       <ProCard tabs={{ type: 'card' }} style={{ minHeight: '700px' }}>
         <ProCard.TabPane key={1} tab="基本信息">
           <BasicInfo invoiceId={id} />
-          报销明细
-          <InvoiceDetail ref={detailRef} invoiceId={id} />
+          {
+            id &&
+            <>报销明细
+              <InvoiceDetail ref={detailRef} invoiceId={id} /></>
+          }
+
         </ProCard.TabPane>
         <ProCard.TabPane key={2} disabled={!id} tab="报销人员">
           <ReimbursementPerson invoiceId={id} />