已审批，待审批，字体颜色调试

WeiChat/src/main/AndroidManifest.xml

@@ -2,8 +2,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     package="com.xzjmyk.pm.activity"
-    android:versionCode="71"
-    android:versionName="5.5.7">
+    android:versionCode="72"
+    android:versionName="5.5.9">
 
     <uses-sdk
         android:minSdkVersion="11"

WeiChat/src/main/java/com/xzjmyk/pm/activity/adapter/WorkDailyAdapter.java

@@ -2,6 +2,7 @@
 package com.xzjmyk.pm.activity.adapter;
 
 import android.content.Context;
+import android.graphics.Color;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.BaseAdapter;
@@ -69,8 +70,12 @@ public class WorkDailyAdapter extends BaseAdapter {
         }else{
             viewHolder.WorkDailyDate.setText(mWorkDailyBeanList.get(position).getWD_DATE());
         }
-
-        //为日报列表界面赋值（状态，总结）
+        //为日报列表界面赋值（状态，总结）,注意已审批和待审批的字体颜色
+        if(mWorkDailyBeanList.get(position).getSTATUS().equals("已审批")){
+            viewHolder.WorkDailyStatus.setTextColor(Color.GREEN);
+        }else {
+            viewHolder.WorkDailyStatus.setTextColor(Color.RED);
+        }
         viewHolder.WorkDailyStatus.setText(mWorkDailyBeanList.get(position).getSTATUS());
         viewHolder.WorkDailySummary.setText(mWorkDailyBeanList.get(position).getWD_COMMENT());
         return convertView;

WeiChat/src/main/java/com/xzjmyk/pm/activity/bean/oa/OABean.java

@@ -40,7 +40,15 @@ public class OABean implements Parcelable {
     private String vp_custcode;//联系人编号
     private String nichestep;//沟通阶段
     private String vp_contact;//联系人
+    private String vp_cucontact;//pc联系人
 
+    public String getVp_cucontact() {
+        return vp_cucontact;
+    }
+
+    public void setVp_cucontact(String vp_cucontact) {
+        this.vp_cucontact = vp_cucontact;
+    }
 
     public OABean() {
     }

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

@@ -142,7 +142,7 @@ public class VisitReportAddActivity extends BaseActivity implements View.OnClick
             tv_date_start.setText(getJSONString(object, "vr_visittime"));
             tv_date_end.setText(getJSONString(object, "vr_visitend"));
             tv_customer_login.setText(getJSONString(object, "custname"));
-            tv_linksman_login.setText(getJSONString(object, "vr_cucontact"));
+            tv_linksman_login.setText(getJSONString(object, "vr_contact"));
             tv_address_login.setText(getJSONString(object, "address"));
             tv_visit_theme.setText(getJSONString(object, "vr_title"));
             tv_visit_steps.setText(getJSONString(object, "vr_nichestep"));

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

@@ -1,6 +1,7 @@
 package com.xzjmyk.pm.activity.ui.erp.activity.oa;
 
 import android.content.Intent;
+import android.graphics.Color;
 import android.os.Bundle;
 import android.text.TextUtils;
 import android.view.View;
@@ -133,6 +134,11 @@ public class DailydetailsActivity extends BaseActivity {
         if (!TextUtils.isEmpty(summary) && !TextUtils.isEmpty(status) && !TextUtils.isEmpty(date)) {
             wdd_data.setText(date);
             wdd_summary.setText(summary);
+            if(status.equals("已审批")){
+                wdd_status.setTextColor(Color.GREEN);
+            }else{
+                wdd_status.setTextColor(Color.RED);
+            }
             wdd_status.setText(status);
             wdd_plan.setText(plan);
             wdd_experience.setText(experience);

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

@@ -161,9 +161,9 @@ public class WorkDailyAddActivity extends BaseActivity implements View.OnTouchLi
        add_submit.setOnClickListener(new View.OnClickListener() {
            @Override
            public void onClick(View v) {
-               if(add_summary.testValidity()){
+             //  if(add_summary.testValidity()){
                    sendAble();
-               }
+           //    }
            }
        });
        share_experience.setOnClickListener(new View.OnClickListener() {

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

@@ -47,6 +47,7 @@
                     android:minHeight="120dp"
                     android:padding="5dp"
                     android:maxHeight="1000dp"
+
                     />
                 <View
                     android:layout_width="match_parent"

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

@@ -520,7 +520,6 @@
     </style>
     <!--适用于考勤单据修改后style-->
     <style name="from_button_base_bule2">
-
         <item name="android:layout_marginBottom">10dp</item>
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">45dp</item>