Browse Source

提交类型 修复bug
提交内容 修改会议出现两个情况

Bitliker 7 years ago
parent
commit
7fdb3de9a1

+ 8 - 8
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/me/MeFragment.java

@@ -501,15 +501,15 @@ public class MeFragment extends EasyFragment implements View.OnClickListener, On
                         , CommonUtil.getSharedPreferences(ct, "user_password"), ct);
                 break;
             case R.id.editInfoIv://个人资料
-//                if (BaseConfig.isDebug()) {
-//                    startActivity(new Intent(ct, CustomerManageActivity.class)
-//                    .putExtra(Constants.Intents.CALLER,"Sale")
-//                    .putExtra(Constants.Intents.TITLE,"Sale")
-//                    .putExtra(Constants.Intents.ID,0)
-//                    );
-//                } else {
+                if (BaseConfig.isDebug()) {
+                    startActivity(new Intent(ct, CustomerManageActivity.class)
+                    .putExtra(Constants.Intents.CALLER,"Sale")
+                    .putExtra(Constants.Intents.TITLE,"Sale")
+                    .putExtra(Constants.Intents.ID,0)
+                    );
+                } else {
                     ct.startActivity(new Intent(getActivity(), BaseInfoActivity.class));
-//                }
+                }
                 break;
             case R.id.rl_master_change:
                 if (!platform) {

+ 1 - 7
app_modular/appworks/src/main/java/com/uas/appworks/crm3_0/fragment/CustomerListDetailsFragment.java

@@ -76,8 +76,6 @@ public class CustomerListDetailsFragment extends BaseNetFragment {
         if (args != null) {
             mCondition = args.getString("mCondition");
             mCaller = args.getString("mCaller");
-            LogUtil.i("gong", "mCaller=" + mCaller);
-            LogUtil.i("gong", "mCondition=" + mCondition);
         }
         mRecyclerView = findViewById(R.id.mRecyclerView);
         mRecyclerView.setLayoutManager(new LinearLayoutManager(ct));
@@ -202,10 +200,6 @@ public class CustomerListDetailsFragment extends BaseNetFragment {
             }
         }
 
-        @Override
-        public int getItemViewType(int position) {
-            return listFields.get(position).getId();
-        }
 
         @Override
         public ViewHolder onCreateViewHolder(ViewGroup viewGroup, int type) {
@@ -214,7 +208,7 @@ public class CustomerListDetailsFragment extends BaseNetFragment {
 
         @Override
         public int getItemCount() {
-            return ListUtils.getSize(groupModels);
+            return ListUtils.getSize(listFields);
         }
 
         class ViewHolder extends RecyclerView.ViewHolder {

+ 4 - 6
app_modular/appworks/src/main/java/com/uas/appworks/crm3_0/fragment/CustomerListFragment.java

@@ -73,15 +73,13 @@ public class CustomerListFragment extends EasyFragment {
             if (position == 0) {
                 mCondition = "cu_sellercode=\'" + CommonUtil.getEmcode()+"\'";
             } else {
-                mCondition = "\"(\n" +
-                        "cu_sellercode in (\n" +
+                mCondition = "cu_sellercode in ( " +
                         " select em_code from employee left join job on em_defaulthsid=jo_subof where jo_subof=" +
                         " (select em_defaulthsid from employee where em_code =\'" + CommonUtil.getEmcode() + "\')" +
-                        ")" +
-                        ")";
+                        ")" ;
             }
-//            mCaller = "Device";
-//            mCondition = "1=1";
+            mCaller = "Device";
+            mCondition = "1=1";
             return CustomerListDetailsFragment.newInstance(mCaller, mCondition);
         }
 

+ 24 - 0
app_modular/appworks/src/main/res/drawable/ic_customer_list.xml

@@ -0,0 +1,24 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="20dp"
+    android:height="15dp"
+    android:viewportHeight="13"
+    android:viewportWidth="16">
+    <path
+        android:fillColor="@color/color_public_inquiry_quote"
+        android:fillType="evenOdd"
+        android:pathData="M1.5,0L14.5,0A1.5,1.5 0,0 1,16 1.5L16,1.5A1.5,1.5 0,0 1,14.5 3L1.5,3A1.5,1.5 0,0 1,0 1.5L0,1.5A1.5,1.5 0,0 1,1.5 0z"
+        android:strokeColor="#00000000"
+        android:strokeWidth="1" />
+    <path
+        android:fillColor="@color/color_public_inquiry_quote"
+        android:fillType="evenOdd"
+        android:pathData="M1.5,5L14.5,5A1.5,1.5 0,0 1,16 6.5L16,6.5A1.5,1.5 0,0 1,14.5 8L1.5,8A1.5,1.5 0,0 1,0 6.5L0,6.5A1.5,1.5 0,0 1,1.5 5z"
+        android:strokeColor="#00000000"
+        android:strokeWidth="1" />
+    <path
+        android:fillColor="@color/color_public_inquiry_quote"
+        android:fillType="evenOdd"
+        android:pathData="M1.5,10L14.5,10A1.5,1.5 0,0 1,16 11.5L16,11.5A1.5,1.5 0,0 1,14.5 13L1.5,13A1.5,1.5 0,0 1,0 11.5L0,11.5A1.5,1.5 0,0 1,1.5 10z"
+        android:strokeColor="#00000000"
+        android:strokeWidth="1" />
+</vector>