Browse Source

日历控件抽离为公共界面;集成的树形控件

Arison 9 years ago
parent
commit
6698f497a7

+ 1 - 1
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/form/DataFormDetailActivity.java

@@ -602,7 +602,7 @@ public class DataFormDetailActivity extends BaseActivity implements View.OnClick
 
                 break;
             case R.id.oa_leave:
-               // startActivity(new Intent(mContext,SelectCalendarActivity.class));
+//                startActivity(new Intent(mContext,SelectCalendarActivity.class));
                 startActivity(new Intent(mContext, FormListSelectActivity.class)
                         .putExtra("caller",
                                 caller));

+ 3 - 1
WeiChat/src/main/res/layout/activity_select_calendar.xml

@@ -96,7 +96,7 @@
                     android:text="开始时间"/>
 
                 <TextView
-                    android:id="@+id/tv_time_end"
+                    android:id="@+id/v_time_start"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:textSize="12sp"
@@ -114,12 +114,14 @@
                 android:background="@drawable/shape_brounds_bottom"
                 android:orientation="vertical">
                 <TextView
+                    android:id="@+id/tv_time_end"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginBottom="3dp"
                     android:text="开始时间"/>
 
                 <TextView
+                    android:id="@+id/v_time_end"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:textSize="12sp"

+ 1 - 1
WeiChat/src/main/res/values/strings.xml

@@ -557,6 +557,6 @@
     <string name="umeng_socialize_text_googleplus_key">GooglePlus</string>
     <string name="umeng_socialize_text_more_key">更多</string>
     <string name="title_activity_process_msg">ProcessMsgActivity</string>
-    <string name="title_activity_select_calendar">SelectCalendarActivity</string>
+    <string name="title_activity_select_calendar">按时间请假</string>
 
 </resources>