FANGLH 7 years ago
parent
commit
be80f706c3

+ 5 - 0
WeiChat/src/main/res/menu/menu_signin_set.xml

@@ -1,6 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
+    <item
+        android:id="@+id/oa_scan"
+        android:title="扫一扫"
+        android:icon="@drawable/xlist"
+        app:showAsAction="always" />
     <item
         android:id="@+id/oa_signin_set"
         android:title="编辑模板"

+ 4 - 0
app_core/common/src/main/res/menu/menu_signin_set.xml

@@ -6,6 +6,10 @@
         android:title="扫一扫"
         android:icon="@drawable/xlist"
         app:showAsAction="always" />
+    <item
+        android:id="@+id/oa_signin_set"
+        android:title="编辑模板"
+        app:showAsAction="always" />
     <item
         android:id="@+id/oa_leave"
         android:title="查看列表"

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

@@ -148,6 +148,7 @@ public class DeviceDataFormAddActivity extends SupportToolBarActivity implements
                     if (!ListUtils.isEmpty(mDatasNet)) mDatasNet.clear();
                     if (StringUtil.isEmpty(result)) return;
 
+//                    LogUtil.prinlnLongMsg("load_success",result);
                     JSONObject loadJsonObject = JSON.parseObject(result).getJSONObject("data");
                     JSONArray forms = JSONUtil.getJSONArray(loadJsonObject, "formdetail");
                     JSONObject formData = JSONUtil.getJSONObject(loadJsonObject, "formData");