提交代码保存

1.隐藏CRm2.0功能
2.修复个别bug
3.修正个别翻译

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/fragment/AttendanceFragment.java

@@ -228,18 +228,18 @@ public class AttendanceFragment extends EasyFragment implements OnHttpResultList
 
 
     private void handlerDate(JSONObject object) {
-        l1.setText("应该出勤 " + OACheckUtil.getJson2Text(object, "ychuqin") + " 天");
-        r1.setText("实际出勤 " + OACheckUtil.getJson2Text(object, "achuqin") + " 天");
-        l2.setText("正常打卡 " + OACheckUtil.getJson2Text(object, "nday") + " 天");
+        l1.setText(getString(R.string.ychuqin) + "  " + OACheckUtil.getJson2Text(object, "ychuqin") + " 天");
+        r1.setText(getString(R.string.achuqin) + "  " + OACheckUtil.getJson2Text(object, "achuqin") + " 天");
+        l2.setText(getString(R.string.nday) + "  " + OACheckUtil.getJson2Text(object, "nday") + " 天");
         r2.setText(getString(R.string.sign_actualtime) + "  " + OACheckUtil.getJson2Text(object, "atime") + " " + getString(R.string.sign_hour_day));
         l3.setText(getString(R.string.sign_late) + "  " + OACheckUtil.getJson2Text(object, "latecount") + " " + getString(R.string.sign_Times));
         r3.setText(getString(R.string.sign_leave) + "  " + OACheckUtil.getJson2Text(object, "earlycount") + " " + getString(R.string.sign_Times));
         l4.setText(getString(R.string.sign_Absenteeism) + "  " + OACheckUtil.getJson2Text(object, "noncount") + " " + getString(R.string.sign_Times));
-        l5.setText("请假    " + OACheckUtil.getJson2Text(object, "qjdaty") + " 天");
-        r5.setText("加班    " + OACheckUtil.getJson2Text(object, "overtime") + " 次/2小时");
-        l6.setText("出差    " + OACheckUtil.getJson2Text(object, "outdays") + " 天");
+        l5.setText(getString(R.string.leave) + "  " + OACheckUtil.getJson2Text(object, "qjdaty") + " 天");
+        r5.setText(getString(R.string.overtime) + "  "+ OACheckUtil.getJson2Text(object, "overtime") + " 次/2小时");
+        l6.setText(getString(R.string.outdays) + "  "+ OACheckUtil.getJson2Text(object, "outdays") + " 天");
         r6.setText(getString(R.string.oaoutplan_title) + " " + OACheckUtil.getJson2Text(object, "outcount") + " 天/3次");
-        r4.setText("补卡    " +  OACheckUtil.getJson2Text(object, "signcard") + " " + getString(R.string.sign_Times));
+        r4.setText(getString(R.string.signcard) + "  "+ OACheckUtil.getJson2Text(object, "signcard") + " " + getString(R.string.sign_Times));
     }
 
     private void setDate2Adapter(ArrayList<WorkModel> models) {

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

@@ -1253,4 +1253,11 @@
     <string name="input_meeting_resolution">会议决议未按要求填写</string>
     <string name="input_meeting_left">遗留问题未按要求填写</string>
     <string name="input_meeting_next">后续工作未按要求填写</string>
+    <string name="leave">请假</string>
+    <string name="overtime">加班</string>
+    <string name="ychuqin">应该出勤</string>
+    <string name="achuqin">实际出勤</string>
+    <string name="nday">正常打卡</string>
+    <string name="outdays">出差</string>
+    <string name="signcard">补卡</string>
 </resources>

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

@@ -654,6 +654,13 @@
     <string name="input_meeting_resolution">會議決議未按要求填寫</string>
     <string name="input_meeting_left">遺留問題未按要求填寫</string>
     <string name="input_meeting_next">後續工作未按要求填寫</string>
+    <string name="leave">請假</string>
+    <string name="overtime">加班</string>
+    <string name="ychuqin">應該出勤</string>
+    <string name="achuqin">實際出勤</string>
+    <string name="nday">正常打卡</string>
+    <string name="outdays">出差</string>
+    <string name="signcard">補卡</string>
     <!--end by Bitliker-->
 
     <!--start by Arison-->

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

@@ -1661,4 +1661,11 @@
     <string name="input_meeting_resolution">会议决议未按要求填写</string>
     <string name="input_meeting_left">遗留问题未按要求填写</string>
     <string name="input_meeting_next">后续工作未按要求填写</string>
+    <string name="leave">请假</string>
+    <string name="overtime">加班</string>
+    <string name="ychuqin">应该出勤</string>
+    <string name="achuqin">实际出勤</string>
+    <string name="nday">正常打卡</string>
+    <string name="outdays">出差</string>
+    <string name="signcard">补卡</string>
 </resources>