日报UI调改及提交后跳转修改。通用表单着手做之前前备份2

WeiChat/src/main/java/com/xzjmyk/pm/activity/adapter/CommonDocApprovalFlowAdapter.java

@@ -18,7 +18,7 @@ import java.util.List;
 
 
 /**
- * 通用适配器
+ * 单据审批流通用适配器
  * 考勤单据里面的所有单据详情界面，审批流适配器都会用到这里
  * Created by FANGlh on 2016/11/16.
  */

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

@@ -49,7 +49,8 @@ public class CommonDocDetailsActivity extends BaseActivity {
     private int mkeyValue;
     private String mCaller;
     private int mNoc = 1;
-    private final static int COMMON_DOC_REQUEST = 1102;
+    private final static int COMMON_DOC_AF_REQUEST = 1101;
+    private final static int COMMON_DOC_MSG_REQUEST = 1102;
     private EmptyLayout mEmptyLayput_approvalflow;
     private CommonDocApprovalFlowAdapter mCommonDocApprovalFlowAdapter;
     private CommonApprovalFlowBean mCommonApprovalFlowBean;
@@ -106,6 +107,7 @@ public class CommonDocDetailsActivity extends BaseActivity {
                 getSupportActionBar().setTitle("特殊考勤申请");
             }
 
+            //请求获取单据审批流数据
             String url = Constants.getAppBaseUrl(getApplicationContext()) + "common/getCurrentJnodes.action";
             Map<String, Object> param = new HashMap<>();
             param.put("caller", mCaller);
@@ -113,33 +115,57 @@ public class CommonDocDetailsActivity extends BaseActivity {
             param.put("_noc", mNoc);
             LinkedHashMap headers = new LinkedHashMap();
             headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(getApplicationContext(), "sessionId"));
-            ViewUtil.httpSendRequest(getApplicationContext(), url, param, mHandler, headers, COMMON_DOC_REQUEST, null, null, "post");
+            ViewUtil.httpSendRequest(getApplicationContext(), url, param, mHandler, headers, COMMON_DOC_AF_REQUEST, null, null, "post");
         }else{
             mEmptyLayput_approvalflow.showEmpty();
         }
 
+        //请求获取单据提交内容数据
+        String docmsg_url = Constants.getAppBaseUrl(getApplicationContext()) + "mobile/common/getformandgriddata.action";
+        Map<String, Object> param = new HashMap<>();
+        param.put("caller", "Workovertime");
+        param.put("keyValue", mkeyValue);
+        LinkedHashMap headers = new LinkedHashMap();
+        headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(getApplicationContext(), "sessionId"));
+        ViewUtil.httpSendRequest(getApplicationContext(), docmsg_url, param, mHandler, headers, COMMON_DOC_MSG_REQUEST, null, null, "post");
+
+
     }
     public Handler mHandler = new Handler(){
         @Override
         public void handleMessage(Message msg) {
             switch (msg.what){
-                case COMMON_DOC_REQUEST:
-                    String result = msg.getData().getString("result");
-                    LogUtil.prinlnLongMsg("docurl", result);
-                    AFandAMshow(result);  //审批流和单据申请人信息展示
+                case COMMON_DOC_AF_REQUEST:
+                    String af_result = msg.getData().getString("result");
+                    LogUtil.prinlnLongMsg("afurl", af_result);
+                    AFshow(af_result);  //单据审批流信息展示
                     break;
+
+                case COMMON_DOC_MSG_REQUEST:
+                    String msg_result = msg.getData().getString("result");
+                    LogUtil.prinlnLongMsg("amurl", msg_result);
+                    AMshow(msg_result); //单据申请信息展示
+                    break;
+
                 case Constants.APP_SOCKETIMEOUTEXCEPTION:
-                Toast.makeText(CommonDocDetailsActivity.this, msg.getData().getString("result"), Toast.LENGTH_SHORT).show();
-                break;
+                    Toast.makeText(CommonDocDetailsActivity.this, msg.getData().getString("result"), Toast.LENGTH_SHORT).show();
+                    break;
             }
         }
     };
 
     /**
-     * 处理请求url后获取到的数据并显示
+     * 处理请求申请单据url后获取到的数据并显示
+     * @param msg_result
+     */
+    public void AMshow(String msg_result){
+
+    }
+    /**
+     * 处理请求审批流url后获取到的数据并显示
      * @param result
      */
-    public void AFandAMshow(String result){
+    public void AFshow(String result){
         try{
             JSONObject resultJsonObject = new JSONObject(result);
             //JSONArray dailynodeArray = resultJsonObject.getJSONArray("nodes");
@@ -233,7 +259,7 @@ public class CommonDocDetailsActivity extends BaseActivity {
                     String imPosition = String.valueOf(bean.getEM_POSITION());
 
                     name_tv.setText(imName);
-                    AvatarHelper.getInstance().displayAvatar(imId, photo_im, false);
+                    AvatarHelper.getInstance().display(imId, photo_im, true, false);  //显示圆角图片
                     section_tv.setText(imDepartment + ">" + imPosition);
 
                     Log.i("todo", "imId=" + imId + "imName" + imName + "imDepartment" + imDepartment + "imPosition" + imPosition);

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

@@ -97,7 +97,6 @@ public class SaleSelectActivity extends BaseActivity implements OnClickListener
     private int mPreviousVisibleItem;
     private int mketValue;
 
-
     private ArrayList<Map<String, Object>> rdata = new ArrayList<Map<String, Object>>();
     private Map<String, Object> rMap = new HashMap<String, Object>();//@注释：列表数据
 

WeiChat/src/main/res/layout/activity_common_docui.xml

@@ -78,28 +78,19 @@
                 android:orientation="vertical"
                 android:layout_marginLeft="10dp"
                 android:layout_marginRight="10dp">
-                <TextView
-                    style="@style/form_relative_right_text1"
-                    android:textColor="#575757"
-                    android:text="时间情况"/>
-                <View
+
+                <com.xzjmyk.pm.activity.view.MyListView
+                    android:id="@+id/common_docui_apply_msg_lv"
                     android:layout_width="match_parent"
-                    android:layout_height="1dp"
-                    android:background="@color/item_line"/>
-                <TextView
-                    style="@style/form_relative_right_text1"
-                    android:textColor="#575757"
-                    android:text="出差情况1"/>
+                    android:layout_height="wrap_content">
+                </com.xzjmyk.pm.activity.view.MyListView>
+
 
-                <TextView
-                    style="@style/form_relative_right_text1"
-                    android:textColor="#575757"
-                    android:text="出差情况2"/>
             </LinearLayout>
             <View
                 android:layout_width="match_parent"
                 android:layout_height="10dp"
-                android:background="@color/white"
+                android:background="@color/item_line"
                 android:layout_marginTop="5dp"
                 android:visibility="visible"/>
             <com.xzjmyk.pm.activity.view.MyListView