1.修改用户数据采集bug

2.//TODO 设备三个子菜单，退件详情（审核历史（缺接口））,领用申请列表（数据不对），坩埚下单，mes其他页面，编辑任务担当无法修改.支数参数

app/src/main/java/com/wd/workoffice/ui/activity/mes/user/MesChooseClientActivity.java

@@ -51,6 +51,7 @@ public class MesChooseClientActivity extends WorkToolBarActivity {
     private List<MesClientBean.ListBean> clientList;
     private UserDataClientAdapter clientAdapter;
     private int page = 1;
+    private Map<String, Object> paramMap;
 
     @Override
     protected void initView() {
@@ -65,7 +66,9 @@ public class MesChooseClientActivity extends WorkToolBarActivity {
         clientAdapter.bindToRecyclerView(rvClient);
         clientAdapter.setEmptyView(R.layout.view_empty_content, rvClient);
         param = WorkUtils.pageMesKey();
+        paramMap = WorkUtils.simpleParam();
         param.put("pageNum", 1);
+        param.put("paramMap",paramMap);
         getData();
     }
 
@@ -149,7 +152,7 @@ public class MesChooseClientActivity extends WorkToolBarActivity {
 
     @OnClick(R.id.btn_search)
     public void onViewClicked() {
-        param.put("customerName", etKey.getText().toString());
+        paramMap.put("customerName", etKey.getText().toString());
         param.put("pageNum", 1);
         page = 1;
         getData();

app/src/main/java/com/wd/workoffice/ui/activity/mes/user/MesUserDataConditionActivity.java

@@ -121,7 +121,7 @@ public class MesUserDataConditionActivity extends WorkToolBarActivity {
                     param.put("continuousCasterName", etMachine.getText().toString());
                 }
                 if (!TextUtils.isEmpty(etName.getText().toString())) {
-                    param.put("salesCompanyName", etName.getText().toString());
+                    param.put("customerUserName", etName.getText().toString());
                 }
                 Intent intent = new Intent();
                 intent.putExtra("param", JSON.toJSONString(param));

app/src/main/res/layout/activity_mes_user_data_cnd.xml

@@ -17,7 +17,7 @@
             android:paddingVertical="9mm">
 
             <TextView
-                android:layout_width="wrap_content"
+                android:layout_width="60mm"
                 android:layout_height="wrap_content"
                 android:layout_alignParentLeft="true"
                 android:text="客户名称"
@@ -27,7 +27,7 @@
                 android:id="@+id/et_name"
                 android:layout_width="0dp"
                 android:layout_height="30mm"
-                android:layout_marginLeft="40mm"
+                android:layout_marginLeft="30mm"
                 android:layout_marginRight="3mm"
                 android:layout_weight="1"
                 android:background="@drawable/shape_input_white"
@@ -47,17 +47,17 @@
             android:paddingVertical="9mm">
 
             <TextView
-                android:layout_width="wrap_content"
+                android:layout_width="60mm"
                 android:layout_height="wrap_content"
                 android:layout_alignParentLeft="true"
-                android:text="炼钢厂      "
+                android:text="炼钢厂"
                 android:textSize="14sp" />
 
             <EditText
                 android:id="@+id/et_factory"
                 android:layout_width="0dp"
                 android:layout_height="30mm"
-                android:layout_marginLeft="40mm"
+                android:layout_marginLeft="30mm"
                 android:layout_marginRight="3mm"
                 android:layout_weight="1"
                 android:background="@drawable/shape_input_white"
@@ -77,17 +77,17 @@
             android:paddingVertical="9mm">
 
             <TextView
-                android:layout_width="wrap_content"
+                android:layout_width="60mm"
                 android:layout_height="wrap_content"
                 android:layout_alignParentLeft="true"
-                android:text="连铸机      "
+                android:text="连铸机"
                 android:textSize="14sp" />
 
             <EditText
                 android:id="@+id/et_machine"
                 android:layout_width="0dp"
                 android:layout_height="30mm"
-                android:layout_marginLeft="40mm"
+                android:layout_marginLeft="30mm"
                 android:layout_marginRight="3mm"
                 android:layout_weight="1"
                 android:background="@drawable/shape_input_white"