.

src/components/OrgSearch/index.jsx

@@ -1,63 +0,0 @@
-import { useEffect, useState } from 'react';
-import { Select } from 'antd'
-import { getDetail } from '@/services/org'
-import { getList } from '@/services/org'
-
-const Option = Select.Option;
-export default (props) => {
-  const { value, onChange, ...otherProps } = props;
-
-  const showType = 0; // 不显示报错
-
-  const [list, setList] = useState([])
-
-  const searchData = (val) => { 
-    getList({ pageSize: 999,orgName:val }, showType).then(res => {
-      setList(res.records || [])
-    })    
-  }
-
-  const handleSearch = (text) => {
-    if (text) {
-      searchData(text)
-    }else{
-      getList({ pageSize: 999 }, showType).then(res => {
-        setList(res.records || [])
-      })
-    }
-  }
-
-  useEffect(() => {
-    if (value) {
-      getDetail(value).then((res) => {
-        setList([res])
-      })
-    }else{
-      getList({ pageSize: 999 }, showType).then(res => {
-        setList(res.records || [])
-      })
-    }
-  }, [value])
-
-  return (
-    <Select
-      showSearch
-      value={value}
-      defaultActiveFirstOption={false}
-      showArrow={false}
-      filterOption={false}
-      onSearch={handleSearch}
-      onChange={onChange}
-      notFoundContent={null}
-      {...otherProps}
-    >
-      {
-        list.map((item) => {
-          return (
-            <Option key={item.orgId} value={item.orgId}>{item.orgName}</Option>
-          )
-        })
-      }
-    </Select>
-  )
-}

src/pages/invoiceDetail/index.jsx

@@ -1,11 +1,10 @@
-
-import moment from 'moment';
 import React, { useRef } from 'react'
+import moment from 'moment';
 import { PageHeaderWrapper } from '@ant-design/pro-layout';
-import { getInvoiceDetailList } from '@/services/invoiceDetail'
-import { getExport } from '@/services/invoiceFill'
 import PageTable from '@/components/PageTable'
 import BanjiSearch from '@/components/BanjiSearch';
+import { getInvoiceDetailList } from '@/services/invoiceDetail'
+import { getExport } from '@/services/invoiceFill'
 
 export default (props) => {
   const actionRef = useRef();

src/pages/invoiceFill/components/BasicInfo.jsx

@@ -1,12 +1,12 @@
 import React, { useState, useRef, useEffect, useMemo } from 'react';
+import { history } from 'umi';
 import { Form, Input, Popconfirm, Select, Button, Modal, InputNumber, message, Col, Row, DatePicker } from 'antd';
 import { PlusOutlined } from '@ant-design/icons';
 import moment from 'moment';
+import locale from 'antd/es/date-picker/locale/zh_CN';
+import PageTable from '@/components/PageTable';
 import { saveInvoiceFill, updateInvoiceFill, getInvoiceFillDetail } from '@/services/invoiceFill'
 import { saveInvoiceItemTpl, getInvoiceItemTplList, deleteInvoiceItemTpl } from '@/services/invoiceItemTpl'
-import { history } from 'umi';
-import PageTable from '@/components/PageTable';
-import locale from 'antd/es/date-picker/locale/zh_CN';
 import QRCode from './QRCode'
 
 
@@ -28,13 +28,13 @@ export default (props) => {
   const actionRef = useRef();
 
 
-  const qrcodeText = useMemo(() => 
-  // initialState.report_url + '#resume-work-form?org=' + 
-  'https://www.baidu.com/#resume-work-form?org='+
-  invoiceId, 
-  [invoiceId
-    // , initialState.report_url
-  ]
+  const qrcodeText = useMemo(() =>
+    // initialState.report_url + '#resume-work-form?org=' + 
+    'https://www.baidu.com/#resume-work-form?org=' +
+    invoiceId,
+    [invoiceId
+      // , initialState.report_url
+    ]
   )
 
 
@@ -227,7 +227,6 @@ export default (props) => {
           </FormItem>
         </Form>
       </Modal>
-
     </>
   )
 }

src/pages/invoiceFill/components/InvoiceDetail.jsx

@@ -1,7 +1,7 @@
 import React, { useState, useRef, useImperativeHandle, forwardRef } from 'react';
-import { Form, Input, Button, Modal, message, Popconfirm, Radio } from 'antd';
-import { getInvoiceTplList, updateInvoiceDetail, deleteInvoiceTpl } from '@/services/invoiceDetail'
+import { Form, Input, Button, Modal, message, Popconfirm } from 'antd';
 import PageTable from '@/components/PageTable';
+import { getInvoiceTplList, updateInvoiceDetail, deleteInvoiceTpl } from '@/services/invoiceDetail'
 
 const FormItem = Form.Item;
 const formItemLayout = { labelCol: { span: 6 }, wrapperCol: { span: 14 } };
@@ -45,7 +45,7 @@ export default forwardRef((props, ref) => {
     refrash
   }))
   const handleDelete = (val) => {
-    deleteInvoiceTpl(val.invoiceId,val.invoiceItemId).then(res => {
+    deleteInvoiceTpl(val.invoiceId, val.invoiceItemId).then(res => {
       message.success('删除成功')
       refrash()
     }).catch((err) => {
@@ -107,7 +107,6 @@ export default forwardRef((props, ref) => {
         search={false}
         params={{ invoiceId }}
       />
-
       <Modal
         forceRender
         title='开票模板编辑'

src/pages/invoiceFill/components/ReimbursementPerson.jsx

@@ -1,9 +1,9 @@
 import React, { useState, useRef } from 'react';
 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';
+import { getInvoicePersonList, saveInvoicePerson, deleteInvoicePerson } from '@/services/invoicePerson'
 
 const FormItem = Form.Item;
 const formItemLayout = { labelCol: { span: 6 }, wrapperCol: { span: 14 } };

src/pages/invoiceFill/edit.jsx

@@ -1,13 +1,13 @@
+import { useRef } from 'react';
 import ProCard from '@ant-design/pro-card';
 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, message } from 'antd';
-import { useRef } from 'react';
 import { saveInvoiceDetail } from '@/services/invoiceDetail'
 import { getInvoicePersonList } from '@/services/invoicePerson'
 import { getInvoiceItemTplList } from '@/services/invoiceItemTpl'
+import ReimbursementPerson from './components/ReimbursementPerson';
+import InvoiceDetail from './components/InvoiceDetail.jsx';
+import BasicInfo from './components/BasicInfo.jsx';
 
 export default (props) => {
   const { location } = props;

src/pages/invoiceFill/index.jsx

@@ -1,13 +1,11 @@
-
-import moment from 'moment';
-import React, { useRef, useEffect, useState } from 'react'
-
-import { Button, Modal, Popconfirm, message } from 'antd';
+import React, { useRef } from 'react'
+import { history } from 'umi';
+import { Button, Popconfirm, message } from 'antd';
 import { PlusOutlined } from '@ant-design/icons';
 import { PageHeaderWrapper } from '@ant-design/pro-layout';
-import { getInvoiceFillList, deleteInvoiceFill } from '@/services/invoiceFill'
+import moment from 'moment';
 import PageTable from '@/components/PageTable'
-import { history } from 'umi';
+import { getInvoiceFillList, deleteInvoiceFill } from '@/services/invoiceFill'
 
 const formatterTime = (val) => {
   return val ? moment(val).format('YYYY-MM-DD HH:mm') : '';
@@ -52,7 +50,7 @@ export default (props) => {
       dataIndex: 'status',
       key: 'status',
       render: (_, record) => {
-        return record.status === 0 ? '未发布' :record.status === 1 ? '进行中' : '已截止';
+        return record.status === 0 ? '未发布' : record.status === 1 ? '进行中' : '已截止';
       },
       valueType: 'select',
       valueEnum: {