1.部门列表

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

app/src/main/AndroidManifest.xml

@@ -7,7 +7,6 @@
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
-        android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/Work.Base"
         android:usesCleartextTraffic="true">
@@ -369,6 +368,14 @@
             android:screenOrientation="portrait"
             android:theme="@style/Work.Base"
             android:windowSoftInputMode="adjustPan" />
+        <activity
+            android:name=".ui.activity.bat.work.WorkProDepActivity"
+            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"

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

+package com.wd.workoffice.bean;
+
+import java.util.List;
+
+/**
+ * author : flexible
+ * email : lgd19940421@163.com
+ * github: https://github.com/FlexibleXd
+ **/
+public class WorkDep {
+    private int total;
+    private int size;
+    private int current;
+    private boolean searchCount;
+    private int pages;
+    private List<DepBean> records;
+    private List<?> orders;
+
+    public int getTotal() {
+        return total;
+    }
+
+    public void setTotal(int total) {
+        this.total = total;
+    }
+
+    public int getSize() {
+        return size;
+    }
+
+    public void setSize(int size) {
+        this.size = size;
+    }
+
+    public int getCurrent() {
+        return current;
+    }
+
+    public void setCurrent(int current) {
+        this.current = current;
+    }
+
+    public boolean isSearchCount() {
+        return searchCount;
+    }
+
+    public void setSearchCount(boolean searchCount) {
+        this.searchCount = searchCount;
+    }
+
+    public int getPages() {
+        return pages;
+    }
+
+    public void setPages(int pages) {
+        this.pages = pages;
+    }
+
+    public List<DepBean> getRecords() {
+        return records;
+    }
+
+    public void setRecords(List<DepBean> records) {
+        this.records = records;
+    }
+
+    public List<?> getOrders() {
+        return orders;
+    }
+
+    public void setOrders(List<?> orders) {
+        this.orders = orders;
+    }
+}

app/src/main/java/com/wd/workoffice/retrofit/ApiService.java

@@ -405,6 +405,7 @@ public interface ApiService {
     @PUT("/product/app/shelf")
 //    Observable<BaseBean> onSalePro(@Body RequestBody requestBody);
     Observable<BaseBean> onSalePro(@QueryMap Map<String, Object> param);
+
     /**
      * 下单
      * <p>
@@ -426,6 +427,7 @@ public interface ApiService {
 
     /**
      * 获取客户分厂
+     *
      * @param param
      * @return
      */
@@ -434,6 +436,7 @@ public interface ApiService {
 
     /**
      * app端往来单位分页列表
+     *
      * @param param
      * @return
      */
@@ -442,6 +445,7 @@ public interface ApiService {
 
     /**
      * 部门信息
+     *
      * @return
      */
     @GET("/dept-account-balance/app/account-balance-info")
@@ -449,6 +453,7 @@ public interface ApiService {
 
     /**
      * 获取部门账户的流水
+     *
      * @param param
      * @return
      */
@@ -457,34 +462,42 @@ public interface ApiService {
 
     /**
      * 仓库
-     * @param param
      *
-     * stockTypeId 库存类别id
-     *status 1：启用 0：停用
-     *isShowByDateDesc 是否按时间倒叙展示
-     * siteType IN：厂内库 OUT：场外库
-     * searchKey 按名称模糊搜索时，该参数为name
-     * searchValue 模糊搜索的关键字
+     * @param param stockTypeId 库存类别id
+     *              status 1：启用 0：停用
+     *              isShowByDateDesc 是否按时间倒叙展示
+     *              siteType IN：厂内库 OUT：场外库
+     *              searchKey 按名称模糊搜索时，该参数为name
+     *              searchValue 模糊搜索的关键字
      * @return
      */
     @GET("/stock/page/list")
     Observable<BaseBean> getWarehouse(@QueryMap Map<String, Object> param);
 
-
     /**
      * 仓库
-     * @param param
      *
-     * stockTypeId 库存类别id
-     *status 1：启用 0：停用
-     *isShowByDateDesc 是否按时间倒叙展示
-     * siteType IN：厂内库 OUT：场外库
-     * searchKey 按名称模糊搜索时，该参数为name
-     * searchValue 模糊搜索的关键字
+     * @param param stockTypeId 库存类别id
+     *              status 1：启用 0：停用
+     *              isShowByDateDesc 是否按时间倒叙展示
+     *              siteType IN：厂内库 OUT：场外库
+     *              searchKey 按名称模糊搜索时，该参数为name
+     *              searchValue 模糊搜索的关键字
      * @return
      */
     @GET("/stockQuantity/app/page/listOfOrder")
     Observable<BaseBean> getWareHouseOrder(@QueryMap Map<String, Object> param);
 
+    /**
+     * 获取部门列表（不分页）
+     *
+     * @param param includeCO  1包含集团和冻结部门 0：不包含集团和冻结部门(int)
+     *              includeFreeze   包含冻结部门 0：不包含冻结部门(int)
+     *              name
+     * @return
+     */
+    @GET("/sys/dept/list")
+    Observable<BaseBean> getDep (@QueryMap Map<String, Object> param);
+
 
 }

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

+package com.wd.workoffice.ui.activity.bat.work;
+
+import android.os.Bundle;
+import android.widget.Button;
+import android.widget.EditText;
+
+import com.alibaba.fastjson.JSON;
+import com.chad.library.adapter.base.BaseQuickAdapter;
+import com.scwang.smartrefresh.layout.SmartRefreshLayout;
+import com.scwang.smartrefresh.layout.api.RefreshLayout;
+import com.scwang.smartrefresh.layout.listener.OnRefreshListener;
+import com.wd.workoffice.R;
+import com.wd.workoffice.app.BaseBean;
+import com.wd.workoffice.app.WorkToolBarActivity;
+import com.wd.workoffice.bean.DepBean;
+import com.wd.workoffice.bean.ProPriceBean;
+import com.wd.workoffice.bean.WorkDep;
+import com.wd.workoffice.retrofit.RtfUtils;
+import com.wd.workoffice.retrofit.WorkObserver;
+import com.wd.workoffice.ui.adapter.WorkDepAdapter;
+import com.wd.workoffice.ui.adapter.WorkProPriceAdapter;
+import com.wd.workoffice.util.WorkUtils;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+import butterknife.BindView;
+import butterknife.ButterKnife;
+import butterknife.OnClick;
+import flexible.xd.android_base.network.rtfhttp.Transformer;
+import io.reactivex.disposables.Disposable;
+
+/**
+ * author : flexible
+ * email : lgd19940421@163.com
+ * github: https://github.com/FlexibleXd
+ **/
+public class WorkProDepActivity extends WorkToolBarActivity {
+
+    @BindView(R.id.rv_data)
+    RecyclerView rvData;
+    @BindView(R.id.srl_refresh)
+    SmartRefreshLayout srlRefresh;
+    @BindView(R.id.et_key)
+    EditText etKey;
+    @BindView(R.id.btn_search)
+    Button btnSearch;
+    private Map<String, Object> param;
+    private List<DepBean> dataList;
+    private WorkDepAdapter dataAdapter;
+    private int page = 1;
+
+    @Override
+    protected void initView() {
+        ButterKnife.bind(this);
+        rvData.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false));
+    }
+
+
+    @Override
+    protected void initData() {
+        dataList = new ArrayList<>();
+        dataAdapter = new WorkDepAdapter(R.layout.item_work_dep, dataList);
+        dataAdapter.bindToRecyclerView(rvData);
+        param = WorkUtils.pageKey();
+        param.put("current", page);
+        getData();
+    }
+
+    private void getData() {
+        RtfUtils.getRtf().getDep(param).compose(Transformer.schedule()).subscribe(new WorkObserver<BaseBean>() {
+            @Override
+            public void doOnSubscribe(Disposable d) {
+            }
+
+            @Override
+            public void onFail(String errorMsg) {
+                hideLoading();
+                toast(errorMsg);
+            }
+
+            @Override
+            public void onSuccess(BaseBean data) {
+                hideLoading();
+                if (data.getCode() != 0) {
+                    toast(data.getMessage());
+                    return;
+                }
+                List<DepBean> getList = JSON.parseArray(data.getData().toString(), DepBean.class);
+                if (page == 1) {
+                    srlRefresh.finishRefresh();
+                    dataList.clear();
+                    dataList.addAll(getList);
+                    dataAdapter.notifyDataSetChanged();
+                    dataAdapter.loadMoreComplete();
+                } else {
+                    dataAdapter.loadMoreComplete();
+                    dataList.addAll(getList);
+                    dataAdapter.notifyDataSetChanged();
+                }
+                if (getList.size() == 0) {
+                    dataAdapter.loadMoreEnd();
+                } else {
+                    page++;
+                }
+            }
+        });
+    }
+
+
+    @Override
+    protected void initEvent() {
+        srlRefresh.setOnRefreshListener(new OnRefreshListener() {
+            @Override
+            public void onRefresh(@NonNull RefreshLayout refreshLayout) {
+                page = 1;
+                param.put("current", page);
+                getData();
+            }
+        });
+//        dataAdapter.setOnLoadMoreListener(new BaseQuickAdapter.RequestLoadMoreListener() {
+//            @Override
+//            public void onLoadMoreRequested() {
+//                param.put("current", page);
+//                getData();
+//            }
+//        }, rvData);
+    }
+
+    @Override
+    protected int layoutId() {
+        return R.layout.activity_work_dep;
+    }
+
+
+    @OnClick(R.id.btn_search)
+    public void onViewClicked() {
+        page = 1;
+        param.put("current", etKey.getText().toString());
+        getData();
+    }
+}

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

+package com.wd.workoffice.ui.adapter;
+
+
+import android.text.TextUtils;
+
+import com.chad.library.adapter.base.BaseQuickAdapter;
+import com.chad.library.adapter.base.BaseViewHolder;
+import com.wd.workoffice.R;
+import com.wd.workoffice.bean.DepBean;
+import com.wd.workoffice.bean.ProPriceBean;
+
+import java.util.List;
+
+/**
+ * Created by flexible on 2018/8/13.
+ */
+
+public class WorkDepAdapter extends BaseQuickAdapter<DepBean, BaseViewHolder> {
+
+    public WorkDepAdapter(int layoutResId, List data) {
+        super(layoutResId, data);
+    }
+
+
+    @Override
+    protected void convert(BaseViewHolder helper, DepBean item) {
+        helper.setText(R.id.tv_name,item.getName());
+        helper.setText(R.id.tv_dep,item.getParentId());
+
+        if (TextUtils.equals(item.getStatus(),"1")){
+            helper.setText(R.id.tv_status,"正常");
+            helper.setBackgroundRes(R.id.tv_status,R.drawable.shape_dep_status);
+        }else {
+            helper.setText(R.id.tv_status,"冻结");
+            helper.setBackgroundRes(R.id.tv_status,R.drawable.shape_dep_status_freeze);
+        }
+
+    }
+}
+

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

@@ -27,6 +27,7 @@ import com.wd.workoffice.ui.activity.bat.sale.SaleSupplierOrderActivity;
 import com.wd.workoffice.ui.activity.bat.work.WorkAccountActivity;
 import com.wd.workoffice.ui.activity.bat.work.WorkContactsActivity;
 import com.wd.workoffice.ui.activity.bat.work.WorkProActivity;
+import com.wd.workoffice.ui.activity.bat.work.WorkProDepActivity;
 import com.wd.workoffice.ui.activity.bat.work.WorkWarehouseActivity;
 import com.wd.workoffice.ui.adapter.BatLayoutAdapter;
 import com.wd.workoffice.util.UserKeeper;
@@ -256,6 +257,7 @@ public class MainFragment extends WorkBaseFg {
                                 startActivity(WorkWarehouseActivity.class);
                                 break;
                             case 4:
+                                startActivity(WorkProDepActivity.class);
                                 break;
                             case 5:
                                 break;

app/src/main/res/drawable/shape_dep_status.xml

+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="#ff359486" />
+    <corners android:radius="9dp" />
+</shape>
\ No newline at end of file

app/src/main/res/drawable/shape_dep_status_freeze.xml

+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="@color/red" />
+    <corners android:radius="9dp" />
+</shape>
\ No newline at end of file

app/src/main/res/layout/activity_work_dep.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">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="@color/white"
+            android:orientation="horizontal"
+            android:paddingHorizontal="20mm"
+            android:paddingVertical="10mm">
+
+
+            <LinearLayout
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_weight="1"
+                android:background="@drawable/shape_client_search"
+                android:gravity="center_vertical"
+                android:paddingHorizontal="10mm">
+
+                <ImageView
+                    android:layout_width="15mm"
+                    android:layout_height="15mm"
+                    android:src="@mipmap/client_search" />
+
+                <EditText
+                    android:id="@+id/et_key"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:layout_marginLeft="2mm"
+                    android:background="@null"
+                    android:hint="搜索客户"
+                    android:textColor="#91ABBA"
+                    android:textColorHint="#91ABBA"
+                    android:textSize="14sp" />
+            </LinearLayout>
+
+            <Button
+                android:id="@+id/btn_search"
+                android:layout_width="60mm"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="10mm"
+                android:background="@color/mainTextColor"
+                android:text="搜索"
+                android:textColor="@color/white"
+                android:textSize="16sp" />
+        </LinearLayout>
+
+        <com.scwang.smartrefresh.layout.SmartRefreshLayout
+            android:id="@+id/srl_refresh"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
+
+            <androidx.recyclerview.widget.RecyclerView
+                android:id="@+id/rv_data"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_marginTop="4mm" />
+        </com.scwang.smartrefresh.layout.SmartRefreshLayout>
+
+    </LinearLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file

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

@@ -12,6 +12,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="图号TH82739857"
+        android:textColor="@color/black"
         android:textSize="16sp" />
 
     <LinearLayout

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

+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="@android:color/white"
+    android:orientation="vertical">
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_centerVertical="true"
+        android:background="@android:color/white"
+        android:paddingHorizontal="20mm"
+        android:paddingVertical="14mm">
+
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentLeft="true"
+            android:orientation="vertical">
+
+            <LinearLayout
+                android:layout_width="wrap_content"
+                android:gravity="center_vertical"
+                android:layout_height="wrap_content">
+
+                <TextView
+                    android:id="@+id/tv_name"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="销售一公司"
+                    android:textSize="16sp" />
+
+                <TextView
+                    android:id="@+id/tv_status"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="5mm"
+                    android:background="@drawable/shape_dep_status"
+                    android:paddingHorizontal="7mm"
+                    android:paddingVertical="3mm"
+                    android:text="正常"
+                    android:textColor="@color/white"
+                    android:textSize="10sp" />
+            </LinearLayout>
+
+            <TextView
+                android:id="@+id/tv_dep"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="销售部门"
+                android:layout_marginTop="5mm"
+                android:textColor="@color/main_sup_color"
+                android:textSize="12sp" />
+        </LinearLayout>
+
+        <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentRight="true"
+            android:layout_centerVertical="true"
+            android:src="@mipmap/arrow_right_blue" />
+    </RelativeLayout>
+
+    <View
+        style="@style/dividerX"
+        android:layout_alignParentBottom="true" />
+</LinearLayout>
\ No newline at end of file

app/src/main/res/values/colors.xml

@@ -6,6 +6,7 @@
     <color name="mainColor">#ffffff</color>
     <color name="mainTextColor">#32475C</color>
     <color name="main_icon_select">#3F617F</color>
+    <color name="main_sup_color">#ff5e8196</color>
     <color name="main_icon">#C3CED7</color>
     <color name="flexible_background">#fff6f9fb</color>
     <color name="input_background">#F0F5F8</color>