1.财务回款管理

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

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

@@ -51,19 +51,15 @@ public class WorkFinancialActivity extends WorkToolBarActivity {
     }
 
 
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        // TODO: add setContentView(...) invocation
-        ButterKnife.bind(this);
-    }
 
     @OnClick({R.id.ll_back, R.id.ll_pay, R.id.ll_open_ticket, R.id.ll_receive_ticket, R.id.ll_account, R.id.ll_logistics})
     public void onViewClicked(View view) {
         switch (view.getId()) {
             case R.id.ll_back:
+                startActivity(WorkFinancialOutActivity.class);
                 break;
             case R.id.ll_pay:
+                startActivity(WorkFinancialPayActivity.class);
                 break;
             case R.id.ll_open_ticket:
                 break;

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

 package com.wd.workoffice.ui.activity.bat.work;
 
+import android.os.Bundle;
 import android.widget.TextView;
 
 import com.alibaba.fastjson.JSON;
@@ -33,14 +34,14 @@ public class WorkFinancialDetailActivity extends WorkToolBarActivity {
     TextView tvProcess;
     @BindView(R.id.tv_price)
     TextView tvPrice;
-    @BindView(R.id.tv_position)
-    TextView tvPosition;
     @BindView(R.id.tv_review)
     TextView tvReview;
     @BindView(R.id.tv_review_time)
     TextView tvReviewTime;
-    @BindView(R.id.tv_desc)
-    TextView tvDesc;
+    @BindView(R.id.tv_remark)
+    TextView tvRemark;
+    @BindView(R.id.tv_review_remark)
+    TextView tvReviewRemark;
     private MoneyOutBean.RecordsBean dataBean;
 
     @Override
@@ -51,7 +52,8 @@ public class WorkFinancialDetailActivity extends WorkToolBarActivity {
         tvCode.setText(dataBean.getSerialNumber());
 //        tvDesc.setText();
         tvPerson.setText(dataBean.getApplierName());
-        tvPosition.setText(dataBean.getApplyRemark());
+        tvRemark.setText(dataBean.getAuditRemark());
+        tvReviewRemark.setText(dataBean.getApplyRemark());
         tvPrice.setText(MathUtils.converData(String.valueOf(dataBean.getApplyAmount()), 3));
         tvProcess.setText(dataBean.getProcessName());
         tvReview.setText(dataBean.getUpdatedByName());

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

@@ -63,9 +63,9 @@ public class WorkFinancialOutActivity extends WorkToolBarActivity {
             @Override
             public void clickTwo(String value) {
                 //0未审核      1已通过      2不通过
-                if (TextUtils.equals(value, "全部类型")) {
+                if (TextUtils.equals(value, "全部状态")) {
                     param.put("status", "");
-                } else if (TextUtils.equals(value, "0未审核")) {
+                } else if (TextUtils.equals(value, "待审核")) {
                     param.put("status", "0");
                 } else if (TextUtils.equals(value, "已通过")) {
                     param.put("status", "1");
@@ -73,7 +73,7 @@ public class WorkFinancialOutActivity extends WorkToolBarActivity {
                     param.put("status", "2");
                 }
                 page = 1;
-                param.put("page", page);
+                param.put("current", page);
                 getData();
             }
 
@@ -89,7 +89,7 @@ public class WorkFinancialOutActivity extends WorkToolBarActivity {
     @Override
     protected void initData() {
         dataList = new ArrayList<>();
-        dataAdapter = new WorkFinancialOutAdapter(R.layout.item_work_in_stock, dataList);
+        dataAdapter = new WorkFinancialOutAdapter(R.layout.item_financial_out, dataList);
         dataAdapter.bindToRecyclerView(rvData);
         dataAdapter.setEmptyView(R.layout.view_empty_content, rvData);
         param = WorkUtils.pageKey();

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

@@ -90,7 +90,7 @@ public class WorkFinancialPayActivity extends WorkToolBarActivity {
     @Override
     protected void initData() {
         dataList = new ArrayList<>();
-        dataAdapter = new WorkFinancialOutAdapter(R.layout.item_work_in_stock, dataList);
+        dataAdapter = new WorkFinancialOutAdapter(R.layout.item_financial_out, dataList);
         dataAdapter.bindToRecyclerView(rvData);
         dataAdapter.setEmptyView(R.layout.view_empty_content, rvData);
         param = WorkUtils.pageKey();

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

@@ -81,7 +81,7 @@ public class WorkProFragment extends WorkBaseFg implements WorkProContract.View
                     param.put("status", "0");
                 }
                 page = 1;
-                param.put("page", page);
+                param.put("current", page);
                 workProPresenter.getPro(param);
             }
 

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

@@ -135,7 +135,7 @@ public class WorkUtils {
                 name = "已通过";
                 break;
             case 2:
-                name = "不通过";
+                name = "已驳回";
                 break;
         }
         return name;

app/src/main/java/com/wd/workoffice/util/ddmfilter/FinancialOutFilterData.java

@@ -49,8 +49,8 @@ public class FinancialOutFilterData {
         srlRefresh = mainView.findViewById(R.id.srl_refresh);
         rvData.setLayoutManager(new LinearLayoutManager(context, RecyclerView.VERTICAL, false));
         viewList = new ArrayList<>();
-        addTabView(typeList, 1);
-        addTabView(statusList, 2);
+        addTabView(statusList , 1);
+        addTabView(typeList, 2);
         menu.setDropDownMenu(Arrays.asList(TABLIST), viewList, mainView);
     }
 

app/src/main/java/com/wd/workoffice/util/ddmfilter/FinancialPayFilterData.java

@@ -50,8 +50,8 @@ public class FinancialPayFilterData {
         srlRefresh = mainView.findViewById(R.id.srl_refresh);
         rvData.setLayoutManager(new LinearLayoutManager(context, RecyclerView.VERTICAL, false));
         viewList = new ArrayList<>();
-        addTabView(typeList, 1);
-        addTabView(statusList, 2);
+        addTabView(statusList , 1);
+        addTabView(typeList, 2);
         menu.setDropDownMenu(Arrays.asList(TABLIST), viewList, mainView);
     }
 

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

@@ -207,11 +207,11 @@
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="用来占位"
-                android:textSize="16sp" />
+                android:text="备注"
+                android:textSize="14sp" />
 
             <TextView
-                android:id="@+id/tv_position"
+                android:id="@+id/tv_remark"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="3mm"
@@ -282,11 +282,11 @@
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="系统备注"
-                android:textSize="16sp" />
+                android:text="审核备注"
+                android:textSize="14sp" />
 
             <TextView
-                android:id="@+id/tv_desc"
+                android:id="@+id/tv_review_remark"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="3mm"