提交类型 修改前备份

提交内容  修改通用单据详情前备份

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/WebViewCommActivity.java

@@ -222,7 +222,7 @@ public class WebViewCommActivity extends BaseActivity implements View.OnClickLis
         Log.d("webUrl", url);
         webView.loadUrl(url, headers);
 //        webView.getRefreshableView().loadUrl("file:///android_asset/submit.html");
-        webView.setWebChromeClient(new WebChromeClient());
+        webView.setWebChromeClient(new ChromeClient());
         webView.setWebViewClient(new WebViewClient(){
             @Override
             public void onReceivedError(WebView view, int errorCode, String description, String failingUrl) {

WeiChat/version.properties

@@ -1,5 +1,5 @@
-#Mon Feb 26 17:52:29 CST 2018
-debugName=267
-versionName=619
-debugCode=267
-versionCode=158
+#Mon Mar 05 14:00:03 CST 2018
+debugName=274
+versionName=621
+debugCode=274
+versionCode=160

app_core/common/src/main/java/com/core/app/MyApplication.java

@@ -252,6 +252,7 @@ public class MyApplication extends BaseApplication {
     }
 
     public void initShareAPI() {
+        //wxd1deafafe3fd9a21
         PlatformConfig.setWeixin("wx2539cc96bf158e00", "b057aa3e807ba7c505a2f03cc541bbf6");
         PlatformConfig.setSinaWeibo("493318722", "7def652c3683603b08bab87d34b1f944");
         PlatformConfig.setQQZone("1104894295", "Nk8zMIz5YSqwRQ1F");

app_core/common/src/main/java/com/core/utils/CommonUtil.java

@@ -541,7 +541,7 @@ public class CommonUtil {
             }
         }
         if (StringUtil.isEmpty(name)) {
-            name = MyApplication.getInstance().mLoginUser.getNickName();
+//            name = MyApplication.getInstance().mLoginUser.getNickName();
         }
         return StringUtil.isEmpty(name) ? "" : name;
     }

app_modular/appmessages/src/main/AndroidManifest.xml

@@ -21,15 +21,15 @@
         <activity
             android:name=".activity.ProcessMsgActivity"
             android:label="@string/title_activity_process_msg">
-            <intent-filter>
-                <action android:name="com.modular.work.ProcessMsgActivity" />
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
+
         </activity>
         <activity
             android:name=".activity.ApprovalListActivity"
             android:label="@string/title_activity_process_msg">
-
+            <intent-filter>
+                <action android:name="com.modular.work.ProcessMsgActivity" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
         </activity>
 
         <activity android:name=".activity.AppWebViewActivity" />

app_modular/appmessages/src/main/java/com/modular/appmessages/activity/ApprovalListActivity.java

@@ -87,6 +87,16 @@ public class ApprovalListActivity extends BaseNetActivity implements View.OnClic
         initLoad();
     }
 
+    @Override
+    protected void onResume() {
+        super.onResume();
+        if (tab == 1) {
+            mVoiceSearchView.setText("");
+            loadProcessToDo();
+        }
+
+    }
+
     private void initLoad() {
         loadProcessToDo();
     }
@@ -340,7 +350,7 @@ public class ApprovalListActivity extends BaseNetActivity implements View.OnClic
 
     private void showAdapter(List<ApprovalList> approvalLists) {
         ToastUtil.showToast(ct, getString(R.string.common_up_finish));
-        if (ListUtils.isEmpty(approvalLists) && page == 0) {
+        if (ListUtils.isEmpty(approvalLists) && page <= 1) {
             mEmptyLayout.showEmpty();
             if (tab == 1) {
                 tv_process_un_num.setVisibility(View.GONE);
@@ -352,14 +362,12 @@ public class ApprovalListActivity extends BaseNetActivity implements View.OnClic
                 tv_process_un_num.setText(numSize > 99 ? "99+" : (numSize <= 0 ? "" : String.valueOf(numSize)));
                 Collections.sort(approvalLists, mComparator);
             }
-
-            if (mApprovalListAdapter == null) {
-                mApprovalListAdapter = new ApprovalListAdapter(approvalLists);
-                mListView.setAdapter(mApprovalListAdapter);
-            } else {
-                mApprovalListAdapter.setApprovalLists(approvalLists);
-            }
-
+        }
+        if (mApprovalListAdapter == null) {
+            mApprovalListAdapter = new ApprovalListAdapter(approvalLists);
+            mListView.setAdapter(mApprovalListAdapter);
+        } else {
+            mApprovalListAdapter.setApprovalLists(approvalLists);
         }
     }
 

app_modular/appmessages/src/main/java/com/modular/appmessages/presenter/MessagePresenter.java

@@ -1246,7 +1246,7 @@ public class MessagePresenter implements OnHttpResultListener {
                 if (isB2b) {
                     ct.startActivity(new Intent(ct, ProcessB2BActivity.class));
                 } else {
-                    ct.startActivity(new Intent(ct, ProcessMsgActivity.class));
+                    ct.startActivity(new Intent(ct, ApprovalListActivity.class));
                 }
                 break;
             case 5:

app_modular/appworks/src/main/java/com/uas/appworks/OA/erp/activity/ChangeMobileActivity.java

@@ -294,10 +294,7 @@ public class ChangeMobileActivity extends BaseActivity {
         Map<String, Object> param = new HashMap<>();
         param.put("caller", caller);
         Map<String, Object> params = new HashMap<>();
-        String emname = CommonUtil.getSharedPreferences(ct, "erp_emname");
-        if (StringUtil.isEmpty(emname)) {
-            emname = MyApplication.getInstance().mLoginUser.getNickName().trim();
-        }
+        String emname = CommonUtil.getName();
         params.put("ms_emname", emname);
         params.put("ms_remark", message);
         params.put("ms_status", "在录入");

app_modular/appworks/src/main/java/com/uas/appworks/OA/erp/activity/CommonDocDetailsActivity.java

@@ -653,8 +653,8 @@ public class CommonDocDetailsActivity extends BaseActivity {
         }
         if (device) {
             LogUtil.i("real_status=" + real_status);
-            resanddel_ll.setVisibility(View.GONE);
             if (real_status.equals("已审核") && !StringUtil.isEmpty(mCaller) && (mCaller.equals("DeviceChange!Use") || mCaller.equals("DeviceChange!Inspect"))) {
+                resanddel_ll.setVisibility(View.GONE);
                 sureTv.setVisibility(View.VISIBLE);
                 sureTv.setOnClickListener(new View.OnClickListener() {
                     @Override
@@ -959,41 +959,12 @@ public class CommonDocDetailsActivity extends BaseActivity {
 
 
                     } else {  //已提交状态可进行反提交
-                        new AlertDialog
-                                .Builder(mContext)
-                                .setTitle(getString(R.string.common_notice))
-                                .setMessage(getString(R.string.daily_resubmit_notice1))
-                                .setNegativeButton(getString(R.string.common_cancel), null)
-                                .setPositiveButton(getString(R.string.common_sure), new DialogInterface.OnClickListener() {
-                                    @Override
-                                    public void onClick(DialogInterface dialog, int which) {
-                                        Map<String, Object> params = new HashMap<>();
-                                        params.put("caller", mCaller);
-                                        params.put("id", mkeyValue);
-                                        LinkedHashMap<String, Object> headers = new LinkedHashMap<>();
-                                        headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(ct, "sessionId"));
-                                        String url = "";
-                                        if ("ExtraWork$".equals(mCaller)) { // 新的加班单反提交
-                                            url = CommonUtil.getAppBaseUrl(ct) + "/hr/attendance/resSubmitExtraWork.action";
-                                            ViewUtil.httpSendRequest(ct, url, params, mHandler, headers, NEW_DOC_RESUB_SUCCESSFUL, null, null, "post");
-
-                                        } else if ("FeePlease!FYBX".equals(mCaller)) { // 报销单
-                                            url = CommonUtil.getAppBaseUrl(ct) + "oa/fee/resSubmitFeePlease.action";
-                                            ViewUtil.httpSendRequest(ct, url, params, mHandler, headers, 0x01, null, null, "post");
-                                        } else { // 通用老的反提交
-                                            url = CommonUtil.getAppBaseUrl(ct) + "/mobile/commonres.action";
-                                            ViewUtil.httpSendRequest(ct, url, params, mHandler, headers, COM_DOC_RESUB_SUCCESSFUL, null, null, "post");
-                                        }
-
-                                    }
-                                }).show();
+                        reSubmit();
                     }
 
                 }
             });
-
         }
-
         // 删除
         delete_ll.setOnClickListener(new View.OnClickListener() {
             @Override
@@ -1045,6 +1016,37 @@ public class CommonDocDetailsActivity extends BaseActivity {
         });
     }
 
+    private void reSubmit() {
+        new AlertDialog
+                .Builder(mContext)
+                .setTitle(getString(R.string.common_notice))
+                .setMessage(getString(R.string.daily_resubmit_notice1))
+                .setNegativeButton(getString(R.string.common_cancel), null)
+                .setPositiveButton(getString(R.string.common_sure), new DialogInterface.OnClickListener() {
+                    @Override
+                    public void onClick(DialogInterface dialog, int which) {
+                        Map<String, Object> params = new HashMap<>();
+                        params.put("caller", mCaller);
+                        params.put("id", mkeyValue);
+                        LinkedHashMap<String, Object> headers = new LinkedHashMap<>();
+                        headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(ct, "sessionId"));
+                        String url = "";
+                        if ("ExtraWork$".equals(mCaller)) { // 新的加班单反提交
+                            url = CommonUtil.getAppBaseUrl(ct) + "/hr/attendance/resSubmitExtraWork.action";
+                            ViewUtil.httpSendRequest(ct, url, params, mHandler, headers, NEW_DOC_RESUB_SUCCESSFUL, null, null, "post");
+
+                        } else if ("FeePlease!FYBX".equals(mCaller)) { // 报销单
+                            url = CommonUtil.getAppBaseUrl(ct) + "oa/fee/resSubmitFeePlease.action";
+                            ViewUtil.httpSendRequest(ct, url, params, mHandler, headers, 0x01, null, null, "post");
+                        } else { // 通用老的反提交
+                            url = CommonUtil.getAppBaseUrl(ct) + "/mobile/commonres.action";
+                            ViewUtil.httpSendRequest(ct, url, params, mHandler, headers, COM_DOC_RESUB_SUCCESSFUL, null, null, "post");
+                        }
+
+                    }
+                }).show();
+    }
+
     private void getapplypeomsg(String em_number) {
         if (TextUtils.isEmpty(em_number)) {
             String whichsys = CommonUtil.getSharedPreferences(mContext, "erp_master");

app_modular/appworks/src/main/res/layout/activity_device_match.xml

@@ -18,7 +18,7 @@
             android:gravity="center_vertical"
             android:maxLines="2"
             android:paddingLeft="6dp"
-            android:text="部门编号"
+            android:text="部门名称"
             android:textSize="14sp" />
 
         <TextView
@@ -30,7 +30,6 @@
             android:paddingLeft="10dp"
             android:textSize="14sp" />
     </LinearLayout>
-
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -45,11 +44,11 @@
             android:gravity="center_vertical"
             android:maxLines="2"
             android:paddingLeft="6dp"
-            android:text="线别"
+            android:text="车间"
             android:textSize="14sp" />
 
         <TextView
-            android:id="@+id/lineCodeEd"
+            android:id="@+id/workShopEd"
             android:layout_width="match_parent"
             android:layout_height="36dp"
             android:background="@drawable/shape_corner_white_bg"
@@ -57,6 +56,7 @@
             android:paddingLeft="10dp"
             android:textSize="14sp" />
     </LinearLayout>
+
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -71,11 +71,11 @@
             android:gravity="center_vertical"
             android:maxLines="2"
             android:paddingLeft="6dp"
-            android:text="车间"
+            android:text="线别"
             android:textSize="14sp" />
 
         <TextView
-            android:id="@+id/workShopEd"
+            android:id="@+id/lineCodeEd"
             android:layout_width="match_parent"
             android:layout_height="36dp"
             android:background="@drawable/shape_corner_white_bg"