1.修改加减控件问题

2.//todo  回款管理的客户接口

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

@@ -218,6 +218,14 @@ public interface ApiService {
     Observable<BaseBean> getStock(@QueryMap Map<String, Object> param);
 
 
+    /**
+     * 用户信息
+     *
+     * @return
+     */
+    @GET("/biz-approval/count")
+    Observable<BaseBean> approvalCount();
+
     /**
      * 用户信息
      *
@@ -225,7 +233,6 @@ public interface ApiService {
      */
     @GET("/sys/user/userInfo")
     Observable<BaseBean> userInfo();
-
     /**
      * 订单
      * <p>

app/src/main/java/com/wd/workoffice/ui/activity/bat/order/AddCrucibleProductActivity.java

@@ -65,6 +65,12 @@ public class AddCrucibleProductActivity extends WorkToolBarActivity {
         TextView tvOk = view.findViewById(R.id.tv_ok);
         TextView tvCancel = view.findViewById(R.id.tv_cancel);
         AddAndReduceView num = view.findViewById(R.id.ar_num);
+        num.setOnNumberChangedListener(new AddAndReduceView.OnNumberChangedListener() {
+            @Override
+            public void OnNumberChanged(String vs) {
+
+            }
+        });
         num.setMaxNum(data.getCanUseProductSum());
         EditText etPrice = view.findViewById(R.id.et_price);
         WorkUtils.addDecimalsListener(etPrice);

app/src/main/java/com/wd/workoffice/ui/activity/bat/order/ProductOrderProActivity.java

@@ -97,7 +97,7 @@ public class ProductOrderProActivity extends WorkToolBarActivity {
                 }
                 clientList.get(position).setCarNum(String.valueOf(num.getNumber()));
                 addCart(data, num.getNumber());
-                tvNum.setText("共 ".concat(clientList.size() + "").concat(" 件"));
+                tvNum.setText("共 ".concat(carList.size() + "").concat(" 件"));
                 addCartDialog.dismiss();
             }
         });

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

@@ -2,17 +2,22 @@ package com.wd.workoffice.ui.fg;
 
 import android.view.View;
 import android.widget.LinearLayout;
+import android.widget.TextView;
 
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.scwang.smartrefresh.layout.SmartRefreshLayout;
 import com.wd.workoffice.R;
+import com.wd.workoffice.app.BaseBean;
 import com.wd.workoffice.app.WorkBaseFg;
 import com.wd.workoffice.bean.vo.BatLayoutVo;
+import com.wd.workoffice.retrofit.RtfUtils;
+import com.wd.workoffice.retrofit.WorkObserver;
 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.work.DeviceActivity;
 import com.wd.workoffice.ui.activity.bat.approval.WorkApprovalActivity;
+import com.wd.workoffice.ui.activity.bat.work.DeviceActivity;
 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;
@@ -20,6 +25,7 @@ import com.wd.workoffice.ui.activity.bat.work.WorkInStockActivity;
 import com.wd.workoffice.ui.activity.bat.work.WorkProActivity;
 import com.wd.workoffice.ui.activity.bat.work.WorkWarehouseActivity;
 import com.wd.workoffice.ui.adapter.BatLayoutAdapter;
+import com.wd.workoffice.util.UserKeeper;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -29,6 +35,8 @@ 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;
 
 
 /**
@@ -60,6 +68,10 @@ public class WorkFragment extends WorkBaseFg {
     LinearLayout llNotDeal;
     @BindView(R.id.ll_deal)
     LinearLayout llDeal;
+    @BindView(R.id.tv_submit_num)
+    TextView tvSubmitNum;
+    @BindView(R.id.tv_not_deal_num)
+    TextView tvNotDealNum;
 
     @Override
     protected void initView() {
@@ -68,26 +80,27 @@ public class WorkFragment extends WorkBaseFg {
         initRvLayout(rvFunction, workList);
     }
 
-
     @Override
     protected void initData() {
-//        RtfUtils.getRtf().userInfo().compose(Transformer.schedule()).subscribe(new WorkObserver<BaseBean>() {
-//            @Override
-//            public void doOnSubscribe(Disposable d) {
-//            }
-//
-//            @Override
-//            public void onFail(String errorMsg) {
-//            }
-//
-//            @Override
-//            public void onSuccess(BaseBean data) {
-//                if (data.getCode() != 0) {
-//                    return;
-//                }
-//                UserKeeper.getInstance().keepUserInfo(data.getData().toString());
-//            }
-//        });
+        RtfUtils.getRtf().approvalCount().compose(Transformer.schedule()).subscribe(new WorkObserver<BaseBean>() {
+            @Override
+            public void doOnSubscribe(Disposable d) {
+            }
+
+            @Override
+            public void onFail(String errorMsg) {
+            }
+
+            @Override
+            public void onSuccess(BaseBean data) {
+                if (data.getCode() != 0) {
+                    return;
+                }
+                JSONObject dataJson = JSON.parseObject(data.getData().toString());
+                tvNotDealNum.setText(getNumValue(dataJson.getIntValue("currentUserCanAudit")));
+                tvSubmitNum.setText(getNumValue(dataJson.getIntValue("otherUserCanAudit")));
+            }
+        });
 //        Map<String, Object> param = WorkUtils.pageKey();
 //        RtfUtils.getRtf().notice(param).compose(Transformer.schedule()).subscribe(new WorkObserver<BaseBean>() {
 //            @Override
@@ -117,6 +130,10 @@ public class WorkFragment extends WorkBaseFg {
 
     }
 
+    private String getNumValue(int value) {
+        return value > 99 ? "..." : String.valueOf(value);
+    }
+
 
     @Override
     protected void initEvent() {
@@ -202,13 +219,13 @@ public class WorkFragment extends WorkBaseFg {
     public void onViewClicked(View view) {
         switch (view.getId()) {
             case R.id.ll_submit:
-                startActivity(WorkApprovalActivity.class,"type","1","status","0","title","待审批");
+                startActivity(WorkApprovalActivity.class, "type", "1", "status", "0", "title", "待审批");
                 break;
             case R.id.ll_deal:
                 startActivity(ApprovalDealActivity.class);
                 break;
             case R.id.ll_not_deal:
-                startActivity(WorkApprovalActivity.class,"type","2","status","0","title","待处理");
+                startActivity(WorkApprovalActivity.class, "type", "2", "status", "0", "title", "待处理");
                 break;
         }
     }

app/src/main/java/com/wd/workoffice/widget/AddAndReduceView.java

@@ -59,7 +59,7 @@ public class AddAndReduceView extends LinearLayout implements View.OnClickListen
                     if (new BigDecimal(s.toString()).compareTo(new BigDecimal(maxNum)) == 1) {
                         ToastUtil.showShort("目前已选择最大数量");
                         num = MathUtils.converData(maxNum, 3);
-                        tvNum.setText(MathUtils.converData(maxNum, 3));
+//                        tvNum.setText(MathUtils.converData(maxNum, 3));
                         return;
                     }
                     if (new BigDecimal(Double.valueOf(num)).compareTo(new BigDecimal(maxNum)) == 0) {

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

@@ -386,12 +386,12 @@
 
         <View style="@style/dividerX" />
 
-        <RelativeLayout
+        <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
             android:background="@color/white"
-            android:gravity="center"
+            android:orientation="vertical"
             android:paddingHorizontal="20mm"
             android:paddingVertical="15mm">
 
@@ -407,9 +407,10 @@
                 android:layout_height="wrap_content"
                 android:layout_alignParentRight="true"
                 android:text="销售二公司"
+                android:layout_marginTop="3mm"
                 android:textColor="@color/flexible_text_sup"
                 android:textSize="14sp" />
-        </RelativeLayout>
+        </LinearLayout>
 
         <View style="@style/dividerX" />
         <LinearLayout

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

@@ -55,9 +55,14 @@
                         android:layout_height="wrap_content"
                         android:layout_marginTop="10mm">
 
+                        <FrameLayout
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1">
+
                             <LinearLayout
                                 android:id="@+id/ll_submit"
-                            android:layout_width="0dp"
+                                android:layout_width="match_parent"
                                 android:layout_height="wrap_content"
                                 android:layout_weight="1"
                                 android:gravity="center"
@@ -77,9 +82,27 @@
                                     android:textSize="14sp" />
                             </LinearLayout>
 
+                            <TextView
+                                android:id="@+id/tv_submit_num"
+                                android:layout_width="18mm"
+                                android:layout_height="18mm"
+                                android:layout_gravity="center_horizontal"
+                                android:layout_marginLeft="20mm"
+                                android:layout_marginTop="5mm"
+                                android:background="@drawable/shape_circle_red"
+                                android:gravity="center"
+                                android:text="0"
+                                android:textColor="@color/white" />
+                        </FrameLayout>
+
+                        <FrameLayout
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1">
+
                             <LinearLayout
                                 android:id="@+id/ll_not_deal"
-                            android:layout_width="0dp"
+                                android:layout_width="match_parent"
                                 android:layout_height="wrap_content"
                                 android:layout_weight="1"
                                 android:gravity="center"
@@ -99,6 +122,19 @@
                                     android:textSize="14sp" />
                             </LinearLayout>
 
+                            <TextView
+                                android:id="@+id/tv_not_deal_num"
+                                android:layout_width="18mm"
+                                android:layout_height="18mm"
+                                android:layout_gravity="center_horizontal"
+                                android:layout_marginLeft="20mm"
+                                android:layout_marginTop="5mm"
+                                android:background="@drawable/shape_circle_red"
+                                android:gravity="center"
+                                android:text="0"
+                                android:textColor="@color/white" />
+                        </FrameLayout>
+
                         <LinearLayout
                             android:id="@+id/ll_deal"
                             android:layout_width="0dp"