优化计算器前

WeiChat/src/main/java/com/xzjmyk/pm/activity/bean/oa/UpdateCostDetailsGridStoreBean.java

@@ -8,6 +8,15 @@ public class UpdateCostDetailsGridStoreBean {
     private String fpd_d1;
     private double fpd_total;
     private int fpd_id;
+    private int fpd_fpid;
+
+    public int getFpd_fpid() {
+        return fpd_fpid;
+    }
+
+    public void setFpd_fpid(int fpd_fpid) {
+        this.fpd_fpid = fpd_fpid;
+    }
 
     public String getFpd_d1() {
         return fpd_d1;

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/oa/ExpenseReimbursementActivity.java

@@ -216,7 +216,7 @@ public class ExpenseReimbursementActivity extends BaseActivity implements View.O
                     if (!StringUtils.isEmpty(result)){
                         Log.i("0x07result", result);
                         progressDialog.dismiss();
-                        Toast.makeText(ct,"发票提交成功",Toast.LENGTH_LONG).show();
+                        Toast.makeText(ct,getString(R.string.invoice_submitted_successfully),Toast.LENGTH_LONG).show();
                         new Handler().postDelayed(new Runnable() {
                             @Override
                             public void run() {
@@ -397,13 +397,10 @@ public class ExpenseReimbursementActivity extends BaseActivity implements View.O
         if (!CommonUtil.isNetWorkConnected(mContext)) {
             ToastMessage(getString(R.string.networks_out));
         }
-//        String url = Constants.getAppBaseUrl(ct) + "mobile/getformandgriddetail.action";
         String url = Constants.getAppBaseUrl(getApplicationContext()) + "mobile/common/getformandgriddata.action";
         Map<String, Object> params = new HashMap<>();
         params.put("caller", caller);
         params.put("id", id);
-//        params.put("condition", "1=1");
-//        params.put("id", id);Log.i("formid",id+"if");
         params.put("sessionId", CommonUtil.getSharedPreferences(ct, "sessionId"));
         LinkedHashMap<String, Object> headers = new LinkedHashMap<>();
         headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(ct, "sessionId"));
@@ -569,49 +566,6 @@ public class ExpenseReimbursementActivity extends BaseActivity implements View.O
         }
     }
 
-    private void showUpdateData(List<CostBean.DataBean.FormdetailBean> m2Form_update, List<CostBean.DataBean.GridetailBean> m2Grid_update) {
-        LogUtil.prinlnLongMsg("m2Form_update", JSON.toJSONString(m2Form_update));
-        LogUtil.prinlnLongMsg("m2Grid_update", JSON.toJSONString(m2Grid_update));
-
-        if (!ListUtils.isEmpty(m2Form_update)){
-            for (int i = 0; i < m2Form_update.size(); i++) {
-                if (!StringUtils.isEmpty(m2Form_update.get(i).getFd_field())
-                        && !StringUtils.isEmpty(m2Form_update.get(i).getFd_caption())
-                        && !StringUtils.isEmpty(m2Form_update.get(i).getFd_value())){
-
-                    String key = m2Form_update.get(i).getFd_field();
-                    String value = m2Form_update.get(i).getFd_value();
-                    switch (key){
-                        case "fp_class":
-                            reimbursement_type_fet.setText(value);
-                            break;
-                        case "fp_v13":
-                            reimbursement_currency_fet.setText(value);
-                            break;
-                        case "fp_pleaseamount":
-                            sum_money_tv.setText(value);
-                            break;
-                        case "fp_v3":
-                            reimbursement_title_fet.setText(value);
-                            break;
-                    }
-                }
-
-            }
-        }
-
-        if (!ListUtils.isEmpty(m2Grid_update)){
-            for (int i = 0; i < m2Grid_update.size(); i++) {
-                if (!StringUtils.isEmpty(m2Grid_update.get(i).getDg_field())
-                        && !StringUtils.isEmpty(m2Grid_update.get(i).getDg_caption())
-                        && !StringUtils.isEmpty(m2Grid_update.get(i).getDg_type())){
-//                    costFormModel
-                }
-            }
-        }
-
-    }
-
     private void handleTypeAndM(String result) {
         try {
             JSONObject amresultJsonObject =JSON.parseObject(result);
@@ -849,17 +803,17 @@ public class ExpenseReimbursementActivity extends BaseActivity implements View.O
         if (!reimbursement_title_fet.testValidity()) return;
 
         if (StringUtils.isEmpty(reimbursement_type_fet.getText().toString())){
-            ToastMessage("请选择报销类型");
+            ToastMessage(getString(R.string.select_cost_type));
             return;
         }
 
         if (StringUtils.isEmpty(reimbursement_currency_fet.getText().toString())){
-            ToastMessage("请选择币种");
+            ToastMessage(getString(R.string.select_money_type));
             return;
         }
 
         if (ListUtils.isEmpty(costFormModel_list)) {
-            ToastMessage("请增加消费明细");
+            ToastMessage(getString(R.string.add_cost_details));
             return;
         }
         if (CommonUtil.isNetWorkConnected(ct)){
@@ -893,6 +847,7 @@ public class ExpenseReimbursementActivity extends BaseActivity implements View.O
             gridStore_bean.setFpd_d1(costFormModel_list.get(i).getCost_type());
             gridStore_bean.setFpd_total(costFormModel_list.get(i).getCost_money());
             gridStore_bean.setFpd_id(costFormModel_list.get(i).getFpd_id());
+            gridStore_bean.setFpd_fpid(formid);
             gridStore_list.add(gridStore_bean);
 
             if (i == (costFormModel_list.size()-1)){
@@ -1525,6 +1480,14 @@ public class ExpenseReimbursementActivity extends BaseActivity implements View.O
         imm.hideSoftInputFromWindow(add_details_tv.getWindowToken(), 0);
     }
 
+    @Override
+    public boolean onPrepareOptionsMenu(Menu menu) {
+        menu.clear();
+        if (formid == 0) {
+            getMenuInflater().inflate(R.menu.menu_list, menu);
+        }
+        return super.onPrepareOptionsMenu(menu);
+    }
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
         getMenuInflater().inflate(R.menu.menu_list, menu);
@@ -1538,8 +1501,20 @@ public class ExpenseReimbursementActivity extends BaseActivity implements View.O
                     .putExtra("caller", caller)
                     .putExtra("title", getSupportActionBar().getTitle().toString()));
         }
+        if (item.getItemId() == android.R.id.home){
+            startActivity(new Intent(ExpenseReimbursementActivity.this, OAActivity.class)
+                    .putExtra("WorkDailyAdd", "WorkDailyAdd"));
+        }
         return super.onOptionsItemSelected(item);
     }
+
+    @Override
+    public void onBackPressed() {
+        startActivity(new Intent(ExpenseReimbursementActivity.this, OAActivity.class)
+                .putExtra("WorkDailyAdd", "WorkDailyAdd"));
+        super.onBackPressed();
+    }
+
     private void sendPicture() {
         if (ListUtils.isEmpty(mPhotoList))  {
             commitSuccess(keyValue);
@@ -1578,7 +1553,7 @@ public class ExpenseReimbursementActivity extends BaseActivity implements View.O
             @Override
             public void onStart() {
                 progressDialog.show();
-                ViewUtil.ToastMessage(ct, "正在上传图片...");
+                ViewUtil.ToastMessage(ct, getString(R.string.sending_picture));
             }
 
             @Override

WeiChat/src/main/res/values-en/strings.xml

@@ -1399,4 +1399,9 @@
     <string name="login_progress_b2b">Validating B2B...</string>
     <string name="login_progress_erp">Validating UAS...</string>
     <string name="login_company_select">Select company</string>
+    <string name = "invoice_submitted_successfully"> Invoice Submission Successful </string>
+    <string name = "sending_picture"> uploading picture </string>
+    <string name = "select_cost_type"> Please select reimbursement type </string>
+    <string name = "select_money_type"> Please select the currency </string>
+    <string name = "add_cost_details"> Please add consumption details </string>
 </resources>

WeiChat/src/main/res/values-zh-rCN/strings.xml

@@ -1500,4 +1500,10 @@
     <string name="login_progress_b2b">正在验证B2B...</string>
     <string name="login_progress_erp">正在验证UAS...</string>
     <string name="login_company_select">选择公司</string>
+
+    <string name="invoice_submitted_successfully">发票提交成功</string>
+    <string name="sending_picture">正在上传图片</string>
+    <string name="select_cost_type">请选择报销类型</string>
+    <string name="select_money_type">请选择币种</string>
+    <string name="add_cost_details">请增加消费明细</string>
 </resources>

WeiChat/src/main/res/values-zh-rTW/strings.xml

@@ -1496,4 +1496,9 @@
     <string name="login_progress_b2b">正在驗證B2B...</string>
     <string name="login_progress_erp">正在驗證UAS...</string>
     <string name="login_company_select">選擇公司</string>
+    <string name="invoice_submitted_successfully">發票提交成功</string>
+    <string name="sending_picture">正在上傳圖片</string>
+    <string name="select_cost_type">請選擇報銷類型</string>
+    <string name="select_money_type">請選擇幣種</string>
+    <string name="add_cost_details">請增加消費明細</string>
 </resources>

WeiChat/src/main/res/values/strings.xml

@@ -1788,4 +1788,10 @@
     <string name="all_Amount_of_money">总金额</string>
     <string name="type">类型</string>
     <string name="not_search_message">没有符合条件的结果</string>
+    <string name="invoice_submitted_successfully">发票提交成功</string>
+    <string name="sending_picture">正在上传图片</string>
+
+    <string name="select_cost_type">请选择报销类型</string>
+    <string name="select_money_type">请选择币种</string>
+    <string name="add_cost_details">请增加消费明细</string>
 </resources>