|
|
@@ -1,71 +1,77 @@
|
|
|
<?xml version="1.0" encoding="utf-8"?>
|
|
|
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
|
|
|
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
|
|
xmlns:tools="http://schemas.android.com/tools"
|
|
|
android:layout_width="match_parent"
|
|
|
android:layout_height="match_parent"
|
|
|
android:orientation="vertical"
|
|
|
tools:context="com.xzjmyk.pm.activity.ui.erp.activity.form.DataFormDetailActivity">
|
|
|
-
|
|
|
- <LinearLayout
|
|
|
+ <ScrollView
|
|
|
android:layout_width="match_parent"
|
|
|
- android:layout_height="wrap_content"
|
|
|
- android:orientation="vertical">
|
|
|
- <!--com.xzjmyk.pm.activity.ui.erp.view.ListViewInScroller-->
|
|
|
- <com.xzjmyk.pm.activity.ui.erp.view.ListViewInScroller
|
|
|
- android:id="@+id/lv_datas"
|
|
|
- android:layout_width="match_parent"
|
|
|
- android:layout_height="match_parent"
|
|
|
- android:dividerHeight="0.1dp"
|
|
|
- android:listSelector="@color/transparent"
|
|
|
- android:divider="@color/item_line"/>
|
|
|
+ android:layout_height="match_parent"
|
|
|
+ android:orientation="vertical"
|
|
|
+ tools:context="com.xzjmyk.pm.activity.ui.erp.activity.form.DataFormDetailActivity">
|
|
|
<LinearLayout
|
|
|
- android:id="@+id/ll_item_add"
|
|
|
+ android:id="@+id/ll_top"
|
|
|
android:layout_width="match_parent"
|
|
|
android:layout_height="wrap_content"
|
|
|
android:orientation="vertical">
|
|
|
- <View
|
|
|
- android:layout_width="match_parent"
|
|
|
- android:layout_height="0.5dp"
|
|
|
- android:background="@color/item_line" />
|
|
|
- <TextView
|
|
|
- android:id="@+id/tv_item_add"
|
|
|
+ <com.xzjmyk.pm.activity.ui.erp.view.ListViewInScroller
|
|
|
+ android:id="@+id/lv_datas"
|
|
|
android:layout_width="match_parent"
|
|
|
- android:layout_height="40dp"
|
|
|
- android:layout_gravity="center"
|
|
|
- android:gravity="center"
|
|
|
- android:background="@color/white"
|
|
|
- android:textColor="@color/titleBlue"
|
|
|
- android:text="新增明细"/>
|
|
|
- </LinearLayout>
|
|
|
+ android:layout_height="match_parent"
|
|
|
+ android:dividerHeight="0.1dp"
|
|
|
+ android:listSelector="@color/transparent"
|
|
|
+ android:divider="@color/item_line"/>
|
|
|
+ <LinearLayout
|
|
|
+ android:id="@+id/ll_item_add"
|
|
|
+ android:layout_width="match_parent"
|
|
|
+ android:layout_height="wrap_content"
|
|
|
+ android:orientation="vertical">
|
|
|
+ <View
|
|
|
+ android:layout_width="match_parent"
|
|
|
+ android:layout_height="0.5dp"
|
|
|
+ android:background="@color/item_line" />
|
|
|
+ <TextView
|
|
|
+ android:id="@+id/tv_item_add"
|
|
|
+ android:layout_width="match_parent"
|
|
|
+ android:layout_height="40dp"
|
|
|
+ android:layout_gravity="center"
|
|
|
+ android:gravity="center"
|
|
|
+ android:background="@color/white"
|
|
|
+ android:textColor="@color/titleBlue"
|
|
|
+ android:text="新增明细"/>
|
|
|
+ </LinearLayout>
|
|
|
|
|
|
- <Button
|
|
|
- android:id="@+id/click_btn"
|
|
|
- android:layout_width="match_parent"
|
|
|
- android:layout_height="wrap_content"
|
|
|
- android:layout_below="@+id/info"
|
|
|
- android:layout_marginLeft="10dp"
|
|
|
- android:layout_marginRight="10dp"
|
|
|
- android:layout_marginTop="20dp"
|
|
|
- android:background="@drawable/bg_orange_btn"
|
|
|
- android:padding="10dp"
|
|
|
- android:text="提交"
|
|
|
- android:textColor="@color/white"
|
|
|
- android:layout_marginBottom="150dp"
|
|
|
- android:textSize="@dimen/text_main" />
|
|
|
- <!-- <Button
|
|
|
-
|
|
|
- android:layout_width="match_parent"
|
|
|
- android:layout_height="wrap_content"
|
|
|
- android:layout_below="@+id/info"
|
|
|
- android:layout_marginLeft="10dp"
|
|
|
- android:layout_marginRight="10dp"
|
|
|
- android:layout_marginTop="20dp"
|
|
|
- android:background="@drawable/bg_orange_btn"
|
|
|
- android:padding="10dp"
|
|
|
- android:text="反提交"
|
|
|
- android:textColor="@color/white"
|
|
|
- android:visibility="gone"
|
|
|
- android:textSize="@dimen/text_main" />-->
|
|
|
+ <Button
|
|
|
+ android:id="@+id/click_btn"
|
|
|
+ android:layout_width="match_parent"
|
|
|
+ android:layout_height="wrap_content"
|
|
|
+ android:layout_below="@+id/info"
|
|
|
+ android:layout_marginLeft="10dp"
|
|
|
+ android:layout_marginRight="10dp"
|
|
|
+ android:layout_marginTop="20dp"
|
|
|
+ android:background="@drawable/bg_orange_btn"
|
|
|
+ android:padding="10dp"
|
|
|
+ android:text="提交"
|
|
|
+ android:textColor="@color/white"
|
|
|
+ android:layout_marginBottom="150dp"
|
|
|
+ android:textSize="@dimen/text_main" />
|
|
|
+ <!-- <Button
|
|
|
+
|
|
|
+ android:layout_width="match_parent"
|
|
|
+ android:layout_height="wrap_content"
|
|
|
+ android:layout_below="@+id/info"
|
|
|
+ android:layout_marginLeft="10dp"
|
|
|
+ android:layout_marginRight="10dp"
|
|
|
+ android:layout_marginTop="20dp"
|
|
|
+ android:background="@drawable/bg_orange_btn"
|
|
|
+ android:padding="10dp"
|
|
|
+ android:text="反提交"
|
|
|
+ android:textColor="@color/white"
|
|
|
+ android:visibility="gone"
|
|
|
+ android:textSize="@dimen/text_main" />-->
|
|
|
+
|
|
|
+ </LinearLayout>
|
|
|
+ </ScrollView>
|
|
|
+</LinearLayout>
|
|
|
|
|
|
- </LinearLayout>
|
|
|
-</ScrollView>
|