1.修改开票收票权限展示状态

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

@@ -90,6 +90,9 @@ public class WorkFinancialReceiveTicketActivity extends WorkToolBarActivity {
         });
         rvData = filterData.getRvData();
         srlRefresh = filterData.getSrlRefresh();
+        if (filterData.getStatusList().size() != 0) {
+            orderType = filterData.getStatusList().get(0);
+        }
     }
 
 

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

@@ -20,6 +20,11 @@ import com.wd.workoffice.util.WorkUtils;
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
 
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
 import java.util.Map;
 
 import androidx.annotation.Nullable;
@@ -51,7 +56,8 @@ public class WorkFinancialReceiveTicketAddActivity extends WorkToolBarActivity {
     private Map<String, Object> param;
     private Integer clientId;
     private QMUIDialog.MenuDialogBuilder typeDialog;
-    String[] typeList = new String[]{"外采购订单", "供应订单"};
+//    String[] typeList = new String[]{"外采购订单", "供应订单"};
+    List<String> typeList =new ArrayList<>();
     private String chooseType;
     private Integer depId;
 
@@ -61,11 +67,17 @@ public class WorkFinancialReceiveTicketAddActivity extends WorkToolBarActivity {
         tvDep.setText(UserKeeper.getInstance().getUserDepName());
         param = WorkUtils.simpleParam();
         typeDialog = DialogUtils.listDialog(this);
-        typeDialog.addItems(typeList, new DialogInterface.OnClickListener() {
+        if (WorkUtils.hasPermission(PagePermissionType.FO_RECEIPT_LIST.getPermission())) {
+            typeList.add("供应订单");
+        }
+        if (WorkUtils.hasPermission(PagePermissionType.PO_RECEIPT_LIST.getPermission())) {
+            typeList.add("外采购订单");
+        }
+        typeDialog.addItems(typeList.toArray(new String[typeList.size()]), new DialogInterface.OnClickListener() {
             @Override
             public void onClick(DialogInterface dialog, int which) {
-                chooseType =typeList[which];
-                tvOrder.setText(typeList[which]);
+                chooseType =typeList.get(which);
+                tvOrder.setText(typeList.get(which));
                 dialog.dismiss();
                 if (!hasAddPermission()){
                     toast(R.string.permission);

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

@@ -90,6 +90,9 @@ public class WorkFinancialTicketActivity extends WorkToolBarActivity {
         });
         rvData = filterData.getRvData();
         srlRefresh = filterData.getSrlRefresh();
+        if (filterData.getStatusList().size() != 0) {
+            orderType = filterData.getStatusList().get(0);
+        }
     }
 
 

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

@@ -20,6 +20,8 @@ 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.Nullable;
@@ -51,7 +53,8 @@ public class WorkFinancialTicketAddActivity extends WorkToolBarActivity {
     private Map<String, Object> param;
     private Integer clientId;
     private QMUIDialog.MenuDialogBuilder typeDialog;
-    String[] typeList = new String[]{"销售订单", "组装订单", "外采购订单", "坩埚订单"};
+    //    String[] typeList = new String[]{"销售订单", "组装订单", "外采购订单", "坩埚订单"};
+    List<String> typeList = new ArrayList<>();
     private String chooseType;
     private Integer depId;
 
@@ -61,13 +64,25 @@ public class WorkFinancialTicketAddActivity extends WorkToolBarActivity {
         param = WorkUtils.simpleParam();
         tvDep.setText(UserKeeper.getInstance().getUserDepName());
         typeDialog = DialogUtils.listDialog(this);
-        typeDialog.addItems(typeList, new DialogInterface.OnClickListener() {
+        if (WorkUtils.hasPermission(PagePermissionType.SO_INVOICE_LIST.getPermission())) {
+            typeList.add("销售订单");
+        }
+        if (WorkUtils.hasPermission(PagePermissionType.AO_INVOICE_LIST.getPermission())) {
+            typeList.add("组装订单");
+        }
+        if (WorkUtils.hasPermission(PagePermissionType.PO_INVOICE_LIST.getPermission())) {
+            typeList.add("外采购订单");
+        }
+        if (WorkUtils.hasPermission(PagePermissionType.CO_INVOICE_LIST.getPermission())) {
+            typeList.add("坩埚订单");
+        }
+        typeDialog.addItems(typeList.toArray(new String[typeList.size()]), new DialogInterface.OnClickListener() {
             @Override
             public void onClick(DialogInterface dialog, int which) {
-                chooseType = typeList[which];
-                tvOrder.setText(typeList[which]);
+                chooseType = typeList.get(which);
+                tvOrder.setText(typeList.get(which));
                 dialog.dismiss();
-                if (!hasAddPermission()){
+                if (!hasAddPermission()) {
                     toast(R.string.permission);
                 }
             }
@@ -108,7 +123,7 @@ public class WorkFinancialTicketAddActivity extends WorkToolBarActivity {
     public void onViewClicked(View view) {
         switch (view.getId()) {
             case R.id.tv_next:
-                if (!hasAddPermission()){
+                if (!hasAddPermission()) {
                     toast(R.string.permission);
                     return;
                 }
@@ -132,11 +147,12 @@ public class WorkFinancialTicketAddActivity extends WorkToolBarActivity {
                 typeDialog.show();
                 break;
             case R.id.rl_client:
-                startActivityForResult(StoreSaleClientActivity.class, 10001,"flag","1"
-                        ,"code" ,"CUSTOMER","depId", UserKeeper.getInstance().getUserDepId());
+                startActivityForResult(StoreSaleClientActivity.class, 10001, "flag", "1"
+                        , "code", "CUSTOMER", "depId", UserKeeper.getInstance().getUserDepId());
                 break;
         }
     }
+
     @Override
     public void onStart() {
         super.onStart();
@@ -165,7 +181,7 @@ public class WorkFinancialTicketAddActivity extends WorkToolBarActivity {
             if (WorkUtils.hasPermission(PagePermissionType.AO_INVOICE_SAVE.getPermission())) {
                 hasPermission = true;
             }
-        }else if (TextUtils.equals(chooseType, "外采购订单")) {
+        } else if (TextUtils.equals(chooseType, "外采购订单")) {
             if (WorkUtils.hasPermission(PagePermissionType.PO_INVOICE_SAVE.getPermission())) {
                 hasPermission = true;
             }

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

 package com.wd.workoffice.util.ddmfilter;
 
 import android.content.Context;
+import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.View;
 
@@ -8,7 +9,9 @@ import com.scwang.smartrefresh.layout.SmartRefreshLayout;
 import com.wd.workoffice.R;
 import com.wd.workoffice.app.WorkApp;
 import com.wd.workoffice.bean.listener.ThreeMenuClickListener;
+import com.wd.workoffice.bean.workEnum.PagePermissionType;
 import com.wd.workoffice.ui.adapter.FilterAdapter;
+import com.wd.workoffice.util.WorkUtils;
 import com.wd.workoffice.widget.DropDownMenu;
 
 import java.util.ArrayList;
@@ -29,16 +32,24 @@ public class FinancialReceiveTicketFilterData {
     private View mainView;
     private RecyclerView rvData;
     private SmartRefreshLayout srlRefresh;
-    private List<String> statusList = Arrays.asList("供应订单",  "外采购订单");
-    private List<String> typeList = Arrays.asList("全部状态", "待审核", "已通过","已驳回");
+    //    private List<String> statusList = Arrays.asList("供应订单", "外采购订单");
+    List<String> statusList = new ArrayList<>();
+    private List<String> typeList = Arrays.asList("全部状态", "待审核", "已通过", "已驳回");
     ThreeMenuClickListener listener;
 
-    String[] TABLIST = new String[]{ "供应订单", "全部状态"};
+    String[] TABLIST = new String[]{"", "全部状态"};
     Context context;
+
     public FinancialReceiveTicketFilterData(Context context, DropDownMenu menu, ThreeMenuClickListener listener) {
         this.menu = menu;
-        this.context=context;
+        this.context = context;
         this.listener = listener;
+        if (WorkUtils.hasPermission(PagePermissionType.FO_RECEIPT_LIST.getPermission())) {
+            statusList.add("供应订单");
+        }
+        if (WorkUtils.hasPermission(PagePermissionType.PO_RECEIPT_LIST.getPermission())) {
+            statusList.add("外采购订单");
+        }
         initView();
     }
 
@@ -49,8 +60,11 @@ public class FinancialReceiveTicketFilterData {
         srlRefresh = mainView.findViewById(R.id.srl_refresh);
         rvData.setLayoutManager(new LinearLayoutManager(context, RecyclerView.VERTICAL, false));
         viewList = new ArrayList<>();
-        addTabView(statusList , 1);
+        addTabView(statusList, 1);
         addTabView(typeList, 2);
+        if (statusList.size() != 0) {
+            TABLIST[0] = statusList.get(0);
+        }
         menu.setDropDownMenu(Arrays.asList(TABLIST), viewList, mainView);
     }
 
@@ -97,4 +111,12 @@ public class FinancialReceiveTicketFilterData {
     public void setRvData(RecyclerView rvData) {
         this.rvData = rvData;
     }
+
+    public List<String> getStatusList() {
+        return statusList;
+    }
+
+    public void setStatusList(List<String> statusList) {
+        this.statusList = statusList;
+    }
 }

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

 package com.wd.workoffice.util.ddmfilter;
 
 import android.content.Context;
+import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.View;
 
@@ -8,7 +9,9 @@ import com.scwang.smartrefresh.layout.SmartRefreshLayout;
 import com.wd.workoffice.R;
 import com.wd.workoffice.app.WorkApp;
 import com.wd.workoffice.bean.listener.ThreeMenuClickListener;
+import com.wd.workoffice.bean.workEnum.PagePermissionType;
 import com.wd.workoffice.ui.adapter.FilterAdapter;
+import com.wd.workoffice.util.WorkUtils;
 import com.wd.workoffice.widget.DropDownMenu;
 
 import java.util.ArrayList;
@@ -29,16 +32,30 @@ public class FinancialTicketFilterData {
     private View mainView;
     private RecyclerView rvData;
     private SmartRefreshLayout srlRefresh;
-    private List<String> statusList = Arrays.asList("销售订单", "组装订单", "外采购订单","坩埚订单");
-    private List<String> typeList = Arrays.asList("全部状态", "待审核", "已通过","已驳回");
+    //    private List<String> statusList = Arrays.asList("销售订单", "组装订单", "外采购订单", "坩埚订单");
+    List<String> statusList = new ArrayList<>();
+    private List<String> typeList = Arrays.asList("全部状态", "待审核", "已通过", "已驳回");
     ThreeMenuClickListener listener;
 
-    String[] TABLIST = new String[]{ "销售订单", "全部状态"};
+    String[] TABLIST = new String[]{"", "全部状态"};
     Context context;
+
     public FinancialTicketFilterData(Context context, DropDownMenu menu, ThreeMenuClickListener listener) {
         this.menu = menu;
-        this.context=context;
+        this.context = context;
         this.listener = listener;
+        if (WorkUtils.hasPermission(PagePermissionType.SO_INVOICE_LIST.getPermission())) {
+            statusList.add("销售订单");
+        }
+        if (WorkUtils.hasPermission(PagePermissionType.AO_INVOICE_LIST.getPermission())) {
+            statusList.add("组装订单");
+        }
+        if (WorkUtils.hasPermission(PagePermissionType.PO_INVOICE_LIST.getPermission())) {
+            statusList.add("外采购订单");
+        }
+        if (WorkUtils.hasPermission(PagePermissionType.CO_INVOICE_LIST.getPermission())) {
+            statusList.add("坩埚订单");
+        }
         initView();
     }
 
@@ -49,8 +66,11 @@ public class FinancialTicketFilterData {
         srlRefresh = mainView.findViewById(R.id.srl_refresh);
         rvData.setLayoutManager(new LinearLayoutManager(context, RecyclerView.VERTICAL, false));
         viewList = new ArrayList<>();
-        addTabView(statusList , 1);
+        addTabView(statusList, 1);
         addTabView(typeList, 2);
+        if (statusList.size() != 0) {
+            TABLIST[0] = statusList.get(0);
+        }
         menu.setDropDownMenu(Arrays.asList(TABLIST), viewList, mainView);
     }
 
@@ -97,4 +117,13 @@ public class FinancialTicketFilterData {
     public void setRvData(RecyclerView rvData) {
         this.rvData = rvData;
     }
+
+
+    public List<String> getStatusList() {
+        return statusList;
+    }
+
+    public void setStatusList(List<String> statusList) {
+        this.statusList = statusList;
+    }
 }