31435 勤工助学（新）/工作情况考核，20219001028 批次设置的时间没有受控制 看下

one_stop_public/tableCompon/index.jsx

@@ -167,17 +167,21 @@ export default class TableCom extends Component {
         modalInit: data,
       },
       () => {
-        dispatch({
-          type: 'DataColumn/showModal',
-          payload: { isShowModal: x },
-          callback: () => {
-            this.setState({
-              modalTitle: title,
-              modalCode: fk,
-              modalProps: modalProps,
-            });
-          },
-        });
+        setTimeout(() => {
+          // 解决禅道 31435 勤工助学（新）/工作情况考核，20219001028 批次设置的时间没有受控制 看下
+          dispatch({
+            type: 'DataColumn/showModal',
+            payload: { isShowModal: x },
+            callback: () => {
+              this.setState({
+                modalTitle: title,
+                modalCode: fk,
+                modalProps: modalProps,
+              });
+            },
+          });
+        }, 300);
+
       },
     );
   };
@@ -323,7 +327,7 @@ export default class TableCom extends Component {
       !(
         this.dataFilter.includes(json.comName) ||
         json.comName === 'TableSelect' ||
-        (json.formula != null && json.formula != '')
+        !!json.formula
       )
     ) {
       return;
@@ -414,7 +418,7 @@ export default class TableCom extends Component {
       };
       this.getData(json, dataColumn, obj2);
     }
-    if (json.formula != null && json.formula != '' && !json.isFormulaOnce) {
+    if (!!json.formula && !json.isFormulaOnce) {
       this.getFunctionValue(json.formula, dataColumn, json);
     }
   }
@@ -1049,15 +1053,15 @@ export default class TableCom extends Component {
     if (!isEdit && fatherCode) {
       obj = {
         ...fatherObj,
-        ...form.getFieldsValue(),
         ...defaultValues[formKey],
+        ...form.getFieldsValue(),
       };
     } else {
       obj = {
         ...(fatherObj ? fatherObj : {}),
         ...this.props.obj,
-        ...form.getFieldsValue(),
         ...defaultValues[formKey],
+        ...form.getFieldsValue(),
       };
     }
     return obj;
@@ -1187,6 +1191,7 @@ export default class TableCom extends Component {
         messageData,
         functionObj,
       } = this.functionArguments(column, callback);
+      // console.log(obj.id_4f1c72d949e7, 'getFunctionValue');
       const value = fun1(
         obj,
         init,
@@ -1253,7 +1258,7 @@ export default class TableCom extends Component {
     if (json == null) {
       return;
     }
-    if (json.sqlKey != null && json.sqlKey != '') {
+    if (json.sqlKey != null && json.sqlKey !== '') {
       const { dispatch } = this.props;
       dispatch({
         type: 'SqlManageEntity/find',
@@ -1292,6 +1297,7 @@ export default class TableCom extends Component {
       ...this.props.form.getFieldsValue(),
       ...this.props.defaultValues[this.props.formKey],
     };
+    // console.log(obj.id_4f1c72d949e7, 'tableCom-1295',);
 
     this.getData(json, dataColumn, obj2);
     if (json.formula != null && json.formula != '' && !this.props.safe) {
@@ -4100,6 +4106,7 @@ ${obj[dataColumn.base52]}
           );
         } else {
           // console.log(datas);
+
           return (
             <>
               {modalCode ? (
@@ -4186,6 +4193,7 @@ ${obj[dataColumn.base52]}
       }
     } else {
       // console.log(datas[modalCode]);
+
       return (
         <>
           {modalCode ? (