排班设置需求个鬼，前

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/message/ProcessB2BActivity.java

@@ -144,7 +144,7 @@ public class ProcessB2BActivity extends BaseActivity implements View.OnClickList
                     break;
                 case SUSSCESS_already:
                     itemArray = JSON.parseObject(result).getJSONArray("data");
-                    if (page == 1) arrayRe.clear();
+                    if (pageDone == 1) arrayRe.clear();
                     arrayRe.addAll(itemArray);
                     if (mAdapter == null) {
                         mAdapter = new ProcessAdapter(ct, arrayRe);

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

@@ -561,7 +561,6 @@ public class PlatWDdetailyActivity extends BaseActivity {
                         LogUtil.prinlnLongMsg("app_flow_result", app_flow_result);
 
                         doPlatComAfShow(app_flow_result);
-                        progressDialog.dismiss();
                     }
                     break;
                 case RESUBMIT_OF_DELETEAPPFL:
@@ -692,14 +691,20 @@ public class PlatWDdetailyActivity extends BaseActivity {
     };
 
     private void getapplypeomsg(String doc_em_data) {
-        JSONObject object = JSON.parseObject("doc_em_data");
-        JSONObject dataObject = object.getJSONObject("data");
-        Long em_code = dataObject.getLongValue("emcode");
-        String em_name = dataObject.getString("wd_emp");
-
-        name_tv.setText(em_name);
-        String imageUri = "drawable://" + R.drawable.common_header_boy;
-        AvatarHelper.getInstance().display(imageUri, photo_im, true);
+       try{
+           JSONObject object = JSON.parseObject(doc_em_data);
+           JSONObject dataObject = object.getJSONObject("data");
+           Long em_code = dataObject.getLongValue("emcode");
+           String em_name = dataObject.getString("wd_emp");
+
+           name_tv.setText(em_name);
+           String imageUri = "drawable://" + R.drawable.common_header_boy;
+           AvatarHelper.getInstance().display(imageUri, photo_im, true);
+
+           Log.i("em_name,em_code",em_name + "," + em_code);
+       }catch (Exception e){
+           e.printStackTrace();
+       }
     }
 
     private void getDailyStatue(String doc_em_data) {
@@ -792,6 +797,8 @@ public class PlatWDdetailyActivity extends BaseActivity {
             }
 
         }
+
+        progressDialog.dismiss();
     }
 
 

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/platform/adapter/PagesModelAdapter.java

@@ -22,6 +22,7 @@ import com.xzjmyk.pm.activity.MyApplication;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
+import com.xzjmyk.pm.activity.ui.erp.util.ListUtils;
 import com.xzjmyk.pm.activity.ui.erp.util.LogUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.StringUtils;
 import com.xzjmyk.pm.activity.ui.erp.view.EmptyLayout;
@@ -182,6 +183,7 @@ public class PagesModelAdapter extends BaseAdapter implements Filterable {
         }else {
             model.delete_tv.setVisibility(View.GONE);
         }
+        final ViewModel finalModel = model;
         model.delete_tv.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
@@ -196,6 +198,7 @@ public class PagesModelAdapter extends BaseAdapter implements Filterable {
                                 int item_id= CommonUtil.getNumByString(datas.get(position).getId());
                                 mPosition = position;
                                 doPlatDeleteByid(item_id,whichpage);
+                                finalModel.delete_tv.setEnabled(false);
                             }
                         }).show();
             }
@@ -228,12 +231,14 @@ public class PagesModelAdapter extends BaseAdapter implements Filterable {
                     if (msg.getData() != null){
                         String delete_result=msg.getData().getString("result");
                         LogUtil.d("delete_result", delete_result);
-//                        if (JSON.parseObject(delete_result).containsKey("success")
-//                                && "true".equals(JSON.parseObject(delete_result).getJSONObject("success"))){
+                        if (JSON.parseObject(delete_result).containsKey("success")
+                                && JSON.parseObject(delete_result).getBooleanValue("success")){
                             Toast.makeText(ct,"删除成功",Toast.LENGTH_LONG).show();
-                            datas.remove(mPosition);
-                            notifyDataSetChanged();
-//                        }
+                            if (!ListUtils.isEmpty(datas)) {
+                                datas.remove(mPosition);
+                                notifyDataSetChanged();
+                            }
+                        }
                     }else {
                         Toast.makeText(ct,"删除失败，请稍候再试",Toast.LENGTH_LONG).show();
                     }

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/platform/pageforms/FormDetailActivity.java

@@ -691,6 +691,7 @@ public class FormDetailActivity extends BaseActivity {
             if ("已审批".equals(status) || "已审核".equals(status)) {
                 status_tv.setTextColor(getApplicationContext().getResources().getColor(R.color.approval));
                 status_tv.setText("已审批");
+                resanddel_ll.setVisibility(View.GONE);
             } else {
                 status_tv.setTextColor(getApplicationContext().getResources().getColor(R.color.no_approval));
                 status_tv.setText("待审批");

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

@@ -17,10 +17,11 @@
             android:orientation="vertical">
             <RelativeLayout
                 style="@style/IMTbleLine2"
-                android:layout_height="50dp"
+                android:minHeight="45dp"
                 android:background="@color/white">
                 <TextView
                     style="@style/form_relative_left_text"
+                    android:id="@+id/name_tv"
                     android:text="姓     名"
                     android:layout_marginLeft="0dp"
                     android:textColor="@color/text_main"
@@ -32,6 +33,7 @@
                     android:layout_height="wrap_content"
                     android:textColor="@color/dark_dark_grey"
                     android:padding="10dp"
+                    android:layout_toRightOf="@+id/name_tv"
                     android:layout_alignParentRight="true"
                     android:layout_centerVertical="true"
                     android:background="@null"
@@ -39,8 +41,9 @@
                     android:textSize="15sp"
                     android:gravity="center_vertical|right"
                     whatever:testType="regexp"
-                    whatever:customRegexp="^[A-Za-z\u4e00-\u9fa5]+$"
-                    whatever:testErrorString="姓名只能为中、英文"/>
+                    whatever:customRegexp="^[A-Za-z\u4e00-\u9fa5]{1,24}+$"
+                    whatever:testErrorString="姓名只能为12个字符之内的中、英文"
+                    android:layout_marginLeft="10dp"/>
             </RelativeLayout>
             <View
                 android:layout_width="match_parent"
@@ -141,6 +144,7 @@
                 android:layout_height="50dp"
                 android:background="@color/white">
                 <TextView
+                    android:id="@+id/tel_tv"
                     style="@style/form_relative_left_text"
                     android:text="电话号码"
                     android:layout_marginLeft="0dp"
@@ -159,7 +163,10 @@
                     android:hint="请输入(必填)"
                     android:textSize="15sp"
                     android:inputType="number"
-                    android:gravity="center_vertical|right"/>
+                    android:gravity="center_vertical|right"
+                    android:layout_toRightOf="@id/tel_tv"
+                    android:layout_marginLeft="5dp"
+                    android:maxLength="11"/>
             </RelativeLayout>
             <View
                 android:layout_width="match_parent"
@@ -167,9 +174,10 @@
                 android:background="@color/item_line" />
             <RelativeLayout
                 style="@style/IMTbleLine2"
-                android:layout_height="50dp"
+                android:minHeight="40dp"
                 android:background="@color/white">
                 <TextView
+                    android:id="@+id/email_tv"
                     style="@style/form_relative_left_text"
                     android:text="邮箱地址"
                     android:layout_marginLeft="0dp"
@@ -177,7 +185,7 @@
                     android:textSize="15sp"/>
 
                 <com.andreabaccega.widget.FormEditText xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
-                   android:id="@+id/user_email_tv"
+                    android:id="@+id/user_email_tv"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:textColor="@color/dark_dark_grey"
@@ -185,12 +193,15 @@
                     android:layout_alignParentRight="true"
                     android:layout_centerVertical="true"
                     android:background="@null"
+                    android:layout_toRightOf="@+id/email_tv"
                     android:hint="请输入(必填)"
                     android:textSize="15sp"
                     android:gravity="center_vertical|right"
                     whatever:testType="regexp"
                     whatever:customRegexp="^([\\w-])+(\\.\\w+)*@([\\w-])+((\\.\\w{2,3}){1,3})$"
-                    whatever:testErrorString="请输入正确的邮箱格式"/>
+                    whatever:testErrorString="请输入正确的邮箱格式"
+                    android:maxLength="50"
+                    android:layout_marginLeft="10dp"/>
             </RelativeLayout>
             <View
                 android:layout_width="match_parent"