Skip to content

W
workoffice
提交 a72f1248 authored 作者: lgd's avatar lgd
浏览文件
操作

1.工单其他页面，差图片逻辑 

2.//TODO erp用户是否选择新部门为空，质检接口数据无对应问题,内部交易订单审核，审核规则，领用申请列表/退件列表/参数，坩埚下单，mes，刷新token
上级 f3ff2d29
隐藏空白字符变更
内嵌 并排
正在显示 包含 659 行增加 和 292 行删除
app/build.gradle
浏览文件 @ a72f1248
...@@ -59,7 +59,7 @@ dependencies { ...@@ -59,7 +59,7 @@ dependencies {
testImplementation 'junit:junit:4.12' testImplementation 'junit:junit:4.12'
androidTestImplementation 'androidx.test:runner:1.1.0-alpha4' androidTestImplementation 'androidx.test:runner:1.1.0-alpha4'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.0-alpha4' androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.0-alpha4'
implementation 'com.google.android.material:material:1.0.0'
//ok网络框架拦截器 //ok网络框架拦截器
implementation 'com.squareup.okhttp3:logging-interceptor:3.12.0' implementation 'com.squareup.okhttp3:logging-interceptor:3.12.0'
implementation 'com.github.franmontiel:PersistentCookieJar:v1.0.1' implementation 'com.github.franmontiel:PersistentCookieJar:v1.0.1'
......
app/src/main/AndroidManifest.xml
浏览文件 @ a72f1248
...@@ -1201,6 +1201,14 @@ ...@@ -1201,6 +1201,14 @@
android:screenOrientation="portrait" android:screenOrientation="portrait"
android:theme="@style/Work.Base" android:theme="@style/Work.Base"
android:windowSoftInputMode="adjustPan" /> android:windowSoftInputMode="adjustPan" />
<activity
android:name=".ui.activity.mes.ticket.MesTicketListTakeOnActivity"
android:configChanges="keyboardHidden|orientation"
android:label="工单列表"
android:launchMode="singleTop"
android:screenOrientation="portrait"
android:theme="@style/Work.Base"
android:windowSoftInputMode="adjustPan" />
<activity <activity
android:name=".ui.activity.mes.ticket.MesTicketAddActivity" android:name=".ui.activity.mes.ticket.MesTicketAddActivity"
android:configChanges="keyboardHidden|orientation" android:configChanges="keyboardHidden|orientation"
...@@ -1217,6 +1225,14 @@ ...@@ -1217,6 +1225,14 @@
android:screenOrientation="portrait" android:screenOrientation="portrait"
android:theme="@style/Work.Base" android:theme="@style/Work.Base"
android:windowSoftInputMode="adjustPan" /> android:windowSoftInputMode="adjustPan" />
<activity
android:name=".ui.activity.mes.ticket.MesTicketDetailActivity"
android:configChanges="keyboardHidden|orientation"
android:label="工单详情"
android:launchMode="singleTop"
android:screenOrientation="portrait"
android:theme="@style/Work.Base"
android:windowSoftInputMode="adjustPan" />
<activity <activity
android:name=".ui.activity.mes.ticket.MesTicketDetailReviewActivity" android:name=".ui.activity.mes.ticket.MesTicketDetailReviewActivity"
android:configChanges="keyboardHidden|orientation" android:configChanges="keyboardHidden|orientation"
...@@ -1233,6 +1249,14 @@ ...@@ -1233,6 +1249,14 @@
android:screenOrientation="portrait" android:screenOrientation="portrait"
android:theme="@style/Work.Base" android:theme="@style/Work.Base"
android:windowSoftInputMode="adjustPan" /> android:windowSoftInputMode="adjustPan" />
<activity
android:name=".ui.activity.mes.ticket.MesTicketLogActivity"
android:configChanges="keyboardHidden|orientation"
android:label="工作日志"
android:launchMode="singleTop"
android:screenOrientation="portrait"
android:theme="@style/Work.Base"
android:windowSoftInputMode="adjustPan" />
<activity <activity
android:name=".ui.activity.mes.ticket.MesTicketAddLogActivity" android:name=".ui.activity.mes.ticket.MesTicketAddLogActivity"
android:configChanges="keyboardHidden|orientation" android:configChanges="keyboardHidden|orientation"
......
app/src/main/java/com/wd/workoffice/ui/activity/mes/ticket/MesTicketAddSummaryActivity.java
浏览文件 @ a72f1248
...@@ -73,7 +73,7 @@ public class MesTicketAddSummaryActivity extends WorkToolBarActivity { ...@@ -73,7 +73,7 @@ public class MesTicketAddSummaryActivity extends WorkToolBarActivity {
@Override @Override
protected int layoutId() { protected int layoutId() {
return R.layout.activity_mes_ticket_log_add; return R.layout.activity_mes_ticket_summary_add;
} }
@Override @Override
......
app/src/main/java/com/wd/workoffice/ui/activity/mes/ticket/MesTicketDetailActivity.java
浏览文件 @ a72f1248
package com.wd.workoffice.ui.activity.mes.ticket; package com.wd.workoffice.ui.activity.mes.ticket;
import android.os.Bundle; import android.os.Bundle;
import android.text.TextUtils;
import android.view.View;
import android.widget.Button;
import android.widget.LinearLayout;
import android.widget.RelativeLayout; import android.widget.RelativeLayout;
import android.widget.TextView; import android.widget.TextView;
...@@ -25,6 +29,12 @@ import io.reactivex.disposables.Disposable; ...@@ -25,6 +29,12 @@ import io.reactivex.disposables.Disposable;
* github: https://github.com/FlexibleXd * github: https://github.com/FlexibleXd
**/ **/
public class MesTicketDetailActivity extends WorkToolBarActivity { public class MesTicketDetailActivity extends WorkToolBarActivity {
@BindView(R.id.btn_receive)
Button btnReceive;
@BindView(R.id.btn_submit)
Button btnSubmit;
@BindView(R.id.ll_bottom)
LinearLayout llBottom;
@BindView(R.id.tv_code) @BindView(R.id.tv_code)
TextView tvCode; TextView tvCode;
@BindView(R.id.tv_client) @BindView(R.id.tv_client)
...@@ -41,10 +51,6 @@ public class MesTicketDetailActivity extends WorkToolBarActivity { ...@@ -41,10 +51,6 @@ public class MesTicketDetailActivity extends WorkToolBarActivity {
RelativeLayout rlManager; RelativeLayout rlManager;
@BindView(R.id.tv_desc) @BindView(R.id.tv_desc)
TextView tvDesc; TextView tvDesc;
@BindView(R.id.tv_take_on)
TextView tvTakeOn;
@BindView(R.id.rl_take_on)
RelativeLayout rlTakeOn;
@BindView(R.id.tv_person) @BindView(R.id.tv_person)
TextView tvPerson; TextView tvPerson;
@BindView(R.id.tv_start_time) @BindView(R.id.tv_start_time)
...@@ -55,13 +61,21 @@ public class MesTicketDetailActivity extends WorkToolBarActivity { ...@@ -55,13 +61,21 @@ public class MesTicketDetailActivity extends WorkToolBarActivity {
TextView tvTime; TextView tvTime;
@BindView(R.id.rl_time) @BindView(R.id.rl_time)
RelativeLayout rlTime; RelativeLayout rlTime;
@BindView(R.id.tv_take_on)
TextView tvTakeOn;
@BindView(R.id.rl_log) @BindView(R.id.rl_log)
RelativeLayout rlLog; RelativeLayout rlLog;
@BindView(R.id.rl_add_log)
RelativeLayout rlAddLog;
private AccountBean dataBean; private AccountBean dataBean;
@Override @Override
protected void initView() { protected void initView() {
ButterKnife.bind(this); ButterKnife.bind(this);
String from = getIntent().getStringExtra("from");//0 服务 1 任务担当
if (TextUtils.equals(from, "1")) {
llBottom.setVisibility(View.VISIBLE);
}
} }
@Override @Override
...@@ -109,7 +123,21 @@ public class MesTicketDetailActivity extends WorkToolBarActivity { ...@@ -109,7 +123,21 @@ public class MesTicketDetailActivity extends WorkToolBarActivity {
} }
@OnClick(R.id.rl_log) @OnClick({R.id.btn_receive, R.id.btn_submit, R.id.rl_log, R.id.rl_add_log})
public void onViewClicked() { public void onViewClicked(View view) {
switch (view.getId()) {
case R.id.btn_receive:
break;
case R.id.btn_submit:
startActivity(MesTicketAddSummaryActivity.class);
break;
case R.id.rl_log:
startActivity(MesTicketLogActivity.class);
break;
case R.id.rl_add_log:
startActivity(MesTicketAddLogActivity.class);
break;
}
} }
} }
app/src/main/java/com/wd/workoffice/ui/activity/mes/ticket/MesTicketListActivity.java
浏览文件 @ a72f1248
package com.wd.workoffice.ui.activity.mes.ticket; package com.wd.workoffice.ui.activity.mes.ticket;
import android.os.Bundle;
import android.text.TextUtils; import android.text.TextUtils;
import android.view.Menu; import android.view.Menu;
import android.view.MenuItem; import android.view.MenuItem;
...@@ -7,6 +8,7 @@ import android.view.View; ...@@ -7,6 +8,7 @@ import android.view.View;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.chad.library.adapter.base.BaseQuickAdapter; import com.chad.library.adapter.base.BaseQuickAdapter;
import com.google.android.material.floatingactionbutton.FloatingActionButton;
import com.scwang.smartrefresh.layout.SmartRefreshLayout; import com.scwang.smartrefresh.layout.SmartRefreshLayout;
import com.wd.workoffice.R; import com.wd.workoffice.R;
import com.wd.workoffice.app.BaseMesBean; import com.wd.workoffice.app.BaseMesBean;
...@@ -27,6 +29,7 @@ import java.util.Map; ...@@ -27,6 +29,7 @@ import java.util.Map;
import androidx.recyclerview.widget.RecyclerView; import androidx.recyclerview.widget.RecyclerView;
import butterknife.BindView; import butterknife.BindView;
import butterknife.ButterKnife; import butterknife.ButterKnife;
import butterknife.OnClick;
import flexible.xd.android_base.network.rtfhttp.Transformer; import flexible.xd.android_base.network.rtfhttp.Transformer;
import io.reactivex.disposables.Disposable; import io.reactivex.disposables.Disposable;
...@@ -40,6 +43,8 @@ public class MesTicketListActivity extends WorkToolBarActivity { ...@@ -40,6 +43,8 @@ public class MesTicketListActivity extends WorkToolBarActivity {
@BindView(R.id.ddm_choose) @BindView(R.id.ddm_choose)
DropDownMenu ddmChoose; DropDownMenu ddmChoose;
@BindView(R.id.fab_go)
FloatingActionButton fabGo;
private RecyclerView rvData; private RecyclerView rvData;
private int page = 1; private int page = 1;
private Map<String, Object> param; private Map<String, Object> param;
...@@ -194,4 +199,11 @@ public class MesTicketListActivity extends WorkToolBarActivity { ...@@ -194,4 +199,11 @@ public class MesTicketListActivity extends WorkToolBarActivity {
} }
return super.onOptionsItemSelected(item); return super.onOptionsItemSelected(item);
} }
@OnClick(R.id.fab_go)
public void onViewClicked() {
startActivity(MesTicketListTakeOnActivity.class);
finish();
}
} }
app/src/main/java/com/wd/workoffice/ui/activity/mes/ticket/MesTicketListTakeOnActivity.java 0 → 100644
浏览文件 @ a72f1248
package com.wd.workoffice.ui.activity.mes.ticket;
import android.text.TextUtils;
import android.view.Menu;
import android.view.MenuItem;
import android.view.View;
import com.alibaba.fastjson.JSON;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.scwang.smartrefresh.layout.SmartRefreshLayout;
import com.wd.workoffice.R;
import com.wd.workoffice.app.BaseMesBean;
import com.wd.workoffice.app.WorkToolBarActivity;
import com.wd.workoffice.bean.listener.FourMenuClickListener;
import com.wd.workoffice.bean.mesBean.TicketBean;
import com.wd.workoffice.retrofit.RtfUtils;
import com.wd.workoffice.retrofit.WorkObserver;
import com.wd.workoffice.ui.adapter.MesTicketAdapter;
import com.wd.workoffice.util.WorkUtils;
import com.wd.workoffice.util.ddmfilter.MesTicketListFilterData;
import com.wd.workoffice.widget.DropDownMenu;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import androidx.recyclerview.widget.RecyclerView;
import butterknife.BindView;
import butterknife.ButterKnife;
import butterknife.OnClick;
import flexible.xd.android_base.network.rtfhttp.Transformer;
import io.reactivex.disposables.Disposable;
/**
* 担当列表
* author : flexible
* email : lgd19940421@163.com
* github: https://github.com/FlexibleXd
**/
public class MesTicketListTakeOnActivity extends WorkToolBarActivity {
@BindView(R.id.ddm_choose)
DropDownMenu ddmChoose;
private RecyclerView rvData;
private int page = 1;
private Map<String, Object> param;
private SmartRefreshLayout srlRefresh;
private List<TicketBean.ListBean> dataList;
private MesTicketAdapter dataAdapter;
@Override
protected void initView() {
ButterKnife.bind(this);
MesTicketListFilterData filterData = new MesTicketListFilterData(this, ddmChoose, new FourMenuClickListener() {
@Override
public void clickOne(String value) {
if (TextUtils.equals(value, "全部状态")) {
param.put("level", "");
} else if (TextUtils.equals(value, "一级库")) {
param.put("level", "1");
} else {
param.put("level", "2");
}
page = 1;
param.put("pageNum", page);
getData();
}
@Override
public void clickTwo(String value) {
if (TextUtils.equals(value, "全部类型")) {
param.put("type", "");
} else if (TextUtils.equals(value, "厂内库")) {
param.put("type", "IN");
} else {
param.put("type", "OUT");
}
page = 1;
param.put("page", page);
getData();
}
@Override
public void clickThree(String value) {
if (TextUtils.equals(value, "全部状态")) {
param.put("status", "");
} else if (TextUtils.equals(value, "未启用")) {
param.put("status", "0");
} else {
param.put("status", "1");
}
page = 1;
param.put("pageNum", page);
getData();
}
@Override
public void clickFour(String value) {
}
});
rvData = filterData.getRvData();
srlRefresh = filterData.getSrlRefresh();
}
@Override
protected void initData() {
dataList = new ArrayList<>();
dataAdapter = new MesTicketAdapter(R.layout.item_mes_ticket, dataList);
dataAdapter.bindToRecyclerView(rvData);
dataAdapter.setEmptyView(R.layout.view_empty_content, rvData);
param = WorkUtils.pageMesKey();
param.put("pageNum", page);
getData();
}
private void getData() {
RtfUtils.getMesRtf().ticketList(WorkUtils.convertMapToBody(param)).compose(Transformer.schedule()).subscribe(new WorkObserver<BaseMesBean>() {
@Override
public void doOnSubscribe(Disposable d) {
}
@Override
public void onFail(String errorMsg) {
hideLoading();
toast(errorMsg);
}
@Override
public void onSuccess(BaseMesBean data) {
hideLoading();
if (!data.isSuccess()) {
toast(data.getMessage());
return;
}
List<TicketBean.ListBean> getList = JSON.parseObject(data.getData().toString(), TicketBean.class).getList();
if (page == 1) {
srlRefresh.finishRefresh();
dataList.clear();
dataList.addAll(getList);
dataAdapter.notifyDataSetChanged();
dataAdapter.loadMoreComplete();
} else {
dataAdapter.loadMoreComplete();
dataList.addAll(getList);
dataAdapter.notifyDataSetChanged();
}
if (getList.size() == 0) {
dataAdapter.loadMoreEnd();
} else {
page++;
}
}
});
}
@Override
protected void initEvent() {
srlRefresh.setOnRefreshListener(refreshLayout -> {
page = 1;
param.put("pageNum", page);
getData();
});
dataAdapter.setOnLoadMoreListener(() -> {
param.put("pageNum", page);
getData();
}, rvData);
dataAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
@Override
public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
startActivity(MesTicketDetailActivity.class, "from", "1");
}
});
}
@Override
protected int layoutId() {
return R.layout.activity_mes_ticket_list;
}
@OnClick(R.id.fab_go)
public void onViewClicked() {
startActivity(MesTicketListActivity.class);
finish();
}
}
app/src/main/java/com/wd/workoffice/ui/adapter/MesTicketLogAdapter.java
浏览文件 @ a72f1248
package com.wd.workoffice.ui.adapter; package com.wd.workoffice.ui.adapter;
import android.view.View;
import com.chad.library.adapter.base.BaseQuickAdapter; import com.chad.library.adapter.base.BaseQuickAdapter;
import com.chad.library.adapter.base.BaseViewHolder; import com.chad.library.adapter.base.BaseViewHolder;
import com.wd.workoffice.R; import com.wd.workoffice.R;
import com.wd.workoffice.bean.ProPriceBean; import com.wd.workoffice.bean.ProPriceBean;
import java.util.ArrayList;
import java.util.List; import java.util.List;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
/** /**
* Created by flexible on 2018/8/13. * Created by flexible on 2018/8/13.
*/ */
...@@ -21,6 +27,15 @@ public class MesTicketLogAdapter extends BaseQuickAdapter<Object, BaseViewHolder ...@@ -21,6 +27,15 @@ public class MesTicketLogAdapter extends BaseQuickAdapter<Object, BaseViewHolder
@Override @Override
protected void convert(BaseViewHolder helper, Object item) { protected void convert(BaseViewHolder helper, Object item) {
RecyclerView rvImg = helper.getView(R.id.rv_img);
rvImg.setLayoutManager(new LinearLayoutManager(helper.getConvertView().getContext(), RecyclerView.HORIZONTAL
, false));
List imgList = new ArrayList<>();
imgList.add(null);
imgList.add(null);
imgList.add(null);
ImgAdapter imgAdapter = new ImgAdapter(R.layout.item_mes_ticket_img, imgList);
imgAdapter.bindToRecyclerView(rvImg);
} }
} }
app/src/main/res/layout/activity_mes_ticket_detail.xml
浏览文件 @ a72f1248
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android" <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:paddingHorizontal="10mm" android:background="@color/white">
android:paddingVertical="8mm">
<LinearLayout <LinearLayout
android:id="@+id/ll_bottom"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:background="@color/white"
android:gravity="center"
android:paddingVertical="10mm"
android:visibility="gone">
<Button
android:id="@+id/btn_receive"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/shape_blue_circle"
android:paddingHorizontal="40mm"
android:text="接收"
android:textColor="@color/white" />
<Button
android:id="@+id/btn_submit"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/shape_blue_circle"
android:paddingHorizontal="40mm"
android:text="提交工单总结"
android:textColor="@color/white" />
</LinearLayout>
<androidx.core.widget.NestedScrollView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:orientation="vertical"> android:layout_above="@id/ll_bottom">
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="match_parent"
android:paddingHorizontal="20mm" android:orientation="vertical">
android:paddingVertical="9mm">
<TextView <LinearLayout
android:layout_width="wrap_content" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="任务单号:" android:paddingHorizontal="20mm"
android:textSize="14sp" /> android:paddingVertical="9mm">
<TextView <TextView
android:id="@+id/tv_code" android:layout_width="wrap_content"
android:layout_width="wrap_content" android:layout_height="wrap_content"
android:layout_height="wrap_content" android:text="任务单号:"
android:layout_marginRight="10mm" android:textSize="14sp" />
android:textSize="14sp" />
</LinearLayout>
<View style="@style/dividerX" /> <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" />
android:id="@+id/rl_client"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingHorizontal="20mm"
android:paddingVertical="9mm">
<TextView <RelativeLayout
android:layout_width="wrap_content" android:id="@+id/rl_client"
android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentLeft="true" android:paddingHorizontal="20mm"
android:layout_centerVertical="true" android:paddingVertical="9mm">
android:text="客户"
android:textSize="14sp" />
<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> <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" />
<View style="@style/dividerX" /> </RelativeLayout>
<RelativeLayout <View style="@style/dividerX" />
android:id="@+id/rl_company"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingHorizontal="20mm"
android:paddingVertical="9mm">
<TextView <RelativeLayout
android:layout_width="wrap_content" android:id="@+id/rl_company"
android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentLeft="true" android:paddingHorizontal="20mm"
android:layout_centerVertical="true" android:paddingVertical="9mm">
android:text="销售公司"
android:textSize="14sp" />
<TextView <TextView
android:id="@+id/tv_company" android:layout_width="wrap_content"
android:layout_width="wrap_content" android:layout_height="wrap_content"
android:layout_height="wrap_content" android:layout_alignParentLeft="true"
android:layout_alignParentRight="true" android:layout_centerVertical="true"
android:layout_marginRight="3mm" android:text="销售公司"
android:text="请选择" android:textSize="14sp" />
android:textColor="@color/flexible_text_gray"
android:textSize="14sp" />
</RelativeLayout>
<View style="@style/dividerX" /> <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>
<RelativeLayout <View style="@style/dividerX" />
android:id="@+id/rl_manager"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingHorizontal="20mm"
android:paddingVertical="9mm">
<TextView <RelativeLayout
android:layout_width="wrap_content" android:id="@+id/rl_manager"
android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentLeft="true" android:paddingHorizontal="20mm"
android:layout_centerVertical="true" android:paddingVertical="9mm">
android:text="销售经理"
android:textSize="14sp" />
<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" /> <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 </RelativeLayout>
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingHorizontal="20mm"
android:paddingVertical="9mm">
<TextView <View style="@style/ViewX" />
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_centerVertical="true"
android:text="任务类别"
android:textSize="14sp" />
<LinearLayout <RelativeLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentRight="true"> android:paddingHorizontal="20mm"
android:paddingVertical="9mm">
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginRight="3mm" android:layout_alignParentLeft="true"
android:text="请选择" android:text="任务类别"
android:textColor="@color/flexible_text_gray"
android:textSize="14sp" /> android:textSize="14sp" />
<androidx.recyclerview.widget.RecyclerView <LinearLayout
android:layout_width="match_parent" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginRight="3mm" /> android:layout_alignParentRight="true"
</LinearLayout> android:orientation="vertical">
</RelativeLayout> <TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="3mm"
android:text="请选择"
android:textSize="14sp" />
<View style="@style/dividerX" /> <androidx.recyclerview.widget.RecyclerView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="3mm"
android:layout_marginRight="3mm" />
</LinearLayout>
<TextView </RelativeLayout>
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingHorizontal="20mm"
android:paddingVertical="13mm"
android:text="任务描述"
android:textSize="14sp" />
<TextView <View style="@style/dividerX" />
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 <TextView
android:layout_width="wrap_content" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentLeft="true" android:paddingHorizontal="20mm"
android:layout_centerVertical="true" android:paddingVertical="13mm"
android:text="任务担当" android:text="任务描述"
android:textSize="14sp" /> android:textSize="14sp" />
<TextView <TextView
android:id="@+id/tv_take_on" android:id="@+id/tv_desc"
android:layout_width="wrap_content" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentRight="true" android:layout_marginHorizontal="20mm"
android:layout_marginRight="3mm" android:layout_marginTop="3mm"
android:text="请选择" android:background="@drawable/shape_input_white"
android:textColor="@color/flexible_text_gray" android:gravity="top"
android:minLines="3"
android:padding="5mm"
android:textSize="14sp" /> android:textSize="14sp" />
</RelativeLayout>
<View style="@style/dividerX" /> <View
style="@style/dividerX"
android:layout_marginTop="15mm" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingHorizontal="20mm"
android:paddingVertical="9mm">
<TextView <LinearLayout
android:layout_width="wrap_content" android:layout_width="match_parent"
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_height="wrap_content"
android:layout_alignParentRight="true" android:paddingHorizontal="20mm"
android:layout_marginLeft="10mm" android:paddingVertical="9mm">
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" /> <TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="参与人数"
android:textSize="14sp" />
<RelativeLayout <TextView
android:layout_width="match_parent" android:id="@+id/tv_person"
android:layout_height="wrap_content" android:layout_width="0dp"
android:paddingHorizontal="20mm" android:layout_height="wrap_content"
android:paddingVertical="9mm"> 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>
<TextView <View style="@style/dividerX" />
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:text="计划开始时间"
android:textSize="14sp" />
<LinearLayout <RelativeLayout
android:layout_width="wrap_content" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentRight="true"> android:paddingHorizontal="20mm"
android:paddingVertical="9mm">
<TextView <TextView
android:id="@+id/tv_start_time" android:layout_width="wrap_content"
android:layout_width="100mm"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="10mm" android:layout_centerVertical="true"
android:background="@drawable/shape_input_white" android:text="计划开始时间"
android:gravity="center"
android:padding="5mm"
android:textColor="@color/flexible_text_gray"
android:textSize="14sp" /> 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: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: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 <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginHorizontal="5mm" android:text="制单人"
android:text="—" android:textSize="14sp" />
android:textSize="18sp" />
<TextView <TextView
android:id="@+id/tv_end_time" android:layout_width="wrap_content"
android:layout_width="100mm"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@drawable/shape_input_white" android:layout_alignParentRight="true"
android:layout_marginRight="20mm"
android:gravity="center" android:gravity="center"
android:padding="5mm" android:padding="3mm"
android:textColor="@color/flexible_text_gray" android:textColor="@color/flexible_text_gray"
android:textSize="14sp" /> android:textSize="14sp" />
</LinearLayout>
</RelativeLayout>
<View style="@style/dividerX" />
</RelativeLayout>
<RelativeLayout <View style="@style/dividerX" />
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingHorizontal="20mm"
android:paddingVertical="9mm">
<TextView <RelativeLayout
android:layout_width="wrap_content" android:id="@+id/rl_time"
android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="制单人" android:paddingHorizontal="20mm"
android:textSize="14sp" /> 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 <TextView
android:layout_width="wrap_content" 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:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentRight="true" android:paddingHorizontal="20mm"
android:layout_marginRight="20mm" android:paddingVertical="9mm">
android:gravity="center"
android:padding="3mm"
android:textColor="@color/flexible_text_gray"
android:textSize="14sp" />
</RelativeLayout> <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" /> <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 </RelativeLayout>
android:id="@+id/rl_time"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingHorizontal="20mm"
android:paddingVertical="9mm">
<TextView <View style="@style/ViewX" />
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_centerVertical="true"
android:text="制单日期"
android:textSize="14sp" />
<TextView <RelativeLayout
android:id="@+id/tv_time" android:id="@+id/rl_log"
android:layout_width="wrap_content" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentRight="true" android:paddingHorizontal="20mm"
android:layout_marginRight="3mm" android:paddingVertical="9mm">
android:text="请选择"
android:textColor="@color/flexible_text_gray"
android:textSize="14sp" />
</RelativeLayout>
<View style="@style/dividerX" /> <TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_centerVertical="true"
android:text="日志列表"
android:textSize="14sp" />
<RelativeLayout <ImageView
android:id="@+id/rl_log" android:layout_width="15mm"
android:layout_width="match_parent" android:layout_height="20mm"
android:layout_height="wrap_content" android:layout_alignParentRight="true"
android:paddingHorizontal="20mm" android:src="@mipmap/arrow_right_gray" />
android:paddingVertical="9mm"> </RelativeLayout>
<TextView <RelativeLayout
android:layout_width="wrap_content" android:id="@+id/rl_add_log"
android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentLeft="true" android:paddingHorizontal="20mm"
android:layout_centerVertical="true" android:paddingVertical="9mm">
android:text="制单日期"
android:textSize="14sp" />
<ImageView <TextView
android:layout_width="15mm" android:layout_width="wrap_content"
android:layout_height="20mm" android:layout_height="wrap_content"
android:layout_alignParentRight="true" android:layout_alignParentLeft="true"
android:src="@mipmap/arrow_right_gray" /> android:layout_centerVertical="true"
</RelativeLayout> android:text="日志列表"
</LinearLayout> android:textSize="14sp" />
</androidx.core.widget.NestedScrollView>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="填写工作日志"
android:textColor="@color/blue_btn"
android:textSize="16sp" />
<ImageView
android:layout_width="15mm"
android:layout_height="20mm"
android:src="@mipmap/arrow_right_gray" />
</LinearLayout>
</RelativeLayout>
</LinearLayout>
</androidx.core.widget.NestedScrollView>
</RelativeLayout>
app/src/main/res/layout/activity_mes_ticket_list.xml
浏览文件 @ a72f1248
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:orientation="vertical"> android:orientation="vertical">
<com.google.android.material.floatingactionbutton.FloatingActionButton
android:id="@+id/fab_go"
android:layout_width="70mm"
android:layout_height="70mm"
android:layout_alignParentRight="true"
android:layout_marginTop="30mm"
app:backgroundTint="#FFF3A5A5"
app:elevation="3dp" />
<com.wd.workoffice.widget.DropDownMenu <com.wd.workoffice.widget.DropDownMenu
android:id="@+id/ddm_choose" android:id="@+id/ddm_choose"
android:layout_width="match_parent" android:layout_width="match_parent"
...@@ -19,4 +29,4 @@ ...@@ -19,4 +29,4 @@
app:ddtextSelectedColor="@color/mainTextColor" app:ddtextSelectedColor="@color/mainTextColor"
app:ddtextUnselectedColor="@color/main_icon_select" app:ddtextUnselectedColor="@color/main_icon_select"
app:ddunderlineColor="@color/white" /> app:ddunderlineColor="@color/white" />
</LinearLayout> </RelativeLayout>
\ No newline at end of file \ No newline at end of file
app/src/main/res/layout/item_mes_layout.xml
浏览文件 @ a72f1248
...@@ -3,8 +3,8 @@ ...@@ -3,8 +3,8 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="center" android:gravity="center"
android:paddingBottom="30mm" android:orientation="vertical"
android:orientation="vertical"> android:paddingBottom="30mm">
<ImageView <ImageView
android:id="@+id/iv_img" android:id="@+id/iv_img"
...@@ -17,5 +17,5 @@ ...@@ -17,5 +17,5 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="8mm" android:layout_marginTop="8mm"
android:textSize="12sp" /> android:textSize="15sp" />
</LinearLayout> </LinearLayout>
\ No newline at end of file
app/src/main/res/layout/item_mes_ticket_log.xml
浏览文件 @ a72f1248
...@@ -50,12 +50,13 @@ ...@@ -50,12 +50,13 @@
android:text="2020.04.05" android:text="2020.04.05"
android:textSize="17sp" android:textSize="17sp"
android:textStyle="bold" /> android:textStyle="bold" />
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="35mm" android:layout_marginLeft="35mm"
android:layout_marginTop="14mm" android:layout_marginTop="14mm"
android:text="作业内容" android:text="问题说明"
android:textColor="@color/blue_bg" android:textColor="@color/blue_bg"
android:textSize="15sp" /> android:textSize="15sp" />
...@@ -67,10 +68,29 @@ ...@@ -67,10 +68,29 @@
android:text="2020.04.05" android:text="2020.04.05"
android:textSize="17sp" android:textSize="17sp"
android:textStyle="bold" /> android:textStyle="bold" />
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/rv_img" <TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="35mm"
android:layout_marginTop="14mm"
android:text="客户要求"
android:textColor="@color/blue_bg"
android:textSize="15sp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="35mm" android:layout_marginLeft="35mm"
android:layout_marginTop="10mm" android:layout_marginTop="10mm"
android:text="2020.04.05"
android:textSize="17sp"
android:textStyle="bold" />
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/rv_img"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"/> android:layout_height="wrap_content"
android:layout_marginLeft="35mm"
android:layout_marginTop="10mm" />
</LinearLayout> </LinearLayout>
\ No newline at end of file
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论