11:47

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

@@ -243,6 +243,7 @@ public class TaskActivity extends BaseActivity implements OnClickListener,Recogn
 
                 if (tab_type == 3){
                     adapter = new NewSchedultAdapter(TaskActivity.this, isendList);
+                    adapter.setiSend("iSend");
                     real_List = isendList;
                 }
                 listview_main.setAdapter(adapter);
@@ -468,6 +469,7 @@ public class TaskActivity extends BaseActivity implements OnClickListener,Recogn
                 done_tv.setSelected(false);
                 isend_tv.setSelected(true);
                 adapter = new NewSchedultAdapter(TaskActivity.this, isendList);
+                adapter.setiSend("iSend");
                 real_List = isendList;
                 break;
             case R.id.voice_search_iv:

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/adapter/NewSchedultAdapter.java

@@ -13,6 +13,7 @@ import android.widget.TextView;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.ui.erp.entity.AllProcess;
 import com.xzjmyk.pm.activity.ui.erp.util.ObjectUtils;
+import com.xzjmyk.pm.activity.ui.erp.util.StringUtils;
 
 import java.text.SimpleDateFormat;
 import java.util.List;
@@ -26,6 +27,16 @@ public class NewSchedultAdapter extends BaseAdapter {
     public List<AllProcess> flistNew;
     public List<AllProcess> real_List;
     public String search_content;
+    public String iSend = "";
+
+    public String getiSend() {
+        return iSend;
+    }
+
+    public void setiSend(String iSend) {
+        this.iSend = iSend;
+    }
+
     public String getSearch_content() {
         return search_content;
     }
@@ -127,7 +138,13 @@ public class NewSchedultAdapter extends BaseAdapter {
             store.task_id = fields_object.getRa_taskid();
 
             //TODO update FANGlg 列表做的和审批流一样
-            store.tv_title.setText(fields_object.getRecorder() + "发起的" + fields_object.getTaskname());
+            String recoder_name = "";
+            if (!StringUtils.isEmpty(iSend) && "iSend".equals(iSend)){
+                recoder_name = "我";
+            }else {
+                recoder_name = fields_object.getRecorder();
+            }
+            store.tv_title.setText( recoder_name + "发起的" + fields_object.getTaskname());
             store.tv_status.setText(fields_object.getMainname());
 
             if (!ObjectUtils.isEquals(null, fields_object.getDatetime())) {

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

@@ -193,8 +193,9 @@ public class PagesModelAdapter extends BaseAdapter implements Filterable {
                         .setPositiveButton("确认", new DialogInterface.OnClickListener() {
                             @Override
                             public void onClick(DialogInterface dialog, int which) {
-                                doPlatDeleteByid(mkeyValue,whichpage);
+                                int item_id= CommonUtil.getNumByString(datas.get(position).getId());
                                 mPosition = position;
+                                doPlatDeleteByid(item_id,whichpage);
                             }
                         }).show();
             }
@@ -206,10 +207,10 @@ public class PagesModelAdapter extends BaseAdapter implements Filterable {
         if (!StringUtils.isEmpty(status) && "在录入".equals(status)) return true;
         else return false;
     }
-    private void doPlatDeleteByid(int mkeyValue, int whichpage) {
+    private void doPlatDeleteByid(int item_id, int whichpage) {
         String url = ApiConfig.getInstance(ApiUtils.getApiModel()).getmApiBase().delete_common_doc_url;
         Map<String,Object> param = new HashMap<>();
-        param.put("id",mkeyValue);
+        param.put("id",item_id);
         param.put("whichpage",whichpage);
         param.put("enuu", Long.valueOf(CommonUtil.getSharedPreferences(MyApplication.getInstance().getApplicationContext(), "companyEnUu")).longValue());
         param.put("emcode", Long.valueOf(CommonUtil.getSharedPreferences(MyApplication.getInstance().getApplicationContext(), "b2b_uu")).longValue());LinkedHashMap<String, Object> headers = new LinkedHashMap<>();

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

@@ -581,7 +581,7 @@ public class TaskAddB2BActivity extends BaseActivity implements View.OnClickList
                 List<SelectEmUser> employeesList = data.getParcelableArrayListExtra("data");
                 if (ListUtils.isEmpty(employeesList)) {
                     selectNames = "";
-                    et_task_people.setTags("");
+                    et_task_people.setTags("未填写");
                     return;
                 }
                 int i = 0;

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

@@ -139,7 +139,7 @@ public class TaskAddErpActivity extends BaseActivity implements View.OnClickList
                 List<SelectEmUser> employeesList = data.getParcelableArrayListExtra("data");
                 if (ListUtils.isEmpty(employeesList)) {
                     selectNames="";
-                    et_task_people.setTags("");
+                    et_task_people.setTags("未填写");
                     return;
                 }
                 StringBuilder select = new StringBuilder();

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

@@ -223,6 +223,7 @@ public class TaskB2BActivity extends BaseActivity implements RecognizerDialogLis
         if (tab_type == 3){
             adapter = new NewSchedultAdapter(TaskB2BActivity.this, isendList);
             real_List = isendList;
+            adapter.setiSend("iSend");
         }
         LogUtil.prinlnLongMsg("tab_type ,real_List",tab_type +","+JSON.toJSONString(real_List));
         listview_main.setAdapter(adapter);

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

@@ -40,7 +40,6 @@
                 android:id="@+id/detail"
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent" 
-                android:textStyle="bold"
                android:gravity="bottom"
                 android:layout_marginLeft="10dp"
                 android:text="任务详情"/>

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

@@ -39,7 +39,6 @@
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent" 
-                android:textStyle="bold"
                android:gravity="bottom"
                 android:layout_marginLeft="10dp"
                 android:text="任务详情"/>

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

@@ -68,6 +68,10 @@
                 android:visibility="invisible" />
         </RelativeLayout>
 
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="2px"
+            android:background="@color/item_line" />
         <RelativeLayout
             android:id="@+id/sex_rl"
             style="@style/IMTbleLine"
@@ -100,7 +104,10 @@
                 android:layout_alignParentStart="true"
                 android:layout_marginStart="18dp" />
         </RelativeLayout>
-
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="2px"
+            android:background="@color/item_line" />
         <RelativeLayout
             android:id="@+id/min_age_rl"
             style="@style/IMTbleLine"
@@ -134,7 +141,10 @@
                 android:contentDescription="@string/app_name"
                 android:visibility="invisible" />
         </RelativeLayout>
-
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="2px"
+            android:background="@color/item_line" />
         <RelativeLayout
             android:id="@+id/max_age_rl"
             style="@style/IMTbleLine"
@@ -167,7 +177,10 @@
                 android:contentDescription="@string/app_name"
                 android:visibility="invisible" />
         </RelativeLayout>
-
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="2px"
+            android:background="@color/item_line" />
         <RelativeLayout
             android:id="@+id/show_time_rl"
             style="@style/IMTbleLine"
@@ -197,7 +210,10 @@
                 android:layout_marginRight="5dp"
                 android:contentDescription="@string/app_name" />
         </RelativeLayout>
-
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="2px"
+            android:background="@color/item_line" />
         <RelativeLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content">
@@ -205,13 +221,13 @@
             <Button
                 android:id="@+id/search_btn"
                 android:layout_width="match_parent"
-                android:layout_height="50dp"
-                android:layout_centerHorizontal="true"
-                android:layout_marginLeft="40dp"
-                android:layout_marginRight="40dp"
-                android:layout_marginTop="@dimen/line_big"
-                android:background="@drawable/bg_btn"
-                android:text="搜    索"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="20dp"
+                android:layout_marginRight="20dp"
+                android:layout_marginTop="30dp"
+                android:background="@drawable/bg_bule_btn"
+                android:padding="10dp"
+                android:text="提交"
                 android:textColor="@color/white"
                 android:textSize="@dimen/text_main" />
         </RelativeLayout>

WeiChat/src/main/res/menu/menu_visit_save.xml

@@ -4,6 +4,6 @@
 
     <item
         android:id="@+id/save"
-        android:title="保存"
+        android:title="发送"
         app:showAsAction="always" />
 </menu>