修改表单保存问题，和排版问题

one_stop_public/libs/formList/index.js

@@ -94,7 +94,7 @@ const CreateForm = Form.create()(props => {
       formItem.map((item, index) => {
         if (item.type.indexOf('DATE') > -1) {
           for (let d in fieldsValue) {
-            if (item.name == d) {
+            if (item.name === d&&fieldsValue[d]) {
               fieldsValue[d] = fieldsValue[d].format('YYYY-MM-DD HH:mm:ss');
             }
           }
@@ -186,7 +186,7 @@ class FormList extends React.Component {
     }
   }
   modify = record => {
-    if (this.state.formItem.length < 10) {
+  //  if (this.state.formItem.length < 10) {
       this.getOptions()
       this.setState({
         formData: record,
@@ -194,23 +194,23 @@ class FormList extends React.Component {
         isAdd: false,
         isView:false
       });
-    } else {
-      router.push({
-        pathname: '/admin/ddl/dataObj/formEdit',
-        state: {
-          id: this.state.objId,
-          recordId: record[this.state.primaryKey],
-          recordKey: this.state.primaryKey,
-          isAdd: false,
-          isView:false
-        },
-      });
-    }
+    // } else {
+    //   router.push({
+    //     pathname: '/admin/ddl/dataObj/formEdit',
+    //     state: {
+    //       id: this.state.objId,
+    //       recordId: record[this.state.primaryKey],
+    //       recordKey: this.state.primaryKey,
+    //       isAdd: false,
+    //       isView:false
+    //     },
+    //   });
+    // }
   };
 
 
   view = record => {
-    if (this.state.formItem.length < 10) {
+   // if (this.state.formItem.length < 10) {
       this.getOptions()
       this.setState({
         formData: record,
@@ -218,18 +218,18 @@ class FormList extends React.Component {
         isAdd: false,
         isView:true
       });
-    } else {
-      router.push({
-        pathname: '/admin/ddl/dataObj/formEdit',
-        state: {
-          id: this.state.objId,
-          recordId: record[this.state.primaryKey],
-          recordKey: this.state.primaryKey,
-          isAdd: false,
-          isView:true
-        },
-      });
-    }
+    // } else {
+    //   router.push({
+    //     pathname: '/admin/ddl/dataObj/formEdit',
+    //     state: {
+    //       id: this.state.objId,
+    //       recordId: record[this.state.primaryKey],
+    //       recordKey: this.state.primaryKey,
+    //       isAdd: false,
+    //       isView:true
+    //     },
+    //   });
+    // }
   };
 
   delete = record => {
@@ -606,7 +606,7 @@ class FormList extends React.Component {
   };
 
   add = () => {
-    if (this.state.formItem.length < 10) {
+   // if (this.state.formItem.length < 10) {
       this.getOptions()
       this.setState({
         modalVisible: true,
@@ -614,12 +614,12 @@ class FormList extends React.Component {
         isAdd: true,
         isView:false
       });
-    } else {
-      router.push({
-        pathname: '/admin/ddl/dataObj/formEdit',
-        state: { id: this.state.objId,isAdd: true,isView:false }
-      });
-    }
+    // } else {
+    //   router.push({
+    //     pathname: '/admin/ddl/dataObj/formEdit',
+    //     state: { id: this.state.objId,isAdd: true,isView:false }
+    //   });
+    // }
   };
 
   handleSelectRows = rows => {
@@ -678,7 +678,7 @@ class FormList extends React.Component {
       formItem.map((item, index) => {
         if (item.type.indexOf('DATE') > -1) {
           for (let d in fieldsValue) {
-            if (item.name == d && fieldsValue[d]) {
+            if (item.name === d && fieldsValue[d]) {
               if(fieldsValue[d]!=null&&fieldsValue[d].length>0){
                 fieldsValue[d]=[fieldsValue[d][0].format('YYYY-MM-DD HH:mm:ss'),fieldsValue[d][1].format('YYYY-MM-DD HH:mm:ss')];
               }else {
@@ -759,7 +759,7 @@ class FormList extends React.Component {
           {form.getFieldDecorator(item.name, {
             initialValue: formData == null ? '' : formData[item.name],
             rules: [{ required: !item.isNull }],
-          })(<Select style={{ width: 200 }} placeholder="请选择" allowClear>
+          })(<Select style={{ width: 150 }} placeholder="请选择" allowClear>
             {ops.map((r) => <Option value={r.value}
                                     key={r.value}>{r.value}</Option>)}
           </Select>)}
@@ -799,8 +799,9 @@ class FormList extends React.Component {
 
       return (
         <FormItem labelCol={labelCol} wrapperCol={wrapperCol} label={item.title} key={item.id}>
+
           {form.getFieldDecorator(item.name, {
-            initialValue: formData == null ? null : moment(formData[item.name]),
+            initialValue: formData == null ? moment() :(formData[item.name]?moment(formData[item.name]):null),
             rules: [{ required: !item.isNull }],
           })(
             <DatePicker
@@ -833,13 +834,9 @@ class FormList extends React.Component {
     }
     return (
       <Form layout="inline">
-        <Row gutter={{
-          md: 8,
-          lg: 24,
-          xl: 48
-        }}>
+        <Row >
           {querys.map((item) =>
-            <Col md={6} sm={24} key={item.id}>
+            <Col  span={8}  key={item.id}>
               {this.getItem(true,form, {
                 ...item,
                 isNull: true
@@ -847,7 +844,7 @@ class FormList extends React.Component {
             </Col>
           )}
 
-          <Col md={6} sm={24}>
+          <Col span={8} >
             <span className={styles.submitButtons}>
               <Button type="primary" loading={this.props.loading} onClick={this.handleSearch}>
                 查询