1.退货详情修改

2.TODO 单独菜单

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

@@ -123,6 +123,14 @@ public class ReturnDetailActivity extends WorkToolBarActivity {
     LinearLayout llProcess;
     @BindView(R.id.tv_lot)
     TextView tvLot;
+    @BindView(R.id.tv_top6)
+    TextView tvTop6;
+    @BindView(R.id.view_node6)
+    View viewNode6;
+    @BindView(R.id.view_line6)
+    View viewLine6;
+    @BindView(R.id.tv_dep6)
+    TextView tvDep6;
     private ReturnApplyBean.RecordsBean info;
     private String orderType;
 
@@ -167,7 +175,7 @@ public class ReturnDetailActivity extends WorkToolBarActivity {
      */
     private void changeCheckView(String status) {
         if (TextUtils.equals(orderType, OrderType.SALE.getCode())) {
-            if (status.startsWith("1") && !status.endsWith("4")) {
+            if (status.startsWith("1") && (!status.endsWith("4")&&!status.endsWith("5"))) {
                 llBottom.setVisibility(View.VISIBLE);
                 llCheck.setVisibility(View.VISIBLE);
             } else {
@@ -235,10 +243,23 @@ public class ReturnDetailActivity extends WorkToolBarActivity {
                 changeProcessView(viewNode3, viewLine3, 0);
                 changeProcessView(viewNode4, viewLine4, 0);
                 changeProcessView(viewNode5, viewLine5, 0);
+                changeProcessView(viewNode6, viewLine6, 1);
+                tvTop2.setText("通过");
+                tvTop3.setText("通过");
+                tvTop4.setText("通过");
+                tvTop5.setText("通过");
+            } else if (status.endsWith("5")) {
+                changeProcessView(viewNode2, viewLine2, 0);
+                changeProcessView(viewNode3, viewLine3, 0);
+                changeProcessView(viewNode4, viewLine4, 0);
+                changeProcessView(viewNode5, viewLine5, 0);
+                changeProcessView(viewNode6, viewLine6, 0);
                 tvTop2.setText("通过");
                 tvTop3.setText("通过");
                 tvTop4.setText("通过");
                 tvTop5.setText("通过");
+                tvTop5.setText("通过");
+                tvTop6.setText("通过");
             }
         } else if (status.startsWith("2")) {
             if (status.endsWith("1")) {
@@ -265,6 +286,17 @@ public class ReturnDetailActivity extends WorkToolBarActivity {
                 tvTop3.setText("通过");
                 tvTop4.setText("通过");
                 tvTop5.setText("驳回");
+            }else if (status.endsWith("5")) {
+                changeProcessView(viewNode2, viewLine2, 0);
+                changeProcessView(viewNode3, viewLine3, 0);
+                changeProcessView(viewNode4, viewLine4, 0);
+                changeProcessView(viewNode5, viewLine5, 0);
+                changeProcessView(viewNode5, viewLine6, 1);
+                tvTop2.setText("通过");
+                tvTop3.setText("通过");
+                tvTop4.setText("通过");
+                tvTop5.setText("通过");
+                tvTop6.setText("驳回");
             }
         }
     }

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

@@ -53,6 +53,13 @@
             android:layout_weight="1"
             android:textColor="#5D99C4"
             android:textSize="12sp" />
+        <TextView
+            android:id="@+id/tv_top6"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:textColor="#5D99C4"
+            android:textSize="12sp" />
     </LinearLayout>
 
     <LinearLayout
@@ -140,7 +147,6 @@
                 android:layout_width="match_parent"
                 android:layout_height="1mm"
                 android:background="@color/flexible_gray_background" />
-            />
         </LinearLayout>
 
         <LinearLayout
@@ -161,6 +167,27 @@
                 android:layout_width="match_parent"
                 android:layout_height="1mm"
                 android:background="@color/flexible_gray_background"
+             />
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:gravity="center_vertical">
+
+            <View
+                android:id="@+id/view_node6"
+                android:layout_width="10mm"
+                android:layout_height="10mm"
+                android:background="@drawable/shape_circle_gray" />
+
+            <View
+                android:id="@+id/view_line6"
+                style="@style/dividerX"
+                android:layout_width="match_parent"
+                android:layout_height="1mm"
+                android:background="@color/flexible_gray_background"
                 android:visibility="invisible" />
         </LinearLayout>
     </LinearLayout>
@@ -208,11 +235,20 @@
             android:textSize="12sp" />
 
         <TextView
-            android:id="@+id/tv_dep5"
+        android:id="@+id/tv_dep5"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+        android:text="集团"
+        android:textColor="#5D99C4"
+        android:textSize="12sp" />
+
+        <TextView
+            android:id="@+id/tv_dep6"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"
-            android:text="集团"
+            android:text="ERP专员审核"
             android:textColor="#5D99C4"
             android:textSize="12sp" />
     </LinearLayout>