Browse Source

提交类型 处理bug
1.搜索客户界面进行搜索时候出现字体重叠,起因为由于该item采用的是相对布局,标题TextView是相对距离的textView上对齐 ,后来用户也采用该布局,但是直接把距离的textView的布局隐藏了,导致出现了错误,现在已经处理好本地测
2.外勤部分按照要求在更新外勤地址部分添加人员编号字段,获取外勤地址时候也添加字段保证获取的为当卡人员的地址,已经本地测试成功不影响功能

冲突 无

Bitliker 8 years ago
parent
commit
9506a9c933

+ 3 - 3
WeiChat/version.properties

@@ -1,5 +1,5 @@
-#Thu Dec 14 15:15:01 CST 2017
-debugName=160
+#Fri Dec 15 14:24:30 CST 2017
+debugName=164
 versionName=625
-debugCode=160
+debugCode=164
 versionCode=164

+ 13 - 0
app_modular/appmessages/src/main/java/com/modular/appmessages/model/MessageModel.java

@@ -0,0 +1,13 @@
+package com.modular.appmessages.model;
+
+/**
+ * Created by Bitlike on 2017/12/15.
+ */
+
+public class MessageModel {
+
+
+
+
+
+}

+ 1 - 2
app_modular/appworks/src/main/java/com/uas/appworks/CRM/erp/adapter/SelectAimAdapter.java

@@ -92,9 +92,8 @@ public class SelectAimAdapter extends RecyclerView.Adapter<RecyclerView.ViewHold
         holder.sub_tv.setText(getNull(model.getAddress()));
 
         if (model.getLatLng()==null){
-            holder.distance_tv.setVisibility(View.GONE);
+            holder.distance_tv.setText("");
         }else{
-            holder.distance_tv.setVisibility(View.VISIBLE);
             holder.distance_tv.setText(getKm(BaiduMapUtil.getInstence().getDistance(model.getLatLng())));
         }
         if (model.getTimes()==-1){

+ 5 - 1
app_modular/appworks/src/main/java/com/uas/appworks/CRM/erp/presenter/SelectAimPresenter.java

@@ -123,9 +123,13 @@ public class SelectAimPresenter implements OnHttpResultListener {
 
         //获取网络数据
         Map<String, Object> param = new HashMap<>();
-        param.put("condition", "1=1");
         param.put(isB2b ? "pageNumber" : "pageIndex", 1);
         param.put("pageSize", 1000);
+        String condition = "1=1";
+        if (!isB2b) {
+            condition = "md_emcode='" + CommonUtil.getEmcode() + "'";
+        }
+        param.put("condition", condition);
         String url = isB2b ? ApiConfig.getInstance(ApiUtils.getApiModel()).getmApiBase().getOutAddress : "mobile/getOutAddressDate.action";
         Request request = new Request.Bulider()
                 .setMode(Request.Mode.GET)

+ 3 - 1
app_modular/appworks/src/main/java/com/uas/appworks/OA/erp/presenter/MissionPresenter.java

@@ -299,9 +299,11 @@ public class MissionPresenter implements IMissionPresenter, OnHttpResultListener
         formStore.put("Md_visittime", entity.getVisitTime());//预计时间
         formStore.put("Md_longitude", entity.getLatLng().longitude);//经度
         formStore.put("Md_latitude", entity.getLatLng().latitude);//纬度
+        String emcode= CommonUtil.getEmcode();
+        formStore.put("Md_emcode",emcode);//纬度
         if (isB2b) {
             formStore.put("enuu", CommonUtil.getSharedPreferences(MyApplication.getInstance().getApplicationContext(), "companyEnUu"));
-            formStore.put("emcode", CommonUtil.getEmcode());
+            formStore.put("emcode", emcode);
         }
         param.put("formStore", JSONUtil.map2JSON(formStore));
         Bundle bundle = new Bundle();