1.审批

2.//TODO 坩埚下单，mes其他页面，mes用户反馈空也展示，编辑任务担当无法修改

app/src/main/AndroidManifest.xml

@@ -2103,6 +2103,23 @@
             android:theme="@style/Work.Base"
             android:windowSoftInputMode="adjustPan" />
 
+        <activity
+            android:name=".ui.activity.bat.approval.WorkApprovalActivity"
+            android:configChanges="keyboardHidden|orientation"
+            android:label=" "
+            android:launchMode="singleTop"
+            android:screenOrientation="portrait"
+            android:theme="@style/Work.Base"
+            android:windowSoftInputMode="adjustPan" />
+        <activity
+            android:name=".ui.activity.bat.approval.ApprovalDealActivity"
+            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/ui/activity/WorkOrderActivity.java

@@ -28,6 +28,7 @@ import butterknife.BindView;
 import butterknife.ButterKnife;
 
 /**
+ * 工作台 订单
  * author : flexible
  * email : lgd19940421@163.com
  * github: https://github.com/FlexibleXd

app/src/main/java/com/wd/workoffice/ui/activity/bat/approval/ApprovalDealActivity.java

+package com.wd.workoffice.ui.activity.bat.approval;
+
+import android.os.Bundle;
+
+import com.google.android.material.tabs.TabLayout;
+import com.wd.workoffice.R;
+import com.wd.workoffice.app.WorkToolBarActivity;
+import com.wd.workoffice.ui.adapter.VpDataAdapter;
+import com.wd.workoffice.ui.fg.ApprovalFromMeFragment;
+import com.wd.workoffice.ui.fg.ApprovalToMeFragment;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+import androidx.viewpager.widget.ViewPager;
+import butterknife.BindView;
+import butterknife.ButterKnife;
+
+/**
+ * 我发起的
+ * author : flexible
+ * email : lgd19940421@163.com
+ * github: https://github.com/FlexibleXd
+ **/
+public class ApprovalDealActivity extends WorkToolBarActivity {
+
+    @BindView(R.id.tl_tab)
+    TabLayout tlTab;
+    @BindView(R.id.vp_data)
+    ViewPager vpData;
+    private String tab[] = {
+            "由我发起", "由我审核"};
+    private String order[] = {
+            "0", "1"};
+
+    @Override
+    protected void initView() {
+        ButterKnife.bind(this);
+        tlTab.setupWithViewPager(vpData);
+        tlTab.setTabMode(TabLayout.MODE_FIXED);
+    }
+
+    @Override
+    protected void initData() {
+        FragmentManager sfm = getSupportFragmentManager();
+        List<Fragment> data = new ArrayList<>();
+        ApprovalFromMeFragment fromMeFragment = new ApprovalFromMeFragment();
+        ApprovalToMeFragment toMeFragment = new ApprovalToMeFragment();
+        Bundle bundle = new Bundle();
+        bundle.putString("state", "1");
+        fromMeFragment.setArguments(bundle);
+        Bundle toMeBundle = new Bundle();
+        toMeBundle.putString("state","1");
+        fromMeFragment.setArguments(bundle);
+        toMeFragment.setArguments(toMeBundle);
+        data.add(fromMeFragment);
+        data.add(toMeFragment);
+        VpDataAdapter vpFgAdapter = new VpDataAdapter(sfm, data);
+        vpData.setAdapter(vpFgAdapter);
+        for (int i = 0; i < tab.length; i++) {
+            tlTab.getTabAt(i).setText(tab[i]);
+        }
+    }
+
+    @Override
+    protected void initEvent() {
+    }
+
+    @Override
+    protected int layoutId() {
+        return R.layout.activity_order;
+    }
+
+//    @Override
+//    public boolean onCreateOptionsMenu(Menu menu) {
+//        getMenuInflater().inflate(R.menu.menu_add, menu);
+//        return super.onCreateOptionsMenu(menu);
+//    }
+//
+//    @Override
+//    public boolean onOptionsItemSelected(MenuItem item) {
+//        switch (item.getItemId()) {
+//            case R.id.add:
+//                startActivity(SendApplyAddActivity.class,
+//                        "orderType", getIntent().getStringExtra("orderType"),
+//                        "id", getIntent().getStringExtra("orderId"));
+//                break;
+//        }
+//        return super.onOptionsItemSelected(item);
+//    }
+}

app/src/main/java/com/wd/workoffice/ui/activity/bat/approval/WorkApprovalActivity.java

+package com.wd.workoffice.ui.activity.bat.approval;
+
+import android.os.Bundle;
+import android.text.TextUtils;
+import android.view.View;
+
+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.ApprovalBean;
+import com.wd.workoffice.bean.ProPriceBean;
+import com.wd.workoffice.bean.event.CheckSendEvent;
+import com.wd.workoffice.bean.workEnum.OrderType;
+import com.wd.workoffice.retrofit.RtfUtils;
+import com.wd.workoffice.retrofit.WorkObserver;
+import com.wd.workoffice.ui.activity.bat.order.ProductOrderDetailActivity;
+import com.wd.workoffice.ui.activity.bat.order.SaleOrderDetailActivity;
+import com.wd.workoffice.ui.activity.bat.work.WorkContactsOpenTicketActivity;
+import com.wd.workoffice.ui.activity.bat.work.WorkProDetailActivity;
+import com.wd.workoffice.ui.adapter.ApprovalAdapter;
+import com.wd.workoffice.ui.adapter.WorkProPriceAdapter;
+import com.wd.workoffice.util.WorkUtils;
+
+import org.greenrobot.eventbus.EventBus;
+import org.greenrobot.eventbus.Subscribe;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+import butterknife.BindView;
+import butterknife.ButterKnife;
+import flexible.xd.android_base.network.rtfhttp.Transformer;
+import io.reactivex.Observable;
+import io.reactivex.disposables.Disposable;
+
+/**
+ * 审核列表
+ * author : flexible
+ * email : lgd19940421@163.com
+ * github: https://github.com/FlexibleXd
+ **/
+public class WorkApprovalActivity extends WorkToolBarActivity {
+
+
+    @BindView(R.id.rv_data)
+    RecyclerView rvData;
+    @BindView(R.id.srl_refresh)
+    SmartRefreshLayout srlRefresh;
+    private String state;
+    private int page = 1;
+    private Map<String, Object> param;
+    private ApprovalAdapter dataAdapter;
+    private List<ApprovalBean.RecordsBean> dataList;
+
+    @Override
+    protected void initView() {
+        ButterKnife.bind(this);
+        rvData.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false));
+    }
+
+
+    @Override
+    protected void initData() {
+        param = WorkUtils.pageKey();
+        param.put("statusFilter", getIntent().getStringExtra("status"));
+        param.put("linkUserStatus", getIntent().getStringExtra("status"));
+//        param.put("orderId", orderId);
+        page = 1;
+        param.put("current", page);
+        dataList = new ArrayList<>();
+        dataAdapter = new ApprovalAdapter(R.layout.item_approval, dataList);
+        dataAdapter.bindToRecyclerView(rvData);
+        dataAdapter.setEmptyView(R.layout.view_empty_content, rvData);
+        getData();
+    }
+
+
+    private void getData() {
+        Observable<BaseBean> observable;
+        if (TextUtils.equals("type", "1")) {//待审核
+            observable = RtfUtils.getRtf().bizMeApproval(param);
+        } else {
+            observable = RtfUtils.getRtf().bizApproval(param);
+        }
+        observable.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<ApprovalBean.RecordsBean> getList = JSON.parseObject(data.getData().toString(), ApprovalBean.class).getRecords();
+                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(refreshLayout -> {
+            page = 1;
+            param.put("current", page);
+            getData();
+        });
+        dataAdapter.setOnLoadMoreListener(() -> {
+            param.put("current", page);
+            getData();
+        }, rvData);
+        dataAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
+            @Override
+            public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
+                ApprovalBean.RecordsBean approval = dataList.get(position);
+                if (TextUtils.equals("SO_INVOICE", approval.getFlowCode())) {
+                    startActivity(WorkContactsOpenTicketActivity.class);
+                } else {
+                    if (TextUtils.equals(OrderType.SALE.getCode(), approval.getOrderType())) {
+                        startActivity(SaleOrderDetailActivity.class,
+                                "identity", "1",
+                                "id", approval.getOrderId());
+                    } else if (TextUtils.equals(OrderType.BUILD.getCode(), approval.getOrderType())) {
+                        startActivity(ProductOrderDetailActivity.class,
+                                "identity", "1",
+                                "id", approval.getOrderId());
+                    } else if (TextUtils.equals("PM", approval.getOrderType())) {
+                        startActivity(WorkProDetailActivity.class,
+                                "id", approval.getId() + "");
+                    }
+                }
+            }
+        });
+    }
+
+
+    @Override
+    protected int layoutId() {
+        return R.layout.fg_work_contacts;
+    }
+
+    @Override
+    public void onStart() {
+        super.onStart();
+        EventBus.getDefault().register(this);
+    }
+
+    @Override
+    public void onStop() {
+        super.onStop();
+        EventBus.getDefault().unregister(this);
+    }
+
+    @Subscribe
+    public void refresh(CheckSendEvent event) {
+        page = 1;
+        param.put("current", page);
+        getData();
+    }
+
+}

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

@@ -9,9 +9,10 @@ import com.wd.workoffice.R;
 import com.wd.workoffice.app.WorkBaseFg;
 import com.wd.workoffice.bean.vo.BatLayoutVo;
 import com.wd.workoffice.ui.activity.WorkOrderActivity;
+import com.wd.workoffice.ui.activity.bat.approval.ApprovalDealActivity;
 import com.wd.workoffice.ui.activity.bat.approval.ApprovalFromMeActivity;
-import com.wd.workoffice.ui.activity.bat.approval.ApprovalToMeActivity;
 import com.wd.workoffice.ui.activity.bat.work.DeviceActivity;
+import com.wd.workoffice.ui.activity.bat.approval.WorkApprovalActivity;
 import com.wd.workoffice.ui.activity.bat.work.WorkContactsActivity;
 import com.wd.workoffice.ui.activity.bat.work.WorkDepActivity;
 import com.wd.workoffice.ui.activity.bat.work.WorkFinancialActivity;
@@ -201,13 +202,13 @@ public class WorkFragment extends WorkBaseFg {
     public void onViewClicked(View view) {
         switch (view.getId()) {
             case R.id.ll_submit:
-                startActivity(ApprovalToMeActivity.class);
+                startActivity(WorkApprovalActivity.class,"type","1","status","0","title","待审批");
                 break;
             case R.id.ll_deal:
-                startActivity(ApprovalFromMeActivity.class);
+                startActivity(ApprovalDealActivity.class);
                 break;
             case R.id.ll_not_deal:
-                startActivity(ApprovalFromMeActivity.class);
+                startActivity(WorkApprovalActivity.class,"type","2","status","0","title","待处理");
                 break;
         }
     }

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

@@ -33,9 +33,9 @@
                 android:layout_height="wrap_content"
                 android:layout_marginHorizontal="20mm"
                 android:layout_marginTop="100mm"
+                android:layout_marginBottom="10mm"
                 android:background="@color/white"
                 app:cardCornerRadius="4dp"
-                android:layout_marginBottom="10mm"
                 app:cardElevation="10dp">
 
                 <LinearLayout
@@ -66,8 +66,7 @@
                             <ImageView
                                 android:layout_width="32mm"
                                 android:layout_height="32mm"
-                                android:src="@mipmap/work_not_check"
-                                 />
+                                android:src="@mipmap/work_not_check" />
 
                             <TextView
                                 android:layout_width="wrap_content"
@@ -89,8 +88,7 @@
                             <ImageView
                                 android:layout_width="32mm"
                                 android:layout_height="32mm"
-                                android:src="@mipmap/work_not_deal"
-                                />
+                                android:src="@mipmap/work_not_deal" />
 
                             <TextView
                                 android:layout_width="wrap_content"
@@ -112,8 +110,7 @@
                             <ImageView
                                 android:layout_width="32mm"
                                 android:layout_height="32mm"
-                                android:src="@mipmap/work_deal"
-                                />
+                                android:src="@mipmap/work_deal" />
 
                             <TextView
                                 android:layout_width="wrap_content"
@@ -130,7 +127,6 @@
         </FrameLayout>
 
 
-
         <androidx.core.widget.NestedScrollView
             android:layout_width="match_parent"
             android:layout_height="match_parent">