版本5.8.8

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/form/SelectCalendarActivity.java

@@ -387,9 +387,11 @@ public class SelectCalendarActivity extends BaseActivity implements View.OnClick
                         //结束时间
                         v_date_end.setText( modle.tv_text.getText().toString());
                         end_hour_min = modle.tv_text.getText().toString();
+                       
                     }
                     return;
                 }
+                
                 if (StringUtils.isEmpty(currentSelectDate)) {
                     ToastMessage("请先选择日期,再选择时间段！");
                     return;
@@ -443,7 +445,7 @@ public class SelectCalendarActivity extends BaseActivity implements View.OnClick
                         Log.d("currentSelectDate4", currentSelectDate);
                         v_date_end.setText(currentSelectDate + " " + modle.tv_text.getText().toString());
                         end_hour_min = modle.tv_text.getText().toString();
-
+                       
                     }
                 }
             }
@@ -540,6 +542,7 @@ public class SelectCalendarActivity extends BaseActivity implements View.OnClick
                 Log.d("Slide_date88", yeas + "-" + month + "-" + day + " " + start_hour_min);
             } else {
                 v_date_end.setText(yeas + "-" + m + "-" + d + " " + end_hour_min);
+                
                 Log.d("Slide_date88", yeas + "-" + month + "-" + day + " " + end_hour_min);
             }
 
@@ -575,7 +578,7 @@ public class SelectCalendarActivity extends BaseActivity implements View.OnClick
             if (type == 0) {
                 mTimeData.addAll(timeAddMuilt("08:30", "18:30", minute));
             } else {
-                mTimeData.addAll(timeAddMuilt("08:00", "18:00", minute));
+                mTimeData.addAll(timeAddMuilt("08:00", "20:00", minute));
             }
         }
     }
@@ -767,11 +770,19 @@ public class SelectCalendarActivity extends BaseActivity implements View.OnClick
                     if (!StringUtils.isEmpty(v_date_start.getText().toString()) && !
                             StringUtils.isEmpty(v_date_end.getText().toString())) {
                         if (!checkDateStr(v_date_end.getText().toString() + " " + v_time_end.getText().toString())) {
-                            ToastMessage("结束时间 请选择具体时间点!");
+                            if(type==1){
+                                ToastMessage("不能预约过去时间!");
+                            }else {
+                                ToastMessage("结束时间 请选择具体时间点!");
+                            }
                             return;
                         }
                         if (!checkDateStr(v_date_start.getText().toString() + " " + v_time_start.getText().toString())) {
-                            ToastMessage("开始时间 请选择具体时间点!");
+                            if(type==1){
+                                ToastMessage("不能预约过去时间!");
+                            }else {
+                                ToastMessage("开始时间 请选择具体时间点!");
+                            }
                             return;
                         }
                         Intent intent = new Intent();
@@ -795,11 +806,19 @@ public class SelectCalendarActivity extends BaseActivity implements View.OnClick
                             return;
                         }
                         if (!checkDateStr(v_date_end.getText().toString())) {
-                            ToastMessage("结束时间 请选择具体时间点!");
+                            if(type==1){
+                                ToastMessage("不能预约过去时间!");
+                            }else {
+                                ToastMessage("结束时间 请选择具体时间点!");
+                            }
                             return;
                         }
                         if (!checkDateStr(v_date_start.getText().toString())) {
-                            ToastMessage("开始时间 请选择具体时间点!");
+                            if(type==1){
+                                ToastMessage("不能预约过去时间!");
+                            }else {
+                                ToastMessage("开始时间 请选择具体时间点!");
+                            }
                             return;
                         }
 
@@ -1063,6 +1082,23 @@ public class SelectCalendarActivity extends BaseActivity implements View.OnClick
         String today = DateFormatUtil.getDateStr();
         if (today.compareTo(currentSelectDate) > 0 && type == 1){
             ToastMessage("不能预约过去时间");
+            //按时间
+            currentSelectDate="";
+            // v_date_start.setText(DateFormatUtil.getStrDate4Date(date,"yyyy-MM-dd"));
+            //按时间请假：
+            if (startDate) {//按钮状态
+                //开始时间
+                v_date_start.setText(currentSelectDate);
+            } else {
+                //结束时间
+                v_date_end.setText(currentSelectDate);
+                if (type==1){
+                    startDate = true;
+                    ll_date_end.setEnabled(true);
+                    swichDateButton(startDate);
+                    v_date_start.setText(currentSelectDate);
+                }
+            }
             return;
         }else {
             if (swich) {
@@ -1083,6 +1119,12 @@ public class SelectCalendarActivity extends BaseActivity implements View.OnClick
                 } else {
                     //结束时间
                     v_date_end.setText(currentSelectDate);
+                   if (type==1){
+                       startDate = true;
+                       ll_date_end.setEnabled(true);
+                       swichDateButton(startDate);
+                       v_date_start.setText(currentSelectDate);
+                   }
                 }
             }
             //ToastMessage(currentSelectDate);