1.状态显示

2.//TODO 设备三个子菜单,设备采购，维修列表接口，坩埚下单，下单时间选择器当前时间验证，mes其他页面，mes用户反馈空也展示，编辑任务担当无法修改

app/src/main/java/com/wd/workoffice/ui/adapter/DeviceBuyAdapter.java

@@ -6,6 +6,7 @@ import com.chad.library.adapter.base.BaseViewHolder;
 import com.wd.workoffice.R;
 import com.wd.workoffice.bean.DeviceBuyBean;
 import com.wd.workoffice.bean.RepairBean;
+import com.wd.workoffice.util.WorkUtils;
 
 import java.util.List;
 
@@ -27,6 +28,7 @@ public class DeviceBuyAdapter extends BaseQuickAdapter<DeviceBuyBean.RecordsBean
         helper.setText(R.id.tv_company, item.getLaunchDeptName());
         helper.setText(R.id.tv_code, item.getId());
         helper.setText(R.id.tv_order_time, item.getCreatedTime());
+        helper.setText(R.id.tv_status, WorkUtils.getDeviceStatus(item.getStatus()));
         helper.setText(R.id.tv_all_price, String.valueOf(item.getLaunchOrderAmount()));
     }
 }

app/src/main/java/com/wd/workoffice/ui/adapter/DeviceRepairAdapter.java

@@ -6,6 +6,7 @@ import com.chad.library.adapter.base.BaseViewHolder;
 import com.wd.workoffice.R;
 import com.wd.workoffice.bean.OrderBean;
 import com.wd.workoffice.bean.RepairBean;
+import com.wd.workoffice.util.WorkUtils;
 
 import java.util.List;
 
@@ -28,6 +29,7 @@ public class DeviceRepairAdapter extends BaseQuickAdapter<RepairBean.RecordsBean
         helper.setText(R.id.tv_code, item.getId());
         helper.setText(R.id.tv_order_time, item.getCreatedTime());
         helper.setText(R.id.tv_repair_time, item.getRepairDateTime());
+        helper.setText(R.id.tv_status, WorkUtils.getDeviceStatus(item.getStatus()));
         helper.setText(R.id.tv_all_price, String.valueOf(item.getAmount()));
     }
 }

app/src/main/java/com/wd/workoffice/ui/fg/DeviceBuyCheckFragment.java

@@ -32,7 +32,7 @@ public class DeviceBuyCheckFragment extends WorkBaseFg {
     private String tab[] = {
             "全部",  "待接单", "已接单", "已完成"};
     private String order[] = {
-            "",  "200", "710", "500"};
+            "",  "200", "300", "500"};
     private String identity;
 
     @Override

app/src/main/java/com/wd/workoffice/ui/fg/DeviceBuyFragment.java

@@ -32,9 +32,9 @@ public class DeviceBuyFragment extends WorkBaseFg {
     private String tab[] = {
             "全部", "待审核", "待接单", "已接单", "已完成"};
     private String order[] = {
-            "", "100", "200", "710", "500"};
+            "", "100", "200", "300", "500"};
     private String identity;
-
+    //订单状态 100-已下单 200-审核通过 220-审核驳回 300-已接单 500-已入库（已完成）
     @Override
     protected void initView() {
         ButterKnife.bind(this, getContentView());

app/src/main/java/com/wd/workoffice/ui/fg/DeviceRepairCheckFragment.java

@@ -32,7 +32,7 @@ public class DeviceRepairCheckFragment extends WorkBaseFg {
     private String tab[] = {
             "全部",  "待接单", "已接单", "已完成"};
     private String order[] = {
-            "",  "200", "710", "500"};
+            "",  "200", "300", "500"};
     private String identity;
 
     @Override

app/src/main/java/com/wd/workoffice/ui/fg/DeviceRepairFragment.java

@@ -32,7 +32,7 @@ public class DeviceRepairFragment extends WorkBaseFg {
     private String tab[] = {
             "全部", "待审核", "待接单", "已接单", "已完成"};
     private String order[] = {
-            "", "100", "200", "710", "500"};
+            "", "100", "200", "300", "500"};
     private String identity;
 
     @Override

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

@@ -317,6 +317,25 @@ public class WorkUtils {
         return name;
     }
 
+    // 订单状态 100-已下单 200-审核通过 220-审核驳回 300-已接单 500-已入库（已完成）
+    public static String getDeviceStatus(Integer code) {
+        String name = "";
+        switch (code) {
+            case 100:
+                name = "待审核";
+                break;
+            case 200:
+                name = "待接单";
+                break;
+            case 300:
+                name = "已接单";
+                break;
+            case 500:
+                name = "已完成";
+                break;
+        }
+        return name;
+    }
 
     /**
      * 判断是否有审核权限

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

@@ -10,13 +10,25 @@
     android:paddingVertical="10mm">
 
 
-    <TextView
-        android:id="@+id/tv_name"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentLeft="true"
-        android:text="图号TH82739857"
-        android:textSize="16sp" />
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <TextView
+            android:id="@+id/tv_name"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text="图号TH82739857"
+            android:textSize="16sp" />
+
+        <TextView
+            android:id="@+id/tv_status"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textColor="#0841F0"
+            android:textSize="14sp" />
+    </LinearLayout>
 
 
     <LinearLayout

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

@@ -3,20 +3,31 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:layout_marginTop="10mm"
     android:background="@color/white"
     android:orientation="vertical"
-    android:layout_marginTop="10mm"
     android:paddingHorizontal="20mm"
     android:paddingVertical="10mm">
 
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
 
-    <TextView
-        android:id="@+id/tv_name"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentLeft="true"
-        android:text="图号TH82739857"
-        android:textSize="16sp" />
+        <TextView
+            android:id="@+id/tv_name"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text="图号TH82739857"
+            android:textSize="16sp" />
+
+        <TextView
+            android:id="@+id/tv_status"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textColor="#0841F0"
+            android:textSize="14sp" />
+    </LinearLayout>
 
 
     <LinearLayout