Browse Source

老版通用表单页面,去掉没有明细表的提交限制

RaoMeng 6 years ago
parent
commit
8f7a198057

+ 3 - 3
WeiChat/version.properties

@@ -1,5 +1,5 @@
-#Wed Jul 17 15:27:52 CST 2019
+#Fri Jul 19 10:05:53 CST 2019
 debugName=972
-versionName=704
+versionName=707
 debugCode=972
-versionCode=259
+versionCode=262

+ 1 - 1
app_core/common/src/main/java/com/core/utils/CommonUtil.java

@@ -111,7 +111,7 @@ public class CommonUtil {
 //        }
         baseUrl = "http://117.25.180.218:8090/zz_test/";
 //        baseUrl = "http://10.1.80.180:8080/uas_war_exploded/";
-//        baseUrl = "http://10.1.80.111:8080/uas/";
+//        baseUrl = "http://10.1.80.180:8080/uas/";
         return baseUrl;
     }
 

+ 7 - 7
app_modular/appworks/src/main/java/com/uas/appworks/CRM/erp/activity/DeviceDataFormAddActivity.java

@@ -1771,7 +1771,7 @@ public class DeviceDataFormAddActivity extends SupportToolBarActivity implements
             }
             LogUtil.d("forStore:" + forStore.toString());
 
-            saveData(forStore.toString(), "{}");
+            saveData(forStore.toString(), "[]");
         }
 
 
@@ -1790,12 +1790,12 @@ public class DeviceDataFormAddActivity extends SupportToolBarActivity implements
             ToastMessage("界面字段为空,不能提交!");
             return;
         }
-        if ("[]".equals(gridStore)) {
-            ToastMessage("单据明细必填字段缺失,请联系管理员!");
-            if (!caller.equals("MainTain")) {
-                return;
-            }
-        }
+//        if ("[]".equals(gridStore)) {
+//            ToastMessage("单据明细必填字段缺失,请联系管理员!");
+//            if (!caller.equals("MainTain")) {
+//                return;
+//            }
+//        }
         if ("{}".equals(formStore) || "{".equals(formStore)) {
             ToastMessage("单据主表必填字段缺失,请联系管理员!");
             return;

+ 7 - 7
app_modular/appworks/src/main/java/com/uas/appworks/OA/erp/activity/form/DataFormDetailActivity.java

@@ -2310,7 +2310,7 @@ public class DataFormDetailActivity extends BaseActivity implements View.OnClick
             }
             LogUtil.d("forStore:" + forStore.toString());
 
-            saveData(forStore.toString(), "{}");
+            saveData(forStore.toString(), "[]");
         }
 
 
@@ -2325,12 +2325,12 @@ public class DataFormDetailActivity extends BaseActivity implements View.OnClick
             ToastMessage("界面字段为空,不能提交!");
             return;
         }
-        if ("[]".equals(gridStore)) {
-            ToastMessage("单据明细必填字段缺失,请联系管理员!");
-            if (!caller.equals("MainTain")) {
-                return;
-            }
-        }
+//        if ("[]".equals(gridStore)) {
+//            ToastMessage("单据明细必填字段缺失,请联系管理员!");
+//            if (!caller.equals("MainTain")) {
+//                return;
+//            }
+//        }
         if ("{}".equals(formStore) || "{".equals(formStore)) {
             ToastMessage("单据主表必填字段缺失,请联系管理员!");
             return;