午睡

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

@@ -171,7 +171,7 @@ public class PlatWDdetailyActivity extends BaseActivity {
     }
 
     private void loadPlatAppFlow(String mCaller, int mkeyValue) {
-        String url = ApiConfig.getInstance(ApiUtils.getApiModel()).getmApiBase().common_app_flow_nodes;
+        String url = ApiConfig.getInstance(ApiUtils.getApiModel()).getmApiBase().common_app_flow_nodes_url;
         Map<String,Object> param = new HashMap<>();
         param.put("id",mkeyValue);
         param.put("caller",mCaller);

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/platform/pageforms/FormDetailActivity.java

@@ -2,6 +2,9 @@ package com.xzjmyk.pm.activity.ui.platform.pageforms;
 
 import android.content.Intent;
 import android.os.Bundle;
+import android.os.Handler;
+import android.os.Message;
+import android.util.Log;
 import android.widget.SimpleAdapter;
 
 import com.alibaba.fastjson.JSON;
@@ -10,23 +13,39 @@ import com.alibaba.fastjson.TypeReference;
 import com.handmark.pulltorefresh.library.PullToRefreshListView;
 import com.lidroid.xutils.ViewUtils;
 import com.lidroid.xutils.view.annotation.ViewInject;
+import com.xzjmyk.pm.activity.MyApplication;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
+import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
+import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
+import com.xzjmyk.pm.activity.ui.erp.util.LogUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.StringUtils;
+import com.xzjmyk.pm.activity.view.MyListView;
+import com.xzjmyk.pm.activity.wxapi.ApiConfig;
+import com.xzjmyk.pm.activity.wxapi.ApiUtils;
 
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.List;
+import java.util.Map;
 
 public class FormDetailActivity extends BaseActivity {
 
+    private static final int PLAT_APP_FLOW_NODES = 0x318;
+    private static final int COMMON_DOC_DETAILY = 0x319;
     @ViewInject(R.id.list_form)
     private PullToRefreshListView mForm;
     @ViewInject(R.id.list_detail)
     private  PullToRefreshListView mDetail;
+    @ViewInject(R.id.common_approval_flow_lv)
+    private MyListView common_approval_flow_lv;
     List<LinkedHashMap<String,String>> datas=new ArrayList<>();
     List<LinkedHashMap<String,String>> details=new ArrayList<>();
+    private int mkeyValue;
+    private int whichpage =1 ;
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -41,13 +60,29 @@ public class FormDetailActivity extends BaseActivity {
 
     private void initData() {
        
-         mForm.setAdapter(new SimpleAdapter(mContext,datas,R.layout.item_simple_text1,
-                 new String[]{"key","value"},new int[]{R.id.tv_key1,R.id.tv_value1}));
-        mDetail.setAdapter(new SimpleAdapter(mContext,details,R.layout.item_simple_text14,
-                new String[]{"title","key1","key2","key3","value1","value2","value3"},
-                new int[]{R.id.tv_field1,R.id.tv_key1,R.id.tv_key2,R.id.tv_key3,
-                R.id.tv_value1,R.id.tv_value2,R.id.tv_value3}));
-        
+         mForm.setAdapter(new SimpleAdapter(mContext, datas, R.layout.item_simple_text1,
+                 new String[]{"key", "value"}, new int[]{R.id.tv_key1, R.id.tv_value1}));
+        mDetail.setAdapter(new SimpleAdapter(mContext, details, R.layout.item_simple_text14,
+                new String[]{"title", "key1", "key2", "key3", "value1", "value2", "value3"},
+                new int[]{R.id.tv_field1, R.id.tv_key1, R.id.tv_key2, R.id.tv_key3,
+                        R.id.tv_value1, R.id.tv_value2, R.id.tv_value3}));
+
+        if (mkeyValue != -1) {
+            loadPlatAppFlow(mkeyValue);
+            loadPlatDocDetails(mkeyValue,whichpage);
+        }
+    }
+
+    private void loadPlatDocDetails(int mkeyValue, int whichpage) {
+        String url = ApiConfig.getInstance(ApiUtils.getApiModel()).getmApiBase().common_doc_detaily_url;
+        Map<String,Object> param = new HashMap<>();
+        param.put("id",244);
+        param.put("whichpage",whichpage);
+        param.put("enuu", Long.valueOf(CommonUtil.getSharedPreferences(MyApplication.getInstance().getApplicationContext(), "companyEnUu")).longValue());
+        param.put("emcode",Long.valueOf(CommonUtil.getSharedPreferences(MyApplication.getInstance().getApplicationContext(), "b2b_uu")).longValue());LinkedHashMap<String, Object> headers = new LinkedHashMap<>();
+        headers.put("Cookie", "JSESSIONID=" + ApiConfig.getInstance(ApiUtils.getApiModel()).getmApiBase().getCookie());
+        ViewUtil.httpSendRequest(getApplicationContext(), url, param, handler, headers, COMMON_DOC_DETAILY, null, null, "get");
+
     }
 
     private void initView() {
@@ -56,6 +91,9 @@ public class FormDetailActivity extends BaseActivity {
             String dataJson=intent.getStringExtra("data");
             String detailJson=intent.getStringExtra("detail");
             getSupportActionBar().setTitle(intent.getStringExtra("title"));
+            mkeyValue = intent.getIntExtra("mkeyValue",-1);
+            Log.d("mkeyValue", mkeyValue + "");
+
             LinkedHashMap<String, Object> root= JSON.parseObject(dataJson,new TypeReference<LinkedHashMap<String, Object>>(){} );
             Collection<Object> lists=root.values();
             for(int i=0;i<lists.size();i++){
@@ -78,8 +116,44 @@ public class FormDetailActivity extends BaseActivity {
                     details.add(temp);
                 }
             }
-           
-            
         }
     }
+
+    private void loadPlatAppFlow(int mkeyValue) {
+        String url = ApiConfig.getInstance(ApiUtils.getApiModel()).getmApiBase().common_app_flow_nodes_url;
+        Map<String,Object> param = new HashMap<>();
+        param.put("id",244);
+        param.put("enuu", Long.valueOf(CommonUtil.getSharedPreferences(MyApplication.getInstance().getApplicationContext(), "companyEnUu")).longValue());
+        param.put("emcode",Long.valueOf(CommonUtil.getSharedPreferences(MyApplication.getInstance().getApplicationContext(), "b2b_uu")).longValue());LinkedHashMap<String, Object> headers = new LinkedHashMap<>();
+        headers.put("Cookie", "JSESSIONID=" + ApiConfig.getInstance(ApiUtils.getApiModel()).getmApiBase().getCookie());
+        ViewUtil.httpSendRequest(getApplicationContext(), url, param, handler, headers, PLAT_APP_FLOW_NODES, null, null, "get");
+    }
+
+    private Handler handler = new Handler(){
+        @Override
+        public void handleMessage(Message msg) {
+            super.handleMessage(msg);
+            switch (msg.what){
+                case PLAT_APP_FLOW_NODES:
+                    if (msg.getData() != null){
+                        String app_flow_result = msg.getData().getString("result");
+                        LogUtil.prinlnLongMsg("app_flow_result", app_flow_result);
+                    }
+                    break;
+                case COMMON_DOC_DETAILY:
+                    if (msg.getData() != null){
+                        String details_result = msg.getData().getString("result");
+                        LogUtil.prinlnLongMsg("details_result", details_result);
+                    }
+                    break;
+                default:
+                    if (msg.getData() != null) {
+                        if (!StringUtils.isEmpty(msg.getData().getString("result"))) {
+                            ToastMessage(msg.getData().getString("result"));
+                        }
+                    }
+                    break;
+            }
+        }
+    };
 }

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/platform/pageforms/LeavePageActivity.java

@@ -7,6 +7,7 @@ import android.os.Message;
 import android.text.Editable;
 import android.text.TextUtils;
 import android.text.TextWatcher;
+import android.util.Log;
 import android.view.View;
 import android.widget.AdapterView;
 import android.widget.ListView;
@@ -134,16 +135,19 @@ public class LeavePageActivity extends BaseActivity {
                 //PagesModelAdapter.ViewModel model= (PagesModelAdapter.ViewModel) view.getTag();
                 String data = mDatas.get(position - 1).getModeJson();
                 JSONObject root = JSON.parseObject(data);
+                LogUtil.prinlnLongMsg("root", root.toString());
                 JSONObject map = new JSONObject(true);
                 map.put("请假类型", root.getString("va_vacationtype"));
                 map.put("单据状态", root.getString("va_status"));
                 map.put("开始时间", DateFormatUtil.getFormatDate(root.getLong("va_startime")));
                 map.put("结束时间", DateFormatUtil.getFormatDate(root.getLong("va_endtime")));
                 map.put("请假原因", root.getString("va_remark"));
+                Log.d("mkeyValue", root.getString("va_id"));
                 LogUtil.d(map.toJSONString());
                 startActivity(new Intent(LeavePageActivity.this, FormDetailActivity.class)
                         .putExtra("data", map.toString())
-                        .putExtra("title", "请假单详情"));
+                        .putExtra("title", "请假单详情")
+                        .putExtra("mkeyValue",root.getIntValue("va_id")));
             }
         });
 

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/platform/pageforms/TravelPageActivity.java

@@ -157,7 +157,8 @@ public class TravelPageActivity extends BaseActivity{
                 startActivity(new Intent(ct, FormDetailActivity.class)
                         .putExtra("data", map.toJSONString())
                         .putExtra("detail", detail.toJSONString())
-                        .putExtra("title", "出差单详情"));
+                        .putExtra("title", "出差单详情")
+                        .putExtra("mkeyValue",root.getIntValue("va_id")));
             }
         });
 

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/platform/pageforms/WorkPageActivity.java

@@ -156,7 +156,8 @@ public class WorkPageActivity extends BaseActivity {
                 startActivity(new Intent(ct, FormDetailActivity.class)
                         .putExtra("data", map.toString())
                         .putExtra("detail", detail.toJSONString())
-                        .putExtra("title", "加班单详情"));
+                        .putExtra("title", "加班单详情")
+                        .putExtra("mkeyValue",root.getIntValue("va_id")));
             }
         });
 

WeiChat/src/main/java/com/xzjmyk/pm/activity/wxapi/ApiBase.java

@@ -74,14 +74,23 @@ public abstract class ApiBase {
     public String update_work_daily;//更新日报
     public String getdaily_list; //获取日报列表
 
-    public String common_app_flow_nodes;//单据获取审批流节点数据
+    public String common_app_flow_nodes_url;//单据获取审批流节点数据
+    public String common_doc_detaily_url; //获取单据详情
 
-    public String getCommon_app_flow_nodes() {
-        return common_app_flow_nodes;
+    public String getCommon_doc_detaily_url() {
+        return common_doc_detaily_url;
     }
 
-    public void setCommon_app_flow_nodes(String common_app_flow_nodes) {
-        this.common_app_flow_nodes = common_app_flow_nodes;
+    public void setCommon_doc_detaily_url(String common_doc_detaily_url) {
+        this.common_doc_detaily_url = common_doc_detaily_url;
+    }
+
+    public String getCommon_app_flow_nodes_url() {
+        return common_app_flow_nodes_url;
+    }
+
+    public void setCommon_app_flow_nodes_url(String common_app_flow_nodes_url) {
+        this.common_app_flow_nodes_url = common_app_flow_nodes_url;
     }
 
     public void setGetOutAddress(String getOutAddress) {

WeiChat/src/main/java/com/xzjmyk/pm/activity/wxapi/ApiPlatform.java

@@ -52,7 +52,9 @@ public class ApiPlatform extends ApiBase implements ApiModel {
     private String UPDATE_WORK_DAILY_URL = mBaseUrl + "/workDaily/updateWorkDaily";
     private String GETDAILY_LIST_URL = mBaseUrl + "/workDaily/getWorkDaily";
 
-    private String COMMON_APP_FLOW_NODES = mBaseUrl + "/approvalflow/getNodesAndLog";
+    //单据
+    private String COMMON_APP_FLOW_NODES_URL = mBaseUrl + "/approvalflow/getNodesAndLog";
+    private String COMMON_DOC_DETAILY_URL = mBaseUrl + "/detailCenter/getDetail";
 
     public ApiPlatform() {
         //这里开始写接口
@@ -109,7 +111,8 @@ public class ApiPlatform extends ApiBase implements ApiModel {
         setUpdate_work_daily(UPDATE_WORK_DAILY_URL); //更新日报
         setGetdaily_list(GETDAILY_LIST_URL); //获取日报列表
 
-        setCommon_app_flow_nodes(COMMON_APP_FLOW_NODES); //单据获取审批流节点数据
+        setCommon_app_flow_nodes_url(COMMON_APP_FLOW_NODES_URL); //单据获取审批流节点数据
+        setCommon_doc_detaily_url(COMMON_DOC_DETAILY_URL); //获取单据详情
     }
 
 

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

@@ -6,7 +6,20 @@
     android:orientation="vertical"
     tools:context="com.xzjmyk.pm.activity.ui.platform.pageforms.FormDetailActivity">
     <!--两个listView-->
-
+    <com.xzjmyk.pm.activity.ui.erp.view.CustomerScrollView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_weight="1"
+        android:fillViewport="true"
+        android:scrollbars="none">
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:focusable="true"
+            android:focusableInTouchMode="true"
+            android:orientation="vertical"
+            android:layout_marginTop="5dp"
+            >
     <com.handmark.pulltorefresh.library.PullToRefreshListView
         android:id="@+id/list_form"
         android:layout_height="wrap_content"
@@ -29,4 +42,176 @@
         android:divider="@drawable/bg_bar"
         android:layerType="software"
         android:scrollingCache="false" />
+
+    <com.xzjmyk.pm.activity.view.MyListView
+        android:id="@+id/common_approval_flow_lv"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:visibility="visible"
+        android:background="#ebe9e9"
+        >
+    </com.xzjmyk.pm.activity.view.MyListView>
+</LinearLayout>
+    </com.xzjmyk.pm.activity.ui.erp.view.CustomerScrollView>
+    <LinearLayout
+        android:id="@+id/item_common_docui_res_and_del_ll"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:background="@color/bg_main"
+        android:paddingBottom="5dp"
+        android:visibility="visible"
+        >
+
+        <LinearLayout
+            android:id="@+id/common_docui_resubmit_ll"
+            android:layout_weight="1"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:gravity="center_horizontal"
+            android:background="@drawable/selector_me_menu_item_bg">
+            <TextView
+                android:id="@+id/common_docui_resubmit_tv"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:textSize="18sp"
+                android:textColor="@color/titleBlue"
+                android:layout_marginTop="10dp"
+                android:paddingBottom="10dp"
+                android:text="重新提交"
+                />
+
+        </LinearLayout>
+
+        <View
+            android:layout_width="1dp"
+            android:layout_height="20dp"
+            android:background="@color/item_line"
+            android:layout_gravity="center_vertical"
+            />
+        <LinearLayout
+            android:id="@+id/common_docui_delete_ll"
+            android:layout_weight="1"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:gravity="center_horizontal"
+            android:background="@drawable/selector_me_menu_item_bg">
+            <TextView
+                android:id="@+id/common_docui_delete_tv"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:textSize="18sp"
+                android:textColor="@color/titleBlue"
+                android:layout_marginTop="10dp"
+                android:paddingBottom="10dp"
+                android:text="删除"
+                />
+        </LinearLayout>
+
+    </LinearLayout>
+    <LinearLayout
+        android:id="@+id/common_docui_agree_and_change_ll"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:background="@color/bg_main"
+        android:paddingBottom="5dp"
+        android:visibility="visible">
+
+        <LinearLayout
+            android:id="@+id/common_docui_agree_ll"
+            android:layout_weight="2"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:gravity="center_horizontal"
+            android:background="@drawable/selector_me_menu_item_bg"
+            >
+
+            <ImageView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:src="@drawable/icon_answer"
+                android:layout_gravity="center_vertical"
+                />
+
+            <TextView
+                android:id="@+id/common_docui_agree_tv"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:gravity="center_horizontal"
+                android:textSize="18sp"
+                android:textColor="@color/titleBlue"
+                android:layout_marginTop="10dp"
+                android:layout_marginBottom="10dp"
+                android:text="同意"
+                android:layout_marginLeft="8dp"
+                />
+        </LinearLayout>
+
+        <View
+            android:layout_width="1dp"
+            android:layout_height="20dp"
+            android:background="@color/item_line"
+            android:layout_gravity="center_vertical"
+            />
+        <LinearLayout
+            android:id="@+id/common_docui_disagree_ll"
+            android:layout_weight="2"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:gravity="center_horizontal"
+            android:background="@drawable/selector_me_menu_item_bg">
+
+            <ImageView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:src="@drawable/icon_answer"
+                android:layout_gravity="center_vertical"
+                />
+            <TextView
+                android:id="@+id/common_docui_disagree_tv"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:gravity="center_horizontal"
+                android:textSize="18sp"
+                android:textColor="@color/titleBlue"
+                android:layout_marginTop="10dp"
+                android:layout_marginBottom="10dp"
+                android:text="不同意"
+                android:layout_marginLeft="8dp"/>
+        </LinearLayout>
+
+        <View
+            android:layout_width="1dp"
+            android:layout_height="20dp"
+            android:background="@color/item_line"
+            android:layout_gravity="center_vertical"
+            />
+        <LinearLayout
+            android:id="@+id/common_docui_change_dealman_ll"
+            android:layout_weight="3"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:gravity="center_horizontal"
+            android:background="@drawable/selector_me_menu_item_bg">
+            <ImageView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:src="@drawable/icon_answer"
+                android:layout_gravity="center_vertical"
+                />
+            <TextView
+                android:id="@+id/common_docui_change_dealman_tv"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:gravity="center_horizontal"
+                android:textSize="18sp"
+                android:textColor="@color/titleBlue"
+                android:layout_marginTop="10dp"
+                android:layout_marginBottom="10dp"
+                android:text="变更处理人"
+                android:layout_marginLeft="8dp"/>
+        </LinearLayout>
+
+    </LinearLayout>
 </LinearLayout>