版本5.6.6版本正式版

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

@@ -5,6 +5,7 @@ import android.content.Intent;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
+import android.os.Parcelable;
 import android.text.Html;
 import android.text.TextUtils;
 import android.util.Log;
@@ -29,6 +30,7 @@ import com.xzjmyk.pm.activity.ui.erp.util.CommonInterface;
 import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.Constants;
 import com.xzjmyk.pm.activity.ui.erp.util.JsonValidator;
+import com.xzjmyk.pm.activity.ui.erp.util.LogUtil;
 import com.xzjmyk.pm.activity.ui.erp.view.SingleDialog;
 import com.xzjmyk.pm.activity.util.DateFormatUtil;
 import com.xzjmyk.pm.activity.util.StringUtils;
@@ -68,6 +70,12 @@ public class VisitReportAddActivity extends BaseActivity implements View.OnClick
     private FormEditText tv_visit_content;
     @ViewInject(R.id.tv_relate_business)
     private FormEditText tv_relate_business;
+
+
+    @ViewInject(R.id.tv_visit_type)
+    private FormEditText tv_visit_type;
+    
+    
     private int vp_id = -1;
 
     private int mVrId;
@@ -93,12 +101,16 @@ public class VisitReportAddActivity extends BaseActivity implements View.OnClick
             tv_relate_business.setKeyListener(null);
             tv_visit_steps.setOnClickListener(this);
             tv_relate_business.setOnClickListener(this);
+            tv_visit_type.setOnClickListener(this);
+            tv_visit_type.setKeyListener(null);
+            tv_visit_type.setFocusable(false);
             if (3 == getIntent().getIntExtra("type", -1)) {
                 setFocusable(tv_date_start, isMe && TextUtils.isEmpty(tv_date_start.getText()));
                 setFocusable(tv_date_end, isMe && TextUtils.isEmpty(tv_date_end.getText()));
                 setFocusable(tv_customer_login, isMe && TextUtils.isEmpty(tv_customer_login.getText()));
                 setFocusable(tv_address_login, isMe && TextUtils.isEmpty(tv_address_login.getText()));
                 setFocusable(tv_visit_theme, isMe && TextUtils.isEmpty(tv_visit_theme.getText()));
+                setFocusable(tv_visit_type, isMe && TextUtils.isEmpty(tv_visit_type.getText()));
             } else {
                 tv_date_start.setOnClickListener(this);
                 tv_date_start.setKeyListener(null);
@@ -117,6 +129,7 @@ public class VisitReportAddActivity extends BaseActivity implements View.OnClick
             tv_visit_theme.setFocusable(false);
             tv_address_login.setFocusable(false);
             tv_linksman_login.setFocusable(false);
+            tv_visit_type.setFocusable(false);
         }
     }
 
@@ -334,6 +347,7 @@ public class VisitReportAddActivity extends BaseActivity implements View.OnClick
             formStore =
                     "{\n" +
                             "\"vr_id\":" + mVrId + ",\n" +
+                            "\"vr_class\":\"" + tv_visit_type.getHint().toString() + "\",\n" +
                             "\"vr_code\":\"" + code
                             + "\",\n" +
                             "\"vr_visittime\":\""
@@ -467,6 +481,28 @@ public class VisitReportAddActivity extends BaseActivity implements View.OnClick
                 intent.putExtra("title", "关联商机");
                 startActivityForResult(intent, 0x24);
                 break;
+            case R.id.tv_visit_type:
+                intent = new Intent(ct, SelectActivity.class);
+                intent.putExtra("type", 2);
+                intent.putExtra("reid", R.style.OAThemeMeet);
+                List<SelectBean> beanList=new ArrayList<>();
+
+                //华东地区，华南地区，华北地区，华中地区，西南地区，西北地区，东北地区，港澳台地区，海外地区，其它地区
+                SelectBean ben=new SelectBean();
+                ben.setName("客户拜访");
+                ben.setObject("OfficeClerk");
+                ben.setJson("OfficeClerk");
+                beanList.add(ben);
+
+                ben=new SelectBean();
+                ben.setName("原厂拜访");
+                ben.setObject("VisitRecord!Vender");
+                ben.setJson("VisitRecord!Vender");
+                beanList.add(ben);
+                intent.putExtra("title", "拜访类型");
+                intent.putParcelableArrayListExtra("data", (ArrayList<? extends Parcelable>) beanList);
+                startActivityForResult(intent, 0x27);
+                break;
         }
     }
 
@@ -511,6 +547,12 @@ public class VisitReportAddActivity extends BaseActivity implements View.OnClick
                 JSONObject object = JSON.parseObject(b.getJson());
                 nichecode = object.getString("code");
             }
+        }else if(requestCode == 0x27 && resultCode == 0x20){
+            SelectBean b = data.getParcelableExtra("data");
+            LogUtil.d("b:"+JSON.toJSONString(b));
+            if (b == null || StringUtils.isEmpty(b.getJson())) return;
+            tv_visit_type.setText(b.getName());
+            tv_visit_type.setHint(b.getJson());
         }
     }
 

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

@@ -182,6 +182,8 @@
                 editTextFormExample:testType="nocheck" />
         </RelativeLayout>
 
+     
+
         <RelativeLayout
             style="@style/form_relative_customer"
             android:background="@color/white">
@@ -216,7 +218,42 @@
                 android:hint="请输入"
                 editTextFormExample:testType="nocheck" />
         </RelativeLayout>
+        <RelativeLayout
+            style="@style/form_relative_customer"
+            android:background="@color/white">
+
+            <TextView
+                android:id="@+id/tv_id61"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerVertical="true"
+                android:layout_marginLeft="20dp"
+                android:drawablePadding="10dp"
+                android:gravity="center"
+                android:text="拜访类型"
+                android:textColor="@color/text_main"
+                android:textSize="@dimen/text_main" />
 
+            <TextView
+                android:id="@+id/textView1"
+                style="@style/form_relative_left_text"
+                android:layout_marginLeft="20dp"
+                android:layout_toRightOf="@+id/tv_id61"
+                android:text="*"
+                android:visibility="invisible"
+                android:textColor="@color/red" />
+
+            <com.andreabaccega.widget.FormEditText
+                android:id="@+id/tv_visit_type"
+                style="@style/form_relative_right_text"
+                android:layout_centerVertical="true"
+                android:layout_marginLeft="11dp"
+                android:layout_toEndOf="@+id/textView1"
+                android:layout_toRightOf="@+id/textView1"
+                android:hint="请输入"
+                editTextFormExample:testType="nocheck" />
+        </RelativeLayout>
+        
         <RelativeLayout
             style="@style/form_relative_customer"
             android:background="@color/white">
@@ -250,6 +287,8 @@
                 editTextFormExample:testType="nocheck" />
         </RelativeLayout>
 
+  
+        
         <RelativeLayout
             style="@style/form_relative_customer"
             android:background="@color/white">