1.修改退货bug

app/src/main/AndroidManifest.xml

@@ -1936,7 +1936,7 @@
         <activity
             android:name=".ui.activity.bat.order.ReturnDetailActivity"
             android:configChanges="keyboardHidden|orientation"
-            android:label="退单详情"
+            android:label="退货详情"
             android:launchMode="singleTop"
             android:screenOrientation="portrait"
             android:theme="@style/Work.Base"
@@ -1952,7 +1952,7 @@
         <activity
             android:name=".ui.activity.bat.order.ReturnAddActivity"
             android:configChanges="keyboardHidden|orientation"
-            android:label="新增退单"
+            android:label="新增退货"
             android:launchMode="singleTop"
             android:screenOrientation="portrait"
             android:theme="@style/Work.Base"

app/src/main/java/com/wd/workoffice/ui/activity/bat/order/ReturnDetailActivity.java

@@ -416,10 +416,6 @@ public class ReturnDetailActivity extends WorkToolBarActivity {
                 checkDialog(1, info.getId());
                 break;
             case R.id.rl_history:
-                if (!WorkUtils.hasPermission(PagePermissionType.SO_RETURN_FLOW_LIST.getPermission())) {
-                    toast(R.string.permission);
-                    return;
-                }
                 startActivity(ReturnApplyHistoryActivity.class,"id",info.getId()+"");
                 break;
             case R.id.rl_order:

app/src/main/java/com/wd/workoffice/util/WorkUtils.java

@@ -290,9 +290,9 @@ public class WorkUtils {
      */
     public static String getReturnStatus(Integer code) {
         String name = "";
-        if (code == 10) {
-            name = "未审核";
-        } else if (code.toString().startsWith("1")) {
+        if (code >= 10 && code < 14) {
+            name = "待审核";
+        } else if (code == 14) {
             name = "已通过";
         } else if (code.toString().startsWith("2")) {
             name = "已驳回";

app/src/main/res/layout/activity_bat_retrun_detail.xml

@@ -120,16 +120,18 @@
                 android:background="@color/white"
                 android:gravity="center"
                 android:paddingHorizontal="20mm"
-                android:paddingVertical="15mm">
+                android:paddingVertical="10mm">
 
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:layout_centerVertical="true"
                     android:text="审核历史" />
 
                 <ImageView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:layout_centerVertical="true"
                     android:layout_alignParentRight="true"
                     android:src="@mipmap/arrow_right_blue"
                     android:textColor="@color/flexible_text_gray" />