1.用户反馈列表

2.//TODO erp用户是否选择新部门为空，质检接口数据无对应问题,内部交易订单审核，审核规则，领用申请列表/退件列表/参数，坩埚下单，mes，刷新token，编辑任务担当无法修改

app/src/main/AndroidManifest.xml

@@ -1300,6 +1300,14 @@
             android:screenOrientation="portrait"
             android:theme="@style/Work.Base"
             android:windowSoftInputMode="adjustPan" />
+        <activity
+            android:name=".ui.activity.mes.user.MesUserDataListCheckActivity"
+            android:configChanges="keyboardHidden|orientation"
+            android:label="用户数据采集"
+            android:launchMode="singleTop"
+            android:screenOrientation="portrait"
+            android:theme="@style/Work.Base"
+            android:windowSoftInputMode="adjustPan" />
         <activity
             android:name=".ui.activity.mes.user.MesUserDataAddActivity"
             android:configChanges="keyboardHidden|orientation"

app/src/main/java/com/wd/workoffice/app/BaseMesBean.java

@@ -9,7 +9,7 @@ package com.wd.workoffice.app;
 public class BaseMesBean {
 
     private boolean success;
-    private String message;
+    private String msg;
     private String code;
     private Object status;
     private Object data;
@@ -30,12 +30,12 @@ public class BaseMesBean {
         this.success = success;
     }
 
-    public String getMessage() {
-        return message;
+    public String getMsg() {
+        return msg;
     }
 
-    public void setMessage(String message) {
-        this.message = message;
+    public void setMsg(String message) {
+        this.msg = message;
     }
 
     public String getCode() {

app/src/main/java/com/wd/workoffice/app/WorkApp.java

@@ -51,7 +51,7 @@ public class WorkApp extends BaseApp {
         RtfMesHelper.getInstance().init(MesApiService.DOMAIN, chain -> {
             Request original = chain.request();
             Request request = original.newBuilder()
-                    .header("Cookie", "SESSION=4eb12da5-803b-46b5-be06-49a2d6512baa")
+                    .header("Cookie", "SESSION=0514c62e-9e13-4382-be68-b499ec39b3df")
                     .method(original.method(), original.body())
                     .build();
 

app/src/main/java/com/wd/workoffice/retrofit/MesApiService.java

@@ -148,5 +148,11 @@ public interface MesApiService {
     @Multipart
     @POST("/himes/api/file/uploadFile")
     Observable<BaseMesBean> upload(@Part MultipartBody.Part file);
-
+    /**
+     * 产品
+     *
+     * @return
+     */
+    @POST("/himes/api/msSceneFeedback/show/page.json")
+    Observable<BaseMesBean> userDataList(@Query("functionId") String functionId, @Body RequestBody requestBody);
 }

app/src/main/java/com/wd/workoffice/ui/activity/login/UserRegisterDepAddActivity.java

@@ -109,7 +109,7 @@ public class UserRegisterDepAddActivity extends WorkToolBarActivity {
 //            public void onSuccess(BaseBean data) {
 //                hideLoading();
 //                if (data.getCode() != 0) {
-//                    toast(data.getMessage());
+//                    toast(data.getMsg());
 //                    return;
 //                }
 //                EventBus.getDefault().post(new AddDepEvent());

app/src/main/java/com/wd/workoffice/ui/activity/mes/quality/MesQualityAddActivity.java

@@ -65,7 +65,7 @@ public class MesQualityAddActivity extends WorkToolBarActivity {
 //            public void onSuccess(BaseBean data) {
 //                hideLoading();
 //                if (data.getCode() != 0) {
-//                    toast(data.getMessage());
+//                    toast(data.getMsg());
 //                    return;
 //                }
 //                List<ProPriceBean.RecordsBean> getList = JSON.parseObject(data.getData().toString(), ProPriceBean.class).getRecords();

app/src/main/java/com/wd/workoffice/ui/activity/mes/quality/MesQualityClientActivity.java

@@ -49,7 +49,7 @@ public class MesQualityClientActivity extends WorkToolBarActivity {
 //            public void onSuccess(BaseBean data) {
 //                hideLoading();
 //                if (data.getCode() != 0) {
-//                    toast(data.getMessage());
+//                    toast(data.getMsg());
 //                    return;
 //                }
 //                List<ProPriceBean.RecordsBean> getList = JSON.parseObject(data.getData().toString(), ProPriceBean.class).getRecords();

app/src/main/java/com/wd/workoffice/ui/activity/mes/quality/MesQualityConditionActivity.java

@@ -40,7 +40,7 @@ public class MesQualityConditionActivity extends WorkToolBarActivity {
 //            public void onSuccess(BaseBean data) {
 //                hideLoading();
 //                if (data.getCode() != 0) {
-//                    toast(data.getMessage());
+//                    toast(data.getMsg());
 //                    return;
 //                }
 //                List<ProPriceBean.RecordsBean> getList = JSON.parseObject(data.getData().toString(), ProPriceBean.class).getRecords();

app/src/main/java/com/wd/workoffice/ui/activity/mes/quality/MesQualityDetailActivity.java

@@ -49,7 +49,7 @@ public class MesQualityDetailActivity extends WorkToolBarActivity {
 //            public void onSuccess(BaseBean data) {
 //                hideLoading();
 //                if (data.getCode() != 0) {
-//                    toast(data.getMessage());
+//                    toast(data.getMsg());
 //                    return;
 //                }
 //                List<ProPriceBean.RecordsBean> getList = JSON.parseObject(data.getData().toString(), ProPriceBean.class).getRecords();

app/src/main/java/com/wd/workoffice/ui/activity/mes/quality/MesQualityFactoryActivity.java

@@ -49,7 +49,7 @@ public class MesQualityFactoryActivity extends WorkToolBarActivity {
 //            public void onSuccess(BaseBean data) {
 //                hideLoading();
 //                if (data.getCode() != 0) {
-//                    toast(data.getMessage());
+//                    toast(data.getMsg());
 //                    return;
 //                }
 //                List<ProPriceBean.RecordsBean> getList = JSON.parseObject(data.getData().toString(), ProPriceBean.class).getRecords();

app/src/main/java/com/wd/workoffice/ui/activity/mes/quality/MesQualityManagerActivity.java

@@ -49,7 +49,7 @@ public class MesQualityManagerActivity extends WorkToolBarActivity {
 //            public void onSuccess(BaseBean data) {
 //                hideLoading();
 //                if (data.getCode() != 0) {
-//                    toast(data.getMessage());
+//                    toast(data.getMsg());
 //                    return;
 //                }
 //                List<ProPriceBean.RecordsBean> getList = JSON.parseObject(data.getData().toString(), ProPriceBean.class).getRecords();

app/src/main/java/com/wd/workoffice/ui/activity/mes/search/MesSearchConditionActivity.java

@@ -61,7 +61,7 @@ public class MesSearchConditionActivity extends WorkToolBarActivity {
 //            public void onSuccess(BaseBean data) {
 //                hideLoading();
 //                if (data.getCode() != 0) {
-//                    toast(data.getMessage());
+//                    toast(data.getMsg());
 //                    return;
 //                }
 //                List<ProPriceBean.RecordsBean> getList = JSON.parseObject(data.getData().toString(), ProPriceBean.class).getRecords();

app/src/main/java/com/wd/workoffice/ui/activity/mes/ticket/MesTicketAddActivity.java

@@ -2,7 +2,6 @@ package com.wd.workoffice.ui.activity.mes.ticket;
 
 import android.content.DialogInterface;
 import android.content.Intent;
-import android.os.Bundle;
 import android.text.TextUtils;
 import android.view.View;
 import android.widget.EditText;
@@ -166,7 +165,7 @@ public class MesTicketAddActivity extends WorkToolBarActivity {
             public void onSuccess(BaseMesBean data) {
                 hideLoading();
                 if (!data.isSuccess()) {
-                    toast(data.getMessage());
+                    toast(data.getMsg());
                     return;
                 }
                 List<JobTypeBean> jobTypeList = JSON.parseArray(data.getData().toString(), JobTypeBean.class);
@@ -207,7 +206,7 @@ public class MesTicketAddActivity extends WorkToolBarActivity {
             public void onSuccess(BaseMesBean data) {
                 hideLoading();
                 if (!data.isSuccess()) {
-                    toast(data.getMessage());
+                    toast(data.getMsg());
                     return;
                 }
                 List<JobTypeBean> jobTypeList = JSON.parseArray(data.getData().toString(), JobTypeBean.class);
@@ -320,7 +319,7 @@ public class MesTicketAddActivity extends WorkToolBarActivity {
             public void onSuccess(BaseMesBean data) {
                 hideLoading();
                 if (!data.isSuccess()) {
-                    toast(data.getMessage());
+                    toast(data.getMsg());
                     return;
                 }
                 finish();

app/src/main/java/com/wd/workoffice/ui/activity/mes/ticket/MesTicketAddLogActivity.java

@@ -4,7 +4,6 @@ import android.Manifest;
 import android.content.Intent;
 import android.content.pm.ActivityInfo;
 import android.net.Uri;
-import android.os.Bundle;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
@@ -13,18 +12,14 @@ import android.widget.ImageView;
 import android.widget.TextView;
 
 import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
-import com.bumptech.glide.load.model.GlideUrl;
 import com.tbruyelle.rxpermissions2.RxPermissions;
 import com.wd.workoffice.R;
 import com.wd.workoffice.app.BaseMesBean;
 import com.wd.workoffice.app.WorkToolBarActivity;
 import com.wd.workoffice.bean.mesBean.ImageBean;
 import com.wd.workoffice.bean.mesBean.TicketBean;
-import com.wd.workoffice.retrofit.ApiService;
 import com.wd.workoffice.retrofit.RtfUtils;
 import com.wd.workoffice.retrofit.WorkObserver;
-import com.wd.workoffice.ui.activity.bat.store.StoreSaleConfirmActivity;
 import com.wd.workoffice.util.Glide4Engine;
 import com.wd.workoffice.util.GlideUtils;
 import com.wd.workoffice.util.WorkUtils;
@@ -34,7 +29,6 @@ import com.zhihu.matisse.internal.entity.CaptureStrategy;
 
 import java.io.File;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -43,7 +37,6 @@ import androidx.annotation.Nullable;
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import butterknife.OnClick;
-import flexible.xd.android_base.network.rtfhttp.RtfHelper;
 import flexible.xd.android_base.network.rtfhttp.Transformer;
 import flexible.xd.android_base.utils.FileUtils;
 import io.reactivex.disposables.Disposable;
@@ -115,7 +108,7 @@ public class MesTicketAddLogActivity extends WorkToolBarActivity {
             public void onSuccess(BaseMesBean data) {
                 hideLoading();
                 if (!data.isSuccess()) {
-                    toast(data.getMessage());
+                    toast(data.getMsg());
                     return;
                 }
                 finish();
@@ -256,7 +249,7 @@ public class MesTicketAddLogActivity extends WorkToolBarActivity {
             public void onSuccess(BaseMesBean data) {
                 hideLoading();
                 if (!data.isSuccess()) {
-                    toast(data.getMessage());
+                    toast(data.getMsg());
                     return;
                 }
                 toast("上传成功");

app/src/main/java/com/wd/workoffice/ui/activity/mes/ticket/MesTicketAddSummaryActivity.java

@@ -5,7 +5,6 @@ import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.pm.ActivityInfo;
 import android.net.Uri;
-import android.os.Bundle;
 import android.text.TextUtils;
 import android.view.Menu;
 import android.view.MenuItem;
@@ -25,7 +24,6 @@ import com.wd.workoffice.app.WorkToolBarActivity;
 import com.wd.workoffice.bean.event.AddSummarytEvent;
 import com.wd.workoffice.bean.event.AddTicketEvent;
 import com.wd.workoffice.bean.mesBean.ImageBean;
-import com.wd.workoffice.bean.mesBean.MesClientBean;
 import com.wd.workoffice.bean.mesBean.MesProBean;
 import com.wd.workoffice.bean.mesBean.TicketBean;
 import com.wd.workoffice.retrofit.RtfUtils;
@@ -34,7 +32,6 @@ import com.wd.workoffice.ui.adapter.AnnexAdapter;
 import com.wd.workoffice.ui.adapter.ImgAddAdapter;
 import com.wd.workoffice.util.DialogUtils;
 import com.wd.workoffice.util.Glide4Engine;
-import com.wd.workoffice.util.GlideUtils;
 import com.wd.workoffice.util.WorkUtils;
 import com.zhihu.matisse.Matisse;
 import com.zhihu.matisse.MimeType;
@@ -326,7 +323,7 @@ public class MesTicketAddSummaryActivity extends WorkToolBarActivity {
             public void onSuccess(BaseMesBean data) {
                 hideLoading();
                 if (!data.isSuccess()) {
-                    toast(data.getMessage());
+                    toast(data.getMsg());
                     return;
                 }
                 finish();
@@ -415,7 +412,7 @@ public class MesTicketAddSummaryActivity extends WorkToolBarActivity {
             public void onSuccess(BaseMesBean data) {
                 hideLoading();
                 if (!data.isSuccess()) {
-                    toast(data.getMessage());
+                    toast(data.getMsg());
                     return;
                 }
                 toast("上传成功");

app/src/main/java/com/wd/workoffice/ui/activity/mes/ticket/MesTicketClientActivity.java

@@ -9,17 +9,12 @@ import android.widget.EditText;
 import com.alibaba.fastjson.JSON;
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.wd.workoffice.R;
-import com.wd.workoffice.app.BaseBean;
 import com.wd.workoffice.app.BaseMesBean;
 import com.wd.workoffice.app.WorkToolBarActivity;
-import com.wd.workoffice.bean.ClientBean;
 import com.wd.workoffice.bean.mesBean.MesClientBean;
-import com.wd.workoffice.bean.mesBean.TicketBean;
-import com.wd.workoffice.bean.workEnum.PagePermissionType;
 import com.wd.workoffice.retrofit.RtfUtils;
 import com.wd.workoffice.retrofit.WorkObserver;
 import com.wd.workoffice.ui.adapter.MesClientAdapter;
-import com.wd.workoffice.ui.adapter.StoreClientAdapter;
 import com.wd.workoffice.util.WorkUtils;
 
 import java.util.ArrayList;
@@ -32,7 +27,6 @@ import butterknife.BindView;
 import butterknife.ButterKnife;
 import butterknife.OnClick;
 import flexible.xd.android_base.network.rtfhttp.Transformer;
-import io.reactivex.Observable;
 import io.reactivex.disposables.Disposable;
 
 /**
@@ -91,7 +85,7 @@ public class MesTicketClientActivity extends WorkToolBarActivity {
             public void onSuccess(BaseMesBean data) {
                 hideLoading();
                 if (!data.isSuccess()) {
-                    toast(data.getMessage());
+                    toast(data.getMsg());
                     return;
                 }
                 List<MesClientBean.ListBean> getList = JSON.parseObject(data.getData().toString(), MesClientBean.class).getList();

app/src/main/java/com/wd/workoffice/ui/activity/mes/ticket/MesTicketDetailActivity.java

 package com.wd.workoffice.ui.activity.mes.ticket;
 
-import android.os.Bundle;
 import android.text.TextUtils;
 import android.view.View;
 import android.widget.Button;
@@ -146,7 +145,7 @@ public class MesTicketDetailActivity extends WorkToolBarActivity {
             public void onSuccess(BaseMesBean data) {
                 hideLoading();
                 if (!data.isSuccess()) {
-                    toast(data.getMessage());
+                    toast(data.getMsg());
                     return;
                 }
                 List<JobTypeBean> jobTypeList = JSON.parseArray(data.getData().toString(), JobTypeBean.class);
@@ -241,7 +240,7 @@ public class MesTicketDetailActivity extends WorkToolBarActivity {
             public void onSuccess(BaseMesBean data) {
                 hideLoading();
                 if (!data.isSuccess()) {
-                    toast(data.getMessage());
+                    toast(data.getMsg());
                     return;
                 }
                 toast("接收成功");

app/src/main/java/com/wd/workoffice/ui/activity/mes/ticket/MesTicketDetailFinishActivity.java

@@ -190,7 +190,7 @@ public class MesTicketDetailFinishActivity extends WorkToolBarActivity {
             public void onSuccess(BaseMesBean data) {
                 hideLoading();
                 if (!data.isSuccess()) {
-                    toast(data.getMessage());
+                    toast(data.getMsg());
                     return;
                 }
                 toast("评价成功");
@@ -217,7 +217,7 @@ public class MesTicketDetailFinishActivity extends WorkToolBarActivity {
             public void onSuccess(BaseMesBean data) {
                 hideLoading();
                 if (!data.isSuccess()) {
-                    toast(data.getMessage());
+                    toast(data.getMsg());
                     return;
                 }
                 dataBean = JSON.parseObject(data.getData().toString(), SummaryBean.class);

app/src/main/java/com/wd/workoffice/ui/activity/mes/ticket/MesTicketDetailReviewActivity.java

@@ -158,7 +158,7 @@ public class MesTicketDetailReviewActivity extends WorkToolBarActivity {
             public void onSuccess(BaseMesBean data) {
                 hideLoading();
                 if (!data.isSuccess()) {
-                    toast(data.getMessage());
+                    toast(data.getMsg());
                     return;
                 }
                 dataBean = JSON.parseObject(data.getData().toString(), SummaryBean.class);
@@ -181,7 +181,7 @@ public class MesTicketDetailReviewActivity extends WorkToolBarActivity {
             public void onSuccess(BaseMesBean data) {
                 hideLoading();
                 if (!data.isSuccess()) {
-                    toast(data.getMessage());
+                    toast(data.getMsg());
                     return;
                 }
                 ReviewBean dataBean = JSON.parseObject(data.getData().toString(), ReviewBean.class);

app/src/main/java/com/wd/workoffice/ui/activity/mes/ticket/MesTicketListActivity.java

 package com.wd.workoffice.ui.activity.mes.ticket;
 
-import android.app.Activity;
 import android.content.Intent;
-import android.os.Bundle;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
@@ -95,7 +93,7 @@ public class MesTicketListActivity extends WorkToolBarActivity {
             public void onSuccess(BaseMesBean data) {
                 hideLoading();
                 if (!data.isSuccess()) {
-                    toast(data.getMessage());
+                    toast(data.getMsg());
                     return;
                 }
                 List<TicketBean.ListBean> getList = JSON.parseObject(data.getData().toString(), TicketBean.class).getList();

app/src/main/java/com/wd/workoffice/ui/activity/mes/ticket/MesTicketListTakeOnActivity.java

 package com.wd.workoffice.ui.activity.mes.ticket;
 
 import android.content.Intent;
-import android.os.Bundle;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
@@ -96,7 +95,7 @@ public class MesTicketListTakeOnActivity extends WorkToolBarActivity {
             public void onSuccess(BaseMesBean data) {
                 hideLoading();
                 if (!data.isSuccess()) {
-                    toast(data.getMessage());
+                    toast(data.getMsg());
                     return;
                 }
                 List<TicketBean.ListBean> getList = JSON.parseObject(data.getData().toString(), TicketBean.class).getList();

app/src/main/java/com/wd/workoffice/ui/activity/mes/ticket/MesTicketLogActivity.java

 package com.wd.workoffice.ui.activity.mes.ticket;
 
 import com.alibaba.fastjson.JSON;
-import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.scwang.smartrefresh.layout.SmartRefreshLayout;
 import com.scwang.smartrefresh.layout.api.RefreshLayout;
 import com.scwang.smartrefresh.layout.listener.OnRefreshListener;
 import com.wd.workoffice.R;
-import com.wd.workoffice.app.BaseBean;
 import com.wd.workoffice.app.BaseMesBean;
 import com.wd.workoffice.app.WorkToolBarActivity;
-import com.wd.workoffice.bean.ProPriceBean;
 import com.wd.workoffice.bean.mesBean.LogBean;
 import com.wd.workoffice.retrofit.RtfUtils;
 import com.wd.workoffice.retrofit.WorkObserver;
 import com.wd.workoffice.ui.adapter.MesTicketLogAdapter;
-import com.wd.workoffice.ui.adapter.WorkProPriceAdapter;
 import com.wd.workoffice.util.WorkUtils;
 
 import java.util.ArrayList;
@@ -80,7 +76,7 @@ public class MesTicketLogActivity extends WorkToolBarActivity {
             public void onSuccess(BaseMesBean data) {
                 hideLoading();
                 if (!data.isSuccess()) {
-                    toast(data.getMessage());
+                    toast(data.getMsg());
                     return;
                 }
                 List<LogBean> getList = JSON.parseArray(data.getData().toString(), LogBean.class);

app/src/main/java/com/wd/workoffice/ui/activity/mes/ticket/MesTicketProActivity.java

 package com.wd.workoffice.ui.activity.mes.ticket;
 
 import android.content.Intent;
-import android.text.TextUtils;
 import android.view.View;
 import android.widget.Button;
 import android.widget.EditText;
@@ -11,11 +10,9 @@ import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.wd.workoffice.R;
 import com.wd.workoffice.app.BaseMesBean;
 import com.wd.workoffice.app.WorkToolBarActivity;
-import com.wd.workoffice.bean.mesBean.MesClientBean;
 import com.wd.workoffice.bean.mesBean.MesProBean;
 import com.wd.workoffice.retrofit.RtfUtils;
 import com.wd.workoffice.retrofit.WorkObserver;
-import com.wd.workoffice.ui.adapter.MesClientAdapter;
 import com.wd.workoffice.ui.adapter.MesProAdapter;
 import com.wd.workoffice.util.WorkUtils;
 
@@ -84,7 +81,7 @@ public class MesTicketProActivity extends WorkToolBarActivity {
             public void onSuccess(BaseMesBean data) {
                 hideLoading();
                 if (!data.isSuccess()) {
-                    toast(data.getMessage());
+                    toast(data.getMsg());
                     return;
                 }
                 List<MesProBean.ListBean> getList = JSON.parseObject(data.getData().toString(), MesProBean.class).getList();

app/src/main/java/com/wd/workoffice/ui/activity/mes/ticket/MesTicketTakeOnActivity.java

@@ -10,11 +10,9 @@ import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.wd.workoffice.R;
 import com.wd.workoffice.app.BaseMesBean;
 import com.wd.workoffice.app.WorkToolBarActivity;
-import com.wd.workoffice.bean.mesBean.MesProBean;
 import com.wd.workoffice.bean.mesBean.TakeOnBean;
 import com.wd.workoffice.retrofit.RtfUtils;
 import com.wd.workoffice.retrofit.WorkObserver;
-import com.wd.workoffice.ui.adapter.MesProAdapter;
 import com.wd.workoffice.ui.adapter.MesTakeOnAdapter;
 import com.wd.workoffice.util.WorkUtils;
 
@@ -83,7 +81,7 @@ public class MesTicketTakeOnActivity extends WorkToolBarActivity {
             public void onSuccess(BaseMesBean data) {
                 hideLoading();
                 if (!data.isSuccess()) {
-                    toast(data.getMessage());
+                    toast(data.getMsg());
                     return;
                 }
                 List<TakeOnBean.ListBean> getList = JSON.parseObject(data.getData().toString(), TakeOnBean.class).getList();

app/src/main/java/com/wd/workoffice/ui/activity/mes/user/MesUserDataListActivity.java

 package com.wd.workoffice.ui.activity.mes.user;
 
+import android.os.Bundle;
 import android.text.TextUtils;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
+import android.widget.Button;
+import android.widget.TextView;
 
 import com.alibaba.fastjson.JSON;
 import com.chad.library.adapter.base.BaseQuickAdapter;
-import com.google.android.material.floatingactionbutton.FloatingActionButton;
 import com.scwang.smartrefresh.layout.SmartRefreshLayout;
 import com.wd.workoffice.R;
 import com.wd.workoffice.app.BaseMesBean;
 import com.wd.workoffice.app.WorkToolBarActivity;
 import com.wd.workoffice.bean.listener.FiveMenuClickListener;
-import com.wd.workoffice.bean.listener.FourMenuClickListener;
-import com.wd.workoffice.bean.mesBean.TicketBean;
+import com.wd.workoffice.bean.mesBean.UserDataBean;
 import com.wd.workoffice.retrofit.RtfUtils;
 import com.wd.workoffice.retrofit.WorkObserver;
-import com.wd.workoffice.ui.activity.mes.ticket.MesTicketAddActivity;
-import com.wd.workoffice.ui.activity.mes.ticket.MesTicketDetailFinishActivity;
 import com.wd.workoffice.ui.activity.mes.ticket.MesTicketListTakeOnActivity;
-import com.wd.workoffice.ui.adapter.MesTicketAdapter;
 import com.wd.workoffice.ui.adapter.MesUserDataAdapter;
 import com.wd.workoffice.util.WorkUtils;
-import com.wd.workoffice.util.ddmfilter.MesTicketListFilterData;
 import com.wd.workoffice.util.ddmfilter.MesUserDataListFilterData;
-import com.wd.workoffice.widget.DropDownMenu;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
+import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 import butterknife.BindView;
 import butterknife.ButterKnife;
@@ -46,94 +43,41 @@ import io.reactivex.disposables.Disposable;
  **/
 public class MesUserDataListActivity extends WorkToolBarActivity {
 
-    @BindView(R.id.ddm_choose)
-    DropDownMenu ddmChoose;
-    @BindView(R.id.fab_go)
-    FloatingActionButton fabGo;
-    private RecyclerView rvData;
+    @BindView(R.id.rv_data)
+    RecyclerView rvData;
+    @BindView(R.id.srl_refresh)
+    SmartRefreshLayout srlRefresh;
+    @BindView(R.id.tv_go)
+    TextView tvGo;
+    @BindView(R.id.btn_add)
+    Button btnAdd;
     private int page = 1;
     private Map<String, Object> param;
-    private SmartRefreshLayout srlRefresh;
-    private List<Object> dataList;
+    private List<UserDataBean.ListBean> dataList;
     private MesUserDataAdapter dataAdapter;
 
     @Override
     protected void initView() {
         ButterKnife.bind(this);
-        MesUserDataListFilterData filterData = new MesUserDataListFilterData(this, ddmChoose,
-                new FiveMenuClickListener() {
-                    @Override
-                    public void clickOne(String value) {
-                        if (TextUtils.equals(value, "全部状态")) {
-                            param.put("level", "");
-                        } else if (TextUtils.equals(value, "一级库")) {
-                            param.put("level", "1");
-                        } else {
-                            param.put("level", "2");
-                        }
-                        page = 1;
-                        param.put("pageNum", page);
-                        getData();
-                    }
-
-                    @Override
-                    public void clickTwo(String value) {
-                        if (TextUtils.equals(value, "全部类型")) {
-                            param.put("type", "");
-                        } else if (TextUtils.equals(value, "厂内库")) {
-                            param.put("type", "IN");
-                        } else {
-                            param.put("type", "OUT");
-                        }
-                        page = 1;
-                        param.put("page", page);
-                        getData();
-                    }
-
-                    @Override
-                    public void clickThree(String value) {
-                        if (TextUtils.equals(value, "全部状态")) {
-                            param.put("status", "");
-                        } else if (TextUtils.equals(value, "未启用")) {
-                            param.put("status", "0");
-                        } else {
-                            param.put("status", "1");
-                        }
-                        page = 1;
-                        param.put("pageNum", page);
-                        getData();
-                    }
-
-                    @Override
-                    public void clickFour(String value) {
-
-                    }
-
-                    @Override
-                    public void clickFive(String value) {
-
-                    }
-                });
-        rvData = filterData.getRvData();
-        srlRefresh = filterData.getSrlRefresh();
+        rvData.setLayoutManager(new LinearLayoutManager(this,RecyclerView.VERTICAL,false));
+        tvGo.setText("市场服务\n" +
+                "审核");
     }
 
 
     @Override
     protected void initData() {
         dataList = new ArrayList<>();
-        dataList.add(null);
-        dataList.add(null);
         dataAdapter = new MesUserDataAdapter(R.layout.item_mes_user_data, dataList);
         dataAdapter.bindToRecyclerView(rvData);
         dataAdapter.setEmptyView(R.layout.view_empty_content, rvData);
         param = WorkUtils.pageMesKey();
         param.put("pageNum", page);
-//        getData();
+        getData();
     }
 
     private void getData() {
-        RtfUtils.getMesRtf().ticketList("1", WorkUtils.convertMapToBody(param)).compose(Transformer.schedule()).subscribe(new WorkObserver<BaseMesBean>() {
+        RtfUtils.getMesRtf().userDataList("1", WorkUtils.convertMapToBody(param)).compose(Transformer.schedule()).subscribe(new WorkObserver<BaseMesBean>() {
             @Override
             public void doOnSubscribe(Disposable d) {
             }
@@ -148,10 +92,10 @@ public class MesUserDataListActivity extends WorkToolBarActivity {
             public void onSuccess(BaseMesBean data) {
                 hideLoading();
                 if (!data.isSuccess()) {
-                    toast(data.getMessage());
+                    toast(data.getMsg());
                     return;
                 }
-                List<TicketBean.ListBean> getList = JSON.parseObject(data.getData().toString(), TicketBean.class).getList();
+                List<UserDataBean.ListBean> getList = JSON.parseObject(data.getData().toString(), UserDataBean.class).getList();
                 if (page == 1) {
                     srlRefresh.finishRefresh();
                     dataList.clear();
@@ -194,7 +138,7 @@ public class MesUserDataListActivity extends WorkToolBarActivity {
 
     @Override
     protected int layoutId() {
-        return R.layout.activity_mes_ticket_list;
+        return R.layout.activity_mes_user_data_list;
     }
 
     @Override
@@ -214,9 +158,10 @@ public class MesUserDataListActivity extends WorkToolBarActivity {
     }
 
 
-    @OnClick(R.id.fab_go)
+    @OnClick(R.id.tv_go)
     public void onViewClicked() {
-        startActivity(MesTicketListTakeOnActivity.class);
+        startActivity(MesUserDataListCheckActivity.class);
         finish();
     }
+
 }

app/src/main/java/com/wd/workoffice/ui/activity/mes/user/MesUserDataListCheckActivity.java

+package com.wd.workoffice.ui.activity.mes.user;
+
+import android.view.Menu;
+import android.view.MenuItem;
+import android.view.View;
+import android.widget.Button;
+import android.widget.TextView;
+
+import com.alibaba.fastjson.JSON;
+import com.chad.library.adapter.base.BaseQuickAdapter;
+import com.scwang.smartrefresh.layout.SmartRefreshLayout;
+import com.wd.workoffice.R;
+import com.wd.workoffice.app.BaseMesBean;
+import com.wd.workoffice.app.WorkToolBarActivity;
+import com.wd.workoffice.bean.mesBean.UserDataBean;
+import com.wd.workoffice.retrofit.RtfUtils;
+import com.wd.workoffice.retrofit.WorkObserver;
+import com.wd.workoffice.ui.activity.mes.ticket.MesTicketListTakeOnActivity;
+import com.wd.workoffice.ui.adapter.MesUserDataAdapter;
+import com.wd.workoffice.util.WorkUtils;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+import butterknife.BindView;
+import butterknife.ButterKnife;
+import butterknife.OnClick;
+import flexible.xd.android_base.network.rtfhttp.Transformer;
+import io.reactivex.disposables.Disposable;
+
+
+/**
+ * author : flexible
+ * email : lgd19940421@163.com
+ * github: https://github.com/FlexibleXd
+ **/
+public class MesUserDataListCheckActivity extends WorkToolBarActivity {
+
+    @BindView(R.id.rv_data)
+    RecyclerView rvData;
+    @BindView(R.id.srl_refresh)
+    SmartRefreshLayout srlRefresh;
+    @BindView(R.id.tv_go)
+    TextView tvGo;
+    @BindView(R.id.btn_add)
+    Button btnAdd;
+    private int page = 1;
+    private Map<String, Object> param;
+    private List<UserDataBean.ListBean> dataList;
+    private MesUserDataAdapter dataAdapter;
+
+    @Override
+    protected void initView() {
+        ButterKnife.bind(this);
+        rvData.setLayoutManager(new LinearLayoutManager(this,RecyclerView.VERTICAL,false));
+        tvGo.setText("任务担当\n" +
+                "页面");
+    }
+
+
+    @Override
+    protected void initData() {
+        dataList = new ArrayList<>();
+        dataAdapter = new MesUserDataAdapter(R.layout.item_mes_user_data, dataList);
+        dataAdapter.bindToRecyclerView(rvData);
+        dataAdapter.setEmptyView(R.layout.view_empty_content, rvData);
+        param = WorkUtils.pageMesKey();
+        param.put("pageNum", page);
+        getData();
+    }
+
+    private void getData() {
+        RtfUtils.getMesRtf().userDataList("1", WorkUtils.convertMapToBody(param)).compose(Transformer.schedule()).subscribe(new WorkObserver<BaseMesBean>() {
+            @Override
+            public void doOnSubscribe(Disposable d) {
+            }
+
+            @Override
+            public void onFail(String errorMsg) {
+                hideLoading();
+                toast(errorMsg);
+            }
+
+            @Override
+            public void onSuccess(BaseMesBean data) {
+                hideLoading();
+                if (!data.isSuccess()) {
+                    toast(data.getMsg());
+                    return;
+                }
+                List<UserDataBean.ListBean> getList = JSON.parseObject(data.getData().toString(), UserDataBean.class).getList();
+                if (page == 1) {
+                    srlRefresh.finishRefresh();
+                    dataList.clear();
+                    dataList.addAll(getList);
+                    dataAdapter.notifyDataSetChanged();
+                    dataAdapter.loadMoreComplete();
+                } else {
+                    dataAdapter.loadMoreComplete();
+                    dataList.addAll(getList);
+                    dataAdapter.notifyDataSetChanged();
+                }
+                if (getList.size() == 0) {
+                    dataAdapter.loadMoreEnd();
+                } else {
+                    page++;
+                }
+            }
+        });
+    }
+
+    @Override
+    protected void initEvent() {
+        srlRefresh.setOnRefreshListener(refreshLayout -> {
+            page = 1;
+            param.put("pageNum", page);
+            getData();
+        });
+        dataAdapter.setOnLoadMoreListener(() -> {
+            param.put("pageNum", page);
+            getData();
+        }, rvData);
+        dataAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
+            @Override
+            public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
+//                startActivity(MesTicketDetailFinishActivity.class);
+            }
+        });
+    }
+
+
+    @Override
+    protected int layoutId() {
+        return R.layout.activity_mes_user_data_list;
+    }
+
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        getMenuInflater().inflate(R.menu.menu_ticket_add, menu);
+        return super.onCreateOptionsMenu(menu);
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        switch (item.getItemId()) {
+            case R.id.add:
+                startActivity(MesUserDataAddActivity.class);
+                break;
+        }
+        return super.onOptionsItemSelected(item);
+    }
+
+
+    @OnClick(R.id.tv_go)
+    public void onViewClicked() {
+        startActivity(MesUserDataListActivity.class);
+        finish();
+    }
+
+}

app/src/main/java/com/wd/workoffice/ui/adapter/MesUserDataAdapter.java

@@ -5,6 +5,9 @@ import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.chad.library.adapter.base.BaseViewHolder;
 import com.wd.workoffice.R;
 import com.wd.workoffice.bean.mesBean.TicketBean;
+import com.wd.workoffice.bean.mesBean.UserDataBean;
+
+import org.greenrobot.greendao.annotation.Id;
 
 import java.util.List;
 
@@ -14,7 +17,7 @@ import flexible.xd.android_base.utils.TimeUtils;
  * Created by flexible on 2018/8/13.
  */
 
-public class MesUserDataAdapter extends BaseQuickAdapter<Object, BaseViewHolder> {
+public class MesUserDataAdapter extends BaseQuickAdapter<UserDataBean.ListBean, BaseViewHolder> {
 
     public MesUserDataAdapter(int layoutResId, List data) {
         super(layoutResId, data);
@@ -22,7 +25,12 @@ public class MesUserDataAdapter extends BaseQuickAdapter<Object, BaseViewHolder>
 
 
     @Override
-    protected void convert(BaseViewHolder helper, Object item) {
+    protected void convert(BaseViewHolder helper, UserDataBean.ListBean item) {
+        helper.setText(R.id.tv_time, item.getApprovalDateTime());
+        helper.setText(R.id.tv_client, item.getCustomerUserName());
+        helper.setText(R.id.tv_factory, item.getSalesManagerName());
+        helper.setText(R.id.tv_machine, item.getContinuousCasterName());
+        helper.setText(R.id.tv_status, item.getApprovalStatus() + "");
     }
 }
 

app/src/main/java/com/wd/workoffice/ui/fg/MsgListFragment.java

@@ -168,7 +168,7 @@ public class MsgListFragment extends WorkBaseFg {
             public void onSuccess(BaseBean data) {
                 hideLoading();
                 if (data.getCode() != 0) {
-//                    toast(data.getMessage());
+//                    toast(data.getMsg());
                     return;
                 }
             }

app/src/main/java/com/wd/workoffice/util/ddmfilter/MesTicketListFilterData.java

-package com.wd.workoffice.util.ddmfilter;
-
-import android.content.Context;
-import android.view.LayoutInflater;
-import android.view.View;
-
-import com.scwang.smartrefresh.layout.SmartRefreshLayout;
-import com.wd.workoffice.R;
-import com.wd.workoffice.app.WorkApp;
-import com.wd.workoffice.bean.listener.FourMenuClickListener;
-import com.wd.workoffice.bean.listener.ThreeMenuClickListener;
-import com.wd.workoffice.ui.adapter.FilterAdapter;
-import com.wd.workoffice.widget.DropDownMenu;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import androidx.recyclerview.widget.LinearLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
-
-/**
- * author : flexible
- * email : lgd19940421@163.com
- * github: https://github.com/FlexibleXd
- **/
-public class MesTicketListFilterData {
-    DropDownMenu menu;
-    private List<View> viewList;
-    private View mainView;
-    private RecyclerView rvData;
-    private SmartRefreshLayout srlRefresh;
-    private List<String> statusList = Arrays.asList("客户姓名", "产品名称", "制单日期", "任务状态");
-    private List<String> typeList = Arrays.asList("全部类型", "厂内库", "场外库");
-    FourMenuClickListener listener;
-
-    String[] TABLIST = new String[]{"客户姓名", "产品名称", "制单日期", "任务状态"};
-    Context context;
-
-    public MesTicketListFilterData(Context context, DropDownMenu menu, FourMenuClickListener listener) {
-        this.context = context;
-        this.menu = menu;
-        this.listener = listener;
-        initView();
-    }
-
-
-    private void initView() {
-        mainView = LayoutInflater.from(context).inflate(R.layout.view_ticket, null);
-        rvData = mainView.findViewById(R.id.rv_data);
-        srlRefresh = mainView.findViewById(R.id.srl_refresh);
-        rvData.setLayoutManager(new LinearLayoutManager(context, RecyclerView.VERTICAL, false));
-        viewList = new ArrayList<>();
-        addTabView(typeList, 1);
-        addTabView(statusList, 2);
-        addTabView(typeList, 3);
-        addTabView(typeList, 4);
-        menu.setDropDownMenu(Arrays.asList(TABLIST), viewList, mainView);
-    }
-
-    private void addTabView(List<String> dataList, int type) {
-        View view = LayoutInflater.from(WorkApp.getApp()).inflate(R.layout.view_filter_pro, null);
-        RecyclerView rvData = view.findViewById(R.id.rv_filter);
-        rvData.setLayoutManager(new LinearLayoutManager(WorkApp.getApp(), RecyclerView.VERTICAL, false));
-        FilterAdapter filterAdapter = new FilterAdapter(R.layout.item_filter, dataList);
-        filterAdapter.bindToRecyclerView(rvData);
-        viewList.add(view);
-        filterAdapter.setOnItemClickListener((adapter, v, position) -> {
-            filterAdapter.setChoosePos(position);
-            menu.setTabText(dataList.get(position));
-            if (listener != null) {
-                switch (type) {
-                    case 1:
-                        listener.clickOne(dataList.get(position));
-                        break;
-                    case 2:
-                        listener.clickTwo(dataList.get(position));
-                        break;
-                }
-            }
-            menu.closeMenu();
-            filterAdapter.notifyDataSetChanged();
-        });
-    }
-
-
-    public SmartRefreshLayout getSrlRefresh() {
-        return srlRefresh;
-    }
-
-    public void setSrlRefresh(SmartRefreshLayout srlRefresh) {
-        this.srlRefresh = srlRefresh;
-    }
-
-    public RecyclerView getRvData() {
-
-        return rvData;
-    }
-
-
-    public void setRvData(RecyclerView rvData) {
-        this.rvData = rvData;
-    }
-}

app/src/main/res/layout/activity_mes_user_data_list.xml

 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical">
 
+    <com.scwang.smartrefresh.layout.SmartRefreshLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        android:id="@+id/srl_refresh"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
 
-    <com.google.android.material.floatingactionbutton.FloatingActionButton
-        android:id="@+id/fab_go"
-        android:layout_width="70mm"
-        android:layout_height="70mm"
-        android:layout_alignParentRight="true"
-        android:layout_marginTop="30mm"
-        app:backgroundTint="#FFF3A5A5"
-        app:elevation="3dp" />
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:orientation="vertical">
 
-    <com.wd.workoffice.widget.DropDownMenu
-        android:id="@+id/ddm_choose"
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:paddingVertical="16mm">
+
+                <TextView
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:gravity="center"
+                    android:text="反馈日期"
+                    android:textColor="@color/flexible_text_sup"
+                    android:textSize="12sp" />
+
+                <TextView
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:gravity="center"
+                    android:text="客户信息"
+                    android:textColor="@color/flexible_text_sup"
+                    android:textSize="12sp" />
+
+                <TextView
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:gravity="center"
+                    android:text="炼钢厂"
+                    android:textColor="@color/flexible_text_sup"
+                    android:textSize="12sp" />
+
+                <TextView
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:gravity="center"
+                    android:text="连铸机"
+                    android:textColor="@color/flexible_text_sup"
+                    android:textSize="12sp" />
+
+                <TextView
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:gravity="center"
+                    android:text="状态"
+                    android:textColor="@color/flexible_text_sup"
+                    android:textSize="12sp" />
+            </LinearLayout>
+
+            <androidx.recyclerview.widget.RecyclerView
+                android:id="@+id/rv_data"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-        app:dddividerColor="@color/divider"
-        app:ddmaskColor="#4d000000"
-        app:ddmenuBackgroundColor="@color/white"
-        app:ddmenuMenuHeightPercent="0.5"
-        app:ddmenuSelectedIcon="@mipmap/main_top"
-        app:ddmenuTextSize="13sp"
-        app:ddmenuUnselectedIcon="@mipmap/main_down"
-        app:ddtextSelectedColor="@color/mainTextColor"
-        app:ddtextUnselectedColor="@color/main_icon_select"
-        app:ddunderlineColor="@color/white" />
+                android:background="@android:color/white" />
+        </LinearLayout>
+    </com.scwang.smartrefresh.layout.SmartRefreshLayout>
+
+    <TextView
+        android:id="@+id/tv_go"
+        android:layout_width="60mm"
+        android:layout_height="60mm"
+        android:layout_alignParentRight="true"
+        android:layout_marginTop="30mm"
+        android:background="@drawable/shape_ticket_go"
+        android:gravity="center"
+        android:textColor="@color/white"
+        android:textSize="12sp" />
+
+    <Button
+        android:id="@+id/btn_add"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentBottom="true"
+        android:layout_centerHorizontal="true"
+        android:layout_marginBottom="20mm"
+        android:background="@color/blue_btn"
+        android:text="新建"
+        android:textColor="@color/white" />
 </RelativeLayout>
\ No newline at end of file

app/src/main/res/layout/item_mes_user_data.xml

@@ -6,48 +6,48 @@
     android:paddingVertical="13mm">
 
     <TextView
-        android:id="@+id/tv_name"
+        android:id="@+id/tv_time"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_weight="1"
         android:gravity="center"
-        android:text="客户姓名"
+        android:text="反馈日期"
         android:textSize="12sp" />
 
     <TextView
-        android:id="@+id/tv_pro_name"
+        android:id="@+id/tv_client"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_weight="1"
         android:gravity="center"
-        android:text="产品名称"
+        android:text="客户信息"
         android:textSize="12sp" />
 
     <TextView
-        android:id="@+id/tv_time"
+        android:id="@+id/tv_factory"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_weight="1"
         android:gravity="center"
-        android:text="制单日期"
+        android:text="炼钢厂"
         android:textSize="12sp" />
 
     <TextView
-        android:id="@+id/tv_status"
+        android:id="@+id/tv_machine"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_weight="1"
         android:gravity="center"
-        android:text="任务状态"
-        android:textColor="@color/red"
+        android:text="连铸机"
         android:textSize="12sp" />
 
     <TextView
+        android:id="@+id/tv_status"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_weight="1"
         android:gravity="center"
-        android:text="任务状态"
+        android:text="状态"
         android:textColor="@color/red"
         android:textSize="12sp" />
 </LinearLayout>
\ No newline at end of file

app/src/main/res/layout/view_ticket.xml

-<?xml version="1.0" encoding="utf-8"?>
-<com.scwang.smartrefresh.layout.SmartRefreshLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/srl_refresh"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="vertical">
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:paddingVertical="16mm">
-
-            <TextView
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:gravity="center"
-                android:text="客户姓名"
-                android:textColor="@color/flexible_text_sup"
-                android:textSize="12sp" />
-
-            <TextView
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:gravity="center"
-                android:text="产品名称"
-                android:textColor="@color/flexible_text_sup"
-                android:textSize="12sp" />
-
-            <TextView
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:gravity="center"
-                android:text="制单日期"
-                android:textColor="@color/flexible_text_sup"
-                android:textSize="12sp" />
-
-            <TextView
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:gravity="center"
-                android:text="任务状态"
-                android:textColor="@color/flexible_text_sup"
-                android:textSize="12sp" />
-        </LinearLayout>
-
-        <androidx.recyclerview.widget.RecyclerView
-            android:id="@+id/rv_data"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:background="@android:color/white" />
-    </LinearLayout>
-</com.scwang.smartrefresh.layout.SmartRefreshLayout>
\ No newline at end of file