新的加班申请单据反提交删除操作完成。4

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/crm/CustomerAddActivity.java

@@ -591,7 +591,7 @@ public class CustomerAddActivity extends BaseActivity implements View.OnClickLis
                     }
 
                     if (mLists.isEmpty()) {
-                        mLists.add("无");
+                        mLists.add(getString(R.string.no_));
                     }
                     showSimpleDialog(et_cu_kind, getString(R.string.client_type));
                     break;
@@ -615,11 +615,11 @@ public class CustomerAddActivity extends BaseActivity implements View.OnClickLis
                     break;
                 case UNCOMMIT:
                     progressDialog.dismiss();
-                    ToastMessage("反提交成功！");
+                    ToastMessage(getString(R.string.Operation_succeeded));
                     Log.i(TAG, "handleMessage:" + msg.getData().getString("result"));
                     bt_uncommit.setVisibility(View.GONE);
                     bt_commit.setVisibility(View.VISIBLE);
-                    mMenu.findItem(R.id.btn_save).setTitle("更新");
+                    mMenu.findItem(R.id.btn_save).setTitle(getString(R.string.common_update_button));
                     mMenu.findItem(R.id.btn_save).setVisible(true);
                     //bt_save.setVisibility(View.GONE);
                     disableEdit(true);
@@ -1084,7 +1084,7 @@ public class CustomerAddActivity extends BaseActivity implements View.OnClickLis
                     commit(COMMIT, mCuId);
                 } else {
                     new AlertDialog.Builder(this).setTitle(getString(R.string.common_notice))
-                            .setMessage("您修改了部分内容，请先更新后提交")
+                            .setMessage(getString(R.string.CRM_current_page_change_ecet))
                             .setPositiveButton(getString(R.string.common_sure), null).show();
                 }
                 break;

WeiChat/src/main/res/layout/activity_customter_add.xml

@@ -524,7 +524,7 @@
                 android:gravity="center"
                 android:textSize="18sp"
                 android:visibility="gone"
-                android:text="提交"/>
+                android:text="@string/common_submit_button"/>
             <TextView
                 android:id="@+id/bt_uncommit"
                 android:layout_width="match_parent"
@@ -536,7 +536,7 @@
                 android:gravity="center"
                 android:textSize="18sp"
                 android:visibility="gone"
-                android:text="反提交"/>
+                android:text="@string/unsubmit"/>
             
         </LinearLayout>
     </LinearLayout>

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

@@ -647,7 +647,7 @@
         <string name = "sports_recode_distance"> Walking+Running Distance(estimated) </string>
         <string name = "sports_kilometre"> km </string>
         <string name = "sports_tody"> today </string>
-        <string name = "sports_step"> step </string>
+        <string name = "sports_step"> steps </string>
         <string name = "sports_step_tody"> Steps </string>
         <string name = "sports_recode_more"> More history </string>
 
@@ -1021,7 +1021,7 @@
     </string-array>
     <string name="daily_record">Daily Record</string>
     <string name = "search1"> find </string>
-    <string name = "formal_customer"> official client </string>
+    <string name = "formal_customer"> Formal customer </string>
     <string name = "client_yu_luru"> customer pre-entry </string>
     <string name = "client_type"> Type </string>
     <string name = "common_select1"> Please select </string>

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

@@ -1334,5 +1334,6 @@
     <string name="remove_blacklist_prompt">确定要移出黑名单吗</string>
     <string name="add_blacklist_prompt">确定要加入黑名单吗？</string>
     <string name="add_blacklist_succ">加入黑名单成功</string>
-
+    <string name="unsubmit">反提交</string>
+    <string name="Operation_succeeded">反提交成功</string>
 </resources>

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

@@ -1322,4 +1322,6 @@
     <string name="remove_blacklist_prompt">確定要移出黑名單嗎</string>
     <string name="add_blacklist_prompt">確定要加入黑名單嗎？ </string>
     <string name="add_blacklist_succ">加入黑名單成功</string>
+    <string name="unsubmit">unsubmit</string>
+    <string name="Operation_succeeded">Operation succeeded</string>
 </resources>

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

@@ -1648,4 +1648,6 @@
     <string name="holiday_date4">4月29日~5月1日   共3天</string>
     <string name="holiday_date5">5月28日~5月30日  共3天  调休;5月27日上班</string>
     <string name="holiday_date6">10月1日~10月8日  共8天  调休;9月30日上班</string>
+    <string name="unsubmit">反提交</string>
+    <string name="Operation_succeeded">反提交成功</string>
 </resources>