lisenzhou 2 lat temu
rodzic
commit
9755e74005

+ 23
- 15
src/pages/evaluate/evaluateList/addeValuate.jsx Wyświetl plik

@@ -8,13 +8,15 @@ import {
8 8
 } from "@ant-design/pro-components";
9 9
 import { Button, Form, message } from "antd";
10 10
 // import { getPostsFilesList, savePostsFiles } from "@/services/posts";
11
-import {
12
-  getEvaluateList,
13
-  saveEvaluate
14
-} from "@/services/evaluate";
11
+import { getEvaluateList, saveEvaluate } from "@/services/evaluate";
15 12
 import EvaluateItem from "@/components/evaluateItem";
16 13
 
17
-export default ({ taskId, onsuccess = () => {} }) => {
14
+export default ({
15
+  taskId,
16
+  onsuccess = () => {},
17
+  buttonText = "新增",
18
+  buttonProps,
19
+}) => {
18 20
   const [form] = Form.useForm();
19 21
 
20 22
   const onFinish = async (values) => {
@@ -52,11 +54,15 @@ export default ({ taskId, onsuccess = () => {} }) => {
52 54
       label: "军供文化",
53 55
     },
54 56
   ];
55
-  
57
+
56 58
   return (
57 59
     <ModalForm
58 60
       title="评价"
59
-      trigger={<Button type="primary">新增</Button>}
61
+      trigger={
62
+        <Button type="primary" {...buttonProps}>
63
+          {buttonText}
64
+        </Button>
65
+      }
60 66
       form={form}
61 67
       // open={true}
62 68
       layout={"horizontal"}
@@ -78,14 +84,16 @@ export default ({ taskId, onsuccess = () => {} }) => {
78 84
         hidden={true}
79 85
       />
80 86
       {itemList?.map((x) => {
81
-       return <ProForm.Item
82
-          key={x.name}
83
-          name={x.name}
84
-          label={x.label}
85
-          rules={[{ required: true, message: "请选择评价" }]}
86
-        >
87
-          <EvaluateItem></EvaluateItem>
88
-        </ProForm.Item>;
87
+        return (
88
+          <ProForm.Item
89
+            key={x.name}
90
+            name={x.name}
91
+            label={x.label}
92
+            rules={[{ required: true, message: "请选择评价" }]}
93
+          >
94
+            <EvaluateItem></EvaluateItem>
95
+          </ProForm.Item>
96
+        );
89 97
       })}
90 98
     </ModalForm>
91 99
   );

+ 8
- 10
src/pages/evaluate/index.jsx Wyświetl plik

@@ -88,16 +88,15 @@ const GuaranteeTaskList = (props) => {
88 88
         >
89 89
           评价列表
90 90
         </Button>,
91
-        <Button
92
-          key={2}
93
-          style={{ padding: 0 }}
94
-          type="link"
95
-          onClick={() => {
96
-            navigate(`/task/evaluate/list?id=${record.id}`);
91
+        <AddeValuate
92
+          taskId={record.id}
93
+          key="2"
94
+          buttonText="新增评价"
95
+          buttonProps={{ type: "link" }}
96
+          onsuccess={() => {
97
+            // actionRef.current.reload();
97 98
           }}
98
-        >
99
-          新增评价
100
-        </Button>,
99
+        ></AddeValuate>,
101 100
       ],
102 101
     },
103 102
   ];
@@ -114,7 +113,6 @@ const GuaranteeTaskList = (props) => {
114 113
           }));
115 114
         }}
116 115
         rowKey="id"
117
-       
118 116
         request={queryTable(getGuaranteeTaskList)}
119 117
         columns={columns}
120 118
       />