diff --git a/src/executor/tools/workForm/primary.tsx b/src/executor/tools/workForm/primary.tsx
index ae1c7b4018cf268213c878408aea8d641dbf7ffc..0c65585d459db7974a7af4ea6fce5b28221ce28a 100644
--- a/src/executor/tools/workForm/primary.tsx
+++ b/src/executor/tools/workForm/primary.tsx
@@ -42,9 +42,9 @@ const PrimaryForm: React.FC<IProps> = (props) => {
     }
   });
   if (!fields || !formData || !data) return <></>;
-  if (form.typeName === '表单') {
+  if (form.typeName === '报表') {
     return (
-      <WorkFormViewer
+      <WorkReportViewer
         form={form}
         info={info}
         fields={fields}
@@ -61,16 +61,19 @@ const PrimaryForm: React.FC<IProps> = (props) => {
             } else {
               props.data.primary[field] = value;
             }
+            for (let key in props.data.primary) {
+              data[key] = props.data.primary[key];
+            }
             data.name = form.name;
             formData.after = [data];
             props.onChanged?.apply(this, [form.id, formData, field, value]);
           }
         }}
       />
-    );
+    )
   } else {
     return (
-      <WorkReportViewer
+      <WorkFormViewer
         form={form}
         info={info}
         fields={fields}
@@ -87,9 +90,6 @@ const PrimaryForm: React.FC<IProps> = (props) => {
             } else {
               props.data.primary[field] = value;
             }
-            for (let key in props.data.primary) {
-              data[key] = props.data.primary[key];
-            }
             data.name = form.name;
             formData.after = [data];
             props.onChanged?.apply(this, [form.id, formData, field, value]);