fangmingyue 2 лет назад
Родитель
Сommit
5c8e908a4f
2 измененных файлов: 19 добавлений и 3 удалений
  1. 9
    1
      src/pages/checkAnswer/loc/index.jsx
  2. 10
    2
      src/pages/checkAnswer/survey/index.jsx

+ 9
- 1
src/pages/checkAnswer/loc/index.jsx Просмотреть файл

7
 import { getTaCheck } from '@/service/tacheck';
7
 import { getTaCheck } from '@/service/tacheck';
8
 import { getTdLocType } from '@/service/tdloctype';
8
 import { getTdLocType } from '@/service/tdloctype';
9
 import { getTaCheckAnswer, exportTaCheckAnswer } from '@/service/tacheckanswer';
9
 import { getTaCheckAnswer, exportTaCheckAnswer } from '@/service/tacheckanswer';
10
+import { getTaIssue } from '@/service/taissue';
10
 import useBool from '@/utils/hooks/useBool';
11
 import useBool from '@/utils/hooks/useBool';
11
 
12
 
12
 const getCheck = queryDict(getTaCheck, { labelKey: 'title', valueKey: 'checkId' });
13
 const getCheck = queryDict(getTaCheck, { labelKey: 'title', valueKey: 'checkId' });
13
 const getLocType = queryDict(getTdLocType, { labelKey: 'name', valueKey: 'typeId' });
14
 const getLocType = queryDict(getTdLocType, { labelKey: 'name', valueKey: 'typeId' });
14
 const getAnswer = queryTable(getTaCheckAnswer);
15
 const getAnswer = queryTable(getTaCheckAnswer);
16
+const getIssue = queryDict(getTaIssue, { labelKey: 'userName', valueKey: 'issueId' });
15
 
17
 
16
 export default (props) => {
18
 export default (props) => {
17
 
19
 
57
     {
59
     {
58
       title: "答题人",
60
       title: "答题人",
59
       dataIndex: "userName",
61
       dataIndex: "userName",
60
-      hideInSearch: true,
62
+      valueType: 'select',
63
+      request: getIssue,
64
+      formItemProps: {
65
+        rules: [
66
+          { required: true, message: '请选择答题人' }
67
+        ]
68
+      }
61
     },
69
     },
62
   ]
70
   ]
63
 
71
 

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

6
 import { Button, notification } from "antd";
6
 import { Button, notification } from "antd";
7
 import { getTaCheck } from '@/service/tacheck';
7
 import { getTaCheck } from '@/service/tacheck';
8
 import { getTaCheckAnswer, exportTaCheckAnswer } from '@/service/tacheckanswer';
8
 import { getTaCheckAnswer, exportTaCheckAnswer } from '@/service/tacheckanswer';
9
+import { getTaIssue } from '@/service/taissue';
9
 import useBool from '@/utils/hooks/useBool';
10
 import useBool from '@/utils/hooks/useBool';
10
 
11
 
11
 const getCheck = queryDict(getTaCheck, { labelKey: 'title', valueKey: 'checkId' });
12
 const getCheck = queryDict(getTaCheck, { labelKey: 'title', valueKey: 'checkId' });
12
 const getAnswer = queryTable(getTaCheckAnswer);
13
 const getAnswer = queryTable(getTaCheckAnswer);
14
+const getIssue = queryDict(getTaIssue, { labelKey: 'userName', valueKey: 'issueId' });
13
 
15
 
14
 const addOnParams = { itemType: 'survey' };
16
 const addOnParams = { itemType: 'survey' };
15
 
17
 
58
     {
60
     {
59
       title: "答题人",
61
       title: "答题人",
60
       dataIndex: "userName",
62
       dataIndex: "userName",
61
-      hideInSearch: true,
63
+      valueType: 'select',
64
+      request: getIssue,
65
+      formItemProps: {
66
+        rules: [
67
+          { required: true, message: '请选择答题人' }
68
+        ]
69
+      }
62
     },
70
     },
63
     {
71
     {
64
       title: "受访者性别",
72
       title: "受访者性别",
71
       hideInSearch: true,
79
       hideInSearch: true,
72
     }
80
     }
73
   ]
81
   ]
74
-  
82
+
75
   const beforeSearchSubmit = (params) => {
83
   const beforeSearchSubmit = (params) => {
76
     paramsRef.current = params;
84
     paramsRef.current = params;
77
     return params;
85
     return params;