产城服务备份

WeiChat/version.properties

@@ -1,5 +1,5 @@
-#Mon Nov 20 18:51:09 CST 2017
+#Mon Nov 20 19:22:27 CST 2017
 debugName=1
 versionName=618
-debugCode=45
+debugCode=49
 versionCode=118

app_modular/appworks/src/main/java/com/uas/appworks/activity/CommonDataFormActivity.java

@@ -158,7 +158,7 @@ public class CommonDataFormActivity extends BaseActivity implements View.OnClick
                             ArrayList<Data> itemData = new ArrayList<>();
                             ArrayList<Data> itemDataNet = new ArrayList<>();//传输给配置界面
                             String value = iter.next();
-                            
+
                             for (int i = 0; i < forms.size(); i++) {
                                 JSONObject items = forms.getJSONObject(i);
                                 Data data = new Data();
@@ -762,13 +762,13 @@ public class CommonDataFormActivity extends BaseActivity implements View.OnClick
         if (CommonUtil.getSharedPreferences(MyApplication.getInstance().getApplicationContext(), "erp_master")
                 .equals("USOFTSYS")) {
             if (PreferenceUtils.getBoolean(AppConfig.IS_ADMIN, false)) {
-                menu.findItem(R.id.oa_signin_set).setVisible(true);
+                menu.findItem(R.id.oa_signin_set).setVisible(false);
             } else {
                 menu.findItem(R.id.oa_signin_set).setVisible(false);
             }
         } else {
             if (PreferenceUtils.getBoolean(AppConfig.IS_ADMIN, false)) {
-                menu.findItem(R.id.oa_signin_set).setVisible(true);
+                menu.findItem(R.id.oa_signin_set).setVisible(false);
             } else {
                 menu.findItem(R.id.oa_signin_set).setVisible(false);
             }
@@ -813,7 +813,7 @@ public class CommonDataFormActivity extends BaseActivity implements View.OnClick
                     0x25);
         } else if (item.getItemId() == R.id.oa_leave) {
             startActivity(new Intent(mContext, CommonFormListActivity.class)
-                    .putExtra("serveId",mServeId)
+                    .putExtra("serveId", mServeId)
                     .putExtra("caller", caller)
                     .putExtra("title", getSupportActionBar().getTitle().toString()));
             if (formid != 0) {
@@ -1102,8 +1102,8 @@ public class CommonDataFormActivity extends BaseActivity implements View.OnClick
                     HashMap<String, Object> results = isLastItem(position);
                     final Integer categoryIndex = (Integer) results.get("categoryIndex");
                     model.text.setText(data.getName());
-                    
-                    if ("F".equals(data.getReadonly()) || 
+
+                    if ("F".equals(data.getReadonly()) ||
                             "necessaryField".equals(data.getReadonly())) {
                         model.editText.setHint("请输入(必填)");
                     } else {
@@ -1113,8 +1113,8 @@ public class CommonDataFormActivity extends BaseActivity implements View.OnClick
                             data.getType().equals("C") ||
                             data.getType().equals("MF") ||
                             data.getType().equals("SF") ||
-                            data.getType().equals("DF")||
-                            data.getType().equals("RG")||
+                            data.getType().equals("DF") ||
+                            data.getType().equals("RG") ||
                             data.getType().equals("CBG")) {
                         model.editText.setKeyListener(null);
                         model.editText.setFocusable(false);
@@ -1181,19 +1181,19 @@ public class CommonDataFormActivity extends BaseActivity implements View.OnClick
                             }
                             //单选，多选处理
                             if (data.getType().equals("MF") || data.getType().equals("SF")
-                                    ||data.getType().equals("RG")||
+                                    || data.getType().equals("RG") ||
                                     data.getType().equals("CBG")) {
                                 ArrayList<SelectBean> formBeaan = new ArrayList<>();
-                                String logicType=   data.getFd_logictype();
-                                String [] items=logicType.split(";");
-                                for (int i = 0; i <items.length ; i++) {
+                                String logicType = data.getFd_logictype();
+                                String[] items = logicType.split(";");
+                                for (int i = 0; i < items.length; i++) {
                                     SelectBean selectBean = new SelectBean();
                                     selectBean.setName(items[i]);
                                     formBeaan.add(selectBean);
                                 }
                                 Intent intent = new Intent(ct, SelectActivity.class);
                                 intent.putExtra("type", 2);//本地数据加载
-                                if (data.getType().equals("SF")||data.getType().equals("RG")) {
+                                if (data.getType().equals("SF") || data.getType().equals("RG")) {
                                     intent.putExtra("isSingle", true);
                                 } else {
                                     intent.putExtra("isSingle", false);
@@ -1421,7 +1421,7 @@ public class CommonDataFormActivity extends BaseActivity implements View.OnClick
                             muiltCallerMainTain(vaules, value);//维修申请单特殊处理
                         }
                         if ("SF".equals(vaules.getType()) || "DF".equals(vaules.getType())
-                                ||"RG".equals(vaules.getType())||"CBG".equals(vaules.getType())) {
+                                || "RG".equals(vaules.getType()) || "CBG".equals(vaules.getType())) {
                             mulitSelectUpdate(b, vaules);//联动字段选择
                         }
                         mulitAsk4Leave(b, vaules, value);//请假单特殊处理
@@ -1463,7 +1463,7 @@ public class CommonDataFormActivity extends BaseActivity implements View.OnClick
             case 0x21://多选
                 if (data == null) return;
                 ArrayList<SelectBean> muliData = data.getParcelableArrayListExtra("data");
-                LogUtil.d("HttpLogs","muliData:"+JSON.toJSONString(muliData));
+                LogUtil.d("HttpLogs", "muliData:" + JSON.toJSONString(muliData));
                 int id = data.getIntExtra("id", 0);
                 if (requestCode == id && resultCode == 0x21) {//多选框
                     StringBuilder str = new StringBuilder("");
@@ -1479,9 +1479,9 @@ public class CommonDataFormActivity extends BaseActivity implements View.OnClick
                         }
                     }
                     LogUtil.d(str.toString());
-                    mAdapter.getmListData().get(0).getDatas().get(id-1).setValue(str.toString());
+                    mAdapter.getmListData().get(0).getDatas().get(id - 1).setValue(str.toString());
                     //Toast.makeText(ct, "下拉项：" + datas.get(id - 1).getName() + "返回值：" + str.toString(), Toast.LENGTH_LONG).show();
-                   // mAdapter.get
+                    // mAdapter.get
                     mAdapter.notifyDataSetChanged();
                 }
                 break;
@@ -1681,10 +1681,10 @@ public class CommonDataFormActivity extends BaseActivity implements View.OnClick
      */
     private void mulitSelectUpdate(SelectBean b, Data vaules) {
         JSONObject jdata = JSON.parseObject(b.getJson());
-       
+
         Data tdata = JSON.parseObject(b.getObject(), Data.class);
-        mAdapter.getmListData().get(vaules.getGroupId()).getDatas().get(b.getId()-1).setValue(b.getName());
-        
+        mAdapter.getmListData().get(vaules.getGroupId()).getDatas().get(b.getId() - 1).setValue(b.getName());
+
         if (caller.equals("StandbyApplication")) {
             String cu_name = jdata.getString("cu_name");
             int sa_custname = 0;