1.修改物流开票弹窗

2.修改权限新增判断

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

@@ -6,14 +6,19 @@ import android.widget.TextView;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
+import com.qmuiteam.qmui.widget.dialog.QMUIDialog;
+import com.qmuiteam.qmui.widget.dialog.QMUIDialogAction;
 import com.wd.workoffice.R;
 import com.wd.workoffice.app.BaseBean;
 import com.wd.workoffice.app.WorkToolBarActivity;
 import com.wd.workoffice.bean.LogisticDetailBean;
 import com.wd.workoffice.bean.event.CheckLogisticEvent;
+import com.wd.workoffice.bean.event.ModifyCarEvent;
 import com.wd.workoffice.retrofit.RtfUtils;
 import com.wd.workoffice.retrofit.WorkObserver;
+import com.wd.workoffice.ui.activity.bat.store.StoreSaleCarActivity;
 import com.wd.workoffice.ui.adapter.WorkLogisticDetailAdapter;
+import com.wd.workoffice.util.DialogUtils;
 import com.wd.workoffice.util.MathUtils;
 import com.wd.workoffice.util.WorkUtils;
 
@@ -154,6 +159,18 @@ public class WorkFinancialLogisticsSubmitActivity extends WorkToolBarActivity {
             toast("请输入运费发票单位");
             return;
         }
-        submit();
+        QMUIDialog.MessageDialogBuilder dialog = DialogUtils.okAndCancelDialog(WorkFinancialLogisticsSubmitActivity.this);
+        dialog.setMessage("确认运费开票？").addAction("取消", new QMUIDialogAction.ActionListener() {
+            @Override
+            public void onClick(QMUIDialog dialog, int index) {
+                dialog.dismiss();
+            }
+        }).addAction("确定", new QMUIDialogAction.ActionListener() {
+            @Override
+            public void onClick(QMUIDialog dialog, int index) {
+                submit();
+            }
+        }).show();
+
     }
 }

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

@@ -53,12 +53,12 @@ public class WorkFinancialReceiveTicketActivity extends WorkToolBarActivity {
     private SmartRefreshLayout srlRefresh;
     private List<TicketBean.RecordsBean> dataList;
     private WorkFinancialReceiveTicketAdapter dataAdapter;
-    private String orderType="供应订单";
+    private String orderType = "供应订单";
 
     @Override
     protected void initView() {
         ButterKnife.bind(this);
-        FinancialReceiveTicketFilterData filterData = new FinancialReceiveTicketFilterData(this,ddmChoose, new ThreeMenuClickListener() {
+        FinancialReceiveTicketFilterData filterData = new FinancialReceiveTicketFilterData(this, ddmChoose, new ThreeMenuClickListener() {
             @Override
             public void clickOne(String value) {
                 orderType = value;
@@ -170,7 +170,7 @@ public class WorkFinancialReceiveTicketActivity extends WorkToolBarActivity {
         dataAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
             @Override
             public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
-                startActivity(WorkFinancialReceiveTicketDetailActivity.class,"type",orderType, "info", JSON.toJSONString(dataList.get(position)));
+                startActivity(WorkFinancialReceiveTicketDetailActivity.class, "type", orderType, "info", JSON.toJSONString(dataList.get(position)));
             }
         });
     }
@@ -183,7 +183,10 @@ public class WorkFinancialReceiveTicketActivity extends WorkToolBarActivity {
 
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
-        getMenuInflater().inflate(R.menu.menu_add, menu);
+        if (WorkUtils.hasPermission(PagePermissionType.FO_RECEIPT_SAVE.getPermission())
+                || WorkUtils.hasPermission(PagePermissionType.PO_RECEIPT_SAVE.getPermission())) {
+            getMenuInflater().inflate(R.menu.menu_add, menu);
+        }
         return super.onCreateOptionsMenu(menu);
     }
 

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

@@ -186,7 +186,12 @@ public class WorkFinancialTicketActivity extends WorkToolBarActivity {
 
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
-        getMenuInflater().inflate(R.menu.menu_add, menu);
+        if (WorkUtils.hasPermission(PagePermissionType.SO_INVOICE_SAVE.getPermission()) ||
+                WorkUtils.hasPermission(PagePermissionType.AO_INVOICE_SAVE.getPermission()) ||
+                WorkUtils.hasPermission(PagePermissionType.PO_INVOICE_SAVE.getPermission()) ||
+                WorkUtils.hasPermission(PagePermissionType.CO_INVOICE_SAVE.getPermission())) {
+            getMenuInflater().inflate(R.menu.menu_add, menu);
+        }
         return super.onCreateOptionsMenu(menu);
     }
 
@@ -227,7 +232,7 @@ public class WorkFinancialTicketActivity extends WorkToolBarActivity {
             hasPermission = WorkUtils.hasPermission(PagePermissionType.PO_INVOICE_LIST.getPermission());
         } else if (TextUtils.equals(orderType, "坩埚订单")) {
             hasPermission = WorkUtils.hasPermission(PagePermissionType.CO_INVOICE_LIST.getPermission());
-        }else if (TextUtils.equals(orderType, "组装订单")) {
+        } else if (TextUtils.equals(orderType, "组装订单")) {
             hasPermission = WorkUtils.hasPermission(PagePermissionType.AO_INVOICE_LIST.getPermission());
         }
         return hasPermission;