Browse Source

1.根据测试反馈,处理关于审批流详情界面显示异常的问题
2.根据测试反馈,处理关于在切换新旧版本时候出现的显示问题

Bitliker 8 years ago
parent
commit
58a8237688

+ 1 - 1
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/presenter/ApprovaPresenter.java

@@ -687,7 +687,7 @@ public class ApprovaPresenter implements OnHttpResultListener {
             approval.setDfType(type);
 //            int isdefault = OACheckUtil.getJsonIntager(config, "MFD_ISDEFAULT", "MDG_ISDEFAULT");
             int appwidth = OACheckUtil.getJsonIntager(config, "FD_APPWIDTH", "DG_APPWIDTH");
-            if (isMain && caption.equals("附件")) {
+            if (isMain && approval.isDftypeEQ("MF")) {
                 final String fb_attach = valueKey;
                 OAHttpHelper.getInstance().post(new Runnable() {
                     @Override

+ 1 - 1
WeiChat/src/main/res/layout/item_approval_node.xml

@@ -13,7 +13,7 @@
     <RelativeLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:padding="8dp">
+        android:padding="@dimen/paddingApp">
 
         <ImageView
             android:id="@+id/statusIV"

+ 1 - 0
WeiChat/src/main/res/layout/item_approval_points.xml

@@ -7,6 +7,7 @@
     <LinearLayout
         android:id="@+id/context_ll"
         style="@style/approvalStyle"
+        android:paddingLeft="@dimen/paddingApp"
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
 

+ 1 - 0
WeiChat/src/main/res/layout/item_approval_rv.xml

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
               style="@style/approvalStyle"
+              android:paddingLeft="@dimen/paddingApp"
               android:layout_width="match_parent"
               android:layout_height="wrap_content">
 

+ 1 - 2
WeiChat/src/main/res/layout/item_approval_title.xml

@@ -10,12 +10,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:background="@color/base_bg"
-        android:padding="10dp">
+        android:padding="@dimen/paddingApp">
 
         <com.xzjmyk.pm.activity.ui.erp.view.CircleImageView
             android:id="@+id/handIv"
             android:layout_width="50dp"
-
             android:layout_height="50dp"/>
 
         <ImageView