fangmingyue 2 年 前
コミット
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,11 +7,13 @@ import Page from '@/components/Page';
7 7
 import { getTaCheck } from '@/service/tacheck';
8 8
 import { getTdLocType } from '@/service/tdloctype';
9 9
 import { getTaCheckAnswer, exportTaCheckAnswer } from '@/service/tacheckanswer';
10
+import { getTaIssue } from '@/service/taissue';
10 11
 import useBool from '@/utils/hooks/useBool';
11 12
 
12 13
 const getCheck = queryDict(getTaCheck, { labelKey: 'title', valueKey: 'checkId' });
13 14
 const getLocType = queryDict(getTdLocType, { labelKey: 'name', valueKey: 'typeId' });
14 15
 const getAnswer = queryTable(getTaCheckAnswer);
16
+const getIssue = queryDict(getTaIssue, { labelKey: 'userName', valueKey: 'issueId' });
15 17
 
16 18
 export default (props) => {
17 19
 
@@ -57,7 +59,13 @@ export default (props) => {
57 59
     {
58 60
       title: "答题人",
59 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,10 +6,12 @@ import { ProTable } from "@ant-design/pro-components";
6 6
 import { Button, notification } from "antd";
7 7
 import { getTaCheck } from '@/service/tacheck';
8 8
 import { getTaCheckAnswer, exportTaCheckAnswer } from '@/service/tacheckanswer';
9
+import { getTaIssue } from '@/service/taissue';
9 10
 import useBool from '@/utils/hooks/useBool';
10 11
 
11 12
 const getCheck = queryDict(getTaCheck, { labelKey: 'title', valueKey: 'checkId' });
12 13
 const getAnswer = queryTable(getTaCheckAnswer);
14
+const getIssue = queryDict(getTaIssue, { labelKey: 'userName', valueKey: 'issueId' });
13 15
 
14 16
 const addOnParams = { itemType: 'survey' };
15 17
 
@@ -58,7 +60,13 @@ export default (props) => {
58 60
     {
59 61
       title: "答题人",
60 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 72
       title: "受访者性别",
@@ -71,7 +79,7 @@ export default (props) => {
71 79
       hideInSearch: true,
72 80
     }
73 81
   ]
74
-  
82
+
75 83
   const beforeSearchSubmit = (params) => {
76 84
     paramsRef.current = params;
77 85
     return params;