工资条接口对接

app_modular/appme/src/main/java/com/uas/appme/settings/activity/TableListActivity.java

@@ -150,6 +150,7 @@ public class TableListActivity extends BaseActivity {
                 tableView.deskcode_et = (FormEditText) convertView.findViewById(R.id.deskcode_et);
                 tableView.number_et = (FormEditText) convertView.findViewById(R.id.number_et);
                 tableView.remark_et = (FormEditText) convertView.findViewById(R.id.remark_et);
+                tableView.days_et = (FormEditText) convertView.findViewById(R.id.days_et);
                 convertView.setTag(tableView);
                 tableView.type_et.setFocusable(false);
                 tableView.type_et.setKeyListener(null);
@@ -168,12 +169,12 @@ public class TableListActivity extends BaseActivity {
             tableView.deskcode_et.setText(modeList.get(position).getAs_deskcode()+"");
             tableView.number_et.setText(modeList.get(position).getAs_number()+"");
             tableView.remark_et.setText(modeList.get(position).getAs_remark()+"");
-
+            tableView.days_et.setText(modeList.get(position).getAs_booknumber()+"");
             return convertView;
         }
 
         class TableView{
-            FormEditText type_et,deskcode_et,number_et,remark_et;
+            FormEditText type_et,deskcode_et,number_et,remark_et,days_et;
         }
     }
 }

app_modular/appme/src/main/java/com/uas/appme/settings/activity/TableSetActivity.java

@@ -82,6 +82,7 @@ public class TableSetActivity extends BaseActivity implements View.OnClickListen
             model.setAs_remark("");
             model.setAs_id("0");
             model.setAs_companyid(as_companyid);
+            model.setAs_booknumber("");
             tableList.add(model);
             myAdapter.notifyDataSetChanged();
         }else{
@@ -98,7 +99,7 @@ public class TableSetActivity extends BaseActivity implements View.OnClickListen
             model.setAs_number(JSON.parseObject(updateData).getString("as_number"));
             model.setAs_type(JSON.parseObject(updateData).getString("as_type"));
             model.setAs_remark(JSON.parseObject(updateData).getString("as_remark"));
-
+            model.setAs_booknumber(JSON.parseObject(updateData).getString("as_booknumber"));
             tableList.add(model);
             myAdapter.notifyDataSetChanged();
         }
@@ -222,7 +223,8 @@ public class TableSetActivity extends BaseActivity implements View.OnClickListen
         int c_size = tableList.size();
         if (!StringUtil.isEmpty(tableList.get(c_size-1).getAs_deskcode()) &&
                 !StringUtil.isEmpty(tableList.get(c_size-1).getAs_remark()) &&
-                !StringUtil.isEmpty(tableList.get(c_size-1).getAs_number())){
+                !StringUtil.isEmpty(tableList.get(c_size-1).getAs_number()) &&
+                !StringUtil.isEmpty(tableList.get(c_size-1).getAs_booknumber())){
             canOrNot = true;
         }else {
             ToastMessage("请输全设置信息");
@@ -263,6 +265,7 @@ public class TableSetActivity extends BaseActivity implements View.OnClickListen
                 tableView.deskcode_et = (FormEditText) convertView.findViewById(R.id.deskcode_et);
                 tableView.number_et = (FormEditText) convertView.findViewById(R.id.number_et);
                 tableView.remark_et = (FormEditText) convertView.findViewById(R.id.remark_et);
+                tableView.days_et = (FormEditText) convertView.findViewById(R.id.days_et);
                 convertView.setTag(tableView);
                 tableView.type_et.setFocusable(false);
                 tableView.type_et.setKeyListener(null);
@@ -272,6 +275,8 @@ public class TableSetActivity extends BaseActivity implements View.OnClickListen
                 tableView.number_et.setKeyListener(null);
                 tableView.remark_et.setFocusable(false);
                 tableView.remark_et.setKeyListener(null);
+                tableView.days_et.setFocusable(false);
+                tableView.days_et.setKeyListener(null);
 
             }else {
                 tableView = (TableView) convertView.getTag();
@@ -302,18 +307,24 @@ public class TableSetActivity extends BaseActivity implements View.OnClickListen
                     doInput(3,position);
                 }
             });
+            tableView.days_et.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    doInput(4,position);
+                }
+            });
 
             //showdata
             tableView.type_et.setText(modeList.get(position).getAs_type()+"");
             tableView.deskcode_et.setText(modeList.get(position).getAs_deskcode()+"");
             tableView.number_et.setText(modeList.get(position).getAs_number()+"");
             tableView.remark_et.setText(modeList.get(position).getAs_remark()+"");
-
+            tableView.days_et.setText(modeList.get(position).getAs_booknumber());
             return convertView;
         }
 
         class TableView{
-            FormEditText type_et,deskcode_et,number_et,remark_et;
+            FormEditText type_et,deskcode_et,number_et,remark_et,days_et;
         }
     }
     private PopupWindow popupWindow = null;
@@ -343,6 +354,12 @@ public class TableSetActivity extends BaseActivity implements View.OnClickListen
             editname_et2.setVisibility(View.GONE);
             title_tv.setText("请输入备注");
             editname_et.setText(tableList.get(position).getAs_remark()+"");
+        }else if (type == 4){
+            editname_et.setVisibility(View.GONE);
+            editname_et2.setVisibility(View.VISIBLE);
+            title_tv.setText("请可被预约量/天");
+            editname_et2.setHint(getString(R.string.common_input));
+            editname_et2.setText(tableList.get(position).getAs_booknumber()+"");
         }
         int w_screen = dm.widthPixels;
         int h_screen = dm.heightPixels;
@@ -382,6 +399,14 @@ public class TableSetActivity extends BaseActivity implements View.OnClickListen
                         tableList.get(position).setAs_remark(editname_et.getText().toString());
                         myAdapter.notifyDataSetChanged();
                     }
+                }else if (type == 4){
+                    if (StringUtil.isEmpty(editname_et2.getText().toString())){
+                        ToastMessage("请可被预约量/天");
+                        return;
+                    }else {
+                        tableList.get(position).setAs_booknumber(editname_et2.getText().toString());
+                        myAdapter.notifyDataSetChanged();
+                    }
                 }
                 popupWindow.dismiss();
             }

app_modular/appme/src/main/java/com/uas/appme/settings/model/TableMode.java

@@ -10,9 +10,18 @@ public class TableMode {
     private String as_type;
     private String as_deskcode;
     private String as_number;
+    private String as_booknumber;
     private String as_remark;
     private String as_companyid;
 
+    public String getAs_booknumber() {
+        return as_booknumber;
+    }
+
+    public void setAs_booknumber(String as_booknumber) {
+        this.as_booknumber = as_booknumber;
+    }
+
     public String getAs_id() {
         return as_id;
     }

app_modular/appme/src/main/res/layout/table_item.xml

@@ -94,6 +94,37 @@
             android:layout_alignParentRight="true"
             android:layout_alignParentEnd="true" />
     </RelativeLayout>
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="1px"
+        android:background="@color/item_line" />
+    <RelativeLayout
+        style="@style/IMTbleLine2"
+        android:layout_height="50dp"
+        android:background="@color/white">
+        <TextView
+            style="@style/form_relative_left_text"
+            android:text="可被预约量/天"
+            android:layout_marginLeft="0dp"
+            android:textColor="@color/text_main"
+            android:textSize="15sp"/>
+
+        <com.andreabaccega.widget.FormEditText
+            android:id="@+id/days_et"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textColor="@color/dark_dark_grey"
+            android:padding="10dp"
+            android:background="@null"
+            android:hint="@string/common_input"
+            android:textSize="15sp"
+            android:inputType="number"
+            android:gravity="center_vertical|right"
+            android:maxLength="4"
+            android:layout_alignParentTop="true"
+            android:layout_alignParentRight="true"
+            android:layout_alignParentEnd="true" />
+    </RelativeLayout>
     <View
         android:layout_width="match_parent"
         android:layout_height="1px"
@@ -123,7 +154,7 @@
             android:hint="@string/common_input"
             android:textSize="15sp"
             android:gravity="center_vertical|right"
-            android:maxLength="10"
+            android:maxLength="2"
             />
     </RelativeLayout>
 </LinearLayout>