做日历前

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

@@ -8,7 +8,9 @@ import android.text.Editable;
 import android.text.Selection;
 import android.util.Log;
 import android.view.View;
+import android.widget.Button;
 import android.widget.EditText;
+import android.widget.ImageView;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 
@@ -43,6 +45,10 @@ public class AddFlihtsActivity extends OABaseActivity implements IAddFlihtsView,
     private TextView time_tv;
     @ViewInject(R.id.date_tv)
     private TextView date_tv;
+    @ViewInject(R.id.calender_select_tv)
+    private ImageView calender_select_tv;
+    @ViewInject(R.id.click_btn)
+    private Button click_btn;
     @ViewInject(R.id.department_tv)
     private TextView department_tv;
     @ViewInject(R.id.munber_tv)
@@ -80,6 +86,7 @@ public class AddFlihtsActivity extends OABaseActivity implements IAddFlihtsView,
             findViewById(R.id.date_tv).setOnClickListener(this);
             findViewById(R.id.department_tv).setOnClickListener(this);
             findViewById(R.id.munber_tv).setOnClickListener(this);
+            findViewById(R.id.calender_select_tv).setOnClickListener(this);
             collision_department_tv.setOnClickListener(this);
             collision_munber_tv.setOnClickListener(this);
         } else {
@@ -150,6 +157,10 @@ public class AddFlihtsActivity extends OABaseActivity implements IAddFlihtsView,
                 presenter.putData2Intent(view.getId(), intent);
                 startActivityForResult(intent, COLLISION_DEPARTMENT_TV);
                 break;
+            case R.id.calender_select_tv:
+                //TODO 进入修改班次的考勤日期选择，跳日历界面
+                ToastMessage("进入修改班次的考勤日期选择，跳日历界面");
+                break;
         }
     }
 
@@ -199,14 +210,15 @@ public class AddFlihtsActivity extends OABaseActivity implements IAddFlihtsView,
 
     @Override
     public void updateTime(String time) {
-        time_tv.setText(StringUtils.isEmpty(time) ? "" : time);
-
+//        time_tv.setText(StringUtils.isEmpty(time) ? "" : time);
+        date_tv.setVisibility(View.GONE);
+        calender_select_tv.setVisibility(View.VISIBLE);
     }
 
     @Override
     public void updateDate(String date) {
         date_tv.setText(StringUtils.isEmpty(date) ? "" : date);
-
+        click_btn.setText("更新");
     }
 
     @Override

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/presenter/AddFlihtsPresenter.java

@@ -123,12 +123,15 @@ public class AddFlihtsPresenter implements HttpHandler.OnResultListener {
             iAddFlihtsView.showToast("请填写考勤时间", R.color.load_error);
             return;
         }
-        if (!StringUtils.isEmpty(model.getDay())) {
-            formStore.put("wd_day", model.getDay());
-        } else {
-            iAddFlihtsView.showToast("请填写考勤日期", R.color.load_error);
-            return;
+        if (!isUpdate){
+            if (!StringUtils.isEmpty(model.getDay())) {
+                formStore.put("wd_day", model.getDay());
+            } else {
+                iAddFlihtsView.showToast("请填写考勤日期", R.color.load_error);
+                return;
+            }
         }
+
         //start 人员数据
         EmployeesModel employeesModel = model.getEmployeesModel();
         String employeesName;

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/platform/task/TaskAddB2BActivity.java

@@ -402,12 +402,14 @@ public class TaskAddB2BActivity extends BaseActivity implements View.OnClickList
         }
 
         String resourcename = "";
-        if (tagValues != null && tagValues.length > 0) {
+        if (tagValues != null && tagValues.length > 0 ) {
             try {
                 resourcename = getResourceName(tagValues);
             } catch (Exception e) {
-                ToastMessage("执行人为必填项");
-                return;
+                if (StringUtils.isEmpty(et_task_people.getInputTagText().toString())){
+                    ToastMessage("执行人为必填项");
+                    return;
+                }
             }
         } else {
             ToastMessage("执行人为必填项");

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

@@ -21,7 +21,7 @@
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
             android:gravity="center_vertical"
-            android:text="规则名称"
+            android:text="班次名称"
             android:textColor="@color/text_main"
             android:textSize="@dimen/text_main" />
 
@@ -88,6 +88,16 @@
             android:textColor="@color/text_main"
             android:textSize="@dimen/text_main" />
 
+        <ImageView
+            android:id="@+id/calender_select_tv"
+            android:layout_centerVertical="true"
+            android:layout_width="50dp"
+            android:layout_height="30dp"
+            android:layout_alignParentRight="true"
+            android:background="@drawable/uuu"
+            android:layout_marginRight="10dp"
+            android:visibility="gone"
+            />
         <TextView
             android:id="@+id/date_tv"
             android:layout_width="wrap_content"
@@ -100,7 +110,9 @@
             android:gravity="center_vertical|right"
             android:hint="@string/select_must"
             android:textColor="@color/text_hine"
-            android:textSize="@dimen/text_hine" />
+            android:textSize="@dimen/text_hine"
+            android:visibility="visible"
+            />
     </RelativeLayout>
 
     <RelativeLayout