修改表单排版问题

one_stop_public/libs/formList/index.js

@@ -731,7 +731,7 @@ class FormList extends React.Component {
             {form.getFieldDecorator(item.name, {
               initialValue: formData == null ? '' : formData[item.name],
               rules: [{ required: !item.isNull }],
-            })(<Input readOnly={!isAdd} placeholder="请输入"/>)}
+            })(<Input style={{ width: '70%' }} readOnly={!isAdd} placeholder="请输入"/>)}
           </FormItem>
         );
       }
@@ -771,7 +771,7 @@ class FormList extends React.Component {
           {form.getFieldDecorator(item.name, {
             initialValue: formData == null ? '' : formData[item.name],
             rules: [{ required: !item.isNull }],
-          })(<Input placeholder="请输入"/>)}
+          })(<Input style={{ width: '70%' }} placeholder="请输入"/>)}
         </FormItem>
       );
     } else if (number.indexOf(item.type) > -1) {
@@ -818,7 +818,7 @@ class FormList extends React.Component {
           {form.getFieldDecorator(item.name, {
             initialValue: formData == null ? '' : formData[item.name],
             rules: [{ required: !item.isNull }],
-          })(<Input placeholder="请输入"/>)}
+          })(<Input style={{ width: '70%' }} placeholder="请输入"/>)}
         </FormItem>
       );
     }
@@ -832,11 +832,12 @@ class FormList extends React.Component {
     if (querys.length == 0) {
       return '';
     }
+
     return (
       <Form layout="inline">
         <Row >
           {querys.map((item) =>
-            <Col  span={8}  key={item.id}>
+            <Col style={{height:58}} span={8}  key={item.id}>
               {this.getItem(true,form, {
                 ...item,
                 isNull: true

one_stop_public/tableCompon/index.jsx

@@ -1704,7 +1704,7 @@ export default class tableCom extends Component {
     if (this.props.fatherCode == null&&dataColumn == null) {
       dataColumn = { base52: this.props.uuid }
     }
-    if (!dataColumn.isNull) {
+    if (dataColumn.isNull!=null&&!dataColumn.isNull) {
       required = true;
     }