1.修改bug

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

@@ -83,6 +83,10 @@ public class AddStockApplyActivity extends WorkToolBarActivity {
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
         String orderType = getIntent().getStringExtra("orderType");
+        String num = getIntent().getStringExtra("num");
+        if (Double.valueOf(num) == 0d) {
+            return super.onCreateOptionsMenu(menu);
+        }
         if (TextUtils.equals(getIntent().getStringExtra("status"), "300")) {
             if (TextUtils.equals(orderType, OrderType.SALE.getCode())) {//销售权限判断
                 if (WorkUtils.hasPermission(PagePermissionType.SO_ENTER_SAVE.getPermission())) {

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

@@ -62,6 +62,7 @@ public class ProOutFragment extends WorkBaseFg implements SaleSaleContract.View
     protected void initData() {
         orderList = new ArrayList<>();
         orderAdapter = new ProOutAdapter(R.layout.item_sale_out, orderList);
+        orderAdapter.setEmptyView(R.layout.view_empty_content, rvData);
         orderAdapter.bindToRecyclerView(rvData);
         param = WorkUtils.pageKey();
         param.put("orderStatus", state);

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

@@ -63,6 +63,7 @@ public class ProSaleFragment extends WorkBaseFg implements SaleSaleContract.View
         orderList = new ArrayList<>();
         orderAdapter = new ProSaleAdapter(R.layout.item_sale, orderList);
         orderAdapter.bindToRecyclerView(rvData);
+        orderAdapter.setEmptyView(R.layout.view_empty_content, rvData);
         param = WorkUtils.pageKey();
         param.put("orderStatus", state);
         param.put("current", page);

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

@@ -62,6 +62,7 @@ public class ProSupplierFragment extends WorkBaseFg implements SaleSaleContract.
     protected void initData() {
         orderList = new ArrayList<>();
         orderAdapter = new ProSupplierAdapter(R.layout.item_sale_supplier, orderList);
+        orderAdapter.setEmptyView(R.layout.view_empty_content, rvData);
         orderAdapter.bindToRecyclerView(rvData);
         param = WorkUtils.pageKey();
         param.put("orderStatus", state);

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

@@ -283,21 +283,46 @@ public class WorkFragment extends WorkBaseFg {
                     public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
                         switch (position) {
                             case 0:
+                                if (!WorkUtils.hasPermission(PagePermissionType.SALE_ORDER_PAGE.getPermission())){
+                                    toast(R.string.permission);
+                                    return;
+                                }
                                 startActivity(SaleSaleOrderActivity.class, "identity", "1");
                                 break;
                             case 1:
+                                if (!WorkUtils.hasPermission(PagePermissionType.PO_PURCHASE_LIST.getPermission())){
+                                    toast(R.string.permission);
+                                    return;
+                                }
                                 startActivity(SaleOutOrderActivity.class, "identity", "1");
                                 break;
                             case 2:
+                                if (!WorkUtils.hasPermission(PagePermissionType.FO_SUPPLIER_LIST.getPermission())){
+                                    toast(R.string.permission);
+                                    return;
+                                }
                                 startActivity(SaleSupplierOrderActivity.class, "identity", "1");
                                 break;
                             case 3:
+                                if (!WorkUtils.hasPermission(PagePermissionType.IO_INSIDE_LIST.getPermission())){
+                                    toast(R.string.permission);
+                                    return;
+                                }
                                 startActivity(SaleInsideOrderActivity.class, "identity", "1");
                                 break;
                             case 4:
+                                if (!WorkUtils.hasPermission(PagePermissionType.AO_PACKAGE_LIST.getPermission())&&
+                                        !WorkUtils.hasPermission(PagePermissionType.AO_PACKAGE_APPLY_LIST.getPermission())) {
+                                    toast(R.string.permission);
+                                    return;
+                                }
                                 startActivity(SaleProductOrderActivity.class, "identity", "1");
                                 break;
                             case 5:
+                                if (!WorkUtils.hasPermission(PagePermissionType.CO_CRUCIBLE_LIST.getPermission())){
+                                    toast(R.string.permission);
+                                    return;
+                                }
                                 startActivity(SaleCrucibleOrderActivity.class, "identity", "1");
                                 break;
                         }
@@ -310,21 +335,46 @@ public class WorkFragment extends WorkBaseFg {
                     public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
                         switch (position) {
                             case 0:
+                                if (!WorkUtils.hasPermission(PagePermissionType.SALE_ORDER_PAGE.getPermission())){
+                                    toast(R.string.permission);
+                                    return;
+                                }
                                 startActivity(ProductSaleOrderActivity.class);
                                 break;
                             case 1:
+                                if (!WorkUtils.hasPermission(PagePermissionType.PO_PURCHASE_LIST.getPermission())){
+                                    toast(R.string.permission);
+                                    return;
+                                }
                                 startActivity(ProductOutOrderActivity.class);
                                 break;
                             case 2:
+                                if (!WorkUtils.hasPermission(PagePermissionType.FO_SUPPLIER_LIST.getPermission())){
+                                    toast(R.string.permission);
+                                    return;
+                                }
                                 startActivity(ProductSupplierOrderActivity.class);
                                 break;
                             case 3:
+                                if (!WorkUtils.hasPermission(PagePermissionType.IO_INSIDE_LIST.getPermission())){
+                                    toast(R.string.permission);
+                                    return;
+                                }
                                 startActivity(ProductInsideOrderActivity.class);
                                 break;
                             case 4:
+                                if (!WorkUtils.hasPermission(PagePermissionType.AO_PACKAGE_LIST.getPermission())&&
+                                        !WorkUtils.hasPermission(PagePermissionType.AO_PACKAGE_APPLY_LIST.getPermission())) {
+                                    toast(R.string.permission);
+                                    return;
+                                }
                                 startActivity(SaleProductOrderActivity.class, "identity", "2");
                                 break;
                             case 5:
+                                if (!WorkUtils.hasPermission(PagePermissionType.CO_CRUCIBLE_LIST.getPermission())){
+                                    toast(R.string.permission);
+                                    return;
+                                }
                                 startActivity(SaleCrucibleOrderActivity.class, "identity", "2");
                                 break;
                         }

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

@@ -467,7 +467,7 @@ public class WorkUtils {
                 }
                 break;
             case 4:
-                if (!hasPermission(PagePermissionType.CO_CRUCIBLE_APPLY.getPermission())) {
+                if (!hasPermission(PagePermissionType.IO_INSIDE_APPLY.getPermission())) {
                     return false;
                 }
                 break;
@@ -477,7 +477,7 @@ public class WorkUtils {
 //                }
                 break;
             case 6:
-                if (!hasPermission(PagePermissionType.IO_INSIDE_APPLY.getPermission())) {
+                if (!hasPermission(PagePermissionType.CO_CRUCIBLE_APPLY.getPermission())) {
                     return false;
                 }
                 break;

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

@@ -14,7 +14,7 @@
         app:tabGravity="fill"
         app:tabIndicatorColor="@color/mainTextColor"
         app:tabIndicatorFullWidth="false"
-        app:tabMode="scrollable"
+        app:tabMode="auto"
         app:tabSelectedTextColor="@color/mainTextColor"
         app:tabTextAppearance="@style/tabText"
         app:tabTextColor="#75899B" />