Merge branch 'develop_audit_flow' of http://120.55.44.4:10080/xujunjie/WorkloadWeb into develop_audit_flow

src/components/AuditForm/index.js

@@ -18,11 +18,12 @@ function AuditForm(props) {
   };
 
   const generateItem = item => {
-    return {
+    let newItem = {
       ...item,
-      id: `${item.componentName}_${uuidv4()}`,
-      icon: null,
+      props: { ...item.props, id: `${item.componentName}_${uuidv4()}` },
     };
+    delete newItem.icon;
+    return newItem;
   };
 
   const onChangeAttribute = newItem => {

src/pages/PurchaseAdmin/PurchaseList/List/NewList.js

@@ -135,8 +135,8 @@ function List(props) {
 
   return (
     <div>
-      <AuditForm />
-      {/* <Table
+      {/* <AuditForm onChange={values => console.log(values)} /> */}
+      <Table
         loading={loading || loading2}
         rowKey="id"
         dataSource={excel.list}
@@ -152,7 +152,7 @@ function List(props) {
         version={version}
         onCommit={onCommit}
         onChangeVersion={version => changeVersion(version)}
-      /> */}
+      />
       {/* <VersionModal
         loading={getLoading()}
         visible={versionVisible}