|
|
@@ -6,6 +6,7 @@ import android.os.Bundle;
|
|
|
import android.os.Handler;
|
|
|
import android.os.Message;
|
|
|
import android.text.Editable;
|
|
|
+import android.text.InputType;
|
|
|
import android.text.TextWatcher;
|
|
|
import android.view.KeyEvent;
|
|
|
import android.view.LayoutInflater;
|
|
|
@@ -253,6 +254,7 @@ public class DataFormDetailActivity extends BaseActivity implements View.OnClick
|
|
|
}
|
|
|
data.setMaxlength(String.valueOf(items.getIntValue("fd_maxlength")));
|
|
|
data.setName(items.getString("dg_caption"));
|
|
|
+ data.setReadonly(items.getString("dg_logictype"));
|
|
|
data.setField(items.getString("dg_field"));
|
|
|
data.setDetno(items.getIntValue("dg_sequence"));
|
|
|
data.setFdid(items.getIntValue("gd_id"));
|
|
|
@@ -320,6 +322,7 @@ public class DataFormDetailActivity extends BaseActivity implements View.OnClick
|
|
|
data.setMaxlength(String.valueOf(items.getIntValue("fd_maxlength")));
|
|
|
data.setName(items.getString("dg_caption"));
|
|
|
data.setField(items.getString("dg_field"));
|
|
|
+ data.setReadonly(items.getString("dg_logictype"));
|
|
|
data.setValue(items.getString("dg_value"));
|
|
|
data.setDetno(items.getIntValue("dg_sequence"));
|
|
|
data.setFdid(items.getIntValue("gd_id"));
|
|
|
@@ -834,7 +837,7 @@ public class DataFormDetailActivity extends BaseActivity implements View.OnClick
|
|
|
// }
|
|
|
model.text.setText(data.getName());
|
|
|
//
|
|
|
- if ("F".equals(data.getReadonly())) {
|
|
|
+ if ("F".equals(data.getReadonly())||"necessaryField".equals(data.getReadonly())) {
|
|
|
model.editText.setHint("请输入(必填)");
|
|
|
} else {
|
|
|
model.editText.setHint("请输入");
|
|
|
@@ -852,8 +855,11 @@ public class DataFormDetailActivity extends BaseActivity implements View.OnClick
|
|
|
model.editText.setText(DateFormatUtil.getStrDate4Date(new Date(), "yyyy-MM-dd HH:mm:ss"));
|
|
|
data.setValue(DateFormatUtil.getStrDate4Date(new Date(), "yyyy-MM-dd HH:mm:ss"));
|
|
|
}
|
|
|
+
|
|
|
+ }
|
|
|
+ if(data.getType().equals("N")){
|
|
|
+ model.editText.setRawInputType(InputType.TYPE_CLASS_NUMBER);
|
|
|
}
|
|
|
-
|
|
|
|
|
|
model.editText.setOnClickListener(new View.OnClickListener() {
|
|
|
@Override
|
|
|
@@ -1110,7 +1116,7 @@ public class DataFormDetailActivity extends BaseActivity implements View.OnClick
|
|
|
data.setField(items.getString("dg_field"));
|
|
|
data.setDetno(items.getIntValue("dg_sequence"));
|
|
|
data.setFdid(items.getIntValue("gd_id"));
|
|
|
-
|
|
|
+ data.setReadonly(items.getString("dg_logictype"));
|
|
|
data.setIsDefault(items.getIntValue("mdg_isdefault"));
|
|
|
data.setIsNeed(items.getIntValue("mdg_isdefault"));
|
|
|
data.setType(items.getString("dg_type"));
|