fangmingyue 2 лет назад
Родитель
Сommit
b31a6056a5
3 измененных файлов: 59 добавлений и 9 удалений
  1. 6
    6
      src/pages/invoiceDetail/index.jsx
  2. 48
    2
      src/pages/noFill/index.jsx
  3. 5
    1
      src/services/invoicePerson.js

+ 6
- 6
src/pages/invoiceDetail/index.jsx Просмотреть файл

@@ -20,7 +20,7 @@ export default (props) => {
20 20
         <BanjiSearch placeholder='请输入班次名称' />
21 21
       ),
22 22
       formItemProps: {
23
-        rules: [          
23
+        rules: [
24 24
           {
25 25
             required: true,
26 26
             message: '请输入班次名称',
@@ -109,10 +109,10 @@ export default (props) => {
109 109
     {
110 110
       title: '提交时间',
111 111
       dataIndex: 'createDate',
112
-      key: 'createDate',  
112
+      key: 'createDate',
113 113
       render: (t) => t ? moment(t).format('YYYY-MM-DD HH:mm') : '-',
114 114
       width: 200,
115
-      search:false
115
+      search: false
116 116
     },
117 117
   ]
118 118
 
@@ -123,16 +123,16 @@ export default (props) => {
123 123
         columns={columns}
124 124
         request={getInvoiceDetailList}
125 125
         expfunc={getExport}
126
-        options={false}        
126
+        options={false}
127 127
         actionRef={actionRef}
128 128
         search={{
129
-          defaultCollapsed:false
129
+          defaultCollapsed: false
130 130
         }}
131 131
         form={{ ignoreRules: false }}
132 132
         manualRequest={true}
133 133
         revalidateOnFocus={false}
134 134
         rowKey="detailId"
135
-        scroll={{x:2500}}
135
+        scroll={{ x: 2500 }}
136 136
       />
137 137
     </PageHeaderWrapper>
138 138
   )

+ 48
- 2
src/pages/noFill/index.jsx Просмотреть файл

@@ -1,8 +1,54 @@
1
-import React from 'react';
1
+import React, { useRef } from 'react';
2 2
 import { PageHeaderWrapper } from '@ant-design/pro-layout';
3
+import PageTable from '@/components/PageTable'
4
+import BanjiSearch from '@/components/BanjiSearch';
5
+import { getInvoicePersonNofillList } from '@/services/invoicePerson'
3 6
 
4 7
 export default (props) => {
8
+  const actionRef = useRef();
9
+
10
+  const columns = [
11
+    {
12
+      title: '班次名称',
13
+      dataIndex: 'invoiceId',
14
+      key: 'invoiceId',
15
+      search: true,
16
+      hideInTable: true,
17
+      renderFormItem: () => (
18
+        <BanjiSearch placeholder='请输入班次名称' />
19
+      ),
20
+      formItemProps: {
21
+        rules: [
22
+          {
23
+            required: true,
24
+            message: '请输入班次名称',
25
+          }
26
+        ],
27
+      }
28
+    },
29
+    {
30
+      title: '单位名称',
31
+      dataIndex: 'orgName',
32
+      key: 'orgName',
33
+      search: false,
34
+    },
35
+    {
36
+      title: '学员名称',
37
+      dataIndex: 'name',
38
+      key: 'name',
39
+      search: false,
40
+    },
41
+  ]
42
+
5 43
   return (
6
-    <PageHeaderWrapper></PageHeaderWrapper>
44
+    <PageHeaderWrapper>
45
+      <PageTable
46
+        request={getInvoicePersonNofillList}
47
+        columns={columns}
48
+        options={false}
49
+        actionRef={actionRef}
50
+        form={{ ignoreRules: false }}
51
+      />
52
+    </PageHeaderWrapper>
7 53
   )
8 54
 }

+ 5
- 1
src/services/invoicePerson.js Просмотреть файл

@@ -4,6 +4,10 @@ import request from '@/utils/request';
4 4
 export const getInvoicePersonList = (params) =>
5 5
   request(`/invoice/${params.invoiceId}/person`, { params });
6 6
 
7
+// 未填写列表
8
+export const getInvoicePersonNofillList = (params) =>
9
+  request(`/invoice/${params.invoiceId}/person/nofill`, { params });
10
+
7 11
 // 新增保存
8 12
 export const saveInvoicePerson = (data, invoiceId) =>
9 13
   request(`/invoice/${invoiceId}/person`, { data, method: 'post' });
@@ -18,4 +22,4 @@ export const deleteInvoicePerson = (id, invoiceId) =>
18 22
 
19 23
 // 批量新增保存
20 24
 export const saveImportPerson = (data, invoiceId) =>
21
-request(`/invoice/${invoiceId}/person/import`, { data, method: 'post' });
25
+  request(`/invoice/${invoiceId}/person/import`, { data, method: 'post' });