1.流水詳情

2.//TODO erp用户激活，忘记密码测试，产品下单还差附件，bat，mes，消息，我的，刷新token

app/src/main/AndroidManifest.xml

@@ -448,6 +448,14 @@
             android:screenOrientation="portrait"
             android:theme="@style/Work.Base"
             android:windowSoftInputMode="adjustPan" />
+        <activity
+            android:name=".ui.activity.bat.work.WorkAccountFlowDetailActivity"
+            android:configChanges="keyboardHidden|orientation"
+            android:label="流水详情"
+            android:launchMode="singleTop"
+            android:screenOrientation="portrait"
+            android:theme="@style/Work.Base"
+            android:windowSoftInputMode="adjustPan" />
         <provider
             android:name="androidx.core.content.FileProvider"
             android:authorities="com.wd.workoffice.fileprovider"

app/src/main/java/com/wd/workoffice/bean/FlowBean.java

@@ -135,7 +135,7 @@ public class FlowBean {
         private int receiveDeptId;
         private int customerId;
         private Object supplierId;
-        private Object comments;
+        private String comments;
         private String remark;
         private String typeName;
         private String deptName;
@@ -145,7 +145,7 @@ public class FlowBean {
         private String displayTypeName;
         private String relOrderTypeName;
         private String customerName;
-        private Object supplierName;
+        private String supplierName;
         private String receiveDeptName;
         private String launchDeptName;
         private String createdName;
@@ -326,11 +326,11 @@ public class FlowBean {
             this.supplierId = supplierId;
         }
 
-        public Object getComments() {
+        public String getComments() {
             return comments;
         }
 
-        public void setComments(Object comments) {
+        public void setComments(String comments) {
             this.comments = comments;
         }
 
@@ -406,11 +406,11 @@ public class FlowBean {
             this.customerName = customerName;
         }
 
-        public Object getSupplierName() {
+        public String getSupplierName() {
             return supplierName;
         }
 
-        public void setSupplierName(Object supplierName) {
+        public void setSupplierName(String supplierName) {
             this.supplierName = supplierName;
         }
 

app/src/main/java/com/wd/workoffice/ui/activity/bat/work/WorkAccountFlowActivity.java

@@ -117,6 +117,12 @@ public class WorkAccountFlowActivity extends WorkToolBarActivity {
                 getData();
             }
         }, rvData);
+        clientAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
+            @Override
+            public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
+                startActivity(WorkAccountFlowDetailActivity.class,"detail",JSON.toJSONString(clientList.get(position)));
+            }
+        });
     }
 
     @Override

app/src/main/java/com/wd/workoffice/ui/activity/bat/work/WorkAccountFlowDetailActivity.java

+package com.wd.workoffice.ui.activity.bat.work;
+
+import android.widget.TextView;
+
+import com.alibaba.fastjson.JSON;
+import com.wd.workoffice.R;
+import com.wd.workoffice.app.WorkToolBarActivity;
+import com.wd.workoffice.bean.FlowBean;
+import com.wd.workoffice.util.MathUtils;
+
+import butterknife.BindView;
+import butterknife.ButterKnife;
+
+/**
+ * 工作台 - 部门
+ * author : flexible
+ * email : lgd19940421@163.com
+ * github: https://github.com/FlexibleXd
+ **/
+public class WorkAccountFlowDetailActivity extends WorkToolBarActivity {
+    @BindView(R.id.tv_show_type)
+    TextView tvShowType;
+    @BindView(R.id.tv_dep)
+    TextView tvDep;
+    @BindView(R.id.tv_price)
+    TextView tvPrice;
+    @BindView(R.id.tv_start_price)
+    TextView tvStartPrice;
+    @BindView(R.id.tv_end_price)
+    TextView tvEndPrice;
+    @BindView(R.id.tv_from_dep)
+    TextView tvFromDep;
+    @BindView(R.id.tv_order_type)
+    TextView tvOrderType;
+    @BindView(R.id.tv_order_no)
+    TextView tvOrderNo;
+    @BindView(R.id.tv_order_dep)
+    TextView tvOrderDep;
+    @BindView(R.id.tv_receive_order_dep)
+    TextView tvReceiveOrderDep;
+    @BindView(R.id.tv_client)
+    TextView tvClient;
+    @BindView(R.id.tv_supplier)
+    TextView tvSupplier;
+    @BindView(R.id.tv_operating)
+    TextView tvOperating;
+    @BindView(R.id.tv_time)
+    TextView tvTime;
+    @BindView(R.id.tv_remark)
+    TextView tvRemark;
+    @BindView(R.id.tv_desc)
+    TextView tvDesc;
+    private FlowBean.RecordsBean dataBean;
+
+    @Override
+    protected void initView() {
+        ButterKnife.bind(this);
+        dataBean= JSON.parseObject(getIntent().getStringExtra("detail"),FlowBean.RecordsBean.class);
+        tvShowType.setText(dataBean.getDisplayTypeName());
+        tvDep.setText(dataBean.getDeptName());
+        tvPrice.setText(MathUtils.converData(String.valueOf(dataBean.getMoney()),2));
+        tvEndPrice.setText(MathUtils.converData(String.valueOf(dataBean.getAfterOver()),2));
+        tvStartPrice.setText(MathUtils.converData(String.valueOf(dataBean.getEarlyOver()),2));
+        tvFromDep.setText(dataBean.getFlowAccountName());
+        tvOrderType.setText(dataBean.getRelOrderTypeName());
+        tvOrderNo.setText(dataBean.getOrderId());
+        tvOrderDep.setText(dataBean.getLaunchDeptName());
+        tvReceiveOrderDep.setText(dataBean.getReceiveDeptName());
+        tvClient.setText(dataBean.getCustomerName());
+        tvSupplier.setText(dataBean.getSupplierName());
+        tvRemark.setText(dataBean.getComments());
+        tvDesc.setText(dataBean.getRemark());
+        tvOperating.setText(dataBean.getCreatedName());
+        tvTime.setText(dataBean.getCreatedTime());
+    }
+
+    @Override
+    protected void initData() {
+    }
+
+
+    @Override
+    protected void initEvent() {
+    }
+
+    @Override
+    protected int layoutId() {
+        return R.layout.activity_work_flow_detail;
+    }
+
+}

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

@@ -26,8 +26,8 @@
             android:layout_marginTop="10mm"
             android:background="@drawable/shape_account"
             android:orientation="vertical"
-            android:paddingHorizontal="10mm"
-            android:paddingVertical="15mm">
+            android:paddingHorizontal="15mm"
+            android:paddingVertical="20mm">
 
             <TextView
                 android:id="@+id/tv_dep_name"
@@ -35,7 +35,7 @@
                 android:layout_height="wrap_content"
                 android:text="销售一部"
                 android:textColor="@color/white"
-                android:textSize="16sp" />
+                android:textSize="14sp" />
 
             <LinearLayout
                 android:layout_width="match_parent"
@@ -62,7 +62,7 @@
                         android:layout_height="wrap_content"
                         android:layout_marginTop="4mm"
                         android:textColor="@color/white"
-                        android:textSize="16sp" />
+                        android:textSize="14sp" />
                 </LinearLayout>
 
                 <LinearLayout
@@ -84,7 +84,7 @@
                         android:layout_height="wrap_content"
                         android:layout_marginTop="4mm"
                         android:textColor="@color/white"
-                        android:textSize="16sp" />
+                        android:textSize="14sp" />
                 </LinearLayout>
             </LinearLayout>
 
@@ -93,7 +93,10 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="right"
+                android:layout_marginTop="10mm"
                 android:text="查看流水>"
+                android:textSize="13sp"
+                
                 android:textColor="@color/white" />
         </LinearLayout>
     </LinearLayout>

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

 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-   >
+    android:layout_height="match_parent">
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -20,29 +19,31 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:drawableRight="@mipmap/arrow_down"
-                android:paddingVertical="15mm"
-                android:text="开始时间" />
+                android:paddingVertical="13mm"
+                android:text="开始时间"
+                android:textSize="13sp" />
 
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginHorizontal="20mm"
+                android:layout_marginHorizontal="40mm"
                 android:text="~" />
 
             <TextView
                 android:id="@+id/tv_end"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:paddingVertical="15mm"
                 android:drawableRight="@mipmap/arrow_down"
-                android:text="结束时间" />
+                android:paddingVertical="13mm"
+                android:text="结束时间"
+                android:textSize="13sp" />
         </LinearLayout>
 
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/rv_data"
             android:layout_width="match_parent"
+            android:layout_height="wrap_content"
             android:layout_marginTop="10mm"
-            android:background="@android:color/white"
-            android:layout_height="wrap_content" />
+            android:background="@android:color/white" />
     </LinearLayout>
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file