18:04

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/oa/ApprovalActivity.java

@@ -321,7 +321,7 @@ public class ApprovalActivity extends OABaseActivity implements IApproval, Appro
         contentLV.setAdapter(new PopListAdapter(messages));
         window.setTouchable(true);
         window.getContentView().measure(0, 0);
-        window.setHeight(window.getContentView().getMeasuredHeight() + 30);
+        window.setHeight(window.getContentView().getMeasuredHeight() + 150);
         window.setWidth(window.getContentView().getMeasuredWidth());
         window.setOutsideTouchable(false);
         window.setFocusable(true);

WeiChat/src/main/res/layout/activity_approval.xml

@@ -89,12 +89,12 @@
             android:id="@+id/commonWordsIV"
             android:layout_width="20dp"
             android:layout_height="20dp"
-            android:layout_alignParentRight="true"
             android:layout_gravity="center_vertical"
-            android:layout_marginRight="10dp"
-            android:layout_marginTop="3dp"
             android:src="@drawable/changyongyu"
-            android:visibility="visible"/>
+            android:visibility="visible"
+            android:layout_alignTop="@+id/voiceIV"
+            android:layout_alignParentRight="true"
+            android:layout_alignParentEnd="true" />
 
         <ImageView
             android:id="@+id/voiceIV"
@@ -120,15 +120,16 @@
             android:id="@+id/opinionET"
             style="@style/form_relative_right_text2"
             android:layout_alignParentTop="true"
-            android:layout_toEndOf="@+id/inputTagIV"
-            android:layout_toRightOf="@+id/inputTagIV"
             android:hint="请输入审批意见..."
             android:minHeight="50dp"
             android:paddingLeft="10dp"
             android:paddingTop="5dp"
             whatever:customRegexp="^[\\s\\S]{0,30}$"
             whatever:testErrorString="输入错误或内容超长"
-            whatever:testType="regexp"/>
+            whatever:testType="regexp"
+            android:layout_toLeftOf="@+id/voiceIV"
+            android:layout_toRightOf="@+id/inputTagIV"
+            />
     </RelativeLayout>
 
     <RelativeLayout

WeiChat/src/main/res/layout/item_process_state.xml

@@ -38,7 +38,10 @@
                 android:layout_height="wrap_content"
                 android:layout_margin="10dp"
                 android:textSize="15sp"
-                android:text="采购单-2013212"/>
+                android:text="采购单-2013212"
+                android:maxLength="12"
+                android:singleLine="true"
+                android:ellipsize="end"/>
 
             <TextView
                 android:id="@+id/tv_date"