单据提交 客户详情-客户添加 5.3.12 9-26

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

@@ -250,11 +250,20 @@ public class VisitReportAddActivity extends BaseActivity implements View.OnClick
                             "\"vr_detail\":\"" +
                             CommonUtil.getNoMarkEditText(tv_visit_content) +
                             "\",\n" +
+
                             "\"vr_recorddate\":\"" +
                             DateFormatUtil.getStrDate4Date(new Date(), "yyyy-MM-dd") +
                             "\",\n" +
+
                             "\"vr_recorder\":\"" +
-                            CommonUtil.getSharedPreferences(ct, "erp_username") +
+                            MyApplication.getInstance().mLoginUser.getNickName() +
+                            "\",\n" +
+                            //TODO 修改
+                            "\"vr_status\":\"" +
+                            "在录入" +
+                            "\",\n" +
+                            "\"vr_cuuu\":\"" +
+                            cu_code +
                             "\",\n" +
                             "\"vr_visitend\":\"" +
                             tv_date_end.getText().toString() +//结束时间

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

@@ -73,13 +73,14 @@ public class VisitReportPlanActivity extends BaseActivity implements View.OnClic
 
     @Override
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
-        if (data==null) return;
+        if (data == null) return;
         if (requestCode == 0x22 && resultCode == 0x20) {
             SelectListBean b = data.getParcelableExtra("data");
             if (b == null || StringUtils.isEmpty(b.getObject())) return;
             JsonValidator validator = new JsonValidator();
             if (validator.validate(b.getObject())) {
                 JSONObject object = JSON.parseObject(b.getObject());
+                vp_code = object.containsKey("CU_CODE") ? object.getString("CU_CODE") : "";
                 tv_customer_login.setText(object.containsKey("CU_NAME") ? object.getString("CU_NAME") : " ");
                 tv_linksman_login.setText(object.containsKey("CU_CONTACT") ? object.getString("CU_CONTACT") : " ");
                 tv_address_login.setText(object.containsKey("CU_ADD1") ? object.getString("CU_ADD1") : " ");

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

@@ -65,7 +65,7 @@ public class UserSelectActivity extends BaseActivity {
             switch (msg.what) {
                 case WHAT_LOAD:
                     JSONArray array = JSON.parseObject(message).getJSONArray("datas");//获取到数据
-                    Log.d("userMsg",array.toString());
+                    Log.d("userMsg", array.toString());
                     if (array == null || array.size() <= 0) return;
                     Employees entity = null;
                     String code = null;//em_code
@@ -221,12 +221,12 @@ public class UserSelectActivity extends BaseActivity {
 
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
-        getMenuInflater().inflate(R.menu.menu_visit_save, menu);
+        if (!isSingle)
+            getMenuInflater().inflate(R.menu.menu_visit_save, menu);
         return super.onCreateOptionsMenu(menu);
     }
 
     private void init() {
-
         if (isNet) {
             getDataByNet();
         } else {

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

@@ -113,7 +113,7 @@ public class SigninFragment extends EasyFragment implements View.OnClickListener
                         } else {
                             Crouton.makeText(ct, "当前账号没有分配公司地址，请联系管理员!!");
                         }
-                        if (jsonObject.containsKey("wd_degree") && jsonObject.getInteger("wd_degree") > 0) {//当该用户有排班
+                        if (jsonObject.containsKey("wd_degree") ) {//当该用户有排班
                             //用户有排班时候
                             setDataByDegree(jsonObject);
                         } else {
@@ -512,10 +512,10 @@ public class SigninFragment extends EasyFragment implements View.OnClickListener
     private void setDataForAdapter(ArrayList<Bean> beans) {
         if (adapter == null) {
             adapter = new SigninAdapter(ct);
-            adapter.setBeans(beans,isToday);
+            adapter.setBeans(beans, isToday);
             listview.setAdapter(adapter);
         } else {
-            adapter.setBeans(beans,isToday);
+            adapter.setBeans(beans, isToday);
             adapter.notifyDataSetChanged();
         }
     }