1.工单页面

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

app/src/main/AndroidManifest.xml

@@ -1192,13 +1192,21 @@
             android:theme="@style/Work.Base"
             android:windowSoftInputMode="adjustPan" />
         <activity
-            android:name=".ui.activity.mes.MesTicketListActivity"
+            android:name=".ui.activity.mes.ticket.MesTicketListActivity"
             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.ticket.MesTicketAddActivity"
+            android:configChanges="keyboardHidden|orientation"
+            android:label="新建工单"
+            android:launchMode="singleTop"
+            android:screenOrientation="portrait"
+            android:theme="@style/Work.Base"
+            android:windowSoftInputMode="adjustPan" />
         <provider
             android:name="androidx.core.content.FileProvider"
             android:authorities="com.wd.workoffice.fileprovider"

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

 package com.wd.workoffice.ui.activity.mes;
 
-import android.os.Bundle;
 import android.view.View;
 import android.widget.LinearLayout;
 
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
 import com.wd.workoffice.R;
-import com.wd.workoffice.app.BaseBean;
 import com.wd.workoffice.app.WorkToolBarActivity;
-import com.wd.workoffice.retrofit.RtfUtils;
-import com.wd.workoffice.retrofit.WorkObserver;
+import com.wd.workoffice.ui.activity.mes.ticket.MesTicketListActivity;
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import butterknife.OnClick;
-import flexible.xd.android_base.network.rtfhttp.Transformer;
-import io.reactivex.disposables.Disposable;
 
 /**
  * 工单

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

+package com.wd.workoffice.ui.activity.mes.ticket;
+
+import android.widget.EditText;
+import android.widget.LinearLayout;
+import android.widget.RelativeLayout;
+import android.widget.TextView;
+
+import com.alibaba.fastjson.JSON;
+import com.wd.workoffice.R;
+import com.wd.workoffice.app.BaseBean;
+import com.wd.workoffice.app.WorkToolBarActivity;
+import com.wd.workoffice.bean.AccountBean;
+import com.wd.workoffice.retrofit.RtfUtils;
+import com.wd.workoffice.retrofit.WorkObserver;
+
+import butterknife.BindView;
+import butterknife.ButterKnife;
+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 MesTicketAddActivity extends WorkToolBarActivity {
+    @BindView(R.id.tv_save)
+    TextView tvSave;
+    @BindView(R.id.tv_submit)
+    TextView tvSubmit;
+    @BindView(R.id.ll_bottom)
+    LinearLayout llBottom;
+    @BindView(R.id.tv_code)
+    TextView tvCode;
+    @BindView(R.id.tv_client)
+    TextView tvClient;
+    @BindView(R.id.rl_client)
+    RelativeLayout rlClient;
+    @BindView(R.id.tv_company)
+    TextView tvCompany;
+    @BindView(R.id.rl_company)
+    RelativeLayout rlCompany;
+    @BindView(R.id.tv_manager)
+    TextView tvManager;
+    @BindView(R.id.rl_manager)
+    RelativeLayout rlManager;
+    @BindView(R.id.et_desc)
+    EditText etDesc;
+    @BindView(R.id.tv_take_on)
+    TextView tvTakeOn;
+    @BindView(R.id.rl_take_on)
+    RelativeLayout rlTakeOn;
+    @BindView(R.id.et_person)
+    EditText etPerson;
+    @BindView(R.id.tv_start_time)
+    TextView tvStartTime;
+    @BindView(R.id.tv_end_time)
+    TextView tvEndTime;
+    @BindView(R.id.tv_time)
+    TextView tvTime;
+    @BindView(R.id.rl_time)
+    RelativeLayout rlTime;
+    private AccountBean dataBean;
+
+    @Override
+    protected void initView() {
+        ButterKnife.bind(this);
+    }
+
+    @Override
+    protected void initData() {
+        getData();
+    }
+
+    private void getData() {
+        RtfUtils.getRtf().getAccount().compose(Transformer.schedule()).subscribe(new WorkObserver<BaseBean>() {
+
+
+            @Override
+            public void doOnSubscribe(Disposable d) {
+            }
+
+            @Override
+            public void onFail(String errorMsg) {
+                hideLoading();
+                toast(errorMsg);
+            }
+
+            @Override
+            public void onSuccess(BaseBean data) {
+                hideLoading();
+                if (data.getCode() != 0) {
+                    toast(data.getMessage());
+                    return;
+                }
+                dataBean = JSON.parseObject(data.getData().toString(), AccountBean.class);
+//                tvName.setText(dataBean.getName());
+//                tvDpeName.setText(dataBean.getName());
+//                tvDpePrice.setText(MathUtils.converData(dataBean.getBalance(), 2));
+//                tvDpeFreezePrice.setText(String.valueOf(dataBean.getFrozenAmount()));
+            }
+        });
+    }
+
+    @Override
+    protected void initEvent() {
+    }
+
+    @Override
+    protected int layoutId() {
+        return R.layout.activity_mes_ticket_add;
+    }
+
+}

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

+package com.wd.workoffice.ui.activity.mes.ticket;
+
+import android.view.Menu;
+import android.view.MenuItem;
+import android.widget.EditText;
+import android.widget.TextView;
+
+import com.alibaba.fastjson.JSON;
+import com.wd.workoffice.R;
+import com.wd.workoffice.app.BaseBean;
+import com.wd.workoffice.app.WorkToolBarActivity;
+import com.wd.workoffice.bean.AccountBean;
+import com.wd.workoffice.retrofit.RtfUtils;
+import com.wd.workoffice.retrofit.WorkObserver;
+
+import butterknife.BindView;
+import butterknife.ButterKnife;
+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 MesTicketAddLogActivity extends WorkToolBarActivity {
+    @BindView(R.id.tv_code)
+    TextView tvCode;
+    @BindView(R.id.tv_time)
+    TextView tvTime;
+    @BindView(R.id.tv_create_person)
+    TextView tvCreatePerson;
+    @BindView(R.id.et_content)
+    EditText etContent;
+    @BindView(R.id.et_question_desc)
+    EditText etQuestionDesc;
+    @BindView(R.id.et_client)
+    EditText etClient;
+    private AccountBean dataBean;
+
+    @Override
+    protected void initView() {
+        ButterKnife.bind(this);
+    }
+
+    @Override
+    protected void initData() {
+        getData();
+    }
+
+    private void getData() {
+        RtfUtils.getRtf().getAccount().compose(Transformer.schedule()).subscribe(new WorkObserver<BaseBean>() {
+
+
+            @Override
+            public void doOnSubscribe(Disposable d) {
+            }
+
+            @Override
+            public void onFail(String errorMsg) {
+                hideLoading();
+                toast(errorMsg);
+            }
+
+            @Override
+            public void onSuccess(BaseBean data) {
+                hideLoading();
+                if (data.getCode() != 0) {
+                    toast(data.getMessage());
+                    return;
+                }
+                dataBean = JSON.parseObject(data.getData().toString(), AccountBean.class);
+//                tvName.setText(dataBean.getName());
+//                tvDpeName.setText(dataBean.getName());
+//                tvDpePrice.setText(MathUtils.converData(dataBean.getBalance(), 2));
+//                tvDpeFreezePrice.setText(String.valueOf(dataBean.getFrozenAmount()));
+            }
+        });
+    }
+
+    @Override
+    protected void initEvent() {
+    }
+
+    @Override
+    protected int layoutId() {
+        return R.layout.activity_mes_ticket_log_add;
+    }
+
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        getMenuInflater().inflate(R.menu.menu_report, menu);
+        return super.onCreateOptionsMenu(menu);
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        switch (item.getItemId()) {
+            case R.id.report:
+                break;
+        }
+        return super.onOptionsItemSelected(item);
+    }
+}

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

+package com.wd.workoffice.ui.activity.mes.ticket;
+
+import android.view.Menu;
+import android.view.MenuItem;
+import android.widget.EditText;
+import android.widget.TextView;
+
+import com.alibaba.fastjson.JSON;
+import com.wd.workoffice.R;
+import com.wd.workoffice.app.BaseBean;
+import com.wd.workoffice.app.WorkToolBarActivity;
+import com.wd.workoffice.bean.AccountBean;
+import com.wd.workoffice.retrofit.RtfUtils;
+import com.wd.workoffice.retrofit.WorkObserver;
+
+import butterknife.BindView;
+import butterknife.ButterKnife;
+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 MesTicketAddSummaryActivity extends WorkToolBarActivity {
+    private AccountBean dataBean;
+
+    @Override
+    protected void initView() {
+        ButterKnife.bind(this);
+    }
+
+    @Override
+    protected void initData() {
+        getData();
+    }
+
+    private void getData() {
+        RtfUtils.getRtf().getAccount().compose(Transformer.schedule()).subscribe(new WorkObserver<BaseBean>() {
+
+
+            @Override
+            public void doOnSubscribe(Disposable d) {
+            }
+
+            @Override
+            public void onFail(String errorMsg) {
+                hideLoading();
+                toast(errorMsg);
+            }
+
+            @Override
+            public void onSuccess(BaseBean data) {
+                hideLoading();
+                if (data.getCode() != 0) {
+                    toast(data.getMessage());
+                    return;
+                }
+                dataBean = JSON.parseObject(data.getData().toString(), AccountBean.class);
+//                tvName.setText(dataBean.getName());
+//                tvDpeName.setText(dataBean.getName());
+//                tvDpePrice.setText(MathUtils.converData(dataBean.getBalance(), 2));
+//                tvDpeFreezePrice.setText(String.valueOf(dataBean.getFrozenAmount()));
+            }
+        });
+    }
+
+    @Override
+    protected void initEvent() {
+    }
+
+    @Override
+    protected int layoutId() {
+        return R.layout.activity_mes_ticket_log_add;
+    }
+
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        getMenuInflater().inflate(R.menu.menu_finish, menu);
+        return super.onCreateOptionsMenu(menu);
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        switch (item.getItemId()) {
+            case R.id.finish:
+                break;
+        }
+        return super.onOptionsItemSelected(item);
+    }
+}

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.widget.RelativeLayout;
+import android.widget.TextView;
+
+import com.alibaba.fastjson.JSON;
+import com.wd.workoffice.R;
+import com.wd.workoffice.app.BaseBean;
+import com.wd.workoffice.app.WorkToolBarActivity;
+import com.wd.workoffice.bean.AccountBean;
+import com.wd.workoffice.retrofit.RtfUtils;
+import com.wd.workoffice.retrofit.WorkObserver;
+
+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 MesTicketDetailActivity extends WorkToolBarActivity {
+    @BindView(R.id.tv_code)
+    TextView tvCode;
+    @BindView(R.id.tv_client)
+    TextView tvClient;
+    @BindView(R.id.rl_client)
+    RelativeLayout rlClient;
+    @BindView(R.id.tv_company)
+    TextView tvCompany;
+    @BindView(R.id.rl_company)
+    RelativeLayout rlCompany;
+    @BindView(R.id.tv_manager)
+    TextView tvManager;
+    @BindView(R.id.rl_manager)
+    RelativeLayout rlManager;
+    @BindView(R.id.tv_desc)
+    TextView tvDesc;
+    @BindView(R.id.tv_take_on)
+    TextView tvTakeOn;
+    @BindView(R.id.rl_take_on)
+    RelativeLayout rlTakeOn;
+    @BindView(R.id.tv_person)
+    TextView tvPerson;
+    @BindView(R.id.tv_start_time)
+    TextView tvStartTime;
+    @BindView(R.id.tv_end_time)
+    TextView tvEndTime;
+    @BindView(R.id.tv_time)
+    TextView tvTime;
+    @BindView(R.id.rl_time)
+    RelativeLayout rlTime;
+    @BindView(R.id.rl_log)
+    RelativeLayout rlLog;
+    private AccountBean dataBean;
+
+    @Override
+    protected void initView() {
+        ButterKnife.bind(this);
+    }
+
+    @Override
+    protected void initData() {
+        getData();
+    }
+
+    private void getData() {
+        RtfUtils.getRtf().getAccount().compose(Transformer.schedule()).subscribe(new WorkObserver<BaseBean>() {
+
+
+            @Override
+            public void doOnSubscribe(Disposable d) {
+            }
+
+            @Override
+            public void onFail(String errorMsg) {
+                hideLoading();
+                toast(errorMsg);
+            }
+
+            @Override
+            public void onSuccess(BaseBean data) {
+                hideLoading();
+                if (data.getCode() != 0) {
+                    toast(data.getMessage());
+                    return;
+                }
+                dataBean = JSON.parseObject(data.getData().toString(), AccountBean.class);
+//                tvName.setText(dataBean.getName());
+//                tvDpeName.setText(dataBean.getName());
+//                tvDpePrice.setText(MathUtils.converData(dataBean.getBalance(), 2));
+//                tvDpeFreezePrice.setText(String.valueOf(dataBean.getFrozenAmount()));
+            }
+        });
+    }
+
+    @Override
+    protected void initEvent() {
+    }
+
+    @Override
+    protected int layoutId() {
+        return R.layout.activity_mes_ticket_detail;
+    }
+
+
+    @OnClick(R.id.rl_log)
+    public void onViewClicked() {
+    }
+}

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

+package com.wd.workoffice.ui.activity.mes.ticket;
+
+import android.widget.RelativeLayout;
+import android.widget.TextView;
+
+import com.alibaba.fastjson.JSON;
+import com.wd.workoffice.R;
+import com.wd.workoffice.app.BaseBean;
+import com.wd.workoffice.app.WorkToolBarActivity;
+import com.wd.workoffice.bean.AccountBean;
+import com.wd.workoffice.retrofit.RtfUtils;
+import com.wd.workoffice.retrofit.WorkObserver;
+
+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 MesTicketDetailFinishActivity extends WorkToolBarActivity {
+    @BindView(R.id.tv_code)
+    TextView tvCode;
+    @BindView(R.id.tv_client)
+    TextView tvClient;
+    @BindView(R.id.rl_client)
+    RelativeLayout rlClient;
+    @BindView(R.id.tv_company)
+    TextView tvCompany;
+    @BindView(R.id.rl_company)
+    RelativeLayout rlCompany;
+    @BindView(R.id.tv_manager)
+    TextView tvManager;
+    @BindView(R.id.rl_manager)
+    RelativeLayout rlManager;
+    @BindView(R.id.tv_desc)
+    TextView tvDesc;
+    @BindView(R.id.tv_take_on)
+    TextView tvTakeOn;
+    @BindView(R.id.rl_take_on)
+    RelativeLayout rlTakeOn;
+    @BindView(R.id.tv_person)
+    TextView tvPerson;
+    @BindView(R.id.tv_start_time)
+    TextView tvStartTime;
+    @BindView(R.id.tv_end_time)
+    TextView tvEndTime;
+    @BindView(R.id.tv_time)
+    TextView tvTime;
+    @BindView(R.id.rl_time)
+    RelativeLayout rlTime;
+    @BindView(R.id.rl_log)
+    RelativeLayout rlLog;
+    private AccountBean dataBean;
+
+    @Override
+    protected void initView() {
+        ButterKnife.bind(this);
+    }
+
+    @Override
+    protected void initData() {
+        getData();
+    }
+
+    private void getData() {
+        RtfUtils.getRtf().getAccount().compose(Transformer.schedule()).subscribe(new WorkObserver<BaseBean>() {
+
+
+            @Override
+            public void doOnSubscribe(Disposable d) {
+            }
+
+            @Override
+            public void onFail(String errorMsg) {
+                hideLoading();
+                toast(errorMsg);
+            }
+
+            @Override
+            public void onSuccess(BaseBean data) {
+                hideLoading();
+                if (data.getCode() != 0) {
+                    toast(data.getMessage());
+                    return;
+                }
+                dataBean = JSON.parseObject(data.getData().toString(), AccountBean.class);
+//                tvName.setText(dataBean.getName());
+//                tvDpeName.setText(dataBean.getName());
+//                tvDpePrice.setText(MathUtils.converData(dataBean.getBalance(), 2));
+//                tvDpeFreezePrice.setText(String.valueOf(dataBean.getFrozenAmount()));
+            }
+        });
+    }
+
+    @Override
+    protected void initEvent() {
+    }
+
+    @Override
+    protected int layoutId() {
+        return R.layout.activity_mes_ticket_detail_finish;
+    }
+
+
+    @OnClick(R.id.rl_log)
+    public void onViewClicked() {
+    }
+}

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

+package com.wd.workoffice.ui.activity.mes.ticket;
+
+import android.widget.RelativeLayout;
+import android.widget.TextView;
+
+import com.alibaba.fastjson.JSON;
+import com.wd.workoffice.R;
+import com.wd.workoffice.app.BaseBean;
+import com.wd.workoffice.app.WorkToolBarActivity;
+import com.wd.workoffice.bean.AccountBean;
+import com.wd.workoffice.retrofit.RtfUtils;
+import com.wd.workoffice.retrofit.WorkObserver;
+
+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 MesTicketDetailReviewActivity extends WorkToolBarActivity {
+    @BindView(R.id.tv_code)
+    TextView tvCode;
+    @BindView(R.id.tv_client)
+    TextView tvClient;
+    @BindView(R.id.rl_client)
+    RelativeLayout rlClient;
+    @BindView(R.id.tv_company)
+    TextView tvCompany;
+    @BindView(R.id.rl_company)
+    RelativeLayout rlCompany;
+    @BindView(R.id.tv_manager)
+    TextView tvManager;
+    @BindView(R.id.rl_manager)
+    RelativeLayout rlManager;
+    @BindView(R.id.tv_desc)
+    TextView tvDesc;
+    @BindView(R.id.tv_take_on)
+    TextView tvTakeOn;
+    @BindView(R.id.rl_take_on)
+    RelativeLayout rlTakeOn;
+    @BindView(R.id.tv_person)
+    TextView tvPerson;
+    @BindView(R.id.tv_start_time)
+    TextView tvStartTime;
+    @BindView(R.id.tv_end_time)
+    TextView tvEndTime;
+    @BindView(R.id.tv_time)
+    TextView tvTime;
+    @BindView(R.id.rl_time)
+    RelativeLayout rlTime;
+    @BindView(R.id.rl_log)
+    RelativeLayout rlLog;
+    private AccountBean dataBean;
+
+    @Override
+    protected void initView() {
+        ButterKnife.bind(this);
+    }
+
+    @Override
+    protected void initData() {
+        getData();
+    }
+
+    private void getData() {
+        RtfUtils.getRtf().getAccount().compose(Transformer.schedule()).subscribe(new WorkObserver<BaseBean>() {
+
+
+            @Override
+            public void doOnSubscribe(Disposable d) {
+            }
+
+            @Override
+            public void onFail(String errorMsg) {
+                hideLoading();
+                toast(errorMsg);
+            }
+
+            @Override
+            public void onSuccess(BaseBean data) {
+                hideLoading();
+                if (data.getCode() != 0) {
+                    toast(data.getMessage());
+                    return;
+                }
+                dataBean = JSON.parseObject(data.getData().toString(), AccountBean.class);
+//                tvName.setText(dataBean.getName());
+//                tvDpeName.setText(dataBean.getName());
+//                tvDpePrice.setText(MathUtils.converData(dataBean.getBalance(), 2));
+//                tvDpeFreezePrice.setText(String.valueOf(dataBean.getFrozenAmount()));
+            }
+        });
+    }
+
+    @Override
+    protected void initEvent() {
+    }
+
+    @Override
+    protected int layoutId() {
+        return R.layout.activity_mes_ticket_detail_reviews;
+    }
+
+
+    @OnClick(R.id.rl_log)
+    public void onViewClicked() {
+    }
+}

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

-package com.wd.workoffice.ui.activity.mes;
+package com.wd.workoffice.ui.activity.mes.ticket;
 
 import android.text.TextUtils;
 import android.view.Menu;
@@ -9,23 +9,14 @@ 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.BaseBean;
 import com.wd.workoffice.app.BaseMesBean;
 import com.wd.workoffice.app.WorkToolBarActivity;
-import com.wd.workoffice.bean.InStockBean;
-import com.wd.workoffice.bean.ProDetail;
 import com.wd.workoffice.bean.listener.FourMenuClickListener;
-import com.wd.workoffice.bean.listener.ThreeMenuClickListener;
 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.activity.bat.work.WorkInStockDetailActivity;
-import com.wd.workoffice.ui.activity.bat.work.WorkInStockSearchActivity;
 import com.wd.workoffice.ui.adapter.MesTicketAdapter;
-import com.wd.workoffice.ui.adapter.WorkInStockAdapter;
 import com.wd.workoffice.util.WorkUtils;
-import com.wd.workoffice.util.ddmfilter.InSotckFilterData;
 import com.wd.workoffice.util.ddmfilter.MesTicketListFilterData;
 import com.wd.workoffice.widget.DropDownMenu;
 
@@ -186,6 +177,19 @@ public class MesTicketListActivity extends WorkToolBarActivity {
     protected int layoutId() {
         return R.layout.activity_mes_ticket_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(MesTicketAddActivity.class);
+                break;
+        }
+        return super.onOptionsItemSelected(item);
+    }
 }

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.WorkToolBarActivity;
+import com.wd.workoffice.bean.ProPriceBean;
+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;
+import java.util.List;
+import java.util.Map;
+
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+import butterknife.BindView;
+import butterknife.ButterKnife;
+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 MesTicketLogActivity extends WorkToolBarActivity {
+
+    @BindView(R.id.rv_data)
+    RecyclerView rvData;
+    @BindView(R.id.srl_refresh)
+    SmartRefreshLayout srlRefresh;
+    private Map<String, Object> param;
+    private List<Object> dataList;
+    private MesTicketLogAdapter dataAdapter;
+    private int page = 1;
+
+    @Override
+    protected void initView() {
+        ButterKnife.bind(this);
+        rvData.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false));
+    }
+
+
+    @Override
+    protected void initData() {
+        dataList = new ArrayList<>();
+        dataAdapter = new MesTicketLogAdapter(R.layout.item_mes_ticket_log, dataList);
+        dataAdapter.bindToRecyclerView(rvData);
+        dataAdapter.setEmptyView(R.layout.view_empty_content,rvData);
+        param = WorkUtils.pageKey();
+        param.put("productId", getIntent().getStringExtra("id"));
+        param.put("current", page);
+//        getData();
+        dataList.add(new Object());
+        dataList.add(new Object());
+        dataAdapter.notifyDataSetChanged();
+    }
+
+    private void getData() {
+        RtfUtils.getRtf().getProHistoryPrice(param).compose(Transformer.schedule()).subscribe(new WorkObserver<BaseBean>() {
+            @Override
+            public void doOnSubscribe(Disposable d) {
+            }
+
+            @Override
+            public void onFail(String errorMsg) {
+                hideLoading();
+                toast(errorMsg);
+            }
+
+            @Override
+            public void onSuccess(BaseBean data) {
+                hideLoading();
+                if (data.getCode() != 0) {
+                    toast(data.getMessage());
+                    return;
+                }
+                List<ProPriceBean.RecordsBean> getList = JSON.parseObject(data.getData().toString(), ProPriceBean.class).getRecords();
+
+                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(new OnRefreshListener() {
+            @Override
+            public void onRefresh(@NonNull RefreshLayout refreshLayout) {
+                page = 1;
+                param.put("current", page);
+                getData();
+            }
+        });
+        dataAdapter.setOnLoadMoreListener(new BaseQuickAdapter.RequestLoadMoreListener() {
+            @Override
+            public void onLoadMoreRequested() {
+                param.put("current", page);
+                getData();
+            }
+        }, rvData);
+    }
+
+    @Override
+    protected int layoutId() {
+        return R.layout.activity_pro_price;
+    }
+
+
+}

app/src/main/java/com/wd/workoffice/ui/activity/mes/ticket/MesTicketTakeOnActivity.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;
+
+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.WorkToolBarActivity;
+import com.wd.workoffice.bean.ClientBean;
+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.StoreClientAdapter;
+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.Observable;
+import io.reactivex.disposables.Disposable;
+
+/**
+ * 任务担当
+ * author : flexible
+ * email : lgd19940421@163.com
+ * github: https://github.com/FlexibleXd
+ **/
+public class MesTicketTakeOnActivity extends WorkToolBarActivity {
+
+    @BindView(R.id.et_key)
+    EditText etKey;
+    @BindView(R.id.btn_search)
+    Button btnSearch;
+    @BindView(R.id.rv_client)
+    RecyclerView rvClient;
+    private Map<String, Object> param;
+    private List<ClientBean.RecordsBean> clientList;
+    private StoreClientAdapter clientAdapter;
+    private int page = 1;
+
+    @Override
+    protected void initView() {
+        ButterKnife.bind(this);
+        rvClient.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false));
+
+    }
+
+    @Override
+    protected void initData() {
+        if (!TextUtils.isEmpty(getIntent().getStringExtra("supplier"))) {
+            setTitle(getIntent().getStringExtra("supplier"));
+        }
+
+        clientList = new ArrayList<>();
+        clientAdapter = new StoreClientAdapter(R.layout.item_store_client, clientList);
+        clientAdapter.bindToRecyclerView(rvClient);
+        clientAdapter.setEmptyView(R.layout.view_empty_content, rvClient);
+        param = WorkUtils.pageKey();
+        if (TextUtils.isEmpty(getIntent().getStringExtra("flag"))) {
+            param.put("partTypeCode", getIntent().getStringExtra("code"));
+        } else {
+            param.put("searchType", getIntent().getStringExtra("code"));
+        }
+        String depId = getIntent().getStringExtra("depId");
+        if (!TextUtils.isEmpty(depId)) {
+            param.put("deptId", depId);
+        }
+        if (!WorkUtils.hasPermission(PagePermissionType.TRANSIT_PART_MANAGE_LIST.getPermission())) {
+            toast(R.string.permission);
+        } else {
+            getData();
+        }
+    }
+
+    private void getData() {
+        Observable<BaseBean> observable;
+        if (TextUtils.isEmpty(getIntent().getStringExtra("flag"))) {
+            observable = RtfUtils.getRtf().getClient(param);
+        } else {
+            observable = RtfUtils.getRtf().getClientOut(param);
+        }
+        observable.compose(Transformer.schedule()).subscribe(new WorkObserver<BaseBean>() {
+            @Override
+            public void doOnSubscribe(Disposable d) {
+            }
+
+            @Override
+            public void onFail(String errorMsg) {
+                hideLoading();
+                toast(errorMsg);
+            }
+
+            @Override
+            public void onSuccess(BaseBean data) {
+                hideLoading();
+                if (data.getCode() != 0) {
+                    toast(data.getMessage());
+                    return;
+                }
+                List<ClientBean.RecordsBean> dataList = new ArrayList<>();
+                if (TextUtils.isEmpty(getIntent().getStringExtra("flag"))) {
+                    ClientBean clientBean = JSON.parseObject(data.getData().toString(), ClientBean.class);
+                    dataList.addAll(clientBean.getRecords());
+                    if (page == 1) {
+                        clientList.clear();
+                        clientList.addAll(dataList);
+                        clientAdapter.notifyDataSetChanged();
+                        clientAdapter.loadMoreComplete();
+                    } else {
+                        clientAdapter.loadMoreComplete();
+                        clientList.addAll(dataList);
+                        clientAdapter.notifyDataSetChanged();
+                    }
+                    if (dataList.size() == 0) {
+                        clientAdapter.loadMoreEnd();
+                    } else {
+                        page++;
+                    }
+                } else {
+                    dataList.addAll(JSON.parseArray(data.getData().toString(), ClientBean.RecordsBean.class));
+                    clientAdapter.loadMoreEnd();
+                    clientList.clear();
+                    clientList.addAll(dataList);
+                    clientAdapter.notifyDataSetChanged();
+                }
+                if (TextUtils.isEmpty(getIntent().getStringExtra("flag"))) {
+
+                }
+                toast("搜索成功");
+            }
+        });
+    }
+
+    @Override
+    protected void initEvent() {
+        clientAdapter.setOnLoadMoreListener(new BaseQuickAdapter.RequestLoadMoreListener() {
+            @Override
+            public void onLoadMoreRequested() {
+                param.put("current", page);
+                getData();
+            }
+        }, rvClient);
+        clientAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
+            @Override
+            public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
+                Intent intent = new Intent();
+                intent.putExtra("clientName", clientList.get(position).getName());
+                intent.putExtra("id", clientList.get(position).getId());
+                setResult(10001, intent);
+                finish();
+            }
+        });
+    }
+
+    @Override
+    protected int layoutId() {
+        return R.layout.activity_mes_ticket_take_on;
+    }
+
+
+    @OnClick(R.id.btn_search)
+    public void onViewClicked() {
+        param.put("name", etKey.getText().toString());
+        param.put("current", 1);
+        page = 1;
+        getData();
+    }
+}

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

+package com.wd.workoffice.ui.adapter;
+
+
+import com.chad.library.adapter.base.BaseQuickAdapter;
+import com.chad.library.adapter.base.BaseViewHolder;
+import com.wd.workoffice.R;
+import com.wd.workoffice.bean.ProPriceBean;
+
+import java.util.List;
+
+/**
+ * Created by flexible on 2018/8/13.
+ */
+
+public class MesTicketLogAdapter extends BaseQuickAdapter<Object, BaseViewHolder> {
+
+    public MesTicketLogAdapter(int layoutResId, List data) {
+        super(layoutResId, data);
+    }
+
+
+    @Override
+    protected void convert(BaseViewHolder helper, Object item) {
+    }
+}
+

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

@@ -9,9 +9,12 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_alignParentBottom="true"
-        android:background="@android:color/white">
+        android:background="@android:color/white"
+        android:gravity="center"
+        android:paddingVertical="10mm">
 
         <TextView
+            android:id="@+id/tv_save"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:paddingHorizontal="10mm"
@@ -21,12 +24,15 @@
             android:textSize="14sp" />
 
         <TextView
+            android:id="@+id/tv_submit"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_marginLeft="10mm"
             android:background="@drawable/shape_btn_ticket"
             android:paddingHorizontal="10mm"
             android:paddingVertical="8mm"
             android:text="提交"
+            android:textColor="@color/white"
             android:textSize="14sp" />
 
     </LinearLayout>
@@ -40,387 +46,408 @@
 
         <LinearLayout
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:paddingHorizontal="20mm"
-            android:paddingVertical="9mm">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="单号:"
-                android:textSize="14sp" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginRight="10mm"
-                android:textSize="14sp" />
-        </LinearLayout>
-
-        <View style="@style/dividerX" />
-
-        <RelativeLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:paddingHorizontal="20mm"
-            android:paddingVertical="9mm">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_alignParentLeft="true"
-                android:layout_centerVertical="true"
-                android:text="客户"
-                android:textSize="14sp" />
+            android:layout_height="match_parent"
+            android:orientation="vertical">
 
             <LinearLayout
-                android:layout_width="wrap_content"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_alignParentRight="true"
-                android:gravity="center_vertical">
+                android:paddingHorizontal="20mm"
+                android:paddingVertical="9mm">
 
                 <TextView
+
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_alignParentLeft="true"
-                    android:layout_marginRight="3mm"
-                    android:text="请选择"
-                    android:textColor="@color/flexible_text_gray"
+                    android:text="单号:"
                     android:textSize="14sp" />
 
-                <ImageView
-                    android:layout_width="15mm"
-                    android:layout_height="20mm"
-                    android:src="@mipmap/arrow_right_gray" />
+                <TextView
+                    android:id="@+id/tv_code"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginRight="10mm"
+                    android:textSize="14sp" />
             </LinearLayout>
-        </RelativeLayout>
 
-        <View style="@style/dividerX" />
-
-        <RelativeLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:paddingHorizontal="20mm"
-            android:paddingVertical="9mm">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_alignParentLeft="true"
-                android:layout_centerVertical="true"
-                android:text="销售公司"
-                android:textSize="14sp" />
+            <View style="@style/dividerX" />
 
-            <LinearLayout
-                android:layout_width="wrap_content"
+            <RelativeLayout
+                android:id="@+id/rl_client"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_alignParentRight="true"
-                android:gravity="center_vertical">
+                android:paddingHorizontal="20mm"
+                android:paddingVertical="9mm">
 
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_alignParentLeft="true"
-                    android:layout_marginRight="3mm"
-                    android:text="请选择"
-                    android:textColor="@color/flexible_text_gray"
+                    android:layout_centerVertical="true"
+                    android:text="客户"
                     android:textSize="14sp" />
 
-                <ImageView
-                    android:layout_width="15mm"
-                    android:layout_height="20mm"
-                    android:src="@mipmap/arrow_right_gray" />
-            </LinearLayout>
-        </RelativeLayout>
-
-        <View style="@style/dividerX" />
-
-        <RelativeLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:paddingHorizontal="20mm"
-            android:paddingVertical="9mm">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_alignParentLeft="true"
-                android:layout_centerVertical="true"
-                android:text="销售经理"
-                android:textSize="14sp" />
-
-            <LinearLayout
-                android:layout_width="wrap_content"
+                <LinearLayout
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentRight="true"
+                    android:gravity="center_vertical">
+
+                    <TextView
+                        android:id="@+id/tv_client"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_alignParentLeft="true"
+                        android:layout_marginRight="3mm"
+                        android:text="请选择"
+                        android:textColor="@color/flexible_text_gray"
+                        android:textSize="14sp" />
+
+                    <ImageView
+                        android:layout_width="15mm"
+                        android:layout_height="20mm"
+                        android:src="@mipmap/arrow_right_gray" />
+                </LinearLayout>
+            </RelativeLayout>
+
+            <View style="@style/dividerX" />
+
+            <RelativeLayout
+                android:id="@+id/rl_company"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_alignParentRight="true"
-                android:gravity="center_vertical">
+                android:paddingHorizontal="20mm"
+                android:paddingVertical="9mm">
 
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_alignParentLeft="true"
-                    android:layout_marginRight="3mm"
-                    android:text="请选择"
-                    android:textColor="@color/flexible_text_gray"
+                    android:layout_centerVertical="true"
+                    android:text="销售公司"
                     android:textSize="14sp" />
 
-                <ImageView
-                    android:layout_width="15mm"
-                    android:layout_height="20mm"
-                    android:src="@mipmap/arrow_right_gray" />
-            </LinearLayout>
-        </RelativeLayout>
-
-        <View style="@style/ViewX" />
-
-        <RelativeLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:paddingHorizontal="20mm"
-            android:paddingVertical="9mm">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_alignParentLeft="true"
-                android:layout_centerVertical="true"
-                android:text="销售经理"
-                android:textSize="14sp" />
-
-            <LinearLayout
-                android:layout_width="wrap_content"
+                <LinearLayout
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentRight="true"
+                    android:gravity="center_vertical">
+
+                    <TextView
+                        android:id="@+id/tv_company"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_alignParentLeft="true"
+                        android:layout_marginRight="3mm"
+                        android:text="请选择"
+                        android:textColor="@color/flexible_text_gray"
+                        android:textSize="14sp" />
+
+                    <ImageView
+                        android:layout_width="15mm"
+                        android:layout_height="20mm"
+                        android:src="@mipmap/arrow_right_gray" />
+                </LinearLayout>
+            </RelativeLayout>
+
+            <View style="@style/dividerX" />
+
+            <RelativeLayout
+                android:id="@+id/rl_manager"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_alignParentRight="true"
-                android:gravity="center_vertical">
+                android:paddingHorizontal="20mm"
+                android:paddingVertical="9mm">
 
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_alignParentLeft="true"
-                    android:layout_marginRight="3mm"
-                    android:text="请选择"
-                    android:textColor="@color/flexible_text_gray"
+                    android:layout_centerVertical="true"
+                    android:text="销售经理"
                     android:textSize="14sp" />
 
-                <ImageView
-                    android:layout_width="15mm"
-                    android:layout_height="20mm"
-                    android:src="@mipmap/arrow_right_gray" />
-            </LinearLayout>
-        </RelativeLayout>
-
-        <View style="@style/dividerX" />
-
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:paddingHorizontal="20mm"
-            android:paddingVertical="13mm"
-            android:text="任务描述"
-            android:textSize="14sp" />
-
-        <EditText
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginHorizontal="20mm"
-            android:layout_marginTop="3mm"
-            android:background="@drawable/shape_input_white"
-            android:gravity="top"
-            android:hint="请输入"
-            android:minLines="4"
-            android:padding="5mm"
-            android:textSize="14sp" />
-
-        <View
-            style="@style/dividerX"
-            android:layout_marginTop="15mm" />
-
-        <RelativeLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:paddingHorizontal="20mm"
-            android:paddingVertical="9mm">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_alignParentLeft="true"
-                android:layout_centerVertical="true"
-                android:text="任务担当"
-                android:textSize="14sp" />
-
-            <LinearLayout
-                android:layout_width="wrap_content"
+                <LinearLayout
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentRight="true"
+                    android:gravity="center_vertical">
+
+                    <TextView
+                        android:id="@+id/tv_manager"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_alignParentLeft="true"
+                        android:layout_marginRight="3mm"
+                        android:text="请选择"
+                        android:textColor="@color/flexible_text_gray"
+                        android:textSize="14sp" />
+
+                    <ImageView
+                        android:layout_width="15mm"
+                        android:layout_height="20mm"
+                        android:src="@mipmap/arrow_right_gray" />
+                </LinearLayout>
+            </RelativeLayout>
+
+            <View style="@style/ViewX" />
+
+            <RelativeLayout
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_alignParentRight="true"
-                android:gravity="center_vertical">
+                android:paddingHorizontal="20mm"
+                android:paddingVertical="9mm">
 
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_alignParentLeft="true"
-                    android:layout_marginRight="3mm"
-                    android:text="请选择"
-                    android:textColor="@color/flexible_text_gray"
+                    android:layout_centerVertical="true"
+                    android:text="任务类别"
                     android:textSize="14sp" />
 
-                <ImageView
-                    android:layout_width="15mm"
-                    android:layout_height="20mm"
-                    android:src="@mipmap/arrow_right_gray" />
-            </LinearLayout>
-        </RelativeLayout>
-
-        <View style="@style/dividerX" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:paddingHorizontal="20mm"
-            android:paddingVertical="9mm">
+                <LinearLayout
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentRight="true"
+                    android:gravity="center_vertical">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_alignParentLeft="true"
+                        android:layout_marginRight="3mm"
+                        android:text="请选择"
+                        android:textColor="@color/flexible_text_gray"
+                        android:textSize="14sp" />
+
+                    <ImageView
+                        android:layout_width="15mm"
+                        android:layout_height="20mm"
+                        android:src="@mipmap/arrow_right_gray" />
+                </LinearLayout>
+            </RelativeLayout>
+
+            <View style="@style/dividerX" />
 
             <TextView
-                android:layout_width="wrap_content"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:text="参与人数"
+                android:paddingHorizontal="20mm"
+                android:paddingVertical="13mm"
+                android:text="任务描述"
                 android:textSize="14sp" />
 
             <EditText
-                android:layout_width="0dp"
+                android:id="@+id/et_desc"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_alignParentRight="true"
-                android:layout_marginLeft="10mm"
-                android:layout_weight="1"
-                android:background="@null"
-                android:gravity="right"
+                android:layout_marginHorizontal="20mm"
+                android:layout_marginTop="3mm"
+                android:background="@drawable/shape_input_white"
+                android:gravity="top"
                 android:hint="请输入"
-                android:padding="3mm"
-                android:textColor="@color/flexible_text_gray"
+                android:minLines="4"
+                android:padding="5mm"
                 android:textSize="14sp" />
-        </LinearLayout>
 
-        <View style="@style/dividerX" />
+            <View
+                style="@style/dividerX"
+                android:layout_marginTop="15mm" />
 
-        <RelativeLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:paddingHorizontal="20mm"
-            android:paddingVertical="9mm">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_centerVertical="true"
-                android:text="计划开始时间"
-                android:textSize="14sp" />
-
-            <LinearLayout
-                android:layout_width="wrap_content"
+            <RelativeLayout
+                android:id="@+id/rl_take_on"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_alignParentRight="true">
+                android:paddingHorizontal="20mm"
+                android:paddingVertical="9mm">
 
                 <TextView
-                    android:layout_width="100mm"
+                    android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginLeft="10mm"
-                    android:background="@drawable/shape_input_white"
-                    android:gravity="center"
-                    android:padding="5mm"
-                    android:textColor="@color/flexible_text_gray"
+                    android:layout_alignParentLeft="true"
+                    android:layout_centerVertical="true"
+                    android:text="任务担当"
                     android:textSize="14sp" />
 
-                <TextView
+                <LinearLayout
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginHorizontal="5mm"
-                    android:text="—"
-                    android:textSize="18sp" />
+                    android:layout_alignParentRight="true"
+                    android:gravity="center_vertical">
+
+                    <TextView
+                        android:id="@+id/tv_take_on"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_alignParentLeft="true"
+                        android:layout_marginRight="3mm"
+                        android:text="请选择"
+                        android:textColor="@color/flexible_text_gray"
+                        android:textSize="14sp" />
+
+                    <ImageView
+                        android:layout_width="15mm"
+                        android:layout_height="20mm"
+                        android:src="@mipmap/arrow_right_gray" />
+                </LinearLayout>
+            </RelativeLayout>
+
+            <View style="@style/dividerX" />
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:paddingHorizontal="20mm"
+                android:paddingVertical="9mm">
 
                 <TextView
-                    android:id="@+id/tv_end_time"
-                    android:layout_width="100mm"
+                    android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:background="@drawable/shape_input_white"
-                    android:gravity="center"
-                    android:padding="5mm"
+                    android:text="参与人数"
+                    android:textSize="14sp" />
+
+                <EditText
+                    android:id="@+id/et_person"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentRight="true"
+                    android:layout_marginLeft="10mm"
+                    android:layout_weight="1"
+                    android:background="@null"
+                    android:gravity="right"
+                    android:hint="请输入"
+                    android:padding="3mm"
                     android:textColor="@color/flexible_text_gray"
                     android:textSize="14sp" />
             </LinearLayout>
-        </RelativeLayout>
-
-        <View style="@style/dividerX" />
-
 
-        <RelativeLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:paddingHorizontal="20mm"
-            android:paddingVertical="9mm">
+            <View style="@style/dividerX" />
 
-            <TextView
-                android:layout_width="wrap_content"
+            <RelativeLayout
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:text="制单人"
-                android:textSize="14sp" />
+                android:paddingHorizontal="20mm"
+                android:paddingVertical="9mm">
 
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_centerVertical="true"
+                    android:text="计划开始时间"
+                    android:textSize="14sp" />
 
-            <TextView
-                android:layout_width="wrap_content"
+                <LinearLayout
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentRight="true">
+
+                    <TextView
+                        android:id="@+id/tv_start_time"
+                        android:layout_width="100mm"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="10mm"
+                        android:background="@drawable/shape_input_white"
+                        android:gravity="center"
+                        android:padding="5mm"
+                        android:textColor="@color/flexible_text_gray"
+                        android:textSize="14sp" />
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginHorizontal="5mm"
+                        android:text="—"
+                        android:textSize="18sp" />
+
+                    <TextView
+                        android:id="@+id/tv_end_time"
+                        android:layout_width="100mm"
+                        android:layout_height="wrap_content"
+                        android:background="@drawable/shape_input_white"
+                        android:gravity="center"
+                        android:padding="5mm"
+                        android:textColor="@color/flexible_text_gray"
+                        android:textSize="14sp" />
+                </LinearLayout>
+            </RelativeLayout>
+
+            <View style="@style/dividerX" />
+
+
+            <RelativeLayout
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_alignParentRight="true"
-                android:layout_marginRight="20mm"
-                android:gravity="center"
-                android:padding="3mm"
-                android:textColor="@color/flexible_text_gray"
-                android:textSize="14sp" />
+                android:paddingHorizontal="20mm"
+                android:paddingVertical="9mm">
 
-            <ImageView
-                android:layout_width="13mm"
-                android:layout_height="13mm"
-                android:layout_alignParentRight="true"
-                android:layout_centerVertical="true"
-                android:src="@mipmap/ticket_close" />
-        </RelativeLayout>
-
-        <View style="@style/dividerX" />
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="制单人"
+                    android:textSize="14sp" />
 
-        <RelativeLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:paddingHorizontal="20mm"
-            android:paddingVertical="9mm">
 
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_alignParentLeft="true"
-                android:layout_centerVertical="true"
-                android:text="制单日期"
-                android:textSize="14sp" />
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentRight="true"
+                    android:layout_marginRight="20mm"
+                    android:gravity="center"
+                    android:padding="3mm"
+                    android:textColor="@color/flexible_text_gray"
+                    android:textSize="14sp" />
 
-            <LinearLayout
-                android:layout_width="wrap_content"
+                <ImageView
+                    android:layout_width="13mm"
+                    android:layout_height="13mm"
+                    android:layout_alignParentRight="true"
+                    android:layout_centerVertical="true"
+                    android:src="@mipmap/ticket_close" />
+            </RelativeLayout>
+
+            <View style="@style/dividerX" />
+
+            <RelativeLayout
+                android:id="@+id/rl_time"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_alignParentRight="true"
-                android:gravity="center_vertical">
+                android:paddingHorizontal="20mm"
+                android:paddingVertical="9mm">
 
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_alignParentLeft="true"
-                    android:layout_marginRight="3mm"
-                    android:text="请选择"
-                    android:textColor="@color/flexible_text_gray"
+                    android:layout_centerVertical="true"
+                    android:text="制单日期"
                     android:textSize="14sp" />
 
-                <ImageView
-                    android:layout_width="15mm"
-                    android:layout_height="20mm"
-                    android:src="@mipmap/arrow_right_gray" />
-            </LinearLayout>
-        </RelativeLayout>
-
-        <View style="@style/dividerX" />
+                <LinearLayout
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentRight="true"
+                    android:gravity="center_vertical">
+
+                    <TextView
+                        android:id="@+id/tv_time"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_alignParentLeft="true"
+                        android:layout_marginRight="3mm"
+                        android:text="请选择"
+                        android:textColor="@color/flexible_text_gray"
+                        android:textSize="14sp" />
+
+                    <ImageView
+                        android:layout_width="15mm"
+                        android:layout_height="20mm"
+                        android:src="@mipmap/arrow_right_gray" />
+                </LinearLayout>
+            </RelativeLayout>
+
+            <View style="@style/dividerX" />
+        </LinearLayout>
     </androidx.core.widget.NestedScrollView>
 
 </RelativeLayout>
\ No newline at end of file

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

+<?xml version="1.0" encoding="utf-8"?>
+<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:paddingHorizontal="10mm"
+    android:paddingVertical="8mm">
+
+    <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:paddingHorizontal="20mm"
+            android:paddingVertical="9mm">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="任务单号:"
+                android:textSize="14sp" />
+
+            <TextView
+                android:id="@+id/tv_code"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginRight="10mm"
+                android:textSize="14sp" />
+        </LinearLayout>
+
+        <View style="@style/dividerX" />
+
+        <RelativeLayout
+            android:id="@+id/rl_client"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:paddingHorizontal="20mm"
+            android:paddingVertical="9mm">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentLeft="true"
+                android:layout_centerVertical="true"
+                android:text="客户"
+                android:textSize="14sp" />
+
+
+            <TextView
+                android:id="@+id/tv_client"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentRight="true"
+                android:layout_marginRight="3mm"
+                android:text="请选择"
+                android:textColor="@color/flexible_text_gray"
+                android:textSize="14sp" />
+
+        </RelativeLayout>
+
+        <View style="@style/dividerX" />
+
+        <RelativeLayout
+            android:id="@+id/rl_company"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:paddingHorizontal="20mm"
+            android:paddingVertical="9mm">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentLeft="true"
+                android:layout_centerVertical="true"
+                android:text="销售公司"
+                android:textSize="14sp" />
+
+            <TextView
+                android:id="@+id/tv_company"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentRight="true"
+                android:layout_marginRight="3mm"
+                android:text="请选择"
+                android:textColor="@color/flexible_text_gray"
+                android:textSize="14sp" />
+        </RelativeLayout>
+
+        <View style="@style/dividerX" />
+
+        <RelativeLayout
+            android:id="@+id/rl_manager"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:paddingHorizontal="20mm"
+            android:paddingVertical="9mm">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentLeft="true"
+                android:layout_centerVertical="true"
+                android:text="销售经理"
+                android:textSize="14sp" />
+
+
+            <TextView
+                android:id="@+id/tv_manager"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentRight="true"
+                android:layout_marginRight="3mm"
+                android:text="请选择"
+                android:textColor="@color/flexible_text_gray"
+                android:textSize="14sp" />
+
+        </RelativeLayout>
+
+        <View style="@style/ViewX" />
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:paddingHorizontal="20mm"
+            android:paddingVertical="9mm">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentLeft="true"
+                android:layout_centerVertical="true"
+                android:text="任务类别"
+                android:textSize="14sp" />
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_alignParentRight="true">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginRight="3mm"
+                    android:text="请选择"
+                    android:textColor="@color/flexible_text_gray"
+                    android:textSize="14sp" />
+
+                <androidx.recyclerview.widget.RecyclerView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginRight="3mm" />
+            </LinearLayout>
+
+        </RelativeLayout>
+
+        <View style="@style/dividerX" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:paddingHorizontal="20mm"
+            android:paddingVertical="13mm"
+            android:text="任务描述"
+            android:textSize="14sp" />
+
+        <TextView
+            android:id="@+id/tv_desc"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginHorizontal="20mm"
+            android:layout_marginTop="3mm"
+            android:background="@drawable/shape_input_white"
+            android:gravity="top"
+            android:hint="请输入"
+            android:minLines="4"
+            android:padding="5mm"
+            android:textSize="14sp" />
+
+        <View
+            style="@style/dividerX"
+            android:layout_marginTop="15mm" />
+
+        <RelativeLayout
+            android:id="@+id/rl_take_on"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:paddingHorizontal="20mm"
+            android:paddingVertical="9mm">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentLeft="true"
+                android:layout_centerVertical="true"
+                android:text="任务担当"
+                android:textSize="14sp" />
+
+            <TextView
+                android:id="@+id/tv_take_on"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentRight="true"
+                android:layout_marginRight="3mm"
+                android:text="请选择"
+                android:textColor="@color/flexible_text_gray"
+                android:textSize="14sp" />
+        </RelativeLayout>
+
+        <View style="@style/dividerX" />
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:paddingHorizontal="20mm"
+            android:paddingVertical="9mm">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="参与人数"
+                android:textSize="14sp" />
+
+            <TextView
+                android:id="@+id/tv_person"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_alignParentRight="true"
+                android:layout_marginLeft="10mm"
+                android:layout_weight="1"
+                android:background="@null"
+                android:gravity="right"
+                android:hint="请输入"
+                android:padding="3mm"
+                android:textColor="@color/flexible_text_gray"
+                android:textSize="14sp" />
+        </LinearLayout>
+
+        <View style="@style/dividerX" />
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:paddingHorizontal="20mm"
+            android:paddingVertical="9mm">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerVertical="true"
+                android:text="计划开始时间"
+                android:textSize="14sp" />
+
+            <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentRight="true">
+
+                <TextView
+                    android:id="@+id/tv_start_time"
+                    android:layout_width="100mm"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="10mm"
+                    android:background="@drawable/shape_input_white"
+                    android:gravity="center"
+                    android:padding="5mm"
+                    android:textColor="@color/flexible_text_gray"
+                    android:textSize="14sp" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginHorizontal="5mm"
+                    android:text="—"
+                    android:textSize="18sp" />
+
+                <TextView
+                    android:id="@+id/tv_end_time"
+                    android:layout_width="100mm"
+                    android:layout_height="wrap_content"
+                    android:background="@drawable/shape_input_white"
+                    android:gravity="center"
+                    android:padding="5mm"
+                    android:textColor="@color/flexible_text_gray"
+                    android:textSize="14sp" />
+            </LinearLayout>
+        </RelativeLayout>
+
+        <View style="@style/dividerX" />
+
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:paddingHorizontal="20mm"
+            android:paddingVertical="9mm">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="制单人"
+                android:textSize="14sp" />
+
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentRight="true"
+                android:layout_marginRight="20mm"
+                android:gravity="center"
+                android:padding="3mm"
+                android:textColor="@color/flexible_text_gray"
+                android:textSize="14sp" />
+
+        </RelativeLayout>
+
+        <View style="@style/dividerX" />
+
+        <RelativeLayout
+            android:id="@+id/rl_time"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:paddingHorizontal="20mm"
+            android:paddingVertical="9mm">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentLeft="true"
+                android:layout_centerVertical="true"
+                android:text="制单日期"
+                android:textSize="14sp" />
+
+            <TextView
+                android:id="@+id/tv_time"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentRight="true"
+                android:layout_marginRight="3mm"
+                android:text="请选择"
+                android:textColor="@color/flexible_text_gray"
+                android:textSize="14sp" />
+
+        </RelativeLayout>
+
+        <View style="@style/dividerX" />
+
+        <RelativeLayout
+            android:id="@+id/rl_log"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:paddingHorizontal="20mm"
+            android:paddingVertical="9mm">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentLeft="true"
+                android:layout_centerVertical="true"
+                android:text="制单日期"
+                android:textSize="14sp" />
+
+            <ImageView
+                android:layout_width="15mm"
+                android:layout_height="20mm"
+                android:layout_alignParentRight="true"
+                android:src="@mipmap/arrow_right_gray" />
+        </RelativeLayout>
+    </LinearLayout>
+</androidx.core.widget.NestedScrollView>

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

+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/white">
+
+    <androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:paddingHorizontal="10mm"
+        android:paddingVertical="8mm">
+
+        <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="9mm">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="任务单号:"
+                    android:textSize="14sp" />
+
+                <TextView
+                    android:id="@+id/tv_code"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginRight="10mm"
+                    android:layout_weight="1"
+                    android:gravity="right"
+                    android:textSize="14sp" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="5mm"
+                    android:text="查看详情"
+                    android:textColor="@color/blue_btn"
+                    android:textSize="15sp" />
+            </LinearLayout>
+
+            <View style="@style/ViewX" />
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:paddingVertical="13mm"
+                android:text="完成情况"
+                android:textSize="14sp" />
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="3mm"
+                android:layout_marginBottom="10mm"
+                android:background="@drawable/shape_input_white"
+                android:gravity="top"
+                android:hint="请输入"
+                android:minLines="3"
+                android:padding="5mm"
+                android:textSize="14sp" />
+
+            <View style="@style/dividerX" />
+
+            <RelativeLayout
+                android:id="@+id/rl_client"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:paddingVertical="9mm">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentLeft="true"
+                    android:layout_centerVertical="true"
+                    android:text="资料搜集"
+                    android:textSize="14sp" />
+
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentRight="true"
+                    android:text="已完成"
+                    android:textColor="#ff41b390"
+                    android:textSize="15sp" />
+
+            </RelativeLayout>
+
+            <View style="@style/dividerX" />
+
+            <RelativeLayout
+                android:id="@+id/rl_company"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:paddingVertical="9mm">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentLeft="true"
+                    android:layout_centerVertical="true"
+                    android:text="产品图纸确认"
+                    android:textSize="14sp" />
+
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentRight="true"
+                    android:text="已完成"
+                    android:textColor="#ff41b390"
+                    android:textSize="15sp" />
+            </RelativeLayout>
+
+            <View style="@style/dividerX" />
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:paddingVertical="13mm"
+                android:text="现场情况调查"
+                android:textSize="14sp" />
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="3mm"
+                android:layout_marginBottom="10mm"
+                android:background="@drawable/shape_input_white"
+                android:gravity="top"
+                android:hint="请输入"
+                android:minLines="3"
+                android:padding="5mm"
+                android:textSize="14sp" />
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:paddingVertical="13mm"
+                android:text="可行性方案"
+                android:textSize="14sp" />
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="3mm"
+                android:layout_marginBottom="10mm"
+                android:background="@drawable/shape_input_white"
+                android:gravity="top"
+                android:hint="请输入"
+                android:minLines="3"
+                android:padding="5mm"
+                android:textSize="14sp" />
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:paddingVertical="13mm"
+                android:text="完成情况"
+                android:textSize="14sp" />
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="3mm"
+                android:layout_marginBottom="10mm"
+                android:background="@drawable/shape_input_white"
+                android:gravity="top"
+                android:hint="请输入"
+                android:minLines="3"
+                android:padding="5mm"
+                android:textSize="14sp" />
+
+            <androidx.recyclerview.widget.RecyclerView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:paddingHorizontal="10mm" />
+        </LinearLayout>
+    </androidx.core.widget.NestedScrollView>
+</RelativeLayout>

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

+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@color/white"
+        android:paddingVertical="8mm">
+
+        <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:paddingHorizontal="10mm"
+                android:paddingVertical="9mm">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="任务单号:"
+                    android:textSize="14sp" />
+
+                <TextView
+                    android:id="@+id/tv_code"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginRight="10mm"
+                    android:layout_weight="1"
+                    android:gravity="right"
+                    android:textSize="14sp" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="5mm"
+                    android:text="查看详情"
+                    android:textColor="@color/blue_btn"
+                    android:textSize="15sp" />
+            </LinearLayout>
+
+            <View style="@style/ViewX" />
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:paddingHorizontal="10mm"
+                android:paddingVertical="13mm"
+                android:text="工单评分"
+                android:textSize="14sp" />
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:paddingHorizontal="10mm">
+
+                <androidx.recyclerview.widget.RecyclerView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="4.5分"
+                    android:textSize="19sp" />
+            </LinearLayout>
+
+            <RelativeLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:background="@color/flexible_background"
+                android:paddingHorizontal="10mm"
+                android:paddingVertical="10mm">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentLeft="true"
+                    android:text="任务担当总结"
+                    android:textColor="#ff131415"
+                    android:textSize="18sp" />
+
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentRight="true"
+                    android:src="@mipmap/arrow_down" />
+            </RelativeLayout>
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:paddingHorizontal="10mm"
+                android:paddingVertical="13mm"
+                android:text="完成情况"
+                android:textSize="14sp" />
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginHorizontal="10mm"
+                android:layout_marginTop="3mm"
+                android:layout_marginBottom="10mm"
+                android:background="@drawable/shape_input_white"
+                android:gravity="top"
+                android:hint="请输入"
+                android:minLines="3"
+                android:padding="5mm"
+                android:textSize="14sp" />
+
+            <View style="@style/dividerX" />
+
+            <RelativeLayout
+                android:id="@+id/rl_client"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:paddingHorizontal="10mm"
+                android:paddingVertical="9mm">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentLeft="true"
+                    android:layout_centerVertical="true"
+                    android:text="资料搜集"
+                    android:textSize="14sp" />
+
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentRight="true"
+                    android:text="已完成"
+                    android:textColor="#ff41b390"
+                    android:textSize="15sp" />
+
+            </RelativeLayout>
+
+            <View style="@style/dividerX" />
+
+            <RelativeLayout
+                android:id="@+id/rl_company"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:paddingHorizontal="10mm"
+                android:paddingVertical="9mm">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentLeft="true"
+                    android:layout_centerVertical="true"
+                    android:text="产品图纸确认"
+                    android:textSize="14sp" />
+
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentRight="true"
+                    android:text="已完成"
+                    android:textColor="#ff41b390"
+                    android:textSize="15sp" />
+            </RelativeLayout>
+
+            <View style="@style/dividerX" />
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:paddingHorizontal="10mm"
+                android:paddingVertical="13mm"
+                android:text="现场情况调查"
+                android:textSize="14sp" />
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginHorizontal="10mm"
+                android:layout_marginTop="3mm"
+                android:layout_marginBottom="10mm"
+                android:background="@drawable/shape_input_white"
+                android:gravity="top"
+                android:hint="请输入"
+                android:minLines="3"
+                android:padding="5mm"
+                android:textSize="14sp" />
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:paddingHorizontal="10mm"
+                android:paddingVertical="13mm"
+                android:text="可行性方案"
+                android:textSize="14sp" />
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginHorizontal="10mm"
+                android:layout_marginTop="3mm"
+                android:layout_marginBottom="10mm"
+                android:background="@drawable/shape_input_white"
+                android:gravity="top"
+                android:hint="请输入"
+                android:minLines="3"
+                android:padding="5mm"
+                android:paddingHorizontal="10mm"
+                android:textSize="14sp" />
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:paddingHorizontal="10mm"
+                android:paddingVertical="13mm"
+                android:text="完成情况"
+                android:textSize="14sp" />
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginHorizontal="10mm"
+                android:layout_marginTop="3mm"
+                android:layout_marginBottom="10mm"
+                android:background="@drawable/shape_input_white"
+                android:gravity="top"
+                android:hint="请输入"
+                android:minLines="3"
+                android:padding="5mm"
+                android:textSize="14sp" />
+
+            <androidx.recyclerview.widget.RecyclerView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:paddingHorizontal="10mm" />
+        </LinearLayout>
+    </androidx.core.widget.NestedScrollView>
+</RelativeLayout>

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

+<?xml version="1.0" encoding="utf-8"?>
+<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/white"
+    android:paddingHorizontal="10mm"
+    android:paddingVertical="8mm">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical">
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:paddingHorizontal="20mm"
+            android:paddingVertical="9mm">
+
+            <TextView
+
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="单号:"
+                android:textSize="14sp" />
+
+            <TextView
+                android:id="@+id/tv_code"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentRight="true"
+                android:layout_marginRight="10mm"
+                android:text="1111"
+                android:textSize="14sp" />
+        </RelativeLayout>
+
+        <View style="@style/dividerX" />
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:paddingHorizontal="20mm"
+            android:paddingVertical="9mm">
+
+            <TextView
+
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="日期"
+                android:textSize="14sp" />
+
+            <TextView
+                android:id="@+id/tv_time"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentRight="true"
+                android:layout_marginRight="10mm"
+                android:text="1111"
+                android:textSize="14sp" />
+        </RelativeLayout>
+
+        <View style="@style/dividerX" />
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:paddingHorizontal="20mm"
+            android:paddingVertical="9mm">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="填写人"
+                android:textSize="14sp" />
+
+            <TextView
+                android:id="@+id/tv_create_person"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentRight="true"
+                android:layout_marginRight="10mm"
+                android:text="1111"
+                android:textSize="14sp" />
+        </RelativeLayout>
+
+        <View style="@style/ViewX" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:paddingHorizontal="20mm"
+            android:paddingVertical="13mm"
+            android:text="作业内容"
+            android:textSize="14sp" />
+
+        <EditText
+            android:id="@+id/et_content"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginHorizontal="20mm"
+            android:layout_marginTop="3mm"
+            android:background="@drawable/shape_input_white"
+            android:gravity="top"
+            android:minLines="3"
+            android:padding="5mm"
+            android:textSize="14sp" />
+
+        <View style="@style/ViewX" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:paddingHorizontal="20mm"
+            android:paddingVertical="13mm"
+            android:text="问题说明"
+            android:textSize="14sp" />
+
+        <EditText
+            android:id="@+id/et_question_desc"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginHorizontal="20mm"
+            android:layout_marginTop="3mm"
+            android:background="@drawable/shape_input_white"
+            android:gravity="top"
+            android:minLines="3"
+            android:padding="5mm"
+            android:textSize="14sp" />
+
+        <View style="@style/ViewX" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:paddingHorizontal="20mm"
+            android:paddingVertical="13mm"
+            android:text="客户要求"
+            android:textSize="14sp" />
+
+        <EditText
+            android:id="@+id/et_client"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginHorizontal="20mm"
+            android:layout_marginTop="3mm"
+            android:background="@drawable/shape_input_white"
+            android:gravity="top"
+            android:minLines="3"
+            android:padding="5mm"
+            android:textSize="14sp" />
+
+        <View style="@style/ViewX" />
+
+        <View style="@style/ViewX" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:paddingHorizontal="20mm"
+            android:paddingVertical="13mm"
+            android:text="上传现场照片/视频"
+            android:textSize="14sp" />
+
+        <androidx.recyclerview.widget.RecyclerView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content" />
+    </LinearLayout>
+</androidx.core.widget.NestedScrollView>

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

+<?xml version="1.0" encoding="utf-8"?>
+<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/white"
+    android:paddingVertical="8mm">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical">
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:paddingHorizontal="20mm"
+            android:paddingVertical="9mm">
+
+            <TextView
+
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="产品图纸确认"
+                android:textSize="14sp" />
+
+            <TextView
+                android:id="@+id/tv_code"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentRight="true"
+                android:layout_marginRight="10mm"
+                android:text="1111"
+                android:textSize="14sp" />
+        </RelativeLayout>
+
+        <View style="@style/dividerX" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:paddingHorizontal="20mm"
+            android:paddingVertical="13mm"
+            android:text="现场情况调查"
+            android:textSize="14sp" />
+
+        <EditText
+            android:id="@+id/et_content"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginHorizontal="20mm"
+            android:layout_marginTop="3mm"
+            android:background="@drawable/shape_input_white"
+            android:gravity="top"
+            android:hint="请输入"
+            android:minLines="3"
+            android:padding="5mm"
+            android:textSize="14sp" />
+
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:paddingHorizontal="20mm"
+            android:paddingVertical="13mm"
+            android:text="可行性方案"
+            android:textSize="14sp" />
+
+        <EditText
+            android:id="@+id/et_question_desc"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginHorizontal="20mm"
+            android:layout_marginTop="3mm"
+            android:background="@drawable/shape_input_white"
+            android:gravity="top"
+            android:hint="请输入"
+            android:minLines="3"
+            android:padding="5mm"
+            android:textSize="14sp" />
+
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:paddingHorizontal="20mm"
+            android:paddingVertical="13mm"
+            android:text="完成情况"
+            android:textSize="14sp" />
+
+        <EditText
+            android:id="@+id/et_client"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginHorizontal="20mm"
+            android:layout_marginTop="3mm"
+            android:layout_marginBottom="10mm"
+            android:background="@drawable/shape_input_white"
+            android:gravity="top"
+            android:hint="请输入"
+            android:minLines="3"
+            android:padding="5mm"
+            android:textSize="14sp" />
+
+
+        <View style="@style/ViewX" />
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:paddingHorizontal="20mm"
+            android:paddingVertical="9mm">
+
+            <TextView
+
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="资料上传情况"
+                android:textSize="14sp" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentRight="true"
+                android:layout_marginRight="10mm"
+                android:text="1111"
+                android:textSize="14sp" />
+        </RelativeLayout>
+
+        <View style="@style/dividerX" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:paddingHorizontal="20mm"
+            android:paddingVertical="13mm"
+            android:text="上传照片"
+            android:textSize="14sp" />
+
+        <androidx.recyclerview.widget.RecyclerView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:paddingHorizontal="20mm"
+            android:paddingVertical="13mm"
+            android:text="备注：jpg"
+            android:textSize="14sp" />
+
+        <View style="@style/dividerX" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:paddingHorizontal="20mm"
+            android:paddingVertical="13mm"
+            android:text="上传附件"
+            android:textSize="14sp" />
+
+        <androidx.recyclerview.widget.RecyclerView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:paddingHorizontal="20mm"
+            android:paddingVertical="13mm"
+            android:text="备注：pdf、word、excel"
+            android:textSize="14sp" />
+    </LinearLayout>
+</androidx.core.widget.NestedScrollView>

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

+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    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:background="@color/white"
+            android:orientation="horizontal"
+            android:paddingHorizontal="20mm"
+            android:paddingVertical="10mm">
+
+
+            <LinearLayout
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_weight="1"
+                android:background="@drawable/shape_client_search"
+                android:gravity="center_vertical"
+                android:paddingHorizontal="10mm">
+
+                <ImageView
+                    android:layout_width="15mm"
+                    android:layout_height="15mm"
+                    android:src="@mipmap/client_search" />
+
+                <EditText
+                    android:id="@+id/et_key"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:layout_marginLeft="2mm"
+                    android:background="@null"
+                    android:hint="搜索"
+                    android:textColor="#91ABBA"
+                    android:textColorHint="#91ABBA"
+                    android:textSize="14sp" />
+            </LinearLayout>
+
+
+            <Button
+                android:id="@+id/btn_search"
+                android:layout_width="60mm"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="10mm"
+                android:background="@color/mainTextColor"
+                android:text="搜索"
+                android:textColor="@color/white"
+                android:textSize="16sp" />
+        </LinearLayout>
+
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/rv_client"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_marginTop="4mm">
+
+        </androidx.recyclerview.widget.RecyclerView>
+    </LinearLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file

app/src/main/res/menu/menu_report.xml

+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+    <item
+        android:id="@+id/report"
+        android:title="提交"
+        app:showAsAction="always" />
+</menu>
\ No newline at end of file

app/src/main/res/menu/menu_ticket_add.xml

+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+    <item
+        android:id="@+id/add"
+        android:title="新建"
+        app:showAsAction="always" />
+</menu>
\ No newline at end of file